From: Cameron Gutman <aicommander@gmail.com>
Date: Mon, 5 Dec 2011 18:42:21 +0000 (+0000)
Subject: [TCPIP]
X-Git-Tag: backups/usb-bringup@55523~3^2~201
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=a4be799408715f18bf22b798fa09b092ab71af56

[TCPIP]
- Make interface octets in/out stats more accurate

svn path=/trunk/; revision=54600
---

diff --git a/reactos/drivers/network/tcpip/datalink/lan.c b/reactos/drivers/network/tcpip/datalink/lan.c
index 90c730e455a..d833d332f3c 100644
--- a/reactos/drivers/network/tcpip/datalink/lan.c
+++ b/reactos/drivers/network/tcpip/datalink/lan.c
@@ -353,7 +353,8 @@ VOID LanReceiveWorker( PVOID Context ) {
 	 ("Ether Type = %x Total = %d\n",
 	  PacketType, IPPacket.TotalSize));
 
-    Interface->Stats.InBytes += IPPacket.TotalSize;
+    /* Update interface stats */
+    Interface->Stats.InBytes += IPPacket.TotalSize + Adapter->HeaderSize;
 
     /* NDIS packet is freed in all of these cases */
     switch (PacketType) {
@@ -680,6 +681,7 @@ VOID LANTransmit(
     PLAN_ADAPTER Adapter = (PLAN_ADAPTER)Context;
     KIRQL OldIrql;
     PNDIS_PACKET XmitPacket;
+    PIP_INTERFACE Interface = Adapter->Context;
 
     TI_DbgPrint(DEBUG_DATALINK,
 		("Called( NdisPacket %x, Offset %d, Adapter %x )\n",
@@ -713,7 +715,7 @@ VOID LANTransmit(
 
     (*PC(NdisPacket)->DLComplete)(PC(NdisPacket)->Context, NdisPacket, NDIS_STATUS_SUCCESS);
 
-        switch (Adapter->Media) {
+    switch (Adapter->Media) {
         case NdisMedium802_3:
             EHeader = (PETH_HEADER)Data;
 
@@ -728,25 +730,25 @@ VOID LANTransmit(
             RtlCopyMemory(EHeader->SrcAddr, Adapter->HWAddress, IEEE_802_ADDR_LENGTH);
 
             switch (Type) {
-            case LAN_PROTO_IPv4:
-                EHeader->EType = ETYPE_IPv4;
-                break;
-            case LAN_PROTO_ARP:
-                EHeader->EType = ETYPE_ARP;
-                break;
-            case LAN_PROTO_IPv6:
-                EHeader->EType = ETYPE_IPv6;
-                break;
-            default:
-                ASSERT(FALSE);
-                return;
+                case LAN_PROTO_IPv4:
+                    EHeader->EType = ETYPE_IPv4;
+                    break;
+                case LAN_PROTO_ARP:
+                    EHeader->EType = ETYPE_ARP;
+                    break;
+                case LAN_PROTO_IPv6:
+                    EHeader->EType = ETYPE_IPv6;
+                    break;
+                default:
+                    ASSERT(FALSE);
+                    return;
             }
             break;
 
         default:
             /* FIXME: Support other medias */
             break;
-        }
+    }
 
 	TI_DbgPrint( MID_TRACE, ("LinkAddress: %x\n", LinkAddress));
 	if( LinkAddress ) {
@@ -761,11 +763,14 @@ VOID LANTransmit(
 		   ((PCHAR)LinkAddress)[5] & 0xff));
 	}
 
-        if (Adapter->MTU < Size) {
-            /* This is NOT a pointer. MSDN explicitly says so. */
-            NDIS_PER_PACKET_INFO_FROM_PACKET(NdisPacket,
-                                             TcpLargeSendPacketInfo) = (PVOID)((ULONG_PTR)Adapter->MTU);
-        }
+    if (Adapter->MTU < Size) {
+        /* This is NOT a pointer. MSDN explicitly says so. */
+        NDIS_PER_PACKET_INFO_FROM_PACKET(NdisPacket,
+                                         TcpLargeSendPacketInfo) = (PVOID)((ULONG_PTR)Adapter->MTU);
+    }
+
+    /* Update interface stats */
+    Interface->Stats.OutBytes += Size;
 
 	TcpipAcquireSpinLock( &Adapter->Lock, &OldIrql );
 	TI_DbgPrint(MID_TRACE, ("NdisSend\n"));
diff --git a/reactos/lib/drivers/ip/network/transmit.c b/reactos/lib/drivers/ip/network/transmit.c
index 78fa43b8cae..1673933d0a6 100644
--- a/reactos/lib/drivers/ip/network/transmit.c
+++ b/reactos/lib/drivers/ip/network/transmit.c
@@ -234,8 +234,6 @@ NTSTATUS IPSendDatagram(PIP_PACKET IPPacket, PNEIGHBOR_CACHE_ENTRY NCE)
  *     send routine (IPSendFragment)
  */
 {
-    UINT PacketSize;
-
     TI_DbgPrint(MAX_TRACE, ("Called. IPPacket (0x%X)  NCE (0x%X)\n", IPPacket, NCE));
 
     DISPLAY_IP_PACKET(IPPacket);
@@ -243,10 +241,6 @@ NTSTATUS IPSendDatagram(PIP_PACKET IPPacket, PNEIGHBOR_CACHE_ENTRY NCE)
     /* Fetch path MTU now, because it may change */
     TI_DbgPrint(MID_TRACE,("PathMTU: %d\n", NCE->Interface->MTU));
 
-    NdisQueryPacketLength(IPPacket->NdisPacket, &PacketSize);
-
-    NCE->Interface->Stats.OutBytes += PacketSize;
-
     return SendFragments(IPPacket, NCE, NCE->Interface->MTU);
 }