Changeset 28147 in vbox

Timestamp:

Apr 9, 2010 2:24:34 PM (15 years ago)

Author:

vboxsync

Message:

NAT: Fixed missing setting of time_fasttimo in ip_icmp.c. Removed slirp_arm_fast_timer and slirp_arm_slow_timer.

Location:

trunk/src/VBox

Files:

• Devices/Network/DrvNAT.cpp (modified) (3 diffs)
• Devices/Network/slirp/ip_icmp.c (modified) (1 diff)
• Devices/Network/slirp/libslirp.h (modified) (1 diff)
• Devices/Network/slirp/slirp.c (modified) (3 diffs)
• NetworkServices/NAT/VBoxNetNAT.cpp (modified) (3 diffs)

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

@@ -196 +196 @@
     volatile uint32_t       cUrgPkt;
     volatile uint32_t       cPkt;
-    PTMTIMERR3              pTmrSlow;
-    PTMTIMERR3              pTmrFast;
 } DRVNAT;
 AssertCompileMemberAlignment(DRVNAT, StatNATRecvWakeups, 8);
@@ -832 +830 @@
 #endif /* VBOX_WITH_SLIRP_MT */
 
-
-/**
- * The callback for the fast (2 ms) NAT timer.
- *
- * @param   pDrvIns             The driver instance.
- * @param   pTimer              The timer handle.
- * @param   pvUser              The NAT instance data.
- */
-static DECLCALLBACK(void) drvNATFastTimer(PPDMDRVINS pDrvIns, PTMTIMER pTimer, void *pvUser)
-{
-    PDRVNAT pThis = (PDRVNAT)pvUser;
-    drvNATNotifyNATThread(pThis, "drvNATFastTimer");
-}
-
-void slirp_arm_fast_timer(void *pvUser)
-{
-#if 0
-    PDRVNAT pThis = (PDRVNAT)pvUser;
-    AssertPtr(pThis);
-    TMTimerSetMillies(pThis->pTmrFast, 2);
-#endif
-}
-
-/**
- * The callback for the slow (500 ms) NAT timer.
- *
- * @param   pDrvIns             The driver instance.
- * @param   pTimer              The timer handle.
- * @param   pvUser              The NAT instance data.
- */
-static DECLCALLBACK(void) drvNATSlowTimer(PPDMDRVINS pDrvIns, PTMTIMER pTimer, void *pvUser)
-{
-    PDRVNAT pThis = (PDRVNAT)pvUser;
-    drvNATNotifyNATThread(pThis, "drvNATSlowTimer");
-}
-
-void slirp_arm_slow_timer(void *pvUser)
-{
-#if 0
-    PDRVNAT pThis = (PDRVNAT)pvUser;
-    AssertPtr(pThis);
-
-    TMTimerSetMillies(pThis->pTmrSlow, 500);
-#endif
-}
-
 /**
  * Function called by slirp to check if it's possible to feed incoming data to the network port.
@@ -1276 +1228 @@
             rc = RTSemEventCreate(&pThis->EventUrgRecv);
             rc = RTCritSectInit(&pThis->csDevAccess);
-            rc = PDMDrvHlpTMTimerCreate(pThis->pDrvIns, TMCLOCK_REAL/*enmClock*/, drvNATSlowTimer,
-                    pThis, TMTIMER_FLAGS_NO_CRIT_SECT/*flags*/, "NATSlowTmr", &pThis->pTmrSlow);
-            rc = PDMDrvHlpTMTimerCreate(pThis->pDrvIns, TMCLOCK_REAL/*enmClock*/, drvNATFastTimer,
-                    pThis, TMTIMER_FLAGS_NO_CRIT_SECT/*flags*/, "NATFastTmr", &pThis->pTmrFast);
 
 #ifndef RT_OS_WINDOWS

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

@@ -423 +423 @@
                         icmp_error(pData, m, ICMP_UNREACH, ICMP_UNREACH_NET, 0, strerror(errno));
                     }
-                    else
-                        slirp_arm_fast_timer(pData->pvUser);
+                    else if (!time_fasttimo)
+                    {
+                        time_fasttimo = curtime; /* Flag when we want a fasttimo */
+                    }
 
                 }

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

@@ -54 +54 @@
 /* you must provide the following functions: */
 void slirp_arm_fast_timer(void *pvUser);
-void slirp_arm_slow_timer(void *pvUser);
 int slirp_can_output(void * pvUser);
 void slirp_output(void * pvUser, struct mbuf *m, const uint8_t *pkt, int pkt_len);

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

@@ -836 +836 @@
             {
                 do_slowtimo = 1;
-                slirp_arm_slow_timer(pData->pvUser);
                 break;
             }
@@ -875 +874 @@
         {
             time_fasttimo = curtime; /* Flag when we want a fasttimo */
-            slirp_arm_fast_timer(pData->pvUser);
         }
 
@@ -977 +975 @@
             {
                 do_slowtimo = 1; /* Let socket expire */
-                slirp_arm_slow_timer(pData->pvUser);
             }
         }

trunk/src/VBox/NetworkServices/NAT/VBoxNetNAT.cpp

@@ -108 +108 @@
     volatile uint32_t       cUrgPkt;
     volatile uint32_t       cPkt;
-
-    PRTTIMER              pTmrSlow;
-    PRTTIMER              pTmrFast;
-    bool                  fIsRunning;
+    bool                    fIsRunning;
 };
 
@@ -126 +123 @@
 static void SendWorker(struct mbuf *m, size_t cb);
 static void IntNetSendWorker(bool urg, const void *pvFrame, size_t cbFrame, struct mbuf *m);
-static void natNotifyNATThread();
-
-void slirp_arm_fast_timer(void *pvUser)
-{
-    RTTimerStart(g_pNAT->pTmrFast, 2);
-}
-
-void slirp_arm_slow_timer(void *pvUser)
-{
-    RTTimerStart(g_pNAT->pTmrSlow, 500);
-}
-
-static DECLCALLBACK(void) natSlowTimer(PRTTIMER ppTimer, void *pvUser, uint64_t iTick)
-{
-    natNotifyNATThread();
-}
-
-static DECLCALLBACK(void) natFastTimer(PRTTIMER ppTimer, void *pvUser, uint64_t iTick)
-{
-    natNotifyNATThread();
-}
-
-static void natNotifyNATThread()
+
+
+static void natNotifyNATThread(void)
 {
     int rc;
@@ -222 +199 @@
     rc = RTThreadCreate(&m_ThrSndNAT, natSndThread, this, 128 * _1K, RTTHREADTYPE_DEFAULT, 0, "SndNAT");
     rc = RTThreadCreate(&m_ThrUrgSndNAT, natUrgSndThread, this, 128 * _1K, RTTHREADTYPE_DEFAULT, 0, "UrgSndNAT");
-    rc = RTTimerCreate(&pTmrSlow, 0 /* one-shot */, natSlowTimer, this);
-    rc = RTTimerCreate(&pTmrFast, 0 /* one-shot */ , natFastTimer, this);
     rc = RTSemEventCreate(&m_EventSend);
     rc = RTSemEventCreate(&m_EventUrgSend);