Changeset 5266 in vbox for trunk

Timestamp:

Oct 12, 2007 5:26:21 PM (17 years ago)

Author:

vboxsync

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

25260

Message:

Show a warning message when the guest tries to send a ping packet that
cannot be handled in the NAT code. Just once per VM powerup.

Location:

trunk

Files:

• include/VBox/pdmdrv.h (modified) (2 diffs)
• src/VBox/Devices/Network/DrvNAT.cpp (modified) (2 diffs)
• src/VBox/Devices/Network/slirp/ip_icmp.c (modified) (2 diffs)
• src/VBox/Devices/Network/slirp/libslirp.h (modified) (1 diff)

trunk/include/VBox/pdmdrv.h

@@ -555 +555 @@
     /**
      * Creates a PDM thread.
-     * 
-     * This differs from the RTThreadCreate() API in that PDM takes care of suspending, 
+     *
+     * This differs from the RTThreadCreate() API in that PDM takes care of suspending,
      * resuming, and destroying the thread as the VM state changes.
-     * 
+     *
      * @returns VBox status code.
      * @param   pDrvIns     The driver instance.
@@ -668 +668 @@
  */
 #define PDMDRV_SET_RUNTIME_ERROR(pDrvIns, fFatal, pszErrorID, pszError)  \
-    PDMDrvHlpVMSetError(pDrvIns, fFatal, pszErrorID, "%s", pszError)
+    PDMDrvHlpVMSetRuntimeError(pDrvIns, fFatal, pszErrorID, "%s", pszError)
 
 #endif /* IN_RING3 */

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

@@ -52 +52 @@
     /** NAT state for this instance. */
     PNATState               pNATState;
+    /** Flag whether a NAT ping warning has been shown. */
+    bool                    fSuppressPingWarning;
 } DRVNAT, *PDRVNAT;
 
@@ -238 +240 @@
     LogFlow(("slirp_output END %x %d\n", pu8Buf, cb));
 }
+
+
+/**
+ * Function called by slirp to signal that a ping had to be dropped.
+ */
+void slirp_cannot_ping(void *pvUser)
+{
+    PDRVNAT pData = (PDRVNAT)pvUser;
+
+    Assert(pData);
+
+    /** Happens during termination */
+    if (!RTCritSectIsOwner(&pData->CritSect))
+        return;
+
+    if (!pData->fSuppressPingWarning)
+    {
+        pData->fSuppressPingWarning = true;
+        PDMDRV_SET_RUNTIME_ERROR(pData->pDrvIns, false, "NAT_PING", "The guest OS sent out a ping request which cannot be handled by NAT");
+    }
+}
+
 
 /**

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

@@ -115 +115 @@
       icmp_reflect(pData, m);
     } else {
+#if 1
+      slirp_cannot_ping(pData->pvUser);
+#else
       struct socket *so;
       struct sockaddr_in addr;
@@ -158 +161 @@
         udp_detach(pData, so);
       }
+#endif
     } /* if ip->ip_dst.s_addr == alias_addr.s_addr */
     break;

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

@@ -42 +42 @@
 int slirp_can_output(void * pvUser);
 void slirp_output(void * pvUser, const uint8_t *pkt, int pkt_len);
+void slirp_cannot_ping(void * pvUser);
 
 int slirp_redir(PNATState pData, int is_udp, int host_port,