Changeset 51137 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Apr 24, 2014 2:28:08 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

93447

Message:

NAT: #7342: debug assertion in sofree() triggered by ftp connections.
Do a minimal stop-gap fix by compiling libalias with NO_USE_SOCKETS.
Two wrongs don't make a right, but this at least averts harm.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• libalias/alias_db.c (modified) (3 diffs)
• slirp.h (modified) (1 diff)
• socket.c (modified) (1 diff)

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

@@ -1004 +1004 @@
 }
 
-#ifdef VBOX
+#if defined(VBOX) && !defined(NO_USE_SOCKETS)
+
 /**
  * when slirp delete the link we need inform libalias about it.
@@ -1021 +1022 @@
     }
 }
-#endif /* !VBOX */
+#endif /* VBOX && !NO_USE_SOCKETS */
 
 static void
@@ -1027 +1028 @@
 {
     struct libalias *la = lnk->la;
+#ifndef NO_USE_SOCKETS
     LogFlowFunc(("ENTER: lnk->pSo:%R[natsock]\n", lnk->pSo));
+#else
+    LogFlowFuncEnter();
+#endif
 
     LIBALIAS_LOCK_ASSERT(la);

trunk/src/VBox/Devices/Network/slirp/slirp.h

@@ -393 +393 @@
 # define bcmp(a1, a2, len) memcmp((a1), (a2), (len))
 # define NO_FW_PUNCH
+/* Two wrongs don't make a right, but this at least averts harm. */
+# define NO_USE_SOCKETS
 
 # ifdef alias_addr

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

@@ -204 +204 @@
         udp_last_so = &udb;
 
+#if 0 /* XXX: !defined(NO_USE_SOCKETS) */
     /* libalias notification */
     if (so->so_pvLnk)
         slirpDeleteLinkSocket(so->so_pvLnk);
+#endif
+
     /* check if mbuf haven't been already freed  */
     if (so->so_m != NULL)