From f3612a8d58eeb6448ab8e5f5c28c8ce6a3356c5f Mon Sep 17 00:00:00 2001 From: Zhang Lubo Date: Fri, 23 Sep 2016 11:55:01 +0800 Subject: [PATCH] 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 Cc: Hegde Nagaraj P Cc: Subramanian Sriram Cc: Fu Siyuan Cc: Ye Ting Reviewed-by: Sriram Subramanian --- 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 5addbd1937..4eb42fb868 100644 --- a/NetworkPkg/TcpDxe/SockImpl.c +++ b/NetworkPkg/TcpDxe/SockImpl.c @@ -522,7 +522,7 @@ SockWakeListenToken ( Parent->ConnCnt--; DEBUG ( - (EFI_D_INFO, + (EFI_D_NET, "SockWakeListenToken: accept a socket, now conncnt is %d", Parent->ConnCnt) ); @@ -776,7 +776,7 @@ SockCreate ( 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) ); diff --git a/NetworkPkg/TcpDxe/SockInterface.c b/NetworkPkg/TcpDxe/SockInterface.c index 1ae0c64b10..21ce643a54 100644 --- a/NetworkPkg/TcpDxe/SockInterface.c +++ b/NetworkPkg/TcpDxe/SockInterface.c @@ -470,7 +470,7 @@ SockAccept ( Socket->Parent->ConnCnt--; DEBUG ( - (EFI_D_INFO, + (EFI_D_NET, "SockAccept: Accept a socket, now conncount is %d", Socket->Parent->ConnCnt) ); diff --git a/NetworkPkg/TcpDxe/TcpInput.c b/NetworkPkg/TcpDxe/TcpInput.c index 3115c52771..04c8a8269e 100644 --- a/NetworkPkg/TcpDxe/TcpInput.c +++ b/NetworkPkg/TcpDxe/TcpInput.c @@ -74,7 +74,7 @@ TcpFastRecover ( 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) @@ -97,7 +97,7 @@ TcpFastRecover ( // Tcb->CWnd += Tcb->SndMss; DEBUG ( - (EFI_D_INFO, + (EFI_D_NET, "TcpFastRecover: received another duplicated ACK (%d) for TCB %p\n", Seg->Ack, Tcb) @@ -121,7 +121,7 @@ TcpFastRecover ( 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) @@ -150,7 +150,7 @@ TcpFastRecover ( Tcb->CWnd -= Acked; DEBUG ( - (EFI_D_INFO, + (EFI_D_NET, "TcpFastRecover: received a partial ACK(%d) for TCB %p\n", Seg->Ack, Tcb) @@ -188,7 +188,7 @@ TcpFastLossRecover ( 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) @@ -202,7 +202,7 @@ TcpFastLossRecover ( // TcpRetransmit (Tcb, Seg->Ack); DEBUG ( - (EFI_D_INFO, + (EFI_D_NET, "TcpFastLossRecover: received a partial ACK(%d) for TCB %p\n", Seg->Ack, Tcb) @@ -264,7 +264,7 @@ TcpComputeRtt ( } DEBUG ( - (EFI_D_INFO, + (EFI_D_NET, "TcpComputeRtt: new RTT for TCB %p computed SRTT: %d RTTVAR: %d RTO: %d\n", Tcb, Tcb->SRtt, @@ -455,7 +455,7 @@ TcpDeliverData ( } DEBUG ( - (EFI_D_INFO, + (EFI_D_NET, "TcpDeliverData: processing FIN from peer of TCB %p\n", Tcb) ); @@ -750,7 +750,7 @@ TcpInput ( 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; } @@ -758,7 +758,7 @@ TcpInput ( 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; } @@ -794,7 +794,7 @@ TcpInput ( ); 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; @@ -874,7 +874,7 @@ TcpInput ( } DEBUG ( - (EFI_D_INFO, + (EFI_D_NET, "TcpInput: create a child for TCB %p in listening\n", Tcb) ); @@ -979,7 +979,7 @@ TcpInput ( 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) ); @@ -1134,7 +1134,7 @@ TcpInput ( TcpDeliverData (Tcb); DEBUG ( - (EFI_D_INFO, + (EFI_D_NET, "TcpInput: connection established for TCB %p in SYN_RCVD\n", Tcb) ); @@ -1330,7 +1330,7 @@ NO_UPDATE: { DEBUG ( - (EFI_D_INFO, + (EFI_D_NET, "TcpInput: local FIN is ACKed by peer for connected TCB %p\n", Tcb) ); @@ -1426,7 +1426,7 @@ StepSix: 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) ); diff --git a/NetworkPkg/TcpDxe/TcpMisc.c b/NetworkPkg/TcpDxe/TcpMisc.c index 13b9449906..a8592c9689 100644 --- a/NetworkPkg/TcpDxe/TcpMisc.c +++ b/NetworkPkg/TcpDxe/TcpMisc.c @@ -613,7 +613,7 @@ TcpSetState ( ASSERT (State < (sizeof (mTcpStateName) / sizeof (CHAR16 *))); DEBUG ( - (EFI_D_INFO, + (EFI_D_NET, "Tcb (%p) state %s --> %s\n", Tcb, mTcpStateName[Tcb->State], @@ -862,7 +862,7 @@ TcpOnAppConsume ( if (TcpOld < Tcb->RcvMss) { DEBUG ( - (EFI_D_INFO, + (EFI_D_NET, "TcpOnAppConsume: send a window update for a window closed Tcb %p\n", Tcb) ); @@ -871,7 +871,7 @@ TcpOnAppConsume ( } 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) ); diff --git a/NetworkPkg/TcpDxe/TcpOutput.c b/NetworkPkg/TcpDxe/TcpOutput.c index c038213484..91e56d369a 100644 --- a/NetworkPkg/TcpDxe/TcpOutput.c +++ b/NetworkPkg/TcpDxe/TcpOutput.c @@ -1,7 +1,7 @@ /** @file TCP output process routines. - Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.
+ Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -847,7 +847,7 @@ TcpToSendData ( 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]) @@ -927,7 +927,7 @@ TcpToSendData ( 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) @@ -1058,7 +1058,7 @@ TcpToSendAck ( } DEBUG ( - (EFI_D_INFO, + (EFI_D_NET, "TcpToSendAck: scheduled a delayed ACK for TCB %p\n", Tcb) ); -- 2.39.2