Changeset 5436 in vbox for trunk/src

Timestamp:

Oct 22, 2007 8:22:51 AM (17 years ago)

Author:

vboxsync

Message:

Back out NAT ping error message code.

Location:

trunk/src/VBox/Devices/Network

Files:

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

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

@@ -56 +56 @@
     /** Boot file name to provide in the DHCP server response. */
     char                    *pszBootFile;
-    /** Flag whether a NAT ping warning has been shown. */
-    bool                    fSuppressPingWarning;
 } DRVNAT, *PDRVNAT;
 
@@ -244 +242 @@
     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", N_("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);
-      m_freem(pData, m);
-#else
       struct socket *so;
       struct sockaddr_in addr;
@@ -162 +158 @@
         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,