Changeset 22799 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Sep 7, 2009 10:08:54 AM (15 years ago)

Author:

vboxsync

Message:

Solaris/VBoxNetFlt: IPv6 poll fixes.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (modified) (5 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c

@@ -42 +42 @@
 #ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING
 # include <iprt/timer.h>
+# include <iprt/time.h>
 #endif
 
@@ -386 +387 @@
 
 #ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING
-/** Globla IPv6 polling interval */
+/** Global IPv6 polling interval */
 static int g_VBoxNetFltSolarisPollInterval = 0;
 #endif
@@ -526 +527 @@
                 if (Interval == -1)
                     LogFlow((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling: no poll interval property specified. Skipping Ipv6 polling.\n"));
-
-                if (Interval < 1 || Interval > 120)
+                else if (Interval < 1 || Interval > 120)
                 {
                     LogRel((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling: Invalid polling interval %d. Expected between 1 and 120 secs.\n",
@@ -2426 +2426 @@
              * Setup kernel poll timer.
              */
-            rc = RTTimerCreateEx(&pPromiscStream->pIp6Timer, Interval * (uint64_t)1000000000, RTTIMER_FLAGS_CPU_ALL,
+            rc = RTTimerCreateEx(&pPromiscStream->pIp6Timer, Interval * (uint64_t)1000000000, RTTIMER_FLAGS_CPU_ANY,
                                 vboxNetFltSolarispIp6Timer, (void *)pThis);
             if (RT_SUCCESS(rc))
-                rc = RTTimerStart(pPromiscStream->pIp6Timer, 0 /* fire ASAP */);
+            {
+                rc = RTTimerStart(pPromiscStream->pIp6Timer, 10 * (uint64_t)1000000000 /* 10 seconds to blastoff */);
+                LogFlow((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling: Ipv6 %d second timer begins firing in 10 seconds.\n", Interval));
+            }
             else
                 LogRel((DEVICE_NAME ":vboxNetFltSolarisSetupIp6Polling: Failed to create timer. rc=%d\n", rc));
@@ -2491 +2494 @@
             int rc2 = vboxNetFltSolarisAttachIp6(pThis, true /* fAttach */);
 #ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING
-            if (rc2 == VERR_INTNET_FLT_IF_NOT_FOUND)
+            if (   rc2 == VERR_INTNET_FLT_IF_NOT_FOUND
+                && g_VBoxNetFltSolarisPollInterval != -1)
             {
                 rc = vboxNetFltSolarisSetupIp6Polling(pThis);