NetworkPkg: TcpDriver use EFI_D_NET for DEBUG maessage.

Tcp driver need to use EFI_D_NET to log DEBUG message,
So it becomes easy to separate/filter out debug messages
from network stack versus generic EFI_D_INFO debugs.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo <lubo.zhang@intel.com>
Cc: Hegde Nagaraj P <nagaraj-p.hegde@hpe.com>
Cc: Subramanian Sriram <sriram-s@hpe.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Ye Ting <ting.ye@intel.com>
Reviewed-by: Sriram Subramanian <sriram-s@hpe.com>

diff --git a/NetworkPkg/TcpDxe/SockImpl.c b/NetworkPkg/TcpDxe/SockImpl.c
index 5addbd1937c6670580621c78fd5a0134c8642002..4eb42fb868f43c5f23a6d30f8b50e54b393ccca4 100644 (file)
--- a/NetworkPkg/TcpDxe/SockImpl.c
+++ b/NetworkPkg/TcpDxe/SockImpl.c
@@ -522,7 +522,7 @@ SockWakeListenToken (
 \r
     Parent->ConnCnt--;\r
     DEBUG (\r
-      (EFI_D_INFO,\r
+      (EFI_D_NET,\r
       "SockWakeListenToken: accept a socket, now conncnt is %d",\r
       Parent->ConnCnt)\r
       );\r
@@ -776,7 +776,7 @@ SockCreate (
     Parent->ConnCnt++;\r
 \r
     DEBUG (\r
-      (EFI_D_INFO,\r
+      (EFI_D_NET,\r
       "SockCreate: Create a new socket and add to parent, now conncnt is %d\n",\r
       Parent->ConnCnt)\r
       );\r

diff --git a/NetworkPkg/TcpDxe/SockInterface.c b/NetworkPkg/TcpDxe/SockInterface.c
index 1ae0c64b108a0fe421ec28de194b8ee932c33e4b..21ce643a5481b62b6439408b4f8002ccca3d6b61 100644 (file)
--- a/NetworkPkg/TcpDxe/SockInterface.c
+++ b/NetworkPkg/TcpDxe/SockInterface.c
@@ -470,7 +470,7 @@ SockAccept (
       Socket->Parent->ConnCnt--;\r
 \r
       DEBUG (\r
-        (EFI_D_INFO,\r
+        (EFI_D_NET,\r
         "SockAccept: Accept a socket, now conncount is %d",\r
         Socket->Parent->ConnCnt)\r
         );\r

diff --git a/NetworkPkg/TcpDxe/TcpInput.c b/NetworkPkg/TcpDxe/TcpInput.c
index 3115c52771f658ea035e58c3446ee2ed4f4f3e41..04c8a8269ea704b1a2b8593455ff394097217349 100644 (file)
--- a/NetworkPkg/TcpDxe/TcpInput.c
+++ b/NetworkPkg/TcpDxe/TcpInput.c
@@ -74,7 +74,7 @@ TcpFastRecover (
     Tcb->CWnd = Tcb->Ssthresh + 3 * Tcb->SndMss;\r
 \r
     DEBUG (\r
-      (EFI_D_INFO,\r
+      (EFI_D_NET,\r
       "TcpFastRecover: enter fast retransmission for TCB %p, recover point is %d\n",\r
       Tcb,\r
       Tcb->Recover)\r
@@ -97,7 +97,7 @@ TcpFastRecover (
     //\r
     Tcb->CWnd += Tcb->SndMss;\r
     DEBUG (\r
-      (EFI_D_INFO,\r
+      (EFI_D_NET,\r
       "TcpFastRecover: received another duplicated ACK (%d) for TCB %p\n",\r
       Seg->Ack,\r
       Tcb)\r
@@ -121,7 +121,7 @@ TcpFastRecover (
 \r
       Tcb->CongestState = TCP_CONGEST_OPEN;\r
       DEBUG (\r
-        (EFI_D_INFO,\r
+        (EFI_D_NET,\r
         "TcpFastRecover: received a full ACK(%d) for TCB %p, exit fast recovery\n",\r
         Seg->Ack,\r
         Tcb)\r
@@ -150,7 +150,7 @@ TcpFastRecover (
       Tcb->CWnd -= Acked;\r
 \r
       DEBUG (\r
-        (EFI_D_INFO,\r
+        (EFI_D_NET,\r
         "TcpFastRecover: received a partial ACK(%d) for TCB %p\n",\r
         Seg->Ack,\r
         Tcb)\r
@@ -188,7 +188,7 @@ TcpFastLossRecover (
       Tcb->CongestState = TCP_CONGEST_OPEN;\r
 \r
       DEBUG (\r
-        (EFI_D_INFO,\r
+        (EFI_D_NET,\r
         "TcpFastLossRecover: received a full ACK(%d) for TCB %p\n",\r
         Seg->Ack,\r
         Tcb)\r
@@ -202,7 +202,7 @@ TcpFastLossRecover (
       //\r
       TcpRetransmit (Tcb, Seg->Ack);\r
       DEBUG (\r
-        (EFI_D_INFO,\r
+        (EFI_D_NET,\r
         "TcpFastLossRecover: received a partial ACK(%d) for TCB %p\n",\r
         Seg->Ack,\r
         Tcb)\r
@@ -264,7 +264,7 @@ TcpComputeRtt (
   }\r
 \r
   DEBUG (\r
-    (EFI_D_INFO,\r
+    (EFI_D_NET,\r
     "TcpComputeRtt: new RTT for TCB %p computed SRTT: %d RTTVAR: %d RTO: %d\n",\r
     Tcb,\r
     Tcb->SRtt,\r
@@ -455,7 +455,7 @@ TcpDeliverData (
       }\r
 \r
       DEBUG (\r
-        (EFI_D_INFO,\r
+        (EFI_D_NET,\r
         "TcpDeliverData: processing FIN from peer of TCB %p\n",\r
         Tcb)\r
         );\r
@@ -750,7 +750,7 @@ TcpInput (
   ASSERT (Head != NULL);\r
   \r
   if (Nbuf->TotalSize < sizeof (TCP_HEAD)) {\r
-    DEBUG ((EFI_D_INFO, "TcpInput: received a malformed packet\n"));\r
+    DEBUG ((EFI_D_NET, "TcpInput: received a malformed packet\n"));\r
     goto DISCARD;\r
   }\r
   \r
@@ -758,7 +758,7 @@ TcpInput (
 \r
   if ((Head->HeadLen < 5) || (Len < 0)) {\r
 \r
-    DEBUG ((EFI_D_INFO, "TcpInput: received a malformed packet\n"));\r
+    DEBUG ((EFI_D_NET, "TcpInput: received a malformed packet\n"));\r
     \r
     goto DISCARD;\r
   }\r
@@ -794,7 +794,7 @@ TcpInput (
           );\r
 \r
   if ((Tcb == NULL) || (Tcb->State == TCP_CLOSED)) {\r
-    DEBUG ((EFI_D_INFO, "TcpInput: send reset because no TCB found\n"));\r
+    DEBUG ((EFI_D_NET, "TcpInput: send reset because no TCB found\n"));\r
 \r
     Tcb = NULL;\r
     goto SEND_RESET;\r
@@ -874,7 +874,7 @@ TcpInput (
       }\r
 \r
       DEBUG (\r
-        (EFI_D_INFO,\r
+        (EFI_D_NET,\r
         "TcpInput: create a child for TCB %p in listening\n",\r
         Tcb)\r
         );\r
@@ -979,7 +979,7 @@ TcpInput (
         TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_ACK_NOW);\r
 \r
         DEBUG (\r
-          (EFI_D_INFO,\r
+          (EFI_D_NET,\r
           "TcpInput: connection established for TCB %p in SYN_SENT\n",\r
           Tcb)\r
           );\r
@@ -1134,7 +1134,7 @@ TcpInput (
       TcpDeliverData (Tcb);\r
 \r
       DEBUG (\r
-        (EFI_D_INFO,\r
+        (EFI_D_NET,\r
         "TcpInput: connection established for TCB %p in SYN_RCVD\n",\r
         Tcb)\r
         );\r
@@ -1330,7 +1330,7 @@ NO_UPDATE:
   {\r
 \r
     DEBUG (\r
-      (EFI_D_INFO,\r
+      (EFI_D_NET,\r
       "TcpInput: local FIN is ACKed by peer for connected TCB %p\n",\r
       Tcb)\r
       );\r
@@ -1426,7 +1426,7 @@ StepSix:
   if (TCP_FLG_ON (Seg->Flag, TCP_FLG_URG) && !TCP_FIN_RCVD (Tcb->State)) {\r
 \r
     DEBUG (\r
-      (EFI_D_INFO,\r
+      (EFI_D_NET,\r
       "TcpInput: received urgent data from peer for connected TCB %p\n",\r
       Tcb)\r
       );\r

diff --git a/NetworkPkg/TcpDxe/TcpMisc.c b/NetworkPkg/TcpDxe/TcpMisc.c
index 13b9449906725bec789bd6b0bef6f60fbc28b718..a8592c968956a26fd1037751e943de47954aa751 100644 (file)
--- a/NetworkPkg/TcpDxe/TcpMisc.c
+++ b/NetworkPkg/TcpDxe/TcpMisc.c
@@ -613,7 +613,7 @@ TcpSetState (
   ASSERT (State < (sizeof (mTcpStateName) / sizeof (CHAR16 *)));\r
 \r
   DEBUG (\r
-    (EFI_D_INFO,\r
+    (EFI_D_NET,\r
     "Tcb (%p) state %s --> %s\n",\r
     Tcb,\r
     mTcpStateName[Tcb->State],\r
@@ -862,7 +862,7 @@ TcpOnAppConsume (
       if (TcpOld < Tcb->RcvMss) {\r
 \r
         DEBUG (\r
-          (EFI_D_INFO,\r
+          (EFI_D_NET,\r
           "TcpOnAppConsume: send a window update for a window closed Tcb %p\n",\r
           Tcb)\r
           );\r
@@ -871,7 +871,7 @@ TcpOnAppConsume (
       } else if (Tcb->DelayedAck == 0) {\r
 \r
         DEBUG (\r
-          (EFI_D_INFO,\r
+          (EFI_D_NET,\r
           "TcpOnAppConsume: scheduled a delayed ACK to update window for Tcb %p\n",\r
           Tcb)\r
           );\r

diff --git a/NetworkPkg/TcpDxe/TcpOutput.c b/NetworkPkg/TcpDxe/TcpOutput.c
index c038213484784abf8b4061536c3fe12c11a2bfa4..91e56d369a71b567ade3cb8f2c7720db46be35cc 100644 (file)
--- a/NetworkPkg/TcpDxe/TcpOutput.c
+++ b/NetworkPkg/TcpDxe/TcpOutput.c
@@ -1,7 +1,7 @@
 /** @file\r
   TCP output process routines.\r
 \r
-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -847,7 +847,7 @@ TcpToSendData (
           TCP_SEQ_LT (End + 1, Tcb->SndWnd + Tcb->SndWl2)\r
             ) {\r
         DEBUG (\r
-          (EFI_D_INFO,\r
+          (EFI_D_NET,\r
           "TcpToSendData: send FIN to peer for TCB %p in state %s\n",\r
           Tcb,\r
           mTcpStateName[Tcb->State])\r
@@ -927,7 +927,7 @@ TcpToSendData (
     if ((Tcb->CongestState == TCP_CONGEST_OPEN) && !TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RTT_ON)) {\r
 \r
       DEBUG (\r
-        (EFI_D_INFO,\r
+        (EFI_D_NET,\r
         "TcpToSendData: set RTT measure sequence %d for TCB %p\n",\r
         Seq,\r
         Tcb)\r
@@ -1058,7 +1058,7 @@ TcpToSendAck (
   }\r
 \r
   DEBUG (\r
-    (EFI_D_INFO,\r
+    (EFI_D_NET,\r
     "TcpToSendAck: scheduled a delayed ACK for TCB %p\n",\r
     Tcb)\r
     );\r