Changeset 58466 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Library/DxeIpIoLib

Timestamp:

Oct 29, 2015 4:30:44 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103777

Message:

EFI/Firmware: Merged in the svn:eol-style, svn:mime-type and trailing whitespace cleanup that was done after the initial UDK2014.SP1 import: svn merge ^{/vendor/edk2/UDK2014.SP1} /vendor/edk2/current .

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c (modified) (39 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c

@@ -78 +78 @@
   {FALSE, TRUE}, // ICMP6_ERR_UNREACH_HOST
   {TRUE,  TRUE}, // ICMP6_ERR_UNREACH_PROTOCOL
-  {TRUE,  TRUE}, // ICMP6_ERR_UNREACH_PORT    
+  {TRUE,  TRUE}, // ICMP6_ERR_UNREACH_PORT
   {TRUE,  TRUE}, // ICMP6_ERR_PACKAGE_TOOBIG
   {FALSE, TRUE}, // ICMP6_ERR_TIMXCEED_HOPLIMIT
   {FALSE, TRUE}, // ICMP6_ERR_TIMXCEED_REASS
-  {FALSE, TRUE}, // ICMP6_ERR_PARAMPROB_HEADER    
+  {FALSE, TRUE}, // ICMP6_ERR_PARAMPROB_HEADER
   {FALSE, TRUE}, // ICMP6_ERR_PARAMPROB_NEXHEADER
   {FALSE, TRUE}  // ICMP6_ERR_PARAMPROB_IPV6OPTION
@@ -255 +255 @@
 
 /**
-  This function handles ICMPv4 packets. It is the worker function of 
+  This function handles ICMPv4 packets. It is the worker function of
   IpIoIcmpHandler.
 
@@ -380 +380 @@
   IpIo->PktRcvdNotify (EFI_ICMP_ERROR, IcmpErr, Session, Pkt, IpIo->RcvdContext);
 
-  return EFI_SUCCESS;  
-}
-
-/**
-  This function handles ICMPv6 packets. It is the worker function of 
+  return EFI_SUCCESS;
+}
+
+/**
+  This function handles ICMPv6 packets. It is the worker function of
   IpIoIcmpHandler.
 
@@ -428 +428 @@
   //
   // Analyze the ICMPv6 Error in this ICMPv6 packet
-  // 
+  //
   switch (Type) {
   case ICMP_V6_DEST_UNREACHABLE:
@@ -487 +487 @@
 
      return EFI_ABORTED;
-   } 
+   }
 
   //
@@ -498 +498 @@
   PayLoadHdr = (UINT8 *) ((UINT8 *) IcmpHdr + sizeof (IP6_ICMP_ERROR_HEAD));
   Flag       = TRUE;
-  
+
   do {
     switch (NextHeader) {
@@ -536 +536 @@
 
   TrimBytes = (UINT32) (PayLoadHdr - (UINT8 *) IcmpHdr);
-  
+
   NetbufTrim (Pkt, TrimBytes, TRUE);
 
@@ -625 +625 @@
 {
   IP_IO_SEND_ENTRY          *SndEntry;
-  EFI_EVENT                 Event;  
+  EFI_EVENT                 Event;
   EFI_STATUS                Status;
   NET_FRAGMENT              *ExtFragment;
@@ -675 +675 @@
 
   //
-  // Build a fragment table to contain the fragments in the packet. 
+  // Build a fragment table to contain the fragments in the packet.
   //
   if (IpIo->IpVersion == IP_VERSION_4) {
@@ -732 +732 @@
     Ip6TxData->ExtHdrsLength = 0;
     Ip6TxData->ExtHdrs       = NULL;
-    
+
     //
     // Set the fields of SndToken
@@ -779 +779 @@
 /**
   Destroy the SndEntry.
-  
+
   This function pairs with IpIoCreateSndEntry().
 
@@ -1064 +1064 @@
       goto CleanUp;
     }
-    
+
     //
     // Create a netbuffer representing IPv6 packet
@@ -1084 +1084 @@
     //
     CopyMem (
-      &Session.Source, 
+      &Session.Source,
       &RxData->Ip6RxData.Header->SourceAddress,
       sizeof(EFI_IPv6_ADDRESS)
       );
     CopyMem (
-      &Session.Dest, 
-      &RxData->Ip6RxData.Header->DestinationAddress, 
+      &Session.Dest,
+      &RxData->Ip6RxData.Header->DestinationAddress,
       sizeof(EFI_IPv6_ADDRESS)
       );
@@ -1096 +1096 @@
     Session.IpHdrLen     = RxData->Ip6RxData.HeaderLength;
     Session.IpVersion    = IP_VERSION_6;
-  } 
+  }
 
   if (EFI_SUCCESS == Status) {
@@ -1118 +1118 @@
     gBS->SignalEvent (RxData->Ip4RxData.RecycleSignal);
   } else {
-    gBS->SignalEvent (RxData->Ip6RxData.RecycleSignal); 
+    gBS->SignalEvent (RxData->Ip6RxData.RecycleSignal);
   }
 
@@ -1153 +1153 @@
 /**
   Create a new IP_IO instance.
-  
+
   This function uses IP4/IP6 service binding protocol in Controller to create
   an IP4/IP6 child (aka IP4/IP6 instance).
@@ -1162 +1162 @@
                                 binding protocol installed.
   @param[in]  IpVersion         The version of the IP protocol to use, either
-                                IPv4 or IPv6.                            
+                                IPv4 or IPv6.
 
   @return Pointer to a newly created IP_IO instance, or NULL if failed.
@@ -1217 +1217 @@
              Image,
              &IpIo->ChildHandle,
-             IpVersion,             
+             IpVersion,
              (VOID **)&(IpIo->Ip)
              );
@@ -1240 +1240 @@
 /**
   Open an IP_IO instance for use.
-  
+
   This function is called after IpIoCreate(). It is used for configuring the IP
   instance and register the callbacks and their context data for sending and
@@ -1252 +1252 @@
   @retval          EFI_SUCCESS        The IP_IO instance opened with OpenData
                                       successfully.
-  @retval          EFI_ACCESS_DENIED  The IP_IO instance is configured, avoid to 
+  @retval          EFI_ACCESS_DENIED  The IP_IO instance is configured, avoid to
                                       reopen it.
   @retval          Others             Error condition occurred.
@@ -1286 +1286 @@
 
     Status = IpIo->Ip.Ip6->Configure (
-                             IpIo->Ip.Ip6, 
+                             IpIo->Ip.Ip6,
                              &OpenData->IpConfigData.Ip6CfgData
                              );
@@ -1359 +1359 @@
 /**
   Stop an IP_IO instance.
-  
+
   This function is paired with IpIoOpen(). The IP_IO will be unconfigured and all
   the pending send/receive tokens will be canceled.
@@ -1436 +1436 @@
 /**
   Destroy an IP_IO instance.
-  
+
   This function is paired with IpIoCreate(). The IP_IO will be closed first.
   Resource will be freed afterwards. See IpIoCloseProtocolDestroyIpChild().
@@ -1476 +1476 @@
 /**
   Send out an IP packet.
-  
+
   This function is called after IpIoOpen(). The data to be sent are wrapped in
   Pkt. The IP instance wrapped in IpIo is used for sending by default but can be
@@ -1601 +1601 @@
 /**
   Add a new IP instance for sending data.
-  
+
   The function is used to add the IP_IO to the IP_IO sending list. The caller
   can later use IpIoFindSender() to get the IP_IO and call IpIoSend() to send
@@ -1760 +1760 @@
       if (((EFI_IP4_CONFIG_DATA *) IpConfigData)->UseDefaultAddress) {
         Ip.Ip4->GetModeData (
-                  Ip.Ip4, 
-                  &Ip4ModeData, 
-                  NULL, 
+                  Ip.Ip4,
+                  &Ip4ModeData,
+                  NULL,
                   NULL
                   );
@@ -1771 +1771 @@
 
       CopyMem (
-        &IpInfo->Addr.Addr, 
-        &((EFI_IP4_CONFIG_DATA *) IpConfigData)->StationAddress, 
+        &IpInfo->Addr.Addr,
+        &((EFI_IP4_CONFIG_DATA *) IpConfigData)->StationAddress,
         sizeof (IP4_ADDR)
         );
       CopyMem (
-        &IpInfo->PreMask.SubnetMask, 
+        &IpInfo->PreMask.SubnetMask,
         &((EFI_IP4_CONFIG_DATA *) IpConfigData)->SubnetMask,
         sizeof (IP4_ADDR)
@@ -1830 +1830 @@
         Status = EFI_NO_MAPPING;
         goto OnExit;
-      } 
+      }
 
       CopyMem (
-        &IpInfo->Addr, 
-        &Ip6ModeData.ConfigData.StationAddress, 
+        &IpInfo->Addr,
+        &Ip6ModeData.ConfigData.StationAddress,
         sizeof (EFI_IPv6_ADDRESS)
         );
@@ -1845 +1845 @@
         Ip.Ip6->Configure (Ip.Ip6, NULL);
       }
-    }  
+    }
   } else {
     //
@@ -1863 +1863 @@
   Destroy an IP instance maintained in IpIo->IpList for
   sending purpose.
-  
+
   This function pairs with IpIoAddIp(). The IpInfo is previously created by
   IpIoAddIp(). The IP_IO_IP_INFO::RefCnt is decremented and the IP instance
@@ -1935 +1935 @@
   Find the first IP protocol maintained in IpIo whose local
   address is the same as Src.
-  
+
   This function is called when the caller needs the IpIo to send data to the
   specified Src. The IpIo was added previously by IpIoAddIp().
@@ -1961 +1961 @@
   IP_IO_IP_INFO   *IpInfo;
 
-  ASSERT ((IpVersion == IP_VERSION_4) || (IpVersion == IP_VERSION_6));  
+  ASSERT ((IpVersion == IP_VERSION_4) || (IpVersion == IP_VERSION_6));
 
   NET_LIST_FOR_EACH (IpIoEntry, &mActiveIpIoList) {
@@ -1983 +1983 @@
         if (EFI_IP6_EQUAL (&IpInfo->Addr.v6, &Src->v6)) {
           *IpIo = IpIoPtr;
-          return IpInfo;       
+          return IpInfo;
         }
-      }      
+      }
 
     }
@@ -1999 +1999 @@
 /**
   Get the ICMP error map information.
-  
+
   The ErrorStatus will be returned. The IsHard and Notify are optional. If they
   are not NULL, this routine will fill them.
@@ -2005 +2005 @@
   @param[in]   IcmpError             IcmpError Type.
   @param[in]   IpVersion             The version of the IP protocol to use,
-                                     either IPv4 or IPv6. 
+                                     either IPv4 or IPv6.
   @param[out]  IsHard                If TRUE, indicates that it is a hard error.
   @param[out]  Notify                If TRUE, SockError needs to be notified.
@@ -2076 +2076 @@
     case ICMP6_ERR_UNREACH_HOST:
     case ICMP6_ERR_TIMXCEED_HOPLIMIT:
-    case ICMP6_ERR_TIMXCEED_REASS:       
+    case ICMP6_ERR_TIMXCEED_REASS:
       return EFI_HOST_UNREACHABLE;
 
     case ICMP6_ERR_UNREACH_PROTOCOL:
       return EFI_PROTOCOL_UNREACHABLE;
-      
+
     case ICMP6_ERR_UNREACH_PORT:
       return EFI_PORT_UNREACHABLE;
@@ -2110 +2110 @@
 
   This function is called when the caller needs the IpIo to refresh the existing
-  IPv6 neighbor cache entries since the neighbor is considered reachable by the 
-  node has recently received a confirmation that packets sent recently to the 
-  neighbor were received by its IP layer. 
+  IPv6 neighbor cache entries since the neighbor is considered reachable by the
+  node has recently received a confirmation that packets sent recently to the
+  neighbor were received by its IP layer.
 
   @param[in]   IpIo                  Pointer to an IP_IO instance
   @param[in]   Neighbor              The IP address of the neighbor
   @param[in]   Timeout               Time in 100-ns units that this entry will
-                                     remain in the neighbor cache. A value of 
-                                     zero means that the entry is permanent. 
-                                     A value of non-zero means that the entry is 
+                                     remain in the neighbor cache. A value of
+                                     zero means that the entry is permanent.
+                                     A value of non-zero means that the entry is
                                      dynamic and will be deleted after Timeout.
 
@@ -2125 +2125 @@
   @retval      EFI_NOT_STARTED       The IpIo is not configured.
   @retval      EFI_INVALID_PARAMETER Neighbor Address is invalid.
-  @retval      EFI_NOT_FOUND         The neighbor cache entry is not in the 
-                                     neighbor table.  
+  @retval      EFI_NOT_FOUND         The neighbor cache entry is not in the
+                                     neighbor table.
   @retval      EFI_OUT_OF_RESOURCES  Failed due to resource limit.
 
@@ -2134 +2134 @@
   IN IP_IO           *IpIo,
   IN EFI_IP_ADDRESS  *Neighbor,
-  IN UINT32          Timeout  
+  IN UINT32          Timeout
   )
 {