Changeset 60639 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv
- Timestamp:
- Apr 22, 2016 7:37:54 AM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.h
r56293 r60639 81 81 { 82 82 PLIST_ENTRY pListEntry = RemoveHeadList(pQueue); 83 if (pListEntry != pQueue)83 if (pListEntry != pQueue) 84 84 { 85 85 PVBOXNETFLT_PACKET_INFO pInfo = LIST_ENTRY_2_PACKET_INFO(pListEntry); … … 93 93 { 94 94 PLIST_ENTRY pListEntry = RemoveTailList(pQueue); 95 if (pListEntry != pQueue)95 if (pListEntry != pQueue) 96 96 { 97 97 PVBOXNETFLT_PACKET_INFO pInfo = LIST_ENTRY_2_PACKET_INFO(pListEntry); … … 192 192 PSINGLE_LIST_ENTRY pCur; 193 193 PSINGLE_LIST_ENTRY pPrev; 194 for (pCur = pHead->Next, pPrev = pHead; pCur; pPrev = pCur, pCur = pCur->Next)195 { 196 if (pEntry2Search == pCur)194 for (pCur = pHead->Next, pPrev = pHead; pCur; pPrev = pCur, pCur = pCur->Next) 195 { 196 if (pEntry2Search == pCur) 197 197 { 198 if (bRemove)198 if (bRemove) 199 199 { 200 200 pPrev->Next = pCur->Next; 201 if (pCur == pList->pTail)201 if (pCur == pList->pTail) 202 202 { 203 203 pList->pTail = pPrev; … … 218 218 PSINGLE_LIST_ENTRY pPrev; 219 219 PNDIS_PACKET pCurPacket; 220 for (pCur = pHead->Next, pPrev = pHead; pCur; pPrev = pCur, pCur = pCur->Next)220 for (pCur = pHead->Next, pPrev = pHead; pCur; pPrev = pCur, pCur = pCur->Next) 221 221 { 222 222 pCurPacket = VBOX_SLE_2_SENDPACKET(pCur); 223 if (pCurPacket == pPacket2Search || vboxNetFltWinMatchPackets(pPacket2Search, pCurPacket, cbMatch))223 if (pCurPacket == pPacket2Search || vboxNetFltWinMatchPackets(pPacket2Search, pCurPacket, cbMatch)) 224 224 { 225 if (bRemove)225 if (bRemove) 226 226 { 227 227 pPrev->Next = pCur->Next; 228 if (pCur == pList->pTail)228 if (pCur == pList->pTail) 229 229 { 230 230 pList->pTail = pPrev; … … 243 243 PSINGLE_LIST_ENTRY pPrev; 244 244 PNDIS_PACKET pCurPacket; 245 for (pCur = pHead->Next, pPrev = pHead; pCur; pPrev = pCur, pCur = pCur->Next)245 for (pCur = pHead->Next, pPrev = pHead; pCur; pPrev = pCur, pCur = pCur->Next) 246 246 { 247 247 pCurPacket = VBOX_SLE_2_SENDPACKET(pCur); 248 if (vboxNetFltWinMatchPacketAndSG(pCurPacket, pSG, cbMatch))248 if (vboxNetFltWinMatchPacketAndSG(pCurPacket, pSG, cbMatch)) 249 249 { 250 if (bRemove)250 if (bRemove) 251 251 { 252 252 pPrev->Next = pCur->Next; 253 if (pCur == pList->pTail)253 if (pCur == pList->pTail) 254 254 { 255 255 pList->pTail = pPrev; … … 280 280 pEntry->Next = pList->Head.Next; 281 281 pList->Head.Next = pEntry; 282 if (!pEntry->Next)282 if (!pEntry->Next) 283 283 pList->pTail = pEntry; 284 284 } … … 287 287 { 288 288 PSINGLE_LIST_ENTRY pEntry = pList->Head.Next; 289 if (pEntry && pEntry == pList->pTail)289 if (pEntry && pEntry == pList->pTail) 290 290 { 291 291 pList->Head.Next = NULL; … … 589 589 RTSpinlockAcquire((pNetFlt)->hSpinlock); 590 590 #ifndef VBOXNETADP 591 if (!vboxNetFltWinDoReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState))592 #else 593 if (!vboxNetFltWinDoReferenceDevice(&pNetFlt->u.s.WinIf.MpState))591 if (!vboxNetFltWinDoReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState)) 592 #else 593 if (!vboxNetFltWinDoReferenceDevice(&pNetFlt->u.s.WinIf.MpState)) 594 594 #endif 595 595 { … … 599 599 } 600 600 601 if (pNetFlt->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE)601 if (pNetFlt->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE) 602 602 { 603 603 vboxNetFltWinReferenceModePassThru(pNetFlt); … … 620 620 621 621 Assert(v); 622 if (!v)622 if (!v) 623 623 { 624 624 *pbNetFltActive = false; … … 628 628 RTSpinlockAcquire((pNetFlt)->hSpinlock); 629 629 #ifndef VBOXNETADP 630 if (!vboxNetFltWinDoIncReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState, v))631 #else 632 if (!vboxNetFltWinDoIncReferenceDevice(&pNetFlt->u.s.WinIf.MpState, v))630 if (!vboxNetFltWinDoIncReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState, v)) 631 #else 632 if (!vboxNetFltWinDoIncReferenceDevice(&pNetFlt->u.s.WinIf.MpState, v)) 633 633 #endif 634 634 { … … 638 638 } 639 639 640 if (pNetFlt->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE)640 if (pNetFlt->enmTrunkState != INTNETTRUNKIFSTATE_ACTIVE) 641 641 { 642 642 vboxNetFltWinIncReferenceModePassThru(pNetFlt, v); … … 654 654 655 655 /* we have marked it as busy, so can do the res references outside the lock */ 656 for (i = 0; i < v-1; i++)656 for (i = 0; i < v-1; i++) 657 657 { 658 658 vboxNetFltRetain(pNetFlt, true /* fBusy */); … … 667 667 { 668 668 uint32_t i; 669 for (i = 0; i < n; i++)669 for (i = 0; i < n; i++) 670 670 { 671 671 vboxNetFltRelease(pNetFlt, true); … … 703 703 { 704 704 Assert(v); 705 if (!v)705 if (!v) 706 706 { 707 707 return false; … … 710 710 RTSpinlockAcquire(pNetFlt->hSpinlock); 711 711 #ifdef VBOXNETADP 712 if (vboxNetFltWinDoIncReferenceDevice(&pNetFlt->u.s.WinIf.MpState, v))713 #else 714 if (vboxNetFltWinDoIncReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState, v))712 if (vboxNetFltWinDoIncReferenceDevice(&pNetFlt->u.s.WinIf.MpState, v)) 713 #else 714 if (vboxNetFltWinDoIncReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState, v)) 715 715 #endif 716 716 { … … 727 727 RTSpinlockAcquire(pNetFlt->hSpinlock); 728 728 #ifdef VBOXNETADP 729 if (vboxNetFltWinDoReferenceDevice(&pNetFlt->u.s.WinIf.MpState))730 #else 731 if (vboxNetFltWinDoReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState))729 if (vboxNetFltWinDoReferenceDevice(&pNetFlt->u.s.WinIf.MpState)) 730 #else 731 if (vboxNetFltWinDoReferenceDevices(&pNetFlt->u.s.WinIf.MpState, &pNetFlt->u.s.WinIf.PtState)) 732 732 #endif 733 733 {
Note:
See TracChangeset
for help on using the changeset viewer.