Changeset 40621 in vbox for trunk/src

Timestamp:

Mar 26, 2012 1:18:08 AM (13 years ago)

Author:

vboxsync

Message:

NAT: libalias closes self sockets, and Slirp inform libalias in case it closes its socket.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• libalias/alias_db.c (modified) (10 diffs)
• socket.c (modified) (5 diffs)
• socket.h (modified) (2 diffs)
• tcp_subr.c (modified) (1 diff)

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

@@ -345 +345 @@
      */
     int     sockfd; /* socket descriptor                   */
+#  else
+    struct socket *pSo;
 # endif
 #endif
@@ -570 +572 @@
 static int  GetNewPort(struct libalias *, struct alias_link *, int);
 #ifndef NO_USE_SOCKETS
+# ifdef VBOX
+static u_short  GetSocket(struct libalias *, u_short, struct alias_link*, int);
+# else
 static u_short  GetSocket(struct libalias *, u_short, int *, int);
+# endif
 #endif
 static void CleanupAliasData(struct libalias *);
@@ -688 +694 @@
                 if (GetSocket(la, port_net, &lnk->sockfd, lnk->link_type)) {
 #else
-                if (GetSocket(la, port_net, NULL, lnk->link_type)) {
+                if (GetSocket(la, port_net, lnk, lnk->link_type)) {
 #endif
                     lnk->alias_port = port_net;
@@ -716 +722 @@
 #ifndef NO_USE_SOCKETS
 static      u_short
+# ifndef VBOX
 GetSocket(struct libalias *la, u_short port_net, int *sockfd, int link_type)
+# else
+GetSocket(struct libalias *la, u_short port_net, struct alias_link *pLnk, int link_type)
+# endif
 {
     int err;
@@ -727 +737 @@
     struct sockaddr sa_addr;
     socklen_t socklen = sizeof(struct sockaddr);
-    NOREF(sockfd);
 #endif
 
@@ -816 +825 @@
         }
         LogFunc(("bind called for socket: %R[natsock]\n", so));
+        pLnk->pSo = so;
+        so->so_pvLnk = pLnk;
 #else
         *sockfd = sock;
@@ -970 +981 @@
 }
 
+#ifdef VBOX
+/**
+ * when slirp delete the link we need inform libalias about it.
+ */
+void slirpDeleteLinkSocket(void *pvLnk)
+{
+        struct alias_link *lnk = (struct alias_link *)pvLnk;
+        lnk->pSo = NULL;
+}
+#endif /* !VBOX */
+
 static void
 DeleteLink(struct alias_link *lnk)
 {
     struct libalias *la = lnk->la;
+    LogFlowFunc(("ENTER: lnk->pSo:%R[natsock]\n", lnk->pSo));
 
     LIBALIAS_LOCK_ASSERT(la);
@@ -1008 +1031 @@
     }
 # else
-    /* Slirp will close the socket in its own way */
+    if (lnk->pSo) 
+    {
+        la->sockCount--;
+        /* should we be more smart, or it's enough to be 
+         * narrow-minded and just do sofree here 
+         */
+        sofree(la->pData, lnk->pSo);
+        lnk->pSo = NULL;
+    }
 # endif
 #endif
@@ -1048 +1079 @@
         ShowAliasStats(la);
     }
+    LogFlowFuncLeave();
 }
 
@@ -1081 +1113 @@
 # ifndef VBOX
         lnk->sockfd = -1;
+# else
+        lnk->pSo = NULL;
 # endif
 #endif

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

@@ -187 +187 @@
     else if (so == udp_last_so)
         udp_last_so = &udb;
+    /* libalias notification */
+    if (so->so_pvLnk)
+        slirpDeleteLinkSocket(so->so_pvLnk);
 
     /* check if mbuf haven't been already freed  */
@@ -1224 +1227 @@
 sofcantrcvmore(struct  socket *so)
 {
+    LogFlowFunc(("ENTER: so:%R[natsock]\n", so));
     if ((so->so_state & SS_NOFDREF) == 0)
     {
@@ -1234 +1238 @@
     else
         so->so_state |= SS_FCANTRCVMORE;
+    LogFlowFuncLeave();
 }
 
@@ -1239 +1244 @@
 sofcantsendmore(struct socket *so)
 {
+    LogFlowFunc(("ENTER: so:%R[natsock]\n", so));
     if ((so->so_state & SS_NOFDREF) == 0)
         shutdown(so->s, 1);           /* send FIN to fhost */
@@ -1247 +1253 @@
     else
         so->so_state |= SS_FCANTSENDMORE;
+    LogFlowFuncLeave();
 }
 

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

@@ -106 +106 @@
     /* required for port-forwarding */
     struct libalias *so_la;
+    /* libalias might attach the socket and we want to notify libalias we're freeing it */
+    void *so_pvLnk;
 #ifdef VBOX_WITH_NAT_UDP_SOCKET_CLONE
     struct socket *so_cloneOf; /* pointer to master instance */
@@ -111 +113 @@
 #endif
 };
+
+/* this function inform libalias about socket close */
+void slirpDeleteLinkSocket(void *pvLnk);
 
 #ifdef VBOX_WITH_SLIRP_MT

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

@@ -355 +355 @@
 {
     LogFlowFunc(("ENTER: tp = %R[tcpcb793]\n", tp));
+    LogFunc(("tp->t_socket:%R[natsock]\n",tp->t_socket));
 
     switch (tp->t_state)