X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FNetwork%2FTcp4Dxe%2FTcp4Misc.c;h=0014fc993f61218e01eb97d1060032207b97baa5;hb=1204fe8319e5e6f77df68c375ef403e9ffa9227e;hp=1b0ae5ec54b27a6bc51d3194ac93a2dc8070c6f3;hpb=c191cdd1ff66422a10d525f8e3c98bba595d985e;p=mirror_edk2.git

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
index 1b0ae5ec54..0014fc993f 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
@@ -1,7 +1,7 @@
 /** @file
   Misc support routines for tcp.
 
-Copyright (c) 2005 - 2006, Intel Corporation<BR>
+Copyright (c) 2005 - 2009, Intel Corporation<BR>
 All rights reserved. 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
@@ -52,7 +52,7 @@ CHAR16   *mTcpStateName[] = {
 **/
 VOID
 TcpInitTcbLocal (
-  IN TCP_CB *Tcb
+  IN OUT TCP_CB *Tcb
   )
 {
   //
@@ -92,9 +92,9 @@ TcpInitTcbLocal (
 **/
 VOID
 TcpInitTcbPeer (
-  IN TCP_CB     *Tcb,
-  IN TCP_SEG    *Seg,
-  IN TCP_OPTION *Opt
+  IN OUT TCP_CB     *Tcb,
+  IN     TCP_SEG    *Seg,
+  IN     TCP_OPTION *Opt
   )
 {
   UINT16  RcvMss;
@@ -432,7 +432,7 @@ TcpCloneTcb (
   Clone->Sk = SockClone (Tcb->Sk);
   if (Clone->Sk == NULL) {
     DEBUG ((EFI_D_ERROR, "TcpCloneTcb: failed to clone a sock\n"));
-    gBS->FreePool (Clone);
+    FreePool (Clone);
     return NULL;
   }
 
@@ -471,19 +471,19 @@ TcpGetRcvMss (
   IN SOCKET  *Sock
   )
 {
-  EFI_SIMPLE_NETWORK_MODE SnpMode;
+  EFI_IP4_MODE_DATA       Ip4Mode;
   TCP4_PROTO_DATA         *TcpProto;
   EFI_IP4_PROTOCOL        *Ip;
 
   ASSERT (Sock != NULL);
 
   TcpProto = (TCP4_PROTO_DATA *) Sock->ProtoReserved;
-  Ip       = TcpProto->TcpService->IpIo->Ip;
+  Ip       = (EFI_IP4_PROTOCOL *) (TcpProto->TcpService->IpIo->Ip);
   ASSERT (Ip != NULL);
 
-  Ip->GetModeData (Ip, NULL, NULL, &SnpMode);
+  Ip->GetModeData (Ip, &Ip4Mode, NULL, NULL);
 
-  return (UINT16) (SnpMode.MaxPacketSize - 40);
+  return (UINT16) (Ip4Mode.MaxPacketSize - sizeof (TCP_HEAD));
 }
 
 
@@ -496,8 +496,8 @@ TcpGetRcvMss (
 **/
 VOID
 TcpSetState (
-  IN TCP_CB      *Tcb,
-  IN UINT8       State
+  IN OUT TCP_CB  *Tcb,
+  IN     UINT8   State
   )
 {
   DEBUG (
@@ -578,8 +578,8 @@ TcpChecksum (
 **/
 TCP_SEG *
 TcpFormatNetbuf (
-  IN TCP_CB  *Tcb,
-  IN NET_BUF *Nbuf
+  IN     TCP_CB  *Tcb,
+  IN OUT NET_BUF *Nbuf
   )
 {
   TCP_SEG   *Seg;
@@ -674,7 +674,7 @@ TcpResetConnection (
 **/
 VOID
 TcpOnAppConnect (
-  IN TCP_CB  *Tcb
+  IN OUT TCP_CB  *Tcb
   )
 {
   TcpInitTcbLocal (Tcb);
@@ -694,7 +694,7 @@ TcpOnAppConnect (
 **/
 VOID
 TcpOnAppClose (
-  IN TCP_CB *Tcb
+  IN OUT TCP_CB *Tcb
   )
 {
   ASSERT (Tcb != NULL);
@@ -745,29 +745,25 @@ TcpOnAppClose (
 **/
 INTN
 TcpOnAppSend (
-  IN TCP_CB *Tcb
+  IN OUT TCP_CB *Tcb
   )
 {
 
   switch (Tcb->State) {
   case TCP_CLOSED:
     return -1;
-    break;
 
   case TCP_LISTEN:
     return -1;
-    break;
 
   case TCP_SYN_SENT:
   case TCP_SYN_RCVD:
     return 0;
-    break;
 
   case TCP_ESTABLISHED:
   case TCP_CLOSE_WAIT:
     TcpToSendData (Tcb, 0);
     return 0;
-    break;
 
   case TCP_FIN_WAIT_1:
   case TCP_FIN_WAIT_2:
@@ -775,7 +771,7 @@ TcpOnAppSend (
   case TCP_LAST_ACK:
   case TCP_TIME_WAIT:
     return -1;
-    break;
+
   default:
     break;
   }
@@ -869,6 +865,8 @@ TcpOnAppAbort (
   case TCP_CLOSE_WAIT:
     TcpResetConnection (Tcb);
     break;
+  default:
+    break;
   }
 
   TcpSetState (Tcb, TCP_CLOSED);
@@ -1027,7 +1025,7 @@ TcpSetVariableData (
              );
     }
 
-    gBS->FreePool (Tcp4Service->MacString);
+    FreePool (Tcp4Service->MacString);
   }
 
   Tcp4Service->MacString = NewMacString;
@@ -1042,7 +1040,7 @@ TcpSetVariableData (
 
 ON_ERROR:
 
-  gBS->FreePool (Tcp4VariableData);
+  FreePool (Tcp4VariableData);
 
   return Status;
 }
@@ -1069,7 +1067,7 @@ TcpClearVariableData (
          NULL
          );
 
-  gBS->FreePool (Tcp4Service->MacString);
+  FreePool (Tcp4Service->MacString);
   Tcp4Service->MacString = NULL;
 }
 
@@ -1092,18 +1090,22 @@ TcpInstallDevicePath (
   TCP_CB             *Tcb;
   IPv4_DEVICE_PATH   Ip4DPathNode;
   EFI_STATUS         Status;
+  TCP_PORTNO         LocalPort;
+  TCP_PORTNO         RemotePort;
 
   TcpProto   = (TCP4_PROTO_DATA *) Sock->ProtoReserved;
   TcpService = TcpProto->TcpService;
   Tcb        = TcpProto->TcpPcb;
 
+  LocalPort = NTOHS (Tcb->LocalEnd.Port);
+  RemotePort = NTOHS (Tcb->RemoteEnd.Port);
   NetLibCreateIPv4DPathNode (
     &Ip4DPathNode,
     TcpService->ControllerHandle,
     Tcb->LocalEnd.Ip,
-    NTOHS (Tcb->LocalEnd.Port),
+    LocalPort,
     Tcb->RemoteEnd.Ip,
-    NTOHS (Tcb->RemoteEnd.Port),
+    RemotePort,
     EFI_IP_PROTO_TCP,
     Tcb->UseDefaultAddr
     );
@@ -1123,7 +1125,7 @@ TcpInstallDevicePath (
                   Sock->DevicePath
                   );
   if (EFI_ERROR (Status)) {
-    gBS->FreePool (Sock->DevicePath);
+    FreePool (Sock->DevicePath);
   }
 
   return Status;