儲存庫 vbox 的更動 11538

時間撮記:

2008-8-21 下午03:16:07 (16 年 以前)

作者:

vboxsync

訊息:

pcnet: Rearranged the giant frame detection, adding the VLAN EtherType to iprt/net.h. Btw. to make things easier to read, don't do if (error) do-lots; else do-what-we're-here-for; because then the reader will have to skip lots of code when following the normal execution path. Also, there is hardly any point in using the 'register' keyword these days.

位置:

trunk

檔案:

• include/iprt/net.h (修改) (1 筆差異)
• src/VBox/Devices/Network/DevPCNet.cpp (修改) (4 筆差異)
• src/VBox/Runtime/testcase/tstUuid.cpp (修改) (1 筆差異)

trunk/include/iprt/net.h

@@ -134 +134 @@
 #define RTNET_ETHERTYPE_ARP     UINT16_C(0x0806)
 #define RTNET_ETHERTYPE_IPV6    UINT16_C(0x86dd)
+#define RTNET_ETHERTYPE_VLAN    UINT16_C(0x8100)
 #define RTNET_ETHERTYPE_IPX_1   UINT16_C(0x8037)
 #define RTNET_ETHERTYPE_IPX_2   UINT16_C(0x8137)

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

@@ -64 +64 @@
 #include <iprt/string.h>
 #include <iprt/time.h>
+#include <iprt/net.h>
 #ifdef IN_RING3
 # include <iprt/mem.h>
@@ -4386 +4387 @@
     PCNetState *pThis = INETWORKPORT_2_DATA(pInterface);
     int         rc;
-    static bool firstBigFrameLoss = true;
 
     STAM_PROFILE_ADV_START(&pThis->StatReceive, a);
@@ -4393 +4393 @@
 
     /*
-     * Determine max ethernet frame size with vlan tag (TPID == 0x8100) or without it
-     * (excluding CRC which is not transferred).
-     * It consists of 14-byte header [+ 4-byte vlan tag] + 1500-byte body.
+     * Check for the max ethernet frame size, taking the IEEE 802.1Q (VLAN) tag into
+     * account. Note that we are *not* expecting the CRC Checksum.
+     * Ethernet frames consists of a 14-byte header [+ 4-byte vlan tag] + a 1500-byte body.
      */
-    register unsigned maxFrameSize = ((uint16_t*)pvBuf)[6] == 0x81 ? 1518 : 1514;
-    if (RT_UNLIKELY(cb > maxFrameSize))
-    {
-        if (RT_UNLIKELY(firstBigFrameLoss))
-        {
-            firstBigFrameLoss = false;
-            Log(("#%d Received frame exceeds max size (%u > %u). "
-                 "Further frame losses will be reported at level5\n",
-                 PCNET_INST_NR, (unsigned)cb, maxFrameSize));
-        }
-        else
-            Log5(("#%d Received frame exceeds max size (%u > %u)\n",
-                  PCNET_INST_NR, (unsigned)cb, (unsigned)maxFrameSize));
-    }
-    else
+    if (RT_LIKELY(   cb <= 1514
+                  || (   cb <= 1518
+                      && ((PCRTNETETHERHDR)pvBuf)->EtherType == RT_H2BE_U16_C(RTNET_ETHERTYPE_VLAN))))
     {
         if (cb > 70) /* unqualified guess */
@@ -4418 +4406 @@
         pThis->Led.Actual.s.fReading = 0;
     }
+#ifdef LOG_ENABLED
+    else
+    {
+        static bool s_fFirstBigFrameLoss = true;
+        unsigned cbMaxFrame = ((PCRTNETETHERHDR)pvBuf)->EtherType == RT_H2BE_U16_C(RTNET_ETHERTYPE_VLAN)
+                            ? 1518 : 1514;
+        if (s_fFirstBigFrameLoss)
+        {
+            s_fFirstBigFrameLoss = false;
+            Log(("PCNet#%d: Received giant frame %zu, max %u. (Further giants will be reported at level5.)\n",
+                 PCNET_INST_NR, cb, cbMaxFrame));
+        }
+        else
+            Log5(("PCNet#%d: Received giant frame %zu bytes, max %u.\n",
+                  PCNET_INST_NR, cb, cbMaxFrame));
+    }
+#endif /* LOG_ENABLED */
 
     PDMCritSectLeave(&pThis->CritSect);

trunk/src/VBox/Runtime/testcase/tstUuid.cpp

@@ -106 +106 @@
     CHECK_EXPR(memcmp(&Uuid3, &Uuid, sizeof(Uuid)) == 0);
 
-#if 0 /** @todo make less verbose and print the bits that remain unchanged. */
+#if 1 /** @todo make less verbose and print the bits that remain unchanged. */
     /*
      * checking the clock seq and time hi and version bits...