Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/TcpDxe/TcpOption.c

Timestamp:

Apr 14, 2023 3:17:44 PM (22 months ago)

Author:

vboxsync

Message:

Devices/EFI/FirmwareNew: Update to edk2-stable202302 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• NetworkPkg/TcpDxe/TcpOption.c (modified) (14 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/TcpDxe/TcpOption.c

@@ -20 +20 @@
 UINT16
 TcpGetUint16 (
-  IN UINT8 *Buf
+  IN UINT8  *Buf
   )
 {
   UINT16  Value;
+
   CopyMem (&Value, Buf, sizeof (UINT16));
   return NTOHS (Value);
@@ -38 +39 @@
 UINT32
 TcpGetUint32 (
-  IN UINT8 *Buf
+  IN UINT8  *Buf
   )
 {
   UINT32  Value;
+
   CopyMem (&Value, Buf, sizeof (UINT32));
   return NTOHL (Value);
@@ -55 +57 @@
 VOID
 TcpPutUint32 (
-     OUT UINT8  *Buf,
-  IN     UINT32 Data
+  OUT UINT8      *Buf,
+  IN     UINT32  Data
   )
 {
@@ -73 +75 @@
 UINT8
 TcpComputeScale (
-  IN TCP_CB *Tcb
+  IN TCP_CB  *Tcb
   )
 {
@@ -83 +85 @@
   BufSize = GET_RCV_BUFFSIZE (Tcb->Sk);
 
-  Scale   = 0;
-  while ((Scale < TCP_OPTION_MAX_WS) && ((UINT32) (TCP_OPTION_MAX_WIN << Scale) < BufSize)) {
-
+  Scale = 0;
+  while ((Scale < TCP_OPTION_MAX_WS) && ((UINT32)(TCP_OPTION_MAX_WIN << Scale) < BufSize)) {
     Scale++;
   }
@@ -103 +104 @@
 UINT16
 TcpSynBuildOption (
-  IN TCP_CB  *Tcb,
-  IN NET_BUF *Nbuf
+  IN TCP_CB   *Tcb,
+  IN NET_BUF  *Nbuf
   )
 {
@@ -121 +122 @@
   if (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_TS) &&
       (!TCP_FLG_ON (TCPSEG_NETBUF (Nbuf)->Flag, TCP_FLG_ACK) ||
-        TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RCVD_TS))
-      ) {
-
+       TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RCVD_TS))
+      )
+  {
     Data = NetbufAllocSpace (
              Nbuf,
@@ -145 +146 @@
   if (!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_NO_WS) &&
       (!TCP_FLG_ON (TCPSEG_NETBUF (Nbuf)->Flag, TCP_FLG_ACK) ||
-        TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RCVD_WS))
-      ) {
-
+       TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RCVD_WS))
+      )
+  {
     Data = NetbufAllocSpace (
              Nbuf,
@@ -183 +184 @@
 UINT16
 TcpBuildOption (
-  IN TCP_CB  *Tcb,
-  IN NET_BUF *Nbuf
+  IN TCP_CB   *Tcb,
+  IN NET_BUF  *Nbuf
   )
 {
@@ -198 +199 @@
   if (TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_SND_TS) &&
       !TCP_FLG_ON (TCPSEG_NETBUF (Nbuf)->Flag, TCP_FLG_RST)
-      ) {
-
+      )
+  {
     Data = NetbufAllocSpace (
-            Nbuf,
-            TCP_OPTION_TS_ALIGNED_LEN,
-            NET_BUF_HEAD
-            );
+             Nbuf,
+             TCP_OPTION_TS_ALIGNED_LEN,
+             NET_BUF_HEAD
+             );
 
     ASSERT (Data != NULL);
@@ -230 +231 @@
 INTN
 TcpParseOption (
-  IN     TCP_HEAD   *Tcp,
-  IN OUT TCP_OPTION *Option
-  )
-{
-  UINT8 *Head;
-  UINT8 TotalLen;
-  UINT8 Cur;
-  UINT8 Type;
-  UINT8 Len;
+  IN     TCP_HEAD    *Tcp,
+  IN OUT TCP_OPTION  *Option
+  )
+{
+  UINT8  *Head;
+  UINT8  TotalLen;
+  UINT8  Cur;
+  UINT8  Type;
+  UINT8  Len;
 
   ASSERT ((Tcp != NULL) && (Option != NULL));
 
-  Option->Flag  = 0;
-
-  TotalLen      = (UINT8) ((Tcp->HeadLen << 2) - sizeof (TCP_HEAD));
+  Option->Flag = 0;
+
+  TotalLen = (UINT8)((Tcp->HeadLen << 2) - sizeof (TCP_HEAD));
   if (TotalLen <= 0) {
     return 0;
   }
 
-  Head = (UINT8 *) (Tcp + 1);
+  Head = (UINT8 *)(Tcp + 1);
 
   //
@@ -255 +256 @@
   //
   if ((TotalLen == TCP_OPTION_TS_ALIGNED_LEN) && (TcpGetUint32 (Head) == TCP_OPTION_TS_FAST)) {
-
     Option->TSVal = TcpGetUint32 (Head + 4);
     Option->TSEcr = TcpGetUint32 (Head + 8);
@@ -262 +262 @@
     return 0;
   }
+
   //
   // Slow path to process the options.
@@ -271 +272 @@
 
     switch (Type) {
-    case TCP_OPTION_MSS:
-      Len = Head[Cur + 1];
-
-      if ((Len != TCP_OPTION_MSS_LEN) || (TotalLen - Cur < TCP_OPTION_MSS_LEN)) {
-
-        return -1;
-      }
-
-      Option->Mss = TcpGetUint16 (&Head[Cur + 2]);
-      TCP_SET_FLG (Option->Flag, TCP_OPTION_RCVD_MSS);
-
-      Cur += TCP_OPTION_MSS_LEN;
-      break;
-
-    case TCP_OPTION_WS:
-      Len = Head[Cur + 1];
-
-      if ((Len != TCP_OPTION_WS_LEN) || (TotalLen - Cur < TCP_OPTION_WS_LEN)) {
-
-        return -1;
-      }
-
-      Option->WndScale = (UINT8) MIN (14, Head[Cur + 2]);
-      TCP_SET_FLG (Option->Flag, TCP_OPTION_RCVD_WS);
-
-      Cur += TCP_OPTION_WS_LEN;
-      break;
-
-    case TCP_OPTION_TS:
-      Len = Head[Cur + 1];
-
-      if ((Len != TCP_OPTION_TS_LEN) || (TotalLen - Cur < TCP_OPTION_TS_LEN)) {
-
-        return -1;
-      }
-
-      Option->TSVal = TcpGetUint32 (&Head[Cur + 2]);
-      Option->TSEcr = TcpGetUint32 (&Head[Cur + 6]);
-      TCP_SET_FLG (Option->Flag, TCP_OPTION_RCVD_TS);
-
-      Cur += TCP_OPTION_TS_LEN;
-      break;
-
-    case TCP_OPTION_NOP:
-      Cur++;
-      break;
-
-    case TCP_OPTION_EOP:
-      Cur = TotalLen;
-      break;
-
-    default:
-      Len = Head[Cur + 1];
-
-      if ((TotalLen - Cur) < Len || Len < 2) {
-        return -1;
-      }
-
-      Cur = (UINT8) (Cur + Len);
-      break;
+      case TCP_OPTION_MSS:
+        Len = Head[Cur + 1];
+
+        if ((Len != TCP_OPTION_MSS_LEN) || (TotalLen - Cur < TCP_OPTION_MSS_LEN)) {
+          return -1;
+        }
+
+        Option->Mss = TcpGetUint16 (&Head[Cur + 2]);
+        TCP_SET_FLG (Option->Flag, TCP_OPTION_RCVD_MSS);
+
+        Cur += TCP_OPTION_MSS_LEN;
+        break;
+
+      case TCP_OPTION_WS:
+        Len = Head[Cur + 1];
+
+        if ((Len != TCP_OPTION_WS_LEN) || (TotalLen - Cur < TCP_OPTION_WS_LEN)) {
+          return -1;
+        }
+
+        Option->WndScale = (UINT8)MIN (14, Head[Cur + 2]);
+        TCP_SET_FLG (Option->Flag, TCP_OPTION_RCVD_WS);
+
+        Cur += TCP_OPTION_WS_LEN;
+        break;
+
+      case TCP_OPTION_TS:
+        Len = Head[Cur + 1];
+
+        if ((Len != TCP_OPTION_TS_LEN) || (TotalLen - Cur < TCP_OPTION_TS_LEN)) {
+          return -1;
+        }
+
+        Option->TSVal = TcpGetUint32 (&Head[Cur + 2]);
+        Option->TSEcr = TcpGetUint32 (&Head[Cur + 6]);
+        TCP_SET_FLG (Option->Flag, TCP_OPTION_RCVD_TS);
+
+        Cur += TCP_OPTION_TS_LEN;
+        break;
+
+      case TCP_OPTION_NOP:
+        Cur++;
+        break;
+
+      case TCP_OPTION_EOP:
+        Cur = TotalLen;
+        break;
+
+      default:
+        Len = Head[Cur + 1];
+
+        if (((TotalLen - Cur) < Len) || (Len < 2)) {
+          return -1;
+        }
+
+        Cur = (UINT8)(Cur + Len);
+        break;
     }
-
   }