Changeset 16070 in vbox

Timestamp:

Jan 20, 2009 8:42:03 AM (16 years ago)

Author:

vboxsync

Message:

NAT: 2nd patch from lawrencerust.
Corrects the behaviour of PORT command handling and PASV response.

File:

• trunk/src/VBox/Devices/Network/slirp/tcp_subr.c (modified) (4 diffs)

trunk/src/VBox/Devices/Network/slirp/tcp_subr.c

@@ -669 +669 @@
                  * Need to emulate the PORT command
                  */
+                struct sockaddr_in addr;
+                socklen_t addrlen = sizeof addr;
+
+                if ( getsockname(so->s,(struct sockaddr *)&addr,&addrlen))
+                    return 1;
+
                 x = sscanf(bptr, "ORT %u,%u,%u,%u,%u,%u\r\n%256[^\177]",
                            &n1, &n2, &n3, &n4, &n5, &n6, buff);
@@ -685 +691 @@
                 n6 &= 0xff;
 
-                laddr = ntohl(so->so_faddr.s_addr);
+                laddr = ntohl(addr.sin_addr.s_addr);
 
                 n1 = ((laddr >> 24) & 0xff);
@@ -702 +708 @@
                  * Need to emulate the PASV response
                  */
+                struct sockaddr_in addr;
+                socklen_t addrlen = sizeof addr;
+
+                if ( getsockname(so->s,(struct sockaddr *)&addr,&addrlen))
+                    return 1;
+
                 x = sscanf(bptr, "27 Entering Passive Mode (%u,%u,%u,%u,%u,%u)\r\n%256[^\177]",
                            &n1, &n2, &n3, &n4, &n5, &n6, buff);
@@ -718 +730 @@
                 n6 &= 0xff;
 
-                laddr = ntohl(so->so_faddr.s_addr);
+                laddr = ntohl(addr.sin_addr.s_addr);
 
                 n1 = ((laddr >> 24) & 0xff);