Changeset 12031 in vbox

Timestamp:

Sep 3, 2008 12:26:04 PM (16 years ago)

Author:

vboxsync

Message:

Solaris/vboxnetflt: slightly better failure. And some post 2.0 todos.

File:

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

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

@@ -1505 +1505 @@
     }
 
-    const char *pszAtChar = "@";
     char *pszModName = DEVICE_NAME;
 
@@ -1529 +1528 @@
     ldi_handle_t ARPDevHandle;
 
+    /*
+     * @todo Do opening of each stream separately with error checking.
+     */
     /*
      * Open the IP stream as a layered device.
@@ -1601 +1603 @@
                                     && VBOX_SUCCESS(rc2))
                                 {
+                                    /** @todo -XXX- Do each step here with full error checking. I know the if-levels are
+                                      * getting ridiculous but it has to be done as failure here is still possible
+                                      * (though unlikely) given a terribly ackward user configuration or messed up stack.
+                                      */
                                     /*
                                      * Set global data which will be grabbed by ModOpen.
@@ -1671 +1677 @@
                                         LogRel((DEVICE_NAME ":vboxNetFltSolarisModSetup: module %s or relinking failed. rc=%d rc2=%d rc3=%d.\n",
                                                 fAttach ? "insert" : "remove", rc, rc2, rc3));
+
+                                        /*
+                                         * Try failing gracefully during attach.
+                                         */
+                                        /** @todo -XXX- see todo above, and remove later accordingly. */
+                                        if (fAttach)
+                                        {
+                                            strioctl(pVNodeIp, _I_REMOVE, (intptr_t)&StrMod, 0, K_TO_K, kcred, &ret);
+                                            strioctl(pVNodeArp, _I_REMOVE, (intptr_t)&ArpStrMod, 0, K_TO_K, kcred, &ret);
+                                            vboxNetFltSolarisRelink(pVNodeUDP, &Interface, IpMuxFd, ArpMuxFd);
+                                        }
                                     }
                                 }