Changeset 34209 in vbox for trunk/src/VBox

Timestamp:

Nov 19, 2010 4:04:55 PM (14 years ago)

Author:

vboxsync

Message:

NAT: added 'info nat%d' handler

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (2 diffs)
• slirp/debug.c (modified) (1 diff)
• slirp/libslirp.h (modified) (2 diffs)
• slirp/slirp.c (modified) (1 diff)

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -991 +991 @@
 
 /**
+ * Info handler.
+ */
+static DECLCALLBACK(void) drvNATInfo(PPDMDRVINS pDrvIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
+{
+    PDRVNAT pThis = PDMINS_2_DATA(pDrvIns, PDRVNAT);
+    slirp_info(pThis->pNATState, pHlp, pszArgs);
+}
+
+
+/**
  * Sets up the redirectors.
  *
@@ -1313 +1323 @@
             rc = RTCritSectInit(&pThis->XmitLock);
             AssertRCReturn(rc, rc);
+
+            char szTmp[128];
+            RTStrPrintf(szTmp, sizeof(szTmp), "nat%d", pDrvIns->iInstance);
+            PDMDrvHlpDBGFInfoRegister(pDrvIns, szTmp, "NAT info.", drvNATInfo);
 
 #ifndef RT_OS_WINDOWS

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

@@ -279 +279 @@
     if (so->so_state == SS_NOFDREF || so->s == -1)
         return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
-                "socket(%d) SS_NODREF",so->s);
+                "socket(%d) SS_NOFDREF", so->s);
+
     status = getsockname(so->s, &addr, &socklen);
-
     if(status != 0 || addr.sa_family != AF_INET)
     {
         return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0,
-                "socket(%d) is invalid(probably closed)",so->s);
+                "socket(%d) is invalid(probably closed)", so->s);
     }
 
     in_addr = (struct sockaddr_in *)&addr;
     ip = RT_N2H_U32(so->so_faddr.s_addr);
-    return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "socket %4d:(proto:%u) "
+    return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "socket %d:(proto:%u) "
             "state=%04x ip=" IP4_ADDR_PRINTF_FORMAT ":%d "
             "name=" IP4_ADDR_PRINTF_FORMAT ":%d",

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

@@ -38 +38 @@
 
 #include <VBox/types.h>
+#include <VBox/dbgf.h>
 
 typedef struct NATState *PNATState;
@@ -90 +91 @@
 void slirp_set_tcp_sndspace(PNATState pData, int kilobytes);
 
-int slirp_set_binding_address(PNATState, char *addr);
+int  slirp_set_binding_address(PNATState, char *addr);
 void slirp_set_mtu(PNATState, int);
+void slirp_info(PNATState pData, PCDBGFINFOHLP pHlp, const char *pszArgs);
 
 #if defined(RT_OS_WINDOWS)

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

@@ -2071 +2071 @@
     if_mru = mtu;
 }
+
+/**
+ * Info handler.
+ */
+void slirp_info(PNATState pData, PCDBGFINFOHLP pHlp, const char *pszArgs)
+{
+    struct socket *so, *so_next;
+    struct arp_cache_entry *ac;
+    struct port_forward_rule *rule;
+
+    pHlp->pfnPrintf(pHlp, "NAT parameters: MTU=%d\n", if_mtu);
+    pHlp->pfnPrintf(pHlp, "NAT TCP ports:\n");
+    QSOCKET_FOREACH(so, so_next, tcp)
+    /* { */
+        pHlp->pfnPrintf(pHlp, " %R[natsock]\n", so);
+    }
+
+    pHlp->pfnPrintf(pHlp, "NAT UDP ports:\n");
+    QSOCKET_FOREACH(so, so_next, udp)
+    /* { */
+        pHlp->pfnPrintf(pHlp, " %R[natsock]\n", so);
+    }
+
+    pHlp->pfnPrintf(pHlp, "NAT ARP cache:\n");
+    LIST_FOREACH(ac, &pData->arp_cache, list)
+    {
+        pHlp->pfnPrintf(pHlp, " %R[IP4] %R[ether]\n", &ac->ip, &ac->ether);
+    }
+
+    pHlp->pfnPrintf(pHlp, "NAT rules:\n");
+    LIST_FOREACH(rule, &pData->port_forward_rule_head, list)
+    {
+        pHlp->pfnPrintf(pHlp, " %s %d => %R[IP4]:%d %c\n",
+                        rule->proto == IPPROTO_UDP ? "UDP" : "TCP",
+                        rule->host_port, &rule->guest_addr.s_addr, rule->guest_port,
+                        rule->activated ? ' ' : '*');
+    }
+}