Changeset 12862 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Oct 1, 2008 12:55:02 PM (16 years ago)

Author:

vboxsync

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

37249

Message:

Solaris/vboxnetflt: Made it possible to use VNICs with NetFlt.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (modified) (1 diff)

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

@@ -1509 +1509 @@
     int ret;
 
+    /*
+     * Try style-1 open first.
+     */
     char szDev[128];
-    RTStrPrintf(szDev, sizeof(szDev), "/dev/%s", pThis->szName);
-
+    RTStrPrintf(szDev, sizeof(szDev), "/dev/net/%s", pThis->szName);
     int rc = ldi_open_by_name(szDev, FREAD | FWRITE, kcred, &pThis->u.s.hIface, DevId);
-    ldi_ident_release(DevId);
-    if (rc)
-    {
-        LogRel((DEVICE_NAME ":vboxNetFltSolarisOpenStream Failed to open '%s'\n", szDev));
-        return VERR_INTNET_FLT_IF_FAILED;
-    }
+    if (   rc
+        && rc == ENODEV)
+    {
+        /*
+         * Fallback to style-2 open.
+         */
+        RTStrPrintf(szDev, sizeof(szDev), "/dev/%s", pThis->szName);
+        rc = ldi_open_by_name(szDev, FREAD | FWRITE, kcred, &pThis->u.s.hIface, DevId);
+        ldi_ident_release(DevId);
+        if (rc)
+        {
+            LogRel((DEVICE_NAME ":vboxNetFltSolarisOpenStream Failed to open '%s' rc=%d\n", szDev, rc));
+            return VERR_INTNET_FLT_IF_FAILED;
+        }
+    }
+    else
+        ldi_ident_release(DevId);    
 
     rc = ldi_ioctl(pThis->u.s.hIface, I_FIND, (intptr_t)DEVICE_NAME, FKIOCTL, kcred, &ret);