Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Ip4Dxe/Ip4Output.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/Ip4Dxe/Ip4Output.c (modified) (17 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/Ip4Dxe/Ip4Output.c

@@ -10 +10 @@
 
 UINT16  mIp4Id;
-
 
 /**
@@ -32 +31 @@
 EFI_STATUS
 Ip4PrependHead (
-  IN OUT NET_BUF                *Packet,
-  IN     IP4_HEAD               *Head,
-  IN     UINT8                  *Option,
-  IN     UINT32                 OptLen
-  )
-{
-  UINT32                    HeadLen;
-  UINT32                    Len;
-  IP4_HEAD                  *PacketHead;
-  BOOLEAN                   FirstFragment;
+  IN OUT NET_BUF   *Packet,
+  IN     IP4_HEAD  *Head,
+  IN     UINT8     *Option,
+  IN     UINT32    OptLen
+  )
+{
+  UINT32    HeadLen;
+  UINT32    Len;
+  IP4_HEAD  *PacketHead;
+  BOOLEAN   FirstFragment;
 
   //
@@ -54 +53 @@
   ASSERT (((Len % 4) == 0) && (HeadLen <= IP4_MAX_HEADLEN));
 
-  PacketHead = (IP4_HEAD *) NetbufAllocSpace (Packet, HeadLen, NET_BUF_HEAD);
+  PacketHead = (IP4_HEAD *)NetbufAllocSpace (Packet, HeadLen, NET_BUF_HEAD);
 
   if (PacketHead == NULL) {
@@ -60 +59 @@
   }
 
-  Ip4CopyOption (Option, OptLen, FirstFragment, (UINT8 *) (PacketHead + 1), &Len);
+  Ip4CopyOption (Option, OptLen, FirstFragment, (UINT8 *)(PacketHead + 1), &Len);
 
   //
   // Set the head up, convert the host byte order to network byte order
   //
-  PacketHead->Ver       = 4;
-  PacketHead->HeadLen   = (UINT8) (HeadLen >> 2);
-  PacketHead->Tos       = Head->Tos;
-  PacketHead->TotalLen  = HTONS ((UINT16) Packet->TotalSize);
-  PacketHead->Id        = HTONS (Head->Id);
-  PacketHead->Fragment  = HTONS (Head->Fragment);
-  PacketHead->Checksum  = 0;
-  PacketHead->Ttl       = Head->Ttl;
-  PacketHead->Protocol  = Head->Protocol;
-  PacketHead->Src       = HTONL (Head->Src);
-  PacketHead->Dst       = HTONL (Head->Dst);
-  PacketHead->Checksum  = (UINT16) (~NetblockChecksum ((UINT8 *) PacketHead, HeadLen));
-
-  Packet->Ip.Ip4        = PacketHead;
+  PacketHead->Ver      = 4;
+  PacketHead->HeadLen  = (UINT8)(HeadLen >> 2);
+  PacketHead->Tos      = Head->Tos;
+  PacketHead->TotalLen = HTONS ((UINT16)Packet->TotalSize);
+  PacketHead->Id       = HTONS (Head->Id);
+  PacketHead->Fragment = HTONS (Head->Fragment);
+  PacketHead->Checksum = 0;
+  PacketHead->Ttl      = Head->Ttl;
+  PacketHead->Protocol = Head->Protocol;
+  PacketHead->Src      = HTONL (Head->Src);
+  PacketHead->Dst      = HTONL (Head->Dst);
+  PacketHead->Checksum = (UINT16)(~NetblockChecksum ((UINT8 *)PacketHead, HeadLen));
+
+  Packet->Ip.Ip4 = PacketHead;
   return EFI_SUCCESS;
 }
-
 
 /**
@@ -98 +96 @@
 IP4_INTERFACE *
 Ip4SelectInterface (
-  IN IP4_SERVICE            *IpSb,
-  IN IP4_ADDR               Dst,
-  IN IP4_ADDR               Src
-  )
-{
-  IP4_INTERFACE             *IpIf;
-  IP4_INTERFACE             *Selected;
-  LIST_ENTRY                *Entry;
+  IN IP4_SERVICE  *IpSb,
+  IN IP4_ADDR     Dst,
+  IN IP4_ADDR     Src
+  )
+{
+  IP4_INTERFACE  *IpIf;
+  IP4_INTERFACE  *Selected;
+  LIST_ENTRY     *Entry;
 
   //
@@ -143 +141 @@
   return Selected;
 }
-
 
 /**
@@ -160 +157 @@
 VOID
 Ip4SysPacketSent (
-  IP4_PROTOCOL              *Ip4Instance,
-  NET_BUF                   *Packet,
-  EFI_STATUS                IoStatus,
-  UINT32                    LinkFlag,
-  VOID                      *Context
+  IP4_PROTOCOL  *Ip4Instance,
+  NET_BUF       *Packet,
+  EFI_STATUS    IoStatus,
+  UINT32        LinkFlag,
+  VOID          *Context
   )
 {
   NetbufFree (Packet);
 }
-
 
 /**
@@ -208 +204 @@
 EFI_STATUS
 Ip4Output (
-  IN IP4_SERVICE            *IpSb,
-  IN IP4_PROTOCOL           *IpInstance  OPTIONAL,
-  IN NET_BUF                *Packet,
-  IN IP4_HEAD               *Head,
-  IN UINT8                  *Option,
-  IN UINT32                 OptLen,
-  IN IP4_ADDR               GateWay,
-  IN IP4_FRAME_CALLBACK     Callback,
-  IN VOID                   *Context
-  )
-{
-  IP4_INTERFACE             *IpIf;
-  IP4_ROUTE_CACHE_ENTRY     *CacheEntry;
-  IP4_ADDR                  Dest;
-  EFI_STATUS                Status;
-  NET_BUF                   *Fragment;
-  UINT32                    Index;
-  UINT32                    HeadLen;
-  UINT32                    PacketLen;
-  UINT32                    Offset;
-  UINT32                    Mtu;
-  UINT32                    Num;
-  BOOLEAN                   RawData;
+  IN IP4_SERVICE         *IpSb,
+  IN IP4_PROTOCOL        *IpInstance  OPTIONAL,
+  IN NET_BUF             *Packet,
+  IN IP4_HEAD            *Head,
+  IN UINT8               *Option,
+  IN UINT32              OptLen,
+  IN IP4_ADDR            GateWay,
+  IN IP4_FRAME_CALLBACK  Callback,
+  IN VOID                *Context
+  )
+{
+  IP4_INTERFACE          *IpIf;
+  IP4_ROUTE_CACHE_ENTRY  *CacheEntry;
+  IP4_ADDR               Dest;
+  EFI_STATUS             Status;
+  NET_BUF                *Fragment;
+  UINT32                 Index;
+  UINT32                 HeadLen;
+  UINT32                 PacketLen;
+  UINT32                 Offset;
+  UINT32                 Mtu;
+  UINT32                 Num;
+  BOOLEAN                RawData;
 
   //
@@ -257 +253 @@
 
   if ((IpInstance != NULL) && IpInstance->ConfigData.RawData) {
-    RawData        = TRUE;
+    RawData = TRUE;
   } else {
-    Head->HeadLen  = (UINT8) (HeadLen >> 2);
-    Head->Id       = mIp4Id++;
-    Head->Ver      = 4;
-    RawData        = FALSE;
+    Head->HeadLen = (UINT8)(HeadLen >> 2);
+    Head->Id      = mIp4Id++;
+    Head->Ver     = 4;
+    RawData       = FALSE;
   }
 
@@ -278 +274 @@
              );
 
-  if (EFI_ERROR(Status)) {
+  if (EFI_ERROR (Status)) {
     return Status;
   }
@@ -290 +286 @@
     //
     GateWay = IP4_ALLONE_ADDRESS;
-
   } else if (IP4_IS_MULTICAST (Dest)) {
     //
@@ -298 +293 @@
     //
     GateWay = Head->Dst;
-
   } else if (GateWay == IP4_ALLZERO_ADDRESS) {
     //
@@ -344 +338 @@
     // fragments there are.
     //
-    Mtu       = (Mtu - HeadLen) & (~0x07);
-    Num       = (Packet->TotalSize + Mtu - 1) / Mtu;
+    Mtu = (Mtu - HeadLen) & (~0x07);
+    Num = (Packet->TotalSize + Mtu - 1) / Mtu;
 
     //
@@ -438 +432 @@
 }
 
-
 /**
   The filter function to find a packet and all its fragments.
@@ -452 +445 @@
 BOOLEAN
 Ip4CancelPacketFragments (
-  IN IP4_LINK_TX_TOKEN   *Frame,
-  IN VOID                *Context
-  )
-{
-  if ((Frame->Packet == (NET_BUF *) Context) || (Frame->Context == Context)) {
+  IN IP4_LINK_TX_TOKEN  *Frame,
+  IN VOID               *Context
+  )
+{
+  if ((Frame->Packet == (NET_BUF *)Context) || (Frame->Context == Context)) {
     return TRUE;
   }
@@ -462 +455 @@
   return FALSE;
 }
-
 
 /**
@@ -474 +466 @@
 VOID
 Ip4CancelPacket (
-  IN IP4_INTERFACE    *IpIf,
-  IN NET_BUF          *Packet,
-  IN EFI_STATUS       IoStatus
+  IN IP4_INTERFACE  *IpIf,
+  IN NET_BUF        *Packet,
+  IN EFI_STATUS     IoStatus
   )
 {