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.zh...@intel.com>
Cc: Hegde Nagaraj P <nagaraj-p.he...@hpe.com>
Cc: Subramanian Sriram <srira...@hpe.com>
Cc: Fu Siyuan <siyuan...@intel.com>
Cc: Ye Ting <ting...@intel.com>
---
NetworkPkg/TcpDxe/SockImpl.c | 4 ++--
NetworkPkg/TcpDxe/SockInterface.c | 2 +-
NetworkPkg/TcpDxe/TcpInput.c | 32 ++++++++++++++++----------------
NetworkPkg/TcpDxe/TcpMisc.c | 6 +++---
NetworkPkg/TcpDxe/TcpOutput.c | 8 ++++----
5 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/NetworkPkg/TcpDxe/SockImpl.c b/NetworkPkg/TcpDxe/SockImpl.c
index 5addbd1..4eb42fb 100644
--- a/NetworkPkg/TcpDxe/SockImpl.c
+++ b/NetworkPkg/TcpDxe/SockImpl.c
@@ -520,11 +520,11 @@ SockWakeListenToken (
RemoveEntryList (&Sock->ConnectionList);
Parent->ConnCnt--;
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"SockWakeListenToken: accept a socket, now conncnt is %d",
Parent->ConnCnt)
);
Sock->Parent = NULL;
@@ -774,11 +774,11 @@ SockCreate (
// if the Parent->ConnCnt < Parent->BackLog
//
Parent->ConnCnt++;
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"SockCreate: Create a new socket and add to parent, now conncnt is %d\n",
Parent->ConnCnt)
);
InsertTailList (&Parent->ConnectionList, &Sock->ConnectionList);
diff --git a/NetworkPkg/TcpDxe/SockInterface.c
b/NetworkPkg/TcpDxe/SockInterface.c
index 1ae0c64..21ce643 100644
--- a/NetworkPkg/TcpDxe/SockInterface.c
+++ b/NetworkPkg/TcpDxe/SockInterface.c
@@ -468,11 +468,11 @@ SockAccept (
ASSERT (Socket->Parent != NULL);
Socket->Parent->ConnCnt--;
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"SockAccept: Accept a socket, now conncount is %d",
Socket->Parent->ConnCnt)
);
Socket->Parent = NULL;
diff --git a/NetworkPkg/TcpDxe/TcpInput.c b/NetworkPkg/TcpDxe/TcpInput.c
index 3115c52..04c8a82 100644
--- a/NetworkPkg/TcpDxe/TcpInput.c
+++ b/NetworkPkg/TcpDxe/TcpInput.c
@@ -72,11 +72,11 @@ TcpFastRecover (
//
TcpRetransmit (Tcb, Tcb->SndUna);
Tcb->CWnd = Tcb->Ssthresh + 3 * Tcb->SndMss;
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"TcpFastRecover: enter fast retransmission for TCB %p, recover point is
%d\n",
Tcb,
Tcb->Recover)
);
return;
@@ -95,11 +95,11 @@ TcpFastRecover (
// Step 4 is skipped here only to be executed later
// by TcpToSendData
//
Tcb->CWnd += Tcb->SndMss;
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"TcpFastRecover: received another duplicated ACK (%d) for TCB %p\n",
Seg->Ack,
Tcb)
);
@@ -119,11 +119,11 @@ TcpFastRecover (
Tcb->CWnd = MIN (Tcb->Ssthresh, FlightSize + Tcb->SndMss);
Tcb->CongestState = TCP_CONGEST_OPEN;
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"TcpFastRecover: received a full ACK(%d) for TCB %p, exit fast
recovery\n",
Seg->Ack,
Tcb)
);
@@ -148,11 +148,11 @@ TcpFastRecover (
}
Tcb->CWnd -= Acked;
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"TcpFastRecover: received a partial ACK(%d) for TCB %p\n",
Seg->Ack,
Tcb)
);
@@ -186,11 +186,11 @@ TcpFastLossRecover (
//
Tcb->LossTimes = 0;
Tcb->CongestState = TCP_CONGEST_OPEN;
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"TcpFastLossRecover: received a full ACK(%d) for TCB %p\n",
Seg->Ack,
Tcb)
);
@@ -200,11 +200,11 @@ TcpFastLossRecover (
// Partial ACK:
// fast retransmit the first unacknowledge field.
//
TcpRetransmit (Tcb, Seg->Ack);
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"TcpFastLossRecover: received a partial ACK(%d) for TCB %p\n",
Seg->Ack,
Tcb)
);
}
@@ -262,11 +262,11 @@ TcpComputeRtt (
Tcb->Rto = TCP_RTO_MAX;
}
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"TcpComputeRtt: new RTT for TCB %p computed SRTT: %d RTTVAR: %d RTO: %d\n",
Tcb,
Tcb->SRtt,
Tcb->RttVar,
Tcb->Rto)
@@ -453,11 +453,11 @@ TcpDeliverData (
NetbufFree (Nbuf);
return -1;
}
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"TcpDeliverData: processing FIN from peer of TCB %p\n",
Tcb)
);
switch (Tcb->State) {
@@ -748,19 +748,19 @@ TcpInput (
Head = (TCP_HEAD *) NetbufGetByte (Nbuf, 0, NULL);
ASSERT (Head != NULL);
if (Nbuf->TotalSize < sizeof (TCP_HEAD)) {
- DEBUG ((EFI_D_INFO, "TcpInput: received a malformed packet\n"));
+ DEBUG ((EFI_D_NET, "TcpInput: received a malformed packet\n"));
goto DISCARD;
}
Len = Nbuf->TotalSize - (Head->HeadLen << 2);
if ((Head->HeadLen < 5) || (Len < 0)) {
- DEBUG ((EFI_D_INFO, "TcpInput: received a malformed packet\n"));
+ DEBUG ((EFI_D_NET, "TcpInput: received a malformed packet\n"));
goto DISCARD;
}
if (Version == IP_VERSION_4) {
@@ -792,11 +792,11 @@ TcpInput (
Version,
(BOOLEAN) TCP_FLG_ON (Head->Flag, TCP_FLG_SYN)
);
if ((Tcb == NULL) || (Tcb->State == TCP_CLOSED)) {
- DEBUG ((EFI_D_INFO, "TcpInput: send reset because no TCB found\n"));
+ DEBUG ((EFI_D_NET, "TcpInput: send reset because no TCB found\n"));
Tcb = NULL;
goto SEND_RESET;
}
@@ -872,11 +872,11 @@ TcpInput (
goto DISCARD;
}
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"TcpInput: create a child for TCB %p in listening\n",
Tcb)
);
//
@@ -977,11 +977,11 @@ TcpInput (
TcpTrimInWnd (Tcb, Nbuf);
TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_ACK_NOW);
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"TcpInput: connection established for TCB %p in SYN_SENT\n",
Tcb)
);
goto StepSix;
@@ -1132,11 +1132,11 @@ TcpInput (
TcpClearTimer (Tcb, TCP_TIMER_CONNECT);
TcpDeliverData (Tcb);
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"TcpInput: connection established for TCB %p in SYN_RCVD\n",
Tcb)
);
//
@@ -1328,11 +1328,11 @@ NO_UPDATE:
if (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_FIN_SENT) &&
(Tcb->SndUna == Tcb->SndNxt))
{
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"TcpInput: local FIN is ACKed by peer for connected TCB %p\n",
Tcb)
);
TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_FIN_ACKED);
@@ -1424,11 +1424,11 @@ StepSix:
TcpSetKeepaliveTimer (Tcb);
if (TCP_FLG_ON (Seg->Flag, TCP_FLG_URG) && !TCP_FIN_RCVD (Tcb->State)) {
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"TcpInput: received urgent data from peer for connected TCB %p\n",
Tcb)
);
Urg = Seg->Seq + Seg->Urg;
diff --git a/NetworkPkg/TcpDxe/TcpMisc.c b/NetworkPkg/TcpDxe/TcpMisc.c
index 13b9449..a8592c9 100644
--- a/NetworkPkg/TcpDxe/TcpMisc.c
+++ b/NetworkPkg/TcpDxe/TcpMisc.c
@@ -611,11 +611,11 @@ TcpSetState (
{
ASSERT (Tcb->State < (sizeof (mTcpStateName) / sizeof (CHAR16 *)));
ASSERT (State < (sizeof (mTcpStateName) / sizeof (CHAR16 *)));
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"Tcb (%p) state %s --> %s\n",
Tcb,
mTcpStateName[Tcb->State],
mTcpStateName[State])
);
@@ -860,20 +860,20 @@ TcpOnAppConsume (
if (TcpRcvWinNow (Tcb) > TcpOld) {
if (TcpOld < Tcb->RcvMss) {
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"TcpOnAppConsume: send a window update for a window closed Tcb %p\n",
Tcb)
);
TcpSendAck (Tcb);
} else if (Tcb->DelayedAck == 0) {
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"TcpOnAppConsume: scheduled a delayed ACK to update window for Tcb
%p\n",
Tcb)
);
Tcb->DelayedAck = 1;
diff --git a/NetworkPkg/TcpDxe/TcpOutput.c b/NetworkPkg/TcpDxe/TcpOutput.c
index c038213..91e56d3 100644
--- a/NetworkPkg/TcpDxe/TcpOutput.c
+++ b/NetworkPkg/TcpDxe/TcpOutput.c
@@ -1,9 +1,9 @@
/** @file
TCP output process routines.
- Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
which accompanies this distribution. The full text of the license may be
found at
http://opensource.org/licenses/bsd-license.php.
@@ -845,11 +845,11 @@ TcpToSendData (
if ((TcpGetMaxSndNxt (Tcb) == Tcb->SndNxt) &&
(GET_SND_DATASIZE (Tcb->Sk) == 0) &&
TCP_SEQ_LT (End + 1, Tcb->SndWnd + Tcb->SndWl2)
) {
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"TcpToSendData: send FIN to peer for TCB %p in state %s\n",
Tcb,
mTcpStateName[Tcb->State])
);
@@ -925,11 +925,11 @@ TcpToSendData (
// Karn's algorithm requires not to update RTT when in loss.
//
if ((Tcb->CongestState == TCP_CONGEST_OPEN) && !TCP_FLG_ON (Tcb->CtrlFlag,
TCP_CTRL_RTT_ON)) {
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"TcpToSendData: set RTT measure sequence %d for TCB %p\n",
Seq,
Tcb)
);
@@ -1056,11 +1056,11 @@ TcpToSendAck (
TcpSendAck (Tcb);
return;
}
DEBUG (
- (EFI_D_INFO,
+ (EFI_D_NET,
"TcpToSendAck: scheduled a delayed ACK for TCB %p\n",
Tcb)
);
//
--
1.9.5.msysgit.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
