Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-02-19 19:30:42 +00:00
Code Issues Projects Releases Wiki Activity

fix for slirp ftp proxying putting slirp placeholder host ip in PORT commands

Browse Source
This commit is contained in:
rakslice 2024-10-04 05:09:53 -07:00
parent 03e1593387
commit 2148b0b636
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BasiliskII/src/slirp/tcp_subr.c
View File

@ -986,6 +986,7 @@ do_prompt:
case EMU_FTP: /* ftp */ case EMU_FTP: /* ftp */
*(m->m_data+m->m_len) = 0; /* NULL terminate for strstr */ *(m->m_data+m->m_len) = 0; /* NULL terminate for strstr */
if ((bptr = (char *)strstr(m->m_data, "ORT")) != NULL) { if ((bptr = (char *)strstr(m->m_data, "ORT")) != NULL) {
struct socket * control_so = so;
/* /*
* Need to emulate the PORT command * Need to emulate the PORT command
*/ */
@ -1005,7 +1006,19 @@ do_prompt:
n5 = (n6 >> 8) & 0xff; n5 = (n6 >> 8) & 0xff;
n6 &= 0xff; n6 &= 0xff;
if (so->so_faddr.s_addr != alias_addr.s_addr) {
laddr = ntohl(so->so_faddr.s_addr); laddr = ntohl(so->so_faddr.s_addr);
} else {
/* local side address of control conn */
struct sockaddr_in addr;
socklen_t addrlen = sizeof(struct sockaddr_in);
if (getsockname(control_so->s, &addr, &addrlen) == 0) {
laddr = ntohl(addr.sin_addr.s_addr);
} else {
/* fall back to whatever we have for our address generally */
laddr = ntohl(our_addr.s_addr);
}
}
n1 = ((laddr >> 24) & 0xff); n1 = ((laddr >> 24) & 0xff);
n2 = ((laddr >> 16) & 0xff); n2 = ((laddr >> 16) & 0xff);