Changeset 20974 in vbox for trunk/src/VBox/Devices/Network/slirp/libalias/alias_db.c

Timestamp:

Jun 26, 2009 1:52:10 PM (16 years ago)

Author:

vboxsync

Message:

NAT/libalias: disabling libalias socket managment

File:

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

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

@@ -332 +332 @@
     int     expire_time;    /* Expire time for link                */
 #ifndef NO_USE_SOCKETS
+# ifndef VBOX 
+    /* 
+     * in VBox we do not use host's sockets here, which are managed 
+     * inside slirp. yes we have to create new sockets here but latter
+     * managment and deletion are in repsponsible of Slirp. 
+     */
     int     sockfd; /* socket descriptor                   */
+# endif
 #endif
             LIST_ENTRY    (alias_link) list_out;    /* Linked list of
@@ -671 +678 @@
                 && ((lnk->link_type == LINK_TCP) ||
                 (lnk->link_type == LINK_UDP))) {
+#ifndef VBOX
                 if (GetSocket(la, port_net, &lnk->sockfd, lnk->link_type)) {
+#else
+                if (GetSocket(la, port_net, NULL, lnk->link_type)) {
+#endif
                     lnk->alias_port = port_net;
                     return (0);
@@ -754 +765 @@
     if (err == 0) {
         la->sockCount++;
-        *sockfd = sock;
 #ifdef VBOX
             so->so_expire = la->curtime + SO_EXPIRE;
@@ -782 +792 @@
             }
         
+#else
+        *sockfd = sock;
 #endif
         return (1);
@@ -954 +966 @@
 #ifndef NO_USE_SOCKETS
 /* Close socket, if one has been allocated */
+# ifndef VBOX
     if (lnk->sockfd != -1) {
         la->sockCount--;
         close(lnk->sockfd);
     }
+# else
+    /* Slirp will close the socket in its own way */
+# endif
 #endif
 /* Link-type dependent cleanup */
@@ -1027 +1043 @@
         lnk->link_type = link_type;
 #ifndef NO_USE_SOCKETS
+# ifndef VBOX
         lnk->sockfd = -1;
+# endif
 #endif
         lnk->flags = 0;