Changeset 38345 in vbox

Timestamp:

Aug 8, 2011 10:53:27 AM (13 years ago)

Author:

vboxsync

Message:

NAT: logging. (vbox/#9346).

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• libalias/alias_db.c (modified) (2 diffs)
• udp.c (modified) (4 diffs)

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

@@ -774 +774 @@
 #endif
 
+
     err = bind(sock,
         (struct sockaddr *)&sock_addr,
@@ -780 +781 @@
         la->sockCount++;
 #ifdef VBOX
-            so->so_expire = la->curtime + SO_EXPIRE;
-            setsockopt(so->s, SOL_SOCKET, SO_BROADCAST,
-                (const char *)&opt, sizeof(opt));
-            status = getsockname(so->s, &sa_addr, &socklen);
-            if (status != 0 || sa_addr.sa_family != AF_INET)
-            {
-                closesocket(so->s);
-                RTMemFree(so);
-                return 0;
-            }
-            so->so_hlport = ((struct sockaddr_in *)&sa_addr)->sin_port;
-            so->so_hladdr.s_addr =
-                ((struct sockaddr_in *)&sa_addr)->sin_addr.s_addr;
-            NSOCK_INC_EX(la);
+        so->so_expire = la->curtime + SO_EXPIRE;
+        setsockopt(so->s, SOL_SOCKET, SO_BROADCAST,
+            (const char *)&opt, sizeof(opt));
+        status = getsockname(so->s, &sa_addr, &socklen);
+        if (status != 0 || sa_addr.sa_family != AF_INET)
+        {
+            closesocket(so->s);
+            RTMemFree(so);
+            return 0;
+        }
+        so->so_hlport = ((struct sockaddr_in *)&sa_addr)->sin_port;
+        so->so_hladdr.s_addr =
+            ((struct sockaddr_in *)&sa_addr)->sin_addr.s_addr;
+        NSOCK_INC_EX(la);
         if (link_type == LINK_TCP)
-            {
-                insque(la->pData, so, &la->tcb);
-            }
+            insque(la->pData, so, &la->tcb);
         else if (link_type == LINK_UDP)
-            {
-                insque(la->pData, so, &la->udb);
-            }
-            else {
-                Assert(!"Shouldn't be here");
-            }
-
+            insque(la->pData, so, &la->udb);
+        else
+            Assert(!"Shouldn't be here");
+        LogFunc(("bind called for socket: %R[natsock]\n", so));
 #else
         *sockfd = sock;

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

@@ -493 +493 @@
     socklen_t addrlen = sizeof(struct sockaddr_in);
     int opt = 1;
+    LogFlowFunc(("ENTER: bind_addr:%RTnaipv4, port:%d, laddr:%RTnaipv4, lport:%d, flags:%x\n",
+                 bind_addr, RT_N2H_U16(port), laddr, RT_N2H_U16(lport), flags));
 
     if ((so = socreate()) == NULL)
+    {
+        LogFlowFunc(("LEAVE: NULL\n"));
         return NULL;
+    }
 
     so->s = socket(AF_INET, SOCK_DGRAM, 0);
@@ -502 +507 @@
         LogRel(("NAT: can't create datagram socket\n"));
         RTMemFree(so);
+        LogFlowFunc(("LEAVE: NULL\n"));
         return NULL;
     }
@@ -524 +530 @@
         LogRel(("NAT: bind to %RTnaipv4 has been failed\n", addr.sin_addr));
         udp_detach(pData, so);
+        LogFlowFunc(("LEAVE: NULL\n"));
         return NULL;
     }
@@ -546 +553 @@
     so->so_state = SS_ISFCONNECTED;
 
+    LogFlowFunc(("LEAVE: %R[natsock]\n", so));
     return so;
 }