Changeset 14211 in vbox for trunk

Timestamp:

Nov 14, 2008 2:14:02 PM (16 years ago)

Author:

vboxsync

Message:

Solaris/VBoxNetFlt: Fixed ipsec 1 byte keep_alive causing panic.

File:

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

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

@@ -781 +781 @@
     {
         LogRel((DEVICE_NAME ":VBoxNetFltSolarisModClose failed to get stream.\n"));
+        vboxNetFltRelease(pStream->pThis, false /* fBusy */);
         return ENXIO;
     }
@@ -879 +880 @@
         && pStream->Type == kPromiscStream)
     {
+        fSendUpstream = false;
         pThis = ASMAtomicUoReadPtr((void * volatile *)&pStream->pThis);
         if (RT_LIKELY(pThis))
@@ -907 +909 @@
                         pMsg = NULL;
                     }
-                    fSendUpstream = false;
                     break;
                 }
@@ -926 +927 @@
                                 LogRel((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: Invalid notification size; expected>=%d got=%d\n",
                                             DL_NOTIFY_IND_SIZE, MBLKL(pMsg)));
-
-                                fSendUpstream = false;
                                 break;
                             }
@@ -950 +949 @@
 
                                     bcopy(pMsg->b_rptr + cOffset, &pThis->u.s.Mac, sizeof(pThis->u.s.Mac));
-                                    fSendUpstream = false;
                                     LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: DL_NOTE_PHYS_ADDR. New Mac=%.*Rhxs\n",
                                         sizeof(pThis->u.s.Mac), &pThis->u.s.Mac));
@@ -964 +962 @@
                                         LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: DL_NOTE_LINK_UP.\n"));
                                     }
-                                    fSendUpstream = false;
                                     break;
                                 }
@@ -976 +973 @@
                                         LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: DL_NOTE_LINK_DOWN.\n"));
                                     }
-                                    fSendUpstream = false;
                                     break;
                                 }
@@ -989 +985 @@
                              */
                             LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: DL_BIND_ACK. Bound to requested SAP!\n"));
-                            fSendUpstream = false;
                             break;
                         }
@@ -999 +994 @@
                              */
                             vboxNetFltSolarisCachePhysAddr(pThis, pMsg);
-                            fSendUpstream = false;
                             break;
                         }
@@ -1019 +1013 @@
                                 pPromiscStream->fPromisc = false;
                             }
-
-                            fSendUpstream = false;
                             break;
                         }
@@ -1038 +1030 @@
                         LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: Mode acknowledgement. RawMode is %s\n",
                                 pPromiscStream->fRawMode ? "ON" : "OFF"));
-
-                        fSendUpstream = false;
                     }
                     break;