Changeset 40786 in vbox

Timestamp:

Apr 6, 2012 7:32:46 AM (13 years ago)

Author:

vboxsync

Message:

NAT:libalias: initialization of TCP socket for constructed link.

File:

• trunk/src/VBox/Devices/Network/slirp/libalias/alias_db.c (modified) (3 diffs)

trunk/src/VBox/Devices/Network/slirp/libalias/alias_db.c

@@ -780 +780 @@
     sock_addr.sin_family = AF_INET;
     sock_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+#if 0
     sock_addr.sin_port = htons(port_net);
+#endif
 #ifdef RT_OS_DARWIN
     sock_addr.sin_len = sizeof(struct sockaddr_in);
@@ -802 +804 @@
             return 0;
         }
+        so->so_laddr.s_addr = la->aliasAddress.s_addr;
+        so->so_lport = htons(port_net);
+        so->so_faddr.s_addr = la->true_addr.s_addr;
+        so->so_fport = la->true_port;
         so->so_hlport = ((struct sockaddr_in *)&sa_addr)->sin_port;
         so->so_hladdr.s_addr =
@@ -808 +814 @@
         if (link_type == LINK_TCP)
         {
-            so->so_type = IPPROTO_TCP;
-            insque(la->pData, so, &la->tcb);
+            int ret = 0;
+            struct sockaddr_in sin;
+            RT_ZERO(sin);
+            sin.sin_family = AF_INET;
+            sin.sin_addr.s_addr = so->so_faddr.s_addr;
+            sin.sin_port = so->so_fport;
+            ret = connect(so->s, (struct sockaddr *)&sin, sizeof(sin));
+            if (   ret < 0
+                && errno == EINPROGRESS
+                && errno == EAGAIN
+                && errno == EWOULDBLOCK)
+            {
+                closesocket(so->s);
+                RTMemFree(so);
+                return 0;
+            }
+            so->so_state = SS_ISFCONNECTING; /* slirp happy??? */
+            tcp_attach(la->pData, so);
+            /* tcp_{snd,rcv}space -> pData->tcp_{snd,rcv}space */
+            sbreserve(la->pData, &so->so_snd, la->tcp_sndspace);
+            sbreserve(la->pData, &so->so_rcv, la->tcp_rcvspace);
         }
         else if (link_type == LINK_UDP)