Changeset 10763 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Jul 19, 2008 12:22:51 AM (17 years ago)

Author:

vboxsync

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

33521

Message:

logging changes.

File:

• trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp (modified) (17 diffs)

trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp

@@ -593 +593 @@
 typedef struct INTNETETHERHDR
 {
-    PDMMAC  MacDst;
-    PDMMAC  MacSrc;
+    PDMMAC      MacDst;
+    PDMMAC      MacSrc;
+    uint16_t    EtherType;
 } INTNETETHERHDR;
 #pragma pack()
@@ -610 +611 @@
 static void intnetR0IfSend(PINTNETIF pIf, PINTNETIF pIfSender, PINTNETSG pSG)
 {
-    LogFlow(("intnetR0IfSend: pIf=%p:{.hIf=%RX32}\n", pIf, pIf->hIf));
+//    LogFlow(("intnetR0IfSend: pIf=%p:{.hIf=%RX32}\n", pIf, pIf->hIf));
     int rc = intnetR0RingWriteFrame(pIf->pIntBuf, &pIf->pIntBuf->Recv, pSG);
     if (RT_SUCCESS(rc))
@@ -620 +621 @@
         return;
     }
+
+    Log(("intnetR0IfSend: overflow cb=%d hIf=%#x\n", pSG->cbTotal, pIf->hIf));
 
 #if 0 /* This is bad stuff now as we're blocking while locking down the network.
@@ -737 +740 @@
 
     /** @todo failure statistics? */
+    Log2(("intnetR0TrunkIfSend: %Rrc fDst=%d\n", rc, fDst));
 }
 
@@ -761 +765 @@
      * Write the packet to all the interfaces and signal them.
      */
-    Log2(("Broadcast\n"));
     for (PINTNETIF pIf = pNetwork->pIFs; pIf; pIf = pIf->pNext)
         if (pIf != pIfSender)
@@ -816 +819 @@
      * Only send to the interfaces with matching a MAC address.
      */
