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

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

@@ -7 +7 @@
 
 #include "Ip4Impl.h"
-
 
 /**
@@ -26 +25 @@
 INTN
 Ip4GetNetCast (
-  IN  IP4_ADDR          IpAddr,
-  IN  IP4_INTERFACE     *IpIf
+  IN  IP4_ADDR       IpAddr,
+  IN  IP4_INTERFACE  *IpIf
   )
 {
   if (IpAddr == IpIf->Ip) {
     return IP4_LOCAL_HOST;
-
   } else if (IpAddr == IpIf->SubnetBrdcast) {
     return IP4_SUBNET_BROADCAST;
-
   } else if (IpAddr == IpIf->NetBrdcast) {
     return IP4_NET_BROADCAST;
-
   }
 
   return 0;
 }
-
 
 /**
@@ -63 +58 @@
 INTN
 Ip4GetHostCast (
-  IN  IP4_SERVICE       *IpSb,
-  IN  IP4_ADDR          Dst,
-  IN  IP4_ADDR          Src
-  )
-{
-  LIST_ENTRY            *Entry;
-  IP4_INTERFACE         *IpIf;
-  INTN                  Type;
-  INTN                  Class;
+  IN  IP4_SERVICE  *IpSb,
+  IN  IP4_ADDR     Dst,
+  IN  IP4_ADDR     Src
+  )
+{
+  LIST_ENTRY     *Entry;
+  IP4_INTERFACE  *IpIf;
+  INTN           Type;
+  INTN           Class;
 
   Type = 0;
@@ -107 +102 @@
     IpIf = Ip4FindNet (IpSb, Src);
 
-    if (IpIf != NULL && !IP4_IS_BROADCAST (Ip4GetNetCast (Src, IpIf))) {
+    if ((IpIf != NULL) && !IP4_IS_BROADCAST (Ip4GetNetCast (Src, IpIf))) {
       return IP4_LOCAL_BROADCAST;
     }
-
-  } else if (IP4_IS_MULTICAST (Dst) && Ip4FindGroup (&IpSb->IgmpCtrl, Dst) != NULL) {
+  } else if (IP4_IS_MULTICAST (Dst) && (Ip4FindGroup (&IpSb->IgmpCtrl, Dst) != NULL)) {
     return IP4_MULTICAST;
   }
@@ -117 +111 @@
   return Type;
 }
-
 
 /**
@@ -130 +123 @@
 IP4_INTERFACE *
 Ip4FindInterface (
-  IN IP4_SERVICE        *IpSb,
-  IN IP4_ADDR           Ip
-  )
-{
-  LIST_ENTRY            *Entry;
-  IP4_INTERFACE         *IpIf;
+  IN IP4_SERVICE  *IpSb,
+  IN IP4_ADDR     Ip
+  )
+{
+  LIST_ENTRY     *Entry;
+  IP4_INTERFACE  *IpIf;
 
   NET_LIST_FOR_EACH (Entry, &IpSb->Interfaces) {
@@ -148 +141 @@
 }
 
-
 /**
   Find an interface that Ip is on that connected network.
@@ -160 +152 @@
 IP4_INTERFACE *
 Ip4FindNet (
-  IN IP4_SERVICE        *IpSb,
-  IN IP4_ADDR           Ip
-  )
-{
-  LIST_ENTRY            *Entry;
-  IP4_INTERFACE         *IpIf;
+  IN IP4_SERVICE  *IpSb,
+  IN IP4_ADDR     Ip
+  )
+{
+  LIST_ENTRY     *Entry;
+  IP4_INTERFACE  *IpIf;
 
   NET_LIST_FOR_EACH (Entry, &IpSb->Interfaces) {
@@ -177 +169 @@
   return NULL;
 }
-
 
 /**
@@ -191 +182 @@
 IP4_INTERFACE *
 Ip4FindStationAddress (
-  IN IP4_SERVICE        *IpSb,
-  IN IP4_ADDR           Ip,
-  IN IP4_ADDR           Netmask
-  )
-{
-  LIST_ENTRY      *Entry;
-  IP4_INTERFACE   *IpIf;
+  IN IP4_SERVICE  *IpSb,
+  IN IP4_ADDR     Ip,
+  IN IP4_ADDR     Netmask
+  )
+{
+  LIST_ENTRY     *Entry;
+  IP4_INTERFACE  *IpIf;
 
   NET_LIST_FOR_EACH (Entry, &IpSb->Interfaces) {
@@ -209 +200 @@
   return NULL;
 }
-
 
 /**
@@ -227 +217 @@
 EFI_STATUS
 Ip4GetMulticastMac (
-  IN  EFI_MANAGED_NETWORK_PROTOCOL *Mnp,
-  IN  IP4_ADDR                     Multicast,
-  OUT EFI_MAC_ADDRESS              *Mac
-  )
-{
-  EFI_IP_ADDRESS        EfiIp;
+  IN  EFI_MANAGED_NETWORK_PROTOCOL  *Mnp,
+  IN  IP4_ADDR                      Multicast,
+  OUT EFI_MAC_ADDRESS               *Mac
+  )
+{
+  EFI_IP_ADDRESS  EfiIp;
 
   EFI_IP4 (EfiIp.v4) = HTONL (Multicast);
   return Mnp->McastIpToMac (Mnp, FALSE, &EfiIp, Mac);
 }
-
 
 /**
@@ -251 +240 @@
 IP4_HEAD *
 Ip4NtohHead (
-  IN IP4_HEAD           *Head
-  )
-{
-  Head->TotalLen  = NTOHS (Head->TotalLen);
-  Head->Id        = NTOHS (Head->Id);
-  Head->Fragment  = NTOHS (Head->Fragment);
-  Head->Src       = NTOHL (Head->Src);
-  Head->Dst       = NTOHL (Head->Dst);
+  IN IP4_HEAD  *Head
+  )
+{
+  Head->TotalLen = NTOHS (Head->TotalLen);
+  Head->Id       = NTOHS (Head->Id);
+  Head->Fragment = NTOHS (Head->Fragment);
+  Head->Src      = NTOHL (Head->Src);
+  Head->Dst      = NTOHL (Head->Dst);
 
   return Head;
 }
-
 
 /**
@@ -278 +266 @@
 BOOLEAN
 Ip4StationAddressValid (
-  IN IP4_ADDR               Ip,
-  IN IP4_ADDR               Netmask
+  IN IP4_ADDR  Ip,
+  IN IP4_ADDR  Netmask
   )
 {
@@ -286 +274 @@
   //
   if (Netmask == IP4_ALLZERO_ADDRESS) {
-    return (BOOLEAN) (Ip == IP4_ALLZERO_ADDRESS);
+    return (BOOLEAN)(Ip == IP4_ALLZERO_ADDRESS);
   }