Changeset 28147 in vbox for trunk/src/VBox/NetworkServices/NAT

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.

File:

• trunk/src/VBox/NetworkServices/NAT/VBoxNetNAT.cpp (modified) (3 diffs)

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);