-    Log2(("Dst=%.6Rhxs\n", &pEthHdr->MacDst));
     bool fExactIntNetRecipient = false;
     for (PINTNETIF pIf = pNetwork->pIFs; pIf; pIf = pIf->pNext)
     {
-        Log2(("Dst=%.6Rhxs ?==? %.6Rhxs\n", &pEthHdr->MacDst, &pIf->Mac));
         bool fIt = false;
         if (    (   !pIf->fMacSet
@@ -828 +829 @@
                  && pIf != pIfSender /* promiscuous mode: omit the sender */))
         {
+            Log2(("Dst=%.6Rhxs => %.6Rhxs\n", &pEthHdr->MacDst, &pIf->Mac));
             fExactIntNetRecipient |= fIt;
             intnetR0IfSend(pIf, pIfSender, pSG);
@@ -838 +840 @@
      * frame will hit the wire.
      */
+    uint32_t fDst = 0;
     PINTNETTRUNKIF pTrunkIf = pNetwork->pTrunkIF;
     if (    pIfSender
@@ -843 +846 @@
         &&  pTrunkIf->pIfPort)
     {
-        uint32_t fDst = 0;
-
         /* promiscuous checks first as they are cheaper than pfnIsHostMac. */
         if (    pTrunkIf->fPromiscuousWire
@@ -865 +866 @@
             intnetR0TrunkIfSend(pTrunkIf, pNetwork, fDst, pSG, fTrunkLocked);
     }
+
+    /* log it */
+    if (    !fExactIntNetRecipient
+        &&  !fDst
+        &&  (   (pEthHdr->MacDst.au8[0] == 0x08 && pEthHdr->MacDst.au8[1] == 0x00 && pEthHdr->MacDst.au8[2] == 0x27)
+             || (pEthHdr->MacSrc.au8[0] == 0x08 && pEthHdr->MacSrc.au8[1] == 0x00 && pEthHdr->MacSrc.au8[2] == 0x27)))
+        Log2(("Dst=%.6Rhxs ??\n", &pEthHdr->MacDst));
 
     return fExactIntNetRecipient;
@@ -930 +938 @@
         AssertReturn(!cbLeft, false);
     }
+    if (    (EthHdr.MacDst.au8[0] == 0x08 && EthHdr.MacDst.au8[1] == 0x00 && EthHdr.MacDst.au8[2] == 0x27)
+        ||  (EthHdr.MacSrc.au8[0] == 0x08 && EthHdr.MacSrc.au8[1] == 0x00 && EthHdr.MacSrc.au8[2] == 0x27)
+        ||  (EthHdr.MacDst.au8[0] == 0x00 && EthHdr.MacDst.au8[1] == 0x16 && EthHdr.MacDst.au8[2] == 0xcb)
+        ||  (EthHdr.MacSrc.au8[0] == 0x00 && EthHdr.MacSrc.au8[1] == 0x16 && EthHdr.MacSrc.au8[2] == 0xcb)
+        ||  EthHdr.MacDst.au8[0] == 0xff
+        ||  EthHdr.MacSrc.au8[0] == 0xff)
+        Log2(("D=%.6Rhxs  S=%.6Rhxs  T=%04x f=%x z=%x\n",
+              &EthHdr.MacDst, &EthHdr.MacSrc, RT_BE2H_U16(EthHdr.EtherType), fSrc, pSG->cbTotal));
 
     /*
@@ -974 +990 @@
 INTNETR0DECL(int) INTNETR0IfSend(PINTNET pIntNet, INTNETIFHANDLE hIf, const void *pvFrame, unsigned cbFrame)
 {
-    LogFlow(("INTNETR0IfSend: pIntNet=%p hIf=%RX32 pvFrame=%p cbFrame=%u\n", pIntNet, hIf, pvFrame, cbFrame));
+//    LogFlow(("INTNETR0IfSend: pIntNet=%p hIf=%RX32 pvFrame=%p cbFrame=%u\n", pIntNet, hIf, pvFrame, cbFrame));
 
     /*
@@ -1386 +1402 @@
 INTNETR0DECL(int) INTNETR0IfWait(PINTNET pIntNet, INTNETIFHANDLE hIf, uint32_t cMillies)
 {
-    LogFlow(("INTNETR0IfWait: pIntNet=%p hIf=%RX32 cMillies=%u\n", pIntNet, hIf, cMillies));
+//    LogFlow(("INTNETR0IfWait: pIntNet=%p hIf=%RX32 cMillies=%u\n", pIntNet, hIf, cMillies));
 
     /*
@@ -1429 +1445 @@
     else
         rc = VERR_SEM_DESTROYED;
-    LogFlow(("INTNETR0IfWait: returns %Rrc\n", rc));
+//    LogFlow(("INTNETR0IfWait: returns %Rrc\n", rc));
     return rc;
 }
@@ -1503 +1519 @@
 static DECLCALLBACK(void) intnetR0IfDestruct(void *pvObj, void *pvUser1, void *pvUser2)
 {
-    LogFlow(("intnetR0IfDestruct: pvObj=%p pvUser1=%p pvUser2=%p\n", pvObj, pvUser1, pvUser2));
     PINTNETIF pIf = (PINTNETIF)pvUser1;
     PINTNET   pIntNet = (PINTNET)pvUser2;
+    Log(("intnetR0IfDestruct: pvObj=%p pIf=%p pIntNet=%p hIf=%#x\n", pvObj, pIf, pIntNet, pIf->hIf));
 
     RTSemFastMutexRequest(pIntNet->FastMutex);
@@ -1717 +1733 @@
 
                         *phIf = pIf->hIf;
-                        LogFlow(("intnetR0NetworkCreateIf: returns VINF_SUCCESS *phIf=%p\n", *phIf));
+                        Log(("intnetR0NetworkCreateIf: returns VINF_SUCCESS *phIf=%p cbSend=%u cbRecv=%u cbBuf=%u\n",
+                             *phIf, pIf->pIntBufDefault->cbSend, pIf->pIntBufDefault->cbRecv, pIf->pIntBufDefault->cbBuf));
                         return VINF_SUCCESS;
                     }
@@ -2108 +2125 @@
 static DECLCALLBACK(void) intnetR0NetworkDestruct(void *pvObj, void *pvUser1, void *pvUser2)
 {
-    LogFlow(("intnetR0NetworkDestruct: pvObj=%p pvUser1=%p pvUser2=%p\n", pvObj, pvUser1, pvUser2));
     PINTNETNETWORK  pNetwork = (PINTNETNETWORK)pvUser1;
     PINTNET         pIntNet = (PINTNET)pvUser2;
+    Log(("intnetR0NetworkDestruct: pvObj=%p pNetwork=%p pIntNet=%p %s\n", pvObj, pNetwork, pIntNet, pNetwork->szName));
     Assert(pNetwork->pIntNet == pIntNet);