1. Enable Network stack to pass SCT, currently MNP, ARP, IP4, TCP4 and DHCP4 have...

2. Enable Network stack to pass ICC build.
3. Sync Network library instances' module names with their filenames.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3692 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
index e52d11532f7964d4521ef9d2f647b11f0db917fd..9b8dfd01dd4a71c64892459db2e1358cbb8239bf 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
@@ -553,7 +553,7 @@ UsbScsiModeSense (
   // ModeSense6 command is defined in [SCSI2Spec-Page151]\r
   //\r
   ModeSenseCmd.OpCode         = USB_SCSI_MODE_SENSE6_OPCODE;\r
-  ModeSenseCmd.Lun            = USB_BOOT_LUN (UsbMass->Lun);\r
+  ModeSenseCmd.Lun            = (UINT8) USB_BOOT_LUN (UsbMass->Lun);\r
   ModeSenseCmd.PageCode       = 0x3F;\r
   ModeSenseCmd.AllocateLen    = (UINT8) sizeof (USB_SCSI_MODE_SENSE6_PARA_HEADER);\r
 \r
@@ -572,7 +572,7 @@ UsbScsiModeSense (
   // devices support this command, so have a try here.\r
   //\r
   if (!EFI_ERROR (Status)) {\r
-    Media->ReadOnly = (ModeParaHeader.DevicePara & 0x80) ? TRUE : FALSE;\r
+    Media->ReadOnly = (BOOLEAN) ((ModeParaHeader.DevicePara & 0x80) ? TRUE : FALSE);\r
   }\r
 \r
   return Status;\r

diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
index f377138a1927d1765c557f74d16d5f9e243d2a7a..4b8a699aea9bb9bdb4c924a17b1eb2ba973375a3 100644 (file)
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
+++ b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
@@ -1272,18 +1272,47 @@ IpIoGetIcmpErrStatus (
   OUT BOOLEAN     *Notify OPTIONAL\r
   )\r
 {\r
-  ICMP_ERROR_INFO  IcmpErrMap[] = {\r
-    { EFI_NETWORK_UNREACHABLE,  FALSE, TRUE  }, // ICMP_ERR_UNREACH_NET\r
-    { EFI_HOST_UNREACHABLE,     FALSE, TRUE  }, // ICMP_ERR_UNREACH_HOST\r
-    { EFI_PROTOCOL_UNREACHABLE, TRUE,  TRUE  }, // ICMP_ERR_UNREACH_PROTOCOL\r
-    { EFI_PORT_UNREACHABLE,     TRUE,  TRUE  }, // ICMP_ERR_UNREACH_PORT\r
-    { EFI_ICMP_ERROR,           TRUE,  TRUE  }, // ICMP_ERR_MSGSIZE\r
-    { EFI_ICMP_ERROR,           FALSE, TRUE  }, // ICMP_ERR_UNREACH_SRCFAIL\r
-    { EFI_HOST_UNREACHABLE,     FALSE, TRUE  }, // ICMP_ERR_TIMXCEED_INTRANS\r
-    { EFI_HOST_UNREACHABLE,     FALSE, TRUE  }, // ICMP_ERR_TIMEXCEED_REASS\r
-    { EFI_ICMP_ERROR,           FALSE, FALSE }, // ICMP_ERR_QUENCH\r
-    { EFI_ICMP_ERROR,           FALSE, TRUE  }  // ICMP_ERR_PARAMPROB\r
-  };\r
+  ICMP_ERROR_INFO  IcmpErrMap[10];\r
+\r
+  IcmpErrMap[0].Error  = EFI_NETWORK_UNREACHABLE;\r
+  IcmpErrMap[0].IsHard = FALSE;\r
+  IcmpErrMap[0].Notify = TRUE;\r
+\r
+  IcmpErrMap[1].Error = EFI_HOST_UNREACHABLE;\r
+  IcmpErrMap[1].IsHard = FALSE;\r
+  IcmpErrMap[1].Notify = TRUE;\r
+\r
+  IcmpErrMap[2].Error = EFI_PROTOCOL_UNREACHABLE;\r
+  IcmpErrMap[2].IsHard = TRUE;\r
+  IcmpErrMap[2].Notify = TRUE;\r
+\r
+  IcmpErrMap[3].Error = EFI_PORT_UNREACHABLE;\r
+  IcmpErrMap[3].IsHard = TRUE;\r
+  IcmpErrMap[3].Notify = TRUE;\r
+\r
+  IcmpErrMap[4].Error = EFI_ICMP_ERROR;\r
+  IcmpErrMap[4].IsHard = TRUE;\r
+  IcmpErrMap[4].Notify = TRUE;\r
+\r
+  IcmpErrMap[5].Error = EFI_ICMP_ERROR;\r
+  IcmpErrMap[5].IsHard = FALSE;\r
+  IcmpErrMap[5].Notify = TRUE;\r
+\r
+  IcmpErrMap[6].Error = EFI_HOST_UNREACHABLE;\r
+  IcmpErrMap[6].IsHard = FALSE;\r
+  IcmpErrMap[6].Notify = TRUE;\r
+\r
+  IcmpErrMap[7].Error = EFI_HOST_UNREACHABLE;\r
+  IcmpErrMap[7].IsHard = FALSE;\r
+  IcmpErrMap[7].Notify = TRUE;\r
+\r
+  IcmpErrMap[8].Error = EFI_ICMP_ERROR;\r
+  IcmpErrMap[8].IsHard = FALSE;\r
+  IcmpErrMap[8].Notify = FALSE;\r
+\r
+  IcmpErrMap[9].Error = EFI_ICMP_ERROR;\r
+  IcmpErrMap[9].IsHard = FALSE;\r
+  IcmpErrMap[9].Notify = TRUE;\r
 \r
   ASSERT ((IcmpError >= ICMP_ERR_UNREACH_NET) && (IcmpError <= ICMP_ERR_PARAMPROB));\r
 \r

diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
index 9f922ab1b49677c58e1ee25edf46681a1e8577b8..c797952f65842ea5f122a1c8941c34aad42c10f4 100644 (file)
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
+++ b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
@@ -1,8 +1,8 @@
 #/** @file\r
-# Component name for module NetLib\r
+# Component name for module DxeIpIoLib\r
 #\r
 # FIX ME!\r
-# Copyright (c) 2006, Intel Corporation. \r
+# Copyright (c) 2006, Intel Corporation.\r
 #\r
 #  All rights reserved. This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -17,7 +17,7 @@
 \r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = NetIpIoDxe\r
+  BASE_NAME                      = DxeIpIoLib\r
   FILE_GUID                      = A302F877-8625-425c-B1EC-7487B62C4FDA\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
index ac6260e83f6a3f0eebee5eafa8e23ba23a9229f6..f247e610836006956f46bd5ac3673d029e53e6c9 100644 (file)
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
@@ -1,8 +1,8 @@
 #/** @file\r
-# Component name for module NetLib\r
+# Component name for module DxeNetLib\r
 #\r
 # FIX ME!\r
-# Copyright (c) 2006, Intel Corporation. \r
+# Copyright (c) 2006, Intel Corporation.\r
 #\r
 #  All rights reserved. This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -17,7 +17,7 @@
 \r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = NetLibDxe\r
+  BASE_NAME                      = DxeNetLib\r
   FILE_GUID                      = db6dcef3-9f4e-4340-9351-fc35aa8a5888\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

diff --git a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
index 3a0075c4672f415b98a3dd832d8c90c452561996..b66348c284c9c7401e5f725c99c52fc7cd79cc5e 100644 (file)
--- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
+++ b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
@@ -414,7 +414,10 @@ UdpIoFreePort (
     UdpIo->UdpHandle\r
     );\r
 \r
-  NetListRemoveEntry (&UdpIo->Link);\r
+  if (!IsListEmpty(&UdpIo->Link)) {\r
+    NetListRemoveEntry (&UdpIo->Link);\r
+  }\r
+\r
   NetFreePool (UdpIo);\r
   return EFI_SUCCESS;\r
 }\r

diff --git a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
index 2eff97e343c89aa1ef4dd45d84b04e84af60fcb7..32ccb96c3219160ba243584b2ef104772614f3d6 100644 (file)
--- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
+++ b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
@@ -1,8 +1,8 @@
 #/** @file\r
-# Component name for module NetLib\r
+# Component name for module DxeUpdIoLib\r
 #\r
 # FIX ME!\r
-# Copyright (c) 2006, Intel Corporation. \r
+# Copyright (c) 2006, Intel Corporation.\r
 #\r
 #  All rights reserved. This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -17,7 +17,7 @@
 \r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
-  BASE_NAME                      = DxeUpdIoDxe\r
+  BASE_NAME                      = DxeUpdIoLib\r
   FILE_GUID                      = 7E615AA1-41EE-49d4-B7E9-1D7A60AA5C8D\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
index 93b4c1020037373b77424c579c11cf468a826350..b46c7047eefadaed9438b6c0e06118d77dc6deef 100644 (file)
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
@@ -54,7 +54,7 @@ ArpInitInstance (
   Instance->Signature  = ARP_INSTANCE_DATA_SIGNATURE;\r
   Instance->ArpService = ArpService;\r
 \r
-  CopyMem (&Instance->ArpProto, &mEfiArpProtocolTemplate, sizeof (ARP_SERVICE_DATA));\r
+  CopyMem (&Instance->ArpProto, &mEfiArpProtocolTemplate, sizeof (Instance->ArpProto));\r
 \r
   Instance->Configured = FALSE;\r
   Instance->Destroyed  = FALSE;\r
@@ -263,7 +263,9 @@ ArpOnFrameRcvd (
       }\r
     }\r
 \r
-    NetListRemoveEntry (&CacheEntry->List);\r
+    if (!IsListEmpty (&CacheEntry->List)) {\r
+      NetListRemoveEntry (&CacheEntry->List);\r
+    }\r
 \r
     //\r
     // Fill the addresses into the CacheEntry.\r
@@ -912,7 +914,7 @@ ArpConfigureInstance (
       //\r
       // Save the configuration.\r
       //\r
-      CopyMem (OldConfigData, ConfigData, sizeof (EFI_ARP_CONFIG_DATA));\r
+      CopyMem (OldConfigData, ConfigData, sizeof (*OldConfigData));\r
 \r
       OldConfigData->StationAddress = NetAllocatePool (OldConfigData->SwAddressLength);\r
       if (OldConfigData->StationAddress == NULL) {\r

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
index 08d6076bda4f2c4b1aa1de54a5758358d7b22369..b9f2704c002b03a01aecd3679d90d139c628f4cc 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
@@ -36,7 +36,6 @@ EFI_SERVICE_BINDING_PROTOCOL mDhcp4ServiceBindingTemplete = {
   Dhcp4ServiceBindingDestroyChild\r
 };\r
 \r
-//@MT: EFI_DRIVER_ENTRY_POINT (Dhcp4DriverEntryPoint)\r
 \r
 EFI_STATUS\r
 EFIAPI\r
@@ -250,7 +249,7 @@ Dhcp4CreateService (
 \r
   DhcpSb->HwLen  = (UINT8) DhcpSb->UdpIo->SnpMode.HwAddressSize;\r
   DhcpSb->HwType = DhcpSb->UdpIo->SnpMode.IfType;\r
-  CopyMem (&DhcpSb->Mac, &DhcpSb->UdpIo->SnpMode.CurrentAddress, sizeof (EFI_MAC_ADDRESS));\r
+  CopyMem (&DhcpSb->Mac, &DhcpSb->UdpIo->SnpMode.CurrentAddress, sizeof (DhcpSb->Mac));\r
 \r
   *Service       = DhcpSb;\r
   return EFI_SUCCESS;\r
@@ -454,7 +453,7 @@ DhcpInitProtocol (
   )\r
 {\r
   Instance->Signature         = DHCP_PROTOCOL_SIGNATURE;\r
-  CopyMem (&Instance->Dhcp4Protocol, &mDhcp4ProtocolTemplate, sizeof (EFI_DHCP4_PROTOCOL));\r
+  CopyMem (&Instance->Dhcp4Protocol, &mDhcp4ProtocolTemplate, sizeof (Instance->Dhcp4Protocol));\r
   NetListInit (&Instance->Link);\r
   Instance->Handle            = NULL;\r
   Instance->Service           = DhcpSb;\r

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
index 68da959466aacbae44e09eaabeb93e144959a181..3595e784a0205b9c290d994915991848742e763b 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
@@ -69,9 +69,9 @@ EfiDhcp4GetModeData (
   // Caller can use GetModeData to retrieve current DHCP states\r
   // no matter whether it is the active child or not.\r
   //\r
-  Dhcp4ModeData->State                     = DhcpSb->DhcpState;\r
-  CopyMem (&Dhcp4ModeData->ConfigData, &DhcpSb->ActiveConfig, sizeof (EFI_DHCP4_CONFIG_DATA));\r
-  CopyMem (&Dhcp4ModeData->ClientMacAddress, &DhcpSb->Mac, sizeof (EFI_MAC_ADDRESS));\r
+  Dhcp4ModeData->State                     = (EFI_DHCP4_STATE) DhcpSb->DhcpState;\r
+  CopyMem (&Dhcp4ModeData->ConfigData, &DhcpSb->ActiveConfig, sizeof (Dhcp4ModeData->ConfigData));\r
+  CopyMem (&Dhcp4ModeData->ClientMacAddress, &DhcpSb->Mac, sizeof (Dhcp4ModeData->ClientMacAddress));\r
 \r
   Ip = HTONL (DhcpSb->ClientAddr);\r
   NetCopyMem (&Dhcp4ModeData->ClientAddress, &Ip, sizeof (EFI_IPv4_ADDRESS));\r
@@ -161,7 +161,7 @@ DhcpCopyConfigure (
   INTN                      Len;\r
   UINT32                    Index;\r
 \r
-  CopyMem (Dst, Src, sizeof (EFI_DHCP4_CONFIG_DATA));\r
+  CopyMem (Dst, Src, sizeof (Dst));\r
   Dst->DiscoverTimeout  = NULL;\r
   Dst->RequestTimeout   = NULL;\r
   Dst->OptionList       = NULL;\r
@@ -250,9 +250,7 @@ DhcpYieldControl (
   )\r
 {\r
   EFI_DHCP4_CONFIG_DATA     *Config;\r
-  DHCP_PROTOCOL             *Instance;\r
 \r
-  Instance  = DhcpSb->ActiveChild;\r
   Config    = &DhcpSb->ActiveConfig;\r
 \r
   DhcpSb->ServiceState  = DHCP_UNCONFIGED;\r

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h
index 7f449415d21c7c0940fd3a024ae163a269a4dbb9..d81d68fa1e20a6cf1278753306046c015acd3918 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h
@@ -61,10 +61,10 @@ enum {
   //
   DHCP_UNCONFIGED         = 0,
   DHCP_CONFIGED,
-  DHCP_DESTORY,
+  DHCP_DESTORY
 };
 
-typedef struct _DHCP_PROTOCOL {
+struct _DHCP_PROTOCOL {
   UINT32                            Signature;
   EFI_DHCP4_PROTOCOL                Dhcp4Protocol;
   NET_LIST_ENTRY                    Link;
@@ -83,7 +83,7 @@ typedef struct _DHCP_PROTOCOL {
 // DHCP driver is specical in that it is a singleton. Although it
 // has a service binding, there can be only one active child.
 //
-typedef struct _DHCP_SERVICE {
+struct _DHCP_SERVICE {
   UINT32                        Signature;
   EFI_SERVICE_BINDING_PROTOCOL  ServiceBinding;
 

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
index e0fdcd382c66ef0da001dbe5e2ac7dbc4cc24400..41554393a5e51d7b59e06172c49d248bb5f5d8d4 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
@@ -120,7 +120,7 @@ DhcpCallUser (
   Status = Config->Dhcp4Callback (\r
                      &DhcpSb->ActiveChild->Dhcp4Protocol,\r
                      Config->CallbackContext,\r
-                     DhcpSb->DhcpState,\r
+                     (EFI_DHCP4_STATE) DhcpSb->DhcpState,\r
                      Event,\r
                      Packet,\r
                      NewPacket\r
@@ -948,7 +948,7 @@ DhcpHandleReboot (
   }\r
 \r
   DhcpSb->Selected  = Packet;\r
-  CopyMem (DhcpSb->Para, Para, sizeof (DHCP_PARAMETER));\r
+  CopyMem (DhcpSb->Para, Para, sizeof (*DhcpSb->Para));\r
 \r
   Status            = DhcpLeaseAcquired (DhcpSb);\r
 \r
@@ -1214,7 +1214,7 @@ DhcpSendMessage (
   Len = sizeof (EFI_DHCP4_PACKET) + 128 + DhcpSb->UserOptionLen;\r
 \r
   if (Msg != NULL) {\r
-    Len += (UINT32)AsciiStrLen (Msg);\r
+    Len += (UINT32)AsciiStrLen ((CHAR8 *) Msg);\r
   }\r
 \r
   Packet = NetAllocatePool (Len);\r
@@ -1310,7 +1310,7 @@ DhcpSendMessage (
   // Append the user's message if it isn't NULL\r
   //\r
   if (Msg != NULL) {\r
-    Len     = NET_MIN ((UINT32) AsciiStrLen (Msg), 255);\r
+    Len     = NET_MIN ((UINT32) AsciiStrLen ((CHAR8 *) Msg), 255);\r
     Buf     = DhcpAppendOption (Buf, DHCP_TAG_MESSAGE, (UINT16) Len, Msg);\r
   }\r
 \r

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h
index 1da95f94a799148965d59f56f1201815590d72b9..a05b66282e71675fc2db89722938b17f36694107 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h
@@ -63,7 +63,7 @@ enum {
   //
   DHCP_NOTIFY_COMPLETION  = 1,
   DHCP_NOTIFY_RENEWREBIND,
-  DHCP_NOTIFY_ALL,
+  DHCP_NOTIFY_ALL
 };
 
 #define DHCP_IS_BOOTP(Parameter)  (((Parameter) == NULL) || ((Parameter)->DhcpType == 0))

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.c
index b16f4693d7b4a169f4a62e5ffccb6f36ffb5d976..cf43dfa2062f4a1b93da1f27c560246e65c77ca8 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.c
@@ -424,7 +424,7 @@ DhcpIterateOptions (
 \r
   if ((Overload == DHCP_OVERLOAD_FILENAME) || (Overload == DHCP_OVERLOAD_BOTH)) {\r
     Status = DhcpIterateBufferOptions (\r
-               Packet->Dhcp4.Header.BootFileName,\r
+               (UINT8 *) Packet->Dhcp4.Header.BootFileName,\r
                128,\r
                Check,\r
                Context,\r
@@ -438,7 +438,7 @@ DhcpIterateOptions (
 \r
   if ((Overload == DHCP_OVERLOAD_SVRNAME) || (Overload == DHCP_OVERLOAD_BOTH)) {\r
     Status = DhcpIterateBufferOptions (\r
-               Packet->Dhcp4.Header.ServerName,\r
+               (UINT8 *) Packet->Dhcp4.Header.ServerName,\r
                64,\r
                Check,\r
                Context,\r
@@ -480,7 +480,7 @@ DhcpGetOptionLen (
   DHCP_OPTION_COUNT         *OpCount;\r
 \r
   OpCount             = (DHCP_OPTION_COUNT *) Context;\r
-  OpCount[Tag].Offset = OpCount[Tag].Offset + Len;\r
+  OpCount[Tag].Offset = (UINT16) (OpCount[Tag].Offset + Len);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -528,8 +528,8 @@ DhcpFillOption (
 \r
   NetCopyMem (Buf + OptCount[Tag].Offset, Data, Len);\r
 \r
-  OptCount[Tag].Offset  = OptCount[Tag].Offset + Len;\r
-  Options[Index].Len    = Options[Index].Len + Len;\r
+  OptCount[Tag].Offset  = (UINT16) (OptCount[Tag].Offset + Len);\r
+  Options[Index].Len    = (UINT16) (Options[Index].Len + Len);\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -606,8 +606,8 @@ DhcpParseOption (
     if (OptCount[Index].Offset != 0) {\r
       OptCount[Index].Index   = (UINT8) OptNum;\r
 \r
-      TotalLen                = TotalLen + OptCount[Index].Offset;\r
-      OptCount[Index].Offset  = TotalLen - OptCount[Index].Offset;\r
+      TotalLen                = (UINT16) (TotalLen + OptCount[Index].Offset);\r
+      OptCount[Index].Offset  = (UINT16) (TotalLen - OptCount[Index].Offset);\r
 \r
       OptNum++;\r
     }\r
@@ -727,7 +727,7 @@ DhcpValidateOptions (
       goto ON_EXIT;\r
     }\r
 \r
-    CopyMem (*Para, &Parameter, sizeof (DHCP_PARAMETER));\r
+    CopyMem (*Para, &Parameter, sizeof (**Para));\r
   }\r
 \r
 ON_EXIT:\r
@@ -879,7 +879,7 @@ DhcpBuild (
 \r
   Packet->Size         = Len;\r
   Packet->Length       = 0;\r
-  CopyMem (&Packet->Dhcp4.Header, &SeedPacket->Dhcp4.Header, sizeof (EFI_DHCP4_HEADER));\r
+  CopyMem (&Packet->Dhcp4.Header, &SeedPacket->Dhcp4.Header, sizeof (Packet->Dhcp4.Header));\r
   Packet->Dhcp4.Magik  = DHCP_OPTION_MAGIC;\r
   Buf                  = Packet->Dhcp4.Option;\r
 \r

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.h b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.h
index a6a485bece44b92d0e9e8038dbdc939c724e91b0..4bc1920eb3883b318deaf9b96eb2e714ff51e32d 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.h
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Option.h
@@ -131,7 +131,7 @@ enum {
   DHCP_TAG_T1              = 58,         // Renewal (T1) Time Value
   DHCP_TAG_T2              = 59,         // Rebinding (T2) Time Value
   DHCP_TAG_VENDOR_CLASS    = 60,         // Vendor class identifier
-  DHCP_TAG_CLIENT_ID       = 61,         // Client-identifier
+  DHCP_TAG_CLIENT_ID       = 61          // Client-identifier
 };
 
 enum {
@@ -153,7 +153,7 @@ enum {
   //
   DHCP_OVERLOAD_FILENAME   = 1,
   DHCP_OVERLOAD_SVRNAME    = 2,
-  DHCP_OVERLOAD_BOTH       = 3,
+  DHCP_OVERLOAD_BOTH       = 3
 };
 
 //

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c
index a1bae0f29d50af0f69700dcf3675c22d0cd9e41d..ee78ceea6c7f11d08a6f8850b43fe4b4e9bc16a0 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c
@@ -66,7 +66,7 @@ EfiNicIp4ConfigGetName (
   }\r
 \r
   if (NicAddr != NULL) {\r
-    CopyMem (NicAddr, &Instance->NicAddr, sizeof (NIC_ADDR));\r
+    CopyMem (NicAddr, &Instance->NicAddr, sizeof (*NicAddr));\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -630,7 +630,7 @@ Ip4ConfigOnDhcp4Complete (
       goto ON_EXIT;\r
     }\r
 \r
-    CopyMem (&Instance->NicConfig->NicAddr, &Instance->NicAddr, sizeof (NIC_ADDR));\r
+    CopyMem (&Instance->NicConfig->NicAddr, &Instance->NicAddr, sizeof (Instance->NicConfig->NicAddr));\r
     Instance->NicConfig->Source  = IP4_CONFIG_SOURCE_DHCP;\r
     Instance->NicConfig->Perment = Perment;\r
 \r

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
index 3d857b047e8968f52c01fe3003a72960262b8e1f..dd103bc908fcff7290e1dedb2c3bf28f0cb247a4 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
@@ -251,7 +251,7 @@ Ip4ConfigDriverBindingStart (
 \r
   Instance->NicAddr.Type    = (UINT16) SnpMode.IfType;\r
   Instance->NicAddr.Len     = (UINT8) SnpMode.HwAddressSize;\r
-  CopyMem (&Instance->NicAddr.MacAddr, &SnpMode.CurrentAddress, sizeof (EFI_MAC_ADDRESS));\r
+  CopyMem (&Instance->NicAddr.MacAddr, &SnpMode.CurrentAddress, sizeof (Instance->NicAddr.MacAddr));\r
 \r
   //\r
   // Add it to the global list, and compose the name\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.h
index 59e5c11786dc956bb76a234cde6a3998c1f69de7..4c5a7b40794aa6d027ddf3ca899172ffa0c1fdef 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Common.h
@@ -58,7 +58,7 @@ enum {
   //
   IP4_HEAD_DF_MASK     = 0x4000,
   IP4_HEAD_MF_MASK     = 0x2000,
-  IP4_HEAD_OFFSET_MASK = 0x1fff,
+  IP4_HEAD_OFFSET_MASK = 0x1fff
 };
 
 #define IP4_ALLZERO_ADDRESS   0x00000000u

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c
index 7f29c90869c90b915ba042915930f0fc621f1ce9..14188851b486336ede200f7970ef6883d54ee245 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.c
@@ -251,7 +251,7 @@ Ip4IcmpReplyEcho (
   Icmp                = (IP4_ICMP_QUERY_HEAD *) NetbufGetByte (Data, 0, NULL);\r
   Icmp->Head.Type     = ICMP_ECHO_REPLY;\r
   Icmp->Head.Checksum = 0;\r
-  Icmp->Head.Checksum = ~NetblockChecksum ((UINT8 *) Icmp, Data->TotalSize);\r
+  Icmp->Head.Checksum = (UINT16) (~NetblockChecksum ((UINT8 *) Icmp, Data->TotalSize));\r
 \r
   ReplyHead.Tos       = 0;\r
   ReplyHead.Fragment  = 0;\r
@@ -353,7 +353,7 @@ Ip4IcmpHandle (
     goto DROP;\r
   }\r
 \r
-  Checksum = ~NetbufChecksum (Packet);\r
+  Checksum = (UINT16) (~NetbufChecksum (Packet));\r
   if ((Icmp.Checksum != 0) && (Checksum != 0)) {\r
     goto DROP;\r
   }\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.h
index f4641e2ef60908fa406e8375f31afb69327872ff..366b02c176305951e1211aec0ac86a4f86554d00 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Icmp.h
@@ -79,7 +79,7 @@ enum {
   //
   ICMP_INVALID_MESSAGE      = 0,
   ICMP_ERROR_MESSAGE        = 1,
-  ICMP_QUERY_MESSAGE        = 2,
+  ICMP_QUERY_MESSAGE        = 2
 };
 
 typedef struct {

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
index 952eb98ccc90ceae5c6ba997ccf6a80aec4fab29..bfb9616c2d830b55988823873bdf5cc1b35c5ed6 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
@@ -108,8 +108,8 @@ Ip4WrapLinkTxToken (
   Token->CallBack   = CallBack;\r
   Token->Packet     = Packet;\r
   Token->Context    = Context;\r
-  CopyMem (&Token->DstMac, &mZeroMacAddress, sizeof (EFI_MAC_ADDRESS));\r
-  CopyMem (&Token->SrcMac, &Interface->Mac, sizeof (EFI_MAC_ADDRESS));\r
+  CopyMem (&Token->DstMac, &mZeroMacAddress, sizeof (Token->DstMac));\r
+  CopyMem (&Token->SrcMac, &Interface->Mac, sizeof (Token->SrcMac));\r
 \r
   MnpToken          = &(Token->MnpToken);\r
   MnpToken->Status  = EFI_NOT_READY;\r
@@ -213,7 +213,7 @@ Ip4CreateArpQue (
   }\r
 \r
   ArpQue->Ip  = DestIp;\r
-  CopyMem (&ArpQue->Mac, &mZeroMacAddress, sizeof (EFI_MAC_ADDRESS));\r
+  CopyMem (&ArpQue->Mac, &mZeroMacAddress, sizeof (ArpQue->Mac));\r
 \r
   return ArpQue;\r
 }\r
@@ -485,8 +485,8 @@ Ip4CreateInterface (
     return NULL;\r
   }\r
 \r
-  CopyMem (&Interface->Mac, &SnpMode.CurrentAddress, sizeof (EFI_MAC_ADDRESS));\r
-  CopyMem (&Interface->BroadcastMac, &SnpMode.BroadcastAddress, sizeof (EFI_MAC_ADDRESS));\r
+  CopyMem (&Interface->Mac, &SnpMode.CurrentAddress, sizeof (Interface->Mac));\r
+  CopyMem (&Interface->BroadcastMac, &SnpMode.BroadcastAddress, sizeof (Interface->BroadcastMac));\r
   Interface->HwaddrLen    = SnpMode.HwAddressSize;\r
 \r
   NetListInit (&Interface->IpInstances);\r
@@ -796,7 +796,7 @@ Ip4OnArpResolved (
     NetListRemoveEntry (Entry);\r
 \r
     Token         = NET_LIST_USER_STRUCT (Entry, IP4_LINK_TX_TOKEN, Link);\r
-    CopyMem (&Token->DstMac, &ArpQue->Mac, sizeof (EFI_MAC_ADDRESS));\r
+    CopyMem (&Token->DstMac, &ArpQue->Mac, sizeof (Token->DstMac));\r
 \r
     Status = Interface->Mnp->Transmit (Interface->Mnp, &Token->MnpToken);\r
 \r
@@ -904,7 +904,7 @@ Ip4SendFrame (
   // all the broadcasts.\r
   //\r
   if (NextHop == IP4_ALLONE_ADDRESS) {\r
-    CopyMem (&Token->DstMac, &Interface->BroadcastMac, sizeof (EFI_MAC_ADDRESS));\r
+    CopyMem (&Token->DstMac, &Interface->BroadcastMac, sizeof (Token->DstMac));\r
     goto SEND_NOW;\r
 \r
   } else if (IP4_IS_MULTICAST (NextHop)) {\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h
index a324c8243039480fd6147711b2a4b0a680d86430..9db1d8ac79892b9e3421240e500e02f23bee07c5 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.h
@@ -28,7 +28,7 @@ enum {
   IP4_FRAME_RX_SIGNATURE  = EFI_SIGNATURE_32 ('I', 'P', 'F', 'R'),
   IP4_FRAME_TX_SIGNATURE  = EFI_SIGNATURE_32 ('I', 'P', 'F', 'T'),
   IP4_FRAME_ARP_SIGNATURE = EFI_SIGNATURE_32 ('I', 'P', 'F', 'A'),
-  IP4_INTERFACE_SIGNATURE = EFI_SIGNATURE_32 ('I', 'P', 'I', 'F'),
+  IP4_INTERFACE_SIGNATURE = EFI_SIGNATURE_32 ('I', 'P', 'I', 'F')
 };
 
 //
@@ -134,7 +134,7 @@ BOOLEAN
 // Notice the special cases that DHCP can configure the interface
 // with 0.0.0.0/0.0.0.0.
 //
-typedef struct _IP4_INTERFACE {
+struct _IP4_INTERFACE {
   UINT32                        Signature;
   NET_LIST_ENTRY                Link;
   INTN                          RefCnt;
@@ -182,7 +182,7 @@ typedef struct _IP4_INTERFACE {
   //
   NET_LIST_ENTRY                IpInstances;
   BOOLEAN                       PromiscRecv;
-} IP4_INTERFACE;
+};
 
 IP4_INTERFACE *
 Ip4CreateInterface (

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c
index 135efa62ce99085b78dd2a690efb670684b584ff..6609b1334d8aa7cb86ec49aa08d0aba0b4f65fe0 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.c
@@ -206,7 +206,7 @@ Ip4SendIgmpMessage (
   Igmp->MaxRespTime = 0;\r
   Igmp->Checksum    = 0;\r
   Igmp->Group       = HTONL (Group);\r
-  Igmp->Checksum    = ~NetblockChecksum ((UINT8 *) Igmp, sizeof (IGMP_HEAD));\r
+  Igmp->Checksum    = (UINT16) (~NetblockChecksum ((UINT8 *) Igmp, sizeof (IGMP_HEAD)));\r
 \r
   Head.Tos          = 0;\r
   Head.Protocol     = IP4_PROTO_IGMP;\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.h
index f7cb92c23f7b7dd8b683e95c33f25f443245a71e..9bda9f942bdff916f6965aa342afd40e5d3e3e46 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Igmp.h
@@ -66,7 +66,7 @@ enum {
   IGMP_LEAVE_GROUP          = 0x17,
 
   IGMP_V1ROUTER_PRESENT     = 400,
-  IGMP_UNSOLICIATED_REPORT  = 10,
+  IGMP_UNSOLICIATED_REPORT  = 10
 };
 
 EFI_STATUS

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
index 824524d508ed5ee6086983e7412ca731558092a9..e617d3de80a44f22fc6a5528b527c80482e4a851 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
@@ -67,7 +67,7 @@ EfiIp4GetModeData (
     // IsConfigured is "whether the station address has been configured"\r
     //\r
     Ip4ModeData->IsStarted     = (BOOLEAN)(IpInstance->State == IP4_STATE_CONFIGED);\r
-    CopyMem (&Ip4ModeData->ConfigData, &IpInstance->ConfigData, sizeof (EFI_IP4_CONFIG_DATA));\r
+    CopyMem (&Ip4ModeData->ConfigData, &IpInstance->ConfigData, sizeof (Ip4ModeData->ConfigData));\r
     Ip4ModeData->IsConfigured  = FALSE;\r
 \r
     Ip4ModeData->GroupCount    = IpInstance->GroupCount;\r
@@ -112,11 +112,11 @@ EfiIp4GetModeData (
   }\r
 \r
   if (MnpConfigData != NULL) {\r
-    CopyMem (MnpConfigData, &IpSb->MnpConfigData, sizeof (EFI_MANAGED_NETWORK_CONFIG_DATA));\r
+    CopyMem (MnpConfigData, &IpSb->MnpConfigData, sizeof (*MnpConfigData));\r
   }\r
 \r
   if (SnpModeData != NULL) {\r
-    CopyMem (SnpModeData, &IpSb->SnpMode, sizeof (EFI_SIMPLE_NETWORK_MODE));\r
+    CopyMem (SnpModeData, &IpSb->SnpMode, sizeof (*SnpModeData));\r
   }\r
 \r
   NET_RESTORE_TPL (OldTpl);\r
@@ -197,7 +197,7 @@ Ip4ServiceConfigMnp (
   // recover the original configuration if failed to set the configure.\r
   //\r
   if (EFI_ERROR (Status) && Reconfig) {\r
-    IpSb->MnpConfigData.EnablePromiscuousReceive = !PromiscReceive;\r
+    IpSb->MnpConfigData.EnablePromiscuousReceive = (BOOLEAN) !PromiscReceive;\r
   }\r
 \r
   return Status;\r
@@ -477,7 +477,7 @@ Ip4InitProtocol (
   NetZeroMem (IpInstance, sizeof (IP4_PROTOCOL));\r
 \r
   IpInstance->Signature = IP4_PROTOCOL_SIGNATURE;\r
-  CopyMem (&IpInstance->Ip4Proto, &mEfiIp4ProtocolTemplete, sizeof (EFI_IP4_PROTOCOL));\r
+  CopyMem (&IpInstance->Ip4Proto, &mEfiIp4ProtocolTemplete, sizeof (IpInstance->Ip4Proto));\r
   IpInstance->State     = IP4_STATE_UNCONFIGED;\r
   IpInstance->Service   = IpSb;\r
 \r
@@ -538,7 +538,7 @@ Ip4ConfigProtocol (
       return EFI_DEVICE_ERROR;\r
     }\r
 \r
-    CopyMem (&IpInstance->ConfigData, Config, sizeof (EFI_IP4_CONFIG_DATA));\r
+    CopyMem (&IpInstance->ConfigData, Config, sizeof (IpInstance->ConfigData));\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -627,7 +627,7 @@ Ip4ConfigProtocol (
   IpInstance->Interface = IpIf;\r
   NetListInsertTail (&IpIf->IpInstances, &IpInstance->AddrLink);\r
 \r
-  CopyMem (&IpInstance->ConfigData, Config, sizeof (EFI_IP4_CONFIG_DATA));\r
+  CopyMem (&IpInstance->ConfigData, Config, sizeof (IpInstance->ConfigData));\r
   IpInstance->State       = IP4_STATE_CONFIGED;\r
 \r
   //\r
@@ -1616,7 +1616,6 @@ EfiIp4Receive (
   )\r
 {\r
   IP4_PROTOCOL              *IpInstance;\r
-  EFI_IP4_CONFIG_DATA       *Config;\r
   EFI_STATUS                Status;\r
   EFI_TPL                   OldTpl;\r
 \r
@@ -1636,8 +1635,6 @@ EfiIp4Receive (
     goto ON_EXIT;\r
   }\r
 \r
-  Config = &IpInstance->ConfigData;\r
-\r
   //\r
   // Current Udp implementation creates an IP child for each Udp child.\r
   // It initates a asynchronous receive immediately no matter whether\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
index 1bbee93237688e86d25387b5eafe1e67134b5766..58bf045372ac09c8709cf7f948c42159178f2c61 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
@@ -40,15 +40,15 @@ Abstract:
 #include <Library/BaseMemoryLib.h>
 #include <Library/MemoryAllocationLib.h>
 
-#include "IP4Common.h"
-#include "IP4Driver.h"
-#include "IP4If.h"
+#include "Ip4Common.h"
+#include "Ip4Driver.h"
+#include "Ip4If.h"
 #include "Ip4Icmp.h"
-#include "IP4Option.h"
+#include "Ip4Option.h"
 #include "Ip4Igmp.h"
-#include "IP4Route.h"
-#include "IP4Input.h"
-#include "IP4Output.h"
+#include "Ip4Route.h"
+#include "Ip4Input.h"
+#include "Ip4Output.h"
 
 enum {
   IP4_PROTOCOL_SIGNATURE = EFI_SIGNATURE_32 ('I', 'P', '4', 'P'),
@@ -73,7 +73,7 @@ enum {
   IP4_SERVICE_UNSTARTED  = 0,
   IP4_SERVICE_STARTED,
   IP4_SERVICE_CONFIGED,
-  IP4_SERVICE_DESTORY,
+  IP4_SERVICE_DESTORY
 };
 
 //
@@ -109,7 +109,7 @@ typedef struct {
   EFI_IP4_RECEIVE_DATA      RxData;
 } IP4_RXDATA_WRAP;
 
-typedef struct _IP4_PROTOCOL {
+struct _IP4_PROTOCOL {
   UINT32                    Signature;
 
   EFI_IP4_PROTOCOL          Ip4Proto;
@@ -148,9 +148,9 @@ typedef struct _IP4_PROTOCOL {
 
   EFI_IP4_CONFIG_DATA       ConfigData;
 
-} IP4_PROTOCOL;
+};
 
-typedef struct _IP4_SERVICE {
+struct _IP4_SERVICE {
   UINT32                          Signature;
   EFI_SERVICE_BINDING_PROTOCOL    ServiceBinding;
   INTN                            State;
@@ -200,7 +200,7 @@ typedef struct _IP4_SERVICE {
   // NIC this IP4_SERVICE works on.
   //
   CHAR16                          *MacString;
-} IP4_SERVICE;
+};
 
 #define IP4_INSTANCE_FROM_PROTOCOL(Ip4) \
           CR ((Ip4), IP4_PROTOCOL, Ip4Proto, IP4_PROTOCOL_SIGNATURE)

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
index f5c4c9e1d406ff7963a1b2dbd7928cd86df68496..5ed1ec79f02e24e62cc512bf7b8733236721f508 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
@@ -435,7 +435,7 @@ Ip4Reassemble (
     }\r
 \r
     NewPacket->Ip                  = Assemble->Head;\r
-    CopyMem (IP4_GET_CLIP_INFO (NewPacket), Assemble->Info, sizeof (IP4_CLIP_INFO));\r
+    CopyMem (IP4_GET_CLIP_INFO (NewPacket), Assemble->Info, sizeof (*IP4_GET_CLIP_INFO (NewPacket)));\r
     return NewPacket;\r
   }\r
 \r
@@ -511,7 +511,7 @@ Ip4AccpetFrame (
   //\r
   // Some OS may send IP packets without checksum.\r
   //\r
-  Checksum = ~NetblockChecksum ((UINT8 *) Head, HeadLen);\r
+  Checksum = (UINT16) (~NetblockChecksum ((UINT8 *) Head, HeadLen));\r
 \r
   if ((Head->Checksum != 0) && (Checksum != 0)) {\r
     goto RESTART;\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.h
index 9a3af8fba758a2a4294ba2810cc29169d365302b..2acf769968089c749bed35079f1da25f5d36c1fd 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.h
@@ -27,7 +27,7 @@ enum {
 
   IP4_ASSEMLE_HASH_SIZE = 31,
   IP4_FRAGMENT_LIFE     = 120,
-  IP4_MAX_PACKET_SIZE   = 65535,
+  IP4_MAX_PACKET_SIZE   = 65535
 };
 
 //

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c
index e1f059e89ff8a4126f9b9feabc625268870f041e..322166f657a0ce833269c3414629031c6d5c8524 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.c
@@ -47,9 +47,9 @@ Ip4OptionIsValid (
   UINT32                    Cur;\r
   UINT32                    Len;\r
   UINT32                    Point;\r
-  UINT8                     IcmpType;\r
-  UINT8                     IcmpCode;\r
-  UINT32                    IcmpPoint;\r
+  volatile UINT8            IcmpType;\r
+  volatile UINT8            IcmpCode;\r
+  volatile UINT32           IcmpPoint;\r
 \r
   IcmpType  = ICMP_PARAMETER_PROBLEM;\r
   IcmpCode  = 0;\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.h
index 6af885f25b41aa24f2e5cebe6e3d36c8652ed3d7..665b55b06a79d5eefc46559599e44e1780ec14fb 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Option.h
@@ -31,7 +31,7 @@ enum {
   IP4_OPTION_SSRR      = 137,  // Strict source and record routing, 10001001
   IP4_OPTION_RR        = 7,    // Record routing, 00000111
 
-  IP4_OPTION_COPY_MASK = 0x80,
+  IP4_OPTION_COPY_MASK = 0x80
 };
 
 BOOLEAN

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c
index d595ab29992ec8602380dfa99426706ad29c2f6d..0232bfedda22a5de5f35ec43375cdda0aaa11f66 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c
@@ -89,7 +89,7 @@ Ip4PrependHead (
   PacketHead->Protocol  = Head->Protocol;\r
   PacketHead->Src       = HTONL (Head->Src);\r
   PacketHead->Dst       = HTONL (Head->Dst);\r
-  PacketHead->Checksum  = ~NetblockChecksum ((UINT8 *) PacketHead, HeadLen);\r
+  PacketHead->Checksum  = (UINT16) (~NetblockChecksum ((UINT8 *) PacketHead, HeadLen));\r
 \r
   Packet->Ip            = PacketHead;\r
   return EFI_SUCCESS;\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.c
index 2cf1d0f29cab3a5031752a9aff65610e958a543f..54d934250f5a66177f5d538c3b27983c7f41875e 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.c
@@ -628,7 +628,6 @@ Ip4BuildEfiRouteTable (
   IN IP4_PROTOCOL           *IpInstance\r
   )\r
 {\r
-  IP4_SERVICE               *IpSb;\r
   NET_LIST_ENTRY            *Entry;\r
   IP4_ROUTE_TABLE           *RtTable;\r
   IP4_ROUTE_ENTRY           *RtEntry;\r
@@ -636,7 +635,6 @@ Ip4BuildEfiRouteTable (
   UINT32                    Count;\r
   INT32                     Index;\r
 \r
-  IpSb    = IpInstance->Service;\r
   RtTable = IpInstance->RouteTable;\r
 \r
   if (IpInstance->EfiRouteTable != NULL) {\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.h
index ce07b1d10c5a71cf0b9799c314c4d8d81a160205..3dce5d2f3abe7bd862492bc614bcbc586a9dc370 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Route.h
@@ -30,7 +30,7 @@ enum {
   IP4_DIRECT_ROUTE      = 0x00000001,
 
   IP4_ROUTE_CACHE_HASH  = 31,
-  IP4_ROUTE_CACHE_MAX   = 64, // Max NO. of cache entry per hash bucket
+  IP4_ROUTE_CACHE_MAX   = 64  // Max NO. of cache entry per hash bucket
 };
 
 #define IP4_ROUTE_CACHE_HASH(Dst, Src)  (((Dst) ^ (Src)) % IP4_ROUTE_CACHE_HASH)
@@ -91,7 +91,7 @@ typedef struct {
 //
 typedef struct _IP4_ROUTE_TABLE IP4_ROUTE_TABLE;
 
-typedef struct _IP4_ROUTE_TABLE {
+struct _IP4_ROUTE_TABLE {
   INTN                      RefCnt;
   UINT32                    TotalNum;
   NET_LIST_ENTRY            RouteArea[IP4_MASK_NUM];

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
index 83fc3c6ae48e9a5ec202ee2e8b3b1c7f580854e0..88158ea50baaabc142f826c42f1978af152ce860 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpConfig.c
@@ -537,12 +537,12 @@ MnpInitializeInstanceData (
   //\r
   // Copy the MNP Protocol interfaces from the template.\r
   //\r
-  CopyMem (&Instance->ManagedNetwork, &mMnpProtocolTemplate, sizeof (EFI_MANAGED_NETWORK_PROTOCOL));\r
+  CopyMem (&Instance->ManagedNetwork, &mMnpProtocolTemplate, sizeof (Instance->ManagedNetwork));\r
 \r
   //\r
   // Copy the default config data.\r
   //\r
-  CopyMem (&Instance->ConfigData, &mMnpDefaultConfigData, sizeof (EFI_MANAGED_NETWORK_CONFIG_DATA));\r
+  CopyMem (&Instance->ConfigData, &mMnpDefaultConfigData, sizeof (Instance->ConfigData));\r
 \r
   //\r
   // Initialize the lists.\r
@@ -1038,7 +1038,7 @@ MnpConfigureInstance (
   //\r
   // Save the new configuration data.\r
   //\r
-  CopyMem (OldConfigData, NewConfigData, sizeof (EFI_MANAGED_NETWORK_CONFIG_DATA));\r
+  CopyMem (OldConfigData, NewConfigData, sizeof (*OldConfigData));\r
 \r
   Instance->Configured  = (BOOLEAN) (ConfigData != NULL);\r
 \r
@@ -1152,7 +1152,7 @@ MnpConfigReceiveFilters (
       NET_LIST_FOR_EACH (Entry, &MnpServiceData->GroupAddressList) {\r
 \r
         GroupAddress            = NET_LIST_USER_STRUCT (Entry, MNP_GROUP_ADDRESS, AddrEntry);\r
-        CopyMem (MCastFilter + Index, &GroupAddress->Address, sizeof (EFI_MAC_ADDRESS));\r
+        CopyMem (MCastFilter + Index, &GroupAddress->Address, sizeof (*(MCastFilter + Index)));\r
         Index++;\r
 \r
         ASSERT (Index <= MCastFilterCnt);\r
@@ -1266,7 +1266,7 @@ MnpGroupOpAddCtrlBlk (
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
-    CopyMem (&GroupAddress->Address, MacAddress, sizeof (EFI_MAC_ADDRESS));\r
+    CopyMem (&GroupAddress->Address, MacAddress, sizeof (GroupAddress->Address));\r
     GroupAddress->RefCnt  = 0;\r
     NetListInsertTail (\r
       &MnpServiceData->GroupAddressList,\r

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
index aafc8433a52f8527120b04513aeef147c69eb0b8..c1529d26209d2e84f2d89b4fcc2133d05c6f2257 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
@@ -747,7 +747,7 @@ MnpWrapRxData (
   //\r
   // Fill the RxData in RxDataWrap,\r
   //\r
-  CopyMem (&RxDataWrap->RxData, RxData, sizeof (EFI_MANAGED_NETWORK_RECEIVE_DATA));\r
+  CopyMem (&RxDataWrap->RxData, RxData, sizeof (RxDataWrap->RxData));\r
 \r
   //\r
   // Create the recycle event.\r
@@ -827,7 +827,7 @@ MnpEnqueuePacket (
       //\r
       // Wrap the RxData.\r
       //\r
-      CopyMem (&RxDataWrap, MnpWrapRxData (Instance, &RxData), sizeof (MNP_RXDATA_WRAP));\r
+      RxDataWrap = MnpWrapRxData (Instance, &RxData);\r
       if (RxDataWrap == NULL) {\r
         continue;\r
       }\r

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c
index ccd82d0e8785c0049839e4c8c786a36c38aeff09..04e437e939fea1441e08487d23ad35ce160956e9 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c
@@ -68,7 +68,7 @@ MnpGetModeData (
     //\r
     // Copy the instance configuration data.\r
     //\r
-    CopyMem (MnpConfigData, &Instance->ConfigData, sizeof (EFI_MANAGED_NETWORK_CONFIG_DATA));\r
+    CopyMem (MnpConfigData, &Instance->ConfigData, sizeof (*MnpConfigData));\r
   }\r
 \r
   if (SnpModeData != NULL) {\r
@@ -76,7 +76,7 @@ MnpGetModeData (
     // Copy the underlayer Snp mode data.\r
     //\r
     Snp           = Instance->MnpServiceData->Snp;\r
-    CopyMem (SnpModeData, Snp->Mode, sizeof (EFI_SIMPLE_NETWORK_MODE));\r
+    CopyMem (SnpModeData, Snp->Mode, sizeof (*SnpModeData));\r
   }\r
 \r
   if (!Instance->Configured) {\r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
index 9b30b3d730a01a6d0bbc1e1758a4b0da690f79e0..5a15f9a6f14ec7224790570042dceee07f9df388 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
@@ -34,8 +34,6 @@ EFI_SERVICE_BINDING_PROTOCOL  gMtftp4ServiceBindingTemplete = {
   Mtftp4ServiceBindingDestroyChild\r
 };\r
 \r
-//@MT: EFI_DRIVER_ENTRY_POINT (Mtftp4DriverEntryPoint)\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 Mtftp4DriverEntryPoint (\r
@@ -429,7 +427,7 @@ Mtftp4InitProtocol (
 \r
   Instance->Signature = MTFTP4_PROTOCOL_SIGNATURE;\r
   NetListInit (&Instance->Link);\r
-  CopyMem (&Instance->Mtftp4, &gMtftp4ProtocolTemplate, sizeof (EFI_MTFTP4_PROTOCOL));\r
+  CopyMem (&Instance->Mtftp4, &gMtftp4ProtocolTemplate, sizeof (Instance->Mtftp4));\r
   Instance->State     = MTFTP4_STATE_UNCONFIGED;\r
   Instance->Indestory = FALSE;\r
   Instance->Service   = MtftpSb;\r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
index 9bf5bd59f77d91513900551ac05b3754809d4292..22ba7dd705de10eb79a762ffa2e834c600ca5c1b 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
@@ -61,10 +61,10 @@ enum {
 
   MTFTP4_STATE_UNCONFIGED    = 0,
   MTFTP4_STATE_CONFIGED,
-  MTFTP4_STATE_DESTORY,
+  MTFTP4_STATE_DESTORY
 };
 
-typedef struct _MTFTP4_SERVICE {
+struct _MTFTP4_SERVICE {
   UINT32                        Signature;
   EFI_SERVICE_BINDING_PROTOCOL  ServiceBinding;
 
@@ -92,7 +92,7 @@ typedef struct {
   EFI_STATUS                    Status;
 } MTFTP4_GETINFO_STATE;
 
-typedef struct _MTFTP4_PROTOCOL {
+struct _MTFTP4_PROTOCOL {
   UINT32                        Signature;
   NET_LIST_ENTRY                Link;
   EFI_MTFTP4_PROTOCOL           Mtftp4;

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h
index a136304df40ac17b6bf87feeef839ba6c6d04781..3bd7574eb25e1c0535616922eb8b9a32c672d80d 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.h
@@ -33,7 +33,7 @@ enum {
   MTFTP4_BLKSIZE_EXIST     = 0x01,
   MTFTP4_TIMEOUT_EXIST     = 0x02,
   MTFTP4_TSIZE_EXIST       = 0x04,
-  MTFTP4_MCAST_EXIST       = 0x08,
+  MTFTP4_MCAST_EXIST       = 0x08
 };
 
 typedef struct {

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
index af61c0bf6978266a92b9175454f68bf093dffa50..903494ecb732fab970c0c48435bb1de5628888ed 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
@@ -229,7 +229,7 @@ Mtftp4RemoveBlockNum (
       if (Range->End == Num) {\r
         Range->End--;\r
       } else {\r
-        NewRange = Mtftp4AllocateRange (Num + 1, (UINT16) Range->End);\r
+        NewRange = Mtftp4AllocateRange ((UINT16) (Num + 1), (UINT16) Range->End);\r
 \r
         if (NewRange == NULL) {\r
           return EFI_OUT_OF_RESOURCES;\r
@@ -270,6 +270,8 @@ Mtftp4SendRequest (
   UINT8                     *Cur;\r
   UINT32                    Len;\r
   UINTN                     Index;\r
+  UINT32                    Len1;\r
+  UINT32                    Len2;\r
 \r
   Token   = Instance->Token;\r
   Options = Token->OptionList;\r
@@ -282,11 +284,14 @@ Mtftp4SendRequest (
   //\r
   // Compute the packet length\r
   //\r
-  Len = (UINT32) (AsciiStrLen (Token->Filename) + AsciiStrLen (Mode) + 4);\r
+  Len1 = (UINT32) AsciiStrLen ((CHAR8 *) Token->Filename);\r
+  Len2 = (UINT32) AsciiStrLen ((CHAR8 *) Mode);\r
+  Len  = (Len1 + Len2 + 4);\r
 \r
   for (Index = 0; Index < Token->OptionCount; Index++) {\r
-    Len += (UINT32) (AsciiStrLen (Options[Index].OptionStr) +\r
-                     AsciiStrLen (Options[Index].ValueStr) + 2);\r
+    Len1 = (UINT32) AsciiStrLen ((CHAR8 *) Options[Index].OptionStr);\r
+    Len2 = (UINT32) AsciiStrLen ((CHAR8 *) Options[Index].ValueStr);\r
+    Len += Len1 + Len2 + 2;\r
   }\r
 \r
   //\r
@@ -299,12 +304,12 @@ Mtftp4SendRequest (
   Packet         = (EFI_MTFTP4_PACKET *) NetbufAllocSpace (Nbuf, Len, FALSE);\r
   Packet->OpCode = HTONS (Instance->Operation);\r
   Cur            = Packet->Rrq.Filename;\r
-  Cur            = AsciiStrCpy (Cur, Token->Filename);\r
-  Cur            = AsciiStrCpy (Cur, Mode);\r
+  Cur            = (UINT8 *) AsciiStrCpy ((CHAR8 *) Cur, (CHAR8 *) Token->Filename);\r
+  Cur            = (UINT8 *) AsciiStrCpy ((CHAR8 *) Cur, (CHAR8 *) Mode);\r
 \r
   for (Index = 0; Index < Token->OptionCount; ++Index) {\r
-    Cur = AsciiStrCpy (Cur, Options[Index].OptionStr);\r
-    Cur = AsciiStrCpy (Cur, Options[Index].ValueStr);\r
+    Cur = (UINT8 *) AsciiStrCpy ((CHAR8 *) Cur, (CHAR8 *) Options[Index].OptionStr);\r
+    Cur = (UINT8 *) AsciiStrCpy ((CHAR8 *) Cur, (CHAR8 *) Options[Index].ValueStr);\r
   }\r
 \r
   return Mtftp4SendPacket (Instance, Nbuf);\r
@@ -333,7 +338,7 @@ Mtftp4SendError (
   EFI_MTFTP4_PACKET         *TftpError;\r
   UINT32                    Len;\r
 \r
-  Len     = (UINT32) (AsciiStrLen (ErrInfo) + sizeof (EFI_MTFTP4_ERROR_HEADER));\r
+  Len     = (UINT32) (AsciiStrLen ((CHAR8 *) ErrInfo) + sizeof (EFI_MTFTP4_ERROR_HEADER));\r
   Packet  = NetbufAlloc (Len);\r
 \r
   if (Packet == NULL) {\r
@@ -344,7 +349,7 @@ Mtftp4SendError (
   TftpError->OpCode = HTONS (EFI_MTFTP4_OPCODE_ERROR);\r
   TftpError->Error.ErrorCode = HTONS (ErrCode);\r
 \r
-  AsciiStrCpy (TftpError->Error.ErrorMessage, ErrInfo);\r
+  AsciiStrCpy ((CHAR8 *) TftpError->Error.ErrorMessage, (CHAR8 *) ErrInfo);\r
 \r
   return Mtftp4SendPacket (Instance, Packet);\r
 }\r
@@ -419,6 +424,7 @@ Mtftp4SendPacket (
   UDP_POINTS                UdpPoint;\r
   EFI_STATUS                Status;\r
   UINT16                    OpCode;\r
+  UINT16                    Value;\r
 \r
   //\r
   // Save the packet for retransmission\r
@@ -440,7 +446,8 @@ Mtftp4SendPacket (
   // Send the requests to the listening port, other packets\r
   // to the connected port\r
   //\r
-  OpCode = NTOHS (*((UINT16 *) NetbufGetByte (Packet, 0, NULL)));\r
+  Value = *((UINT16 *) NetbufGetByte (Packet, 0, NULL));\r
+  OpCode = NTOHS (Value);\r
 \r
   if ((OpCode == EFI_MTFTP4_OPCODE_RRQ) || (OpCode == EFI_MTFTP4_OPCODE_DIR) ||\r
       (OpCode == EFI_MTFTP4_OPCODE_WRQ)) {\r
@@ -485,6 +492,7 @@ Mtftp4Retransmit (
   UDP_POINTS                UdpPoint;\r
   EFI_STATUS                Status;\r
   UINT16                    OpCode;\r
+  UINT16                    Value;\r
 \r
   ASSERT (Instance->LastPacket != NULL);\r
 \r
@@ -495,7 +503,8 @@ Mtftp4Retransmit (
   //\r
   // Set the requests to the listening port, other packets to the connected port\r
   //\r
-  OpCode = NTOHS (*(UINT16 *) NetbufGetByte (Instance->LastPacket, 0, NULL));\r
+  Value = *(UINT16 *) NetbufGetByte (Instance->LastPacket, 0, NULL);\r
+  OpCode = NTOHS (Value);\r
 \r
   if ((OpCode == EFI_MTFTP4_OPCODE_RRQ) || (OpCode == EFI_MTFTP4_OPCODE_DIR) ||\r
       (OpCode == EFI_MTFTP4_OPCODE_WRQ)) {\r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
index 5ac5dc8ec020472ab4fab7b531dbb01518115ae0..a3b308f2666e0df0282124e3f94e3a40acecdef9 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
@@ -139,7 +139,7 @@ Mtftp4WrqSendBlock (
     // Get data from PacketNeeded\r
     //\r
     DataBuf = NULL;\r
-    Status  = Token->PacketNeeded (&Instance->Mtftp4, Token, &DataLen, &DataBuf);\r
+    Status  = Token->PacketNeeded (&Instance->Mtftp4, Token, &DataLen, (VOID **) &DataBuf);\r
 \r
     if (EFI_ERROR (Status) || (DataLen > Instance->BlkSize)) {\r
       if (DataBuf != NULL) {\r

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c
index 5f15c81e487b5c080a6f6e2a0098309c0712fbd2..a520349135f1e4bda998adb86ef3d3b330976e81 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Bc.c
@@ -291,8 +291,12 @@ IpChecksum2 (
   )\r
 {\r
   UINT32  Sum;\r
+  UINT16  HeaderChecksum;\r
+  UINT16  MessageChecksum;\r
 \r
-  Sum = (UINT16)~IpChecksum (Header, HeaderLen) + (UINT16)~IpChecksum (Message, MessageLen);\r
+  HeaderChecksum = (UINT16)~IpChecksum (Header, HeaderLen);\r
+  MessageChecksum = (UINT16)~IpChecksum (Message, MessageLen);\r
+  Sum = HeaderChecksum + MessageChecksum;\r
 \r
   //\r
   // in case above carried\r
@@ -1350,7 +1354,7 @@ BcStart (
   Status = gBS->AllocatePool (\r
                   EfiBootServicesData,\r
                   BUFFER_ALLOCATE_SIZE,\r
-                  &Private->TransmitBufferPtr\r
+                  (VOID **) &Private->TransmitBufferPtr\r
                   );\r
 \r
   if (!EFI_ERROR (Status)) {\r
@@ -1364,7 +1368,7 @@ BcStart (
   Status = gBS->AllocatePool (\r
                   EfiBootServicesData,\r
                   BUFFER_ALLOCATE_SIZE,\r
-                  &Private->ReceiveBufferPtr\r
+                  (VOID **) &Private->ReceiveBufferPtr\r
                   );\r
 \r
   if (!EFI_ERROR (Status)) {\r
@@ -1379,7 +1383,7 @@ BcStart (
   Status = gBS->AllocatePool (\r
                   EfiBootServicesData,\r
                   256,\r
-                  &Private->TftpErrorBuffer\r
+                  (VOID **) &Private->TftpErrorBuffer\r
                   );\r
 \r
   if (EFI_ERROR (Status)) {\r
@@ -1389,7 +1393,7 @@ BcStart (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Status = gBS->AllocatePool (EfiBootServicesData, 256, &Private->TftpAckBuffer);\r
+  Status = gBS->AllocatePool (EfiBootServicesData, 256, (VOID **) &Private->TftpAckBuffer);\r
 \r
   if (EFI_ERROR (Status)) {\r
     gBS->FreePool (Private->TftpErrorBuffer);\r
@@ -1473,7 +1477,6 @@ BcStop (
   //\r
   // Lock the instance data\r
   //\r
-  EFI_PXE_BASE_CODE_MODE      *PxebcMode;\r
   EFI_SIMPLE_NETWORK_PROTOCOL *SnpPtr;\r
   EFI_SIMPLE_NETWORK_MODE     *SnpModePtr;\r
   EFI_STATUS                  StatCode;\r
@@ -1495,7 +1498,6 @@ BcStop (
 \r
   EfiAcquireLock (&Private->Lock);\r
 \r
-  PxebcMode   = Private->EfiBc.Mode;\r
   SnpPtr      = Private->SimpleNetwork;\r
   SnpModePtr  = SnpPtr->Mode;\r
 \r
@@ -1875,7 +1877,7 @@ BcSetParameters (
 \r
   if (SendGuidPtr != NULL) {\r
     if (*SendGuidPtr) {\r
-      if (PxeBcLibGetSmbiosSystemGuidAndSerialNumber (&TmpGuid, &SerialNumberPtr) != EFI_SUCCESS) {\r
+      if (PxeBcLibGetSmbiosSystemGuidAndSerialNumber (&TmpGuid, (CHAR8 **) &SerialNumberPtr) != EFI_SUCCESS) {\r
         return EFI_INVALID_PARAMETER;\r
       }\r
     }\r
@@ -2395,7 +2397,7 @@ InitializeBCDriver (
   InitArpHeader ();\r
   OptionsStrucInit ();\r
 \r
-  return EFI_SUCCESS;\r
+  return Status;\r
 }\r
 \r
 /* eof - bc.c */\r

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_arp.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_arp.c
index 3654363e8e5066978e9763e8be76daa2168d914d..59ace83125cd20ccfadacf7f5e949f1ed80fe5d6 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_arp.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_arp.c
@@ -338,7 +338,7 @@ SendRequest (
     Status = gBS->AllocatePool (\r
                     EfiBootServicesData,\r
                     SnpMode->MediaHeaderSize + sizeof (ARP_PACKET),\r
-                    &Private->ArpBuffer\r
+                    (VOID **) &Private->ArpBuffer\r
                     );\r
 \r
     if (EFI_ERROR (Status)) {\r

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
index 7dec5ec2d217f4f0e47015bb90fc9f5670e18c40..d0eb98cfb79eab33542151f703bf61fe7a1d599d 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
@@ -214,7 +214,7 @@ OptionsStrucInit (
   CopyMem (DHCPOpStart.DhcpClassIdentifier.Data.UndiMajor, "yyy", sizeof ("yyy"));\r
   CopyMem (DHCPOpStart.DhcpClassIdentifier.Data.UndiMinor, "xxx", sizeof ("xxx"));\r
   DHCPOpStart.End[0] = OP_END;\r
-};\r
+}\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 \r
@@ -883,7 +883,7 @@ Parse (
   } else if (!RxBufPtr->OpAdds.PktOptAdds[OP_DHCP_BOOTFILE_IX - 1] && RxBufPtr->u.Dhcpv4.file[0]) {\r
     RxBufPtr->OpAdds.PktOptAdds[OP_DHCP_BOOTFILE_IX - 1] = (DHCPV4_OP_STRUCT *) (RxBufPtr->u.Dhcpv4.file - sizeof (DHCPV4_OP_HEADER));\r
 \r
-    RxBufPtr->OpAdds.PktOptAdds[OP_DHCP_BOOTFILE_IX - 1]->Header.Length = (UINT8) AsciiStrLen (RxBufPtr->u.Dhcpv4.file);\r
+    RxBufPtr->OpAdds.PktOptAdds[OP_DHCP_BOOTFILE_IX - 1]->Header.Length = (UINT8) AsciiStrLen ((CHAR8 *) RxBufPtr->u.Dhcpv4.file);\r
   }\r
 \r
   LocalPtr.OpPtr = RxBufPtr->OpAdds.PktOptAdds[OP_DHCP_CLASS_IDENTIFIER_IX - 1];\r
@@ -3169,13 +3169,11 @@ BcSetPackets (
 {\r
   EFI_PXE_BASE_CODE_MODE  *PxebcMode;\r
   EFI_STATUS              Status;\r
-  EFI_STATUS              StatCode;\r
   PXE_BASECODE_DEVICE     *Private;\r
 \r
   //\r
   // Lock the instance data and make sure started\r
   //\r
-  StatCode = EFI_SUCCESS;\r
 \r
   if (This == NULL) {\r
     DEBUG ((DEBUG_ERROR, "BC *This pointer == NULL"));\r

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c
index 43e1bbb429bd6adcee82f4ffca5e237b525f43bd..6a42646ab3de5603937b9f3ccab82a5d63421ddb 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_mtftp.c
@@ -555,7 +555,7 @@ TftpRwReq (
   //\r
   u                 = Buffer;\r
   u->ReqStr.OpCode  = HTONS (Req);\r
-  TotalLen = sizeof (Mode) + sizeof (u->ReqStr.OpCode) + (Len = 1 + AsciiStrLen (FilenamePtr));\r
+  TotalLen = sizeof (Mode) + sizeof (u->ReqStr.OpCode) + (Len = 1 + AsciiStrLen ((CHAR8 *) FilenamePtr));\r
 \r
   CopyMem (u->ReqStr.FileName, FilenamePtr, Len);\r
   Ptr = (UINT8 *) (u->ReqStr.FileName + Len);\r
@@ -567,7 +567,7 @@ TftpRwReq (
     CopyMem (Ptr, BlockSizeOp, sizeof (BlockSizeOp));\r
     UtoA10 (*PacketSizePtr, Ptr + sizeof (BlockSizeOp));\r
 \r
-    TotalLen += (Len = 1 + AsciiStrLen (Ptr + sizeof (BlockSizeOp)) + sizeof (BlockSizeOp));\r
+    TotalLen += (Len = 1 + AsciiStrLen ((CHAR8 *) (Ptr + sizeof (BlockSizeOp))) + sizeof (BlockSizeOp));\r
 \r
     Ptr += Len;\r
   }\r
@@ -1387,7 +1387,7 @@ TftpInfo (
             (UINT16) ReplyLen,\r
             BufferSizePtr,\r
             Offset,\r
-            (INT8 *) &u,\r
+            (UINT8 *) &u,\r
             ServerIpPtr,\r
             &ServerReplyPort,\r
             &Private->EfiBc.Mode->StationIp,\r
@@ -1899,7 +1899,7 @@ PxeBcMtftp (
     Status = gBS->AllocatePool (\r
                     EfiBootServicesData,\r
                     BUFFER_ALLOCATE_SIZE,\r
-                    &BufferPtrLocal\r
+                    (VOID **) &BufferPtrLocal\r
                     );\r
 \r
     if (EFI_ERROR (Status) || BufferPtrLocal == NULL) {\r

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_loadfile.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_loadfile.c
index 7c5d0bc2fb20989c75ef0ec08a498183095662f7..e430757ce4603f713f2241242169c0799bd95cdf 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_loadfile.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_loadfile.c
@@ -374,7 +374,6 @@ DoPrompt (
     if (gST->ConIn->ReadKeyStroke (gST->ConIn, &Key) == EFI_NOT_READY) {\r
       UINT8       Buffer[512];\r
       UINTN       BufferSize;\r
-      EFI_STATUS  Status;\r
 \r
       BufferSize = sizeof Buffer;\r
 \r
@@ -1036,7 +1035,6 @@ DownloadFile (
 \r
   if (Private->EfiBc.Mode->BisSupported && Private->EfiBc.Mode->BisDetected && Private->EfiBc.Mode->PxeBisReplyReceived) {\r
     UINT64  CredentialLen;\r
-    UINTN   BlockSize;\r
     UINT8   CredentialFilename[256];\r
     UINT8   *op;\r
     VOID    *CredentialBuffer;\r
@@ -1327,6 +1325,12 @@ LoadFile (
   BOOLEAN         NewMakeCallback;\r
   EFI_STATUS      Status;\r
   EFI_STATUS      TempStatus;\r
+\r
+  //\r
+  // The following line is only used for passing ICC build.\r
+  //\r
+  DEBUG ((EFI_D_INFO, "FilePath = %x\n", FilePath));\r
+\r
   //\r
   //\r
   //\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
index 536a01a1d5391a59c376c1205e68a8d5206f6a6a..2278e84a82f5e4e27db4b421d51bfe6726aced17 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
@@ -358,7 +358,7 @@ Tcp4ConfigurePcb (
   //\r
   // Add Ip for send pkt to the peer\r
   //\r
-  CopyMem (&IpCfgData, &mIpIoDefaultIpConfigData, sizeof (EFI_IP4_CONFIG_DATA));\r
+  CopyMem (&IpCfgData, &mIpIoDefaultIpConfigData, sizeof (IpCfgData));\r
   IpCfgData.DefaultProtocol   = EFI_IP_PROTO_TCP;\r
   IpCfgData.UseDefaultAddress = CfgData->AccessPoint.UseDefaultAddress;\r
   IpCfgData.StationAddress    = CfgData->AccessPoint.StationAddress;\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
index d7f9fe73f5b3eed9cf7560a247b2810052d07ab8..3ae8a2091cb9f4cff48941d411856002719f59fc 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
@@ -305,7 +305,7 @@ Tcp4DriverBindingStart (
   //\r
   NetZeroMem (&OpenData, sizeof (IP_IO_OPEN_DATA));\r
 \r
-  CopyMem (&OpenData.IpConfigData, &mIpIoDefaultIpConfigData, sizeof (EFI_IP4_CONFIG_DATA));\r
+  CopyMem (&OpenData.IpConfigData, &mIpIoDefaultIpConfigData, sizeof (OpenData.IpConfigData));\r
   OpenData.IpConfigData.DefaultProtocol = EFI_IP_PROTO_TCP;\r
 \r
   OpenData.PktRcvdNotify = Tcp4RxCallback;\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.c
index 4d2e80fcadef8bb4510c96e88360b7e69e3c431e..24f97eb93bc013086134c8b1bf6ebf7d225150a4 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Main.c
@@ -145,6 +145,7 @@ Tcp4Configure (
   SOCKET           *Sock;\r
   EFI_STATUS       Status;\r
   IP4_ADDR         Ip;\r
+  IP4_ADDR         SubnetMask;\r
 \r
   if (NULL == This) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -168,7 +169,8 @@ Tcp4Configure (
     if (!TcpConfigData->AccessPoint.UseDefaultAddress) {\r
 \r
       NetCopyMem (&Ip, &TcpConfigData->AccessPoint.StationAddress, sizeof (IP4_ADDR));\r
-      if (!Ip4IsUnicast (NTOHL (Ip), 0) || !IP4_IS_VALID_NETMASK (NTOHL (Ip))) {\r
+      NetCopyMem (&SubnetMask, &TcpConfigData->AccessPoint.SubnetMask, sizeof (IP4_ADDR));\r
+      if (!Ip4IsUnicast (NTOHL (Ip), 0) || !IP4_IS_VALID_NETMASK (NTOHL (SubnetMask))) {\r
         return EFI_INVALID_PARAMETER;\r
       }\r
     }\r

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
index ada73d79db7249bedc2d1f73d7ab66c8b5e43189..624c54a4d585bc904b0f069290b88c2d2ffafa85 100644 (file)
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Driver.c
@@ -517,7 +517,7 @@ Returns:
     //\r
     // Initialize the UDP random port.\r
     //\r
-    mUdp4RandomPort = ((UINT16) NetRandomInitSeed ()) % UDP4_PORT_KNOWN + UDP4_PORT_KNOWN;\r
+    mUdp4RandomPort = (UINT16) (((UINT16) NetRandomInitSeed ()) % UDP4_PORT_KNOWN + UDP4_PORT_KNOWN);\r
   }\r
 \r
   return Status;\r

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
index e5576820a66a436811a4822c74d47d9c2e2f0a73..fac6d33f3e08805f9dff16afc453428cb2c255ae 100644 (file)
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
@@ -172,7 +172,7 @@ Udp4CreateService (
   //\r
   // Set the OpenData used to open the IpIo.\r
   //\r
-  CopyMem (&OpenData.IpConfigData, &mIpIoDefaultIpConfigData, sizeof (EFI_IP4_CONFIG_DATA));\r
+  CopyMem (&OpenData.IpConfigData, &mIpIoDefaultIpConfigData, sizeof (OpenData.IpConfigData));\r
   OpenData.IpConfigData.AcceptBroadcast = TRUE;\r
   OpenData.RcvdContext                  = (VOID *) Udp4Service;\r
   OpenData.SndContext                   = NULL;\r
@@ -359,7 +359,7 @@ Udp4InitInstance (
   // Save the pointer to the UDP4_SERVICE_DATA, and initialize other members.\r
   //\r
   Instance->Udp4Service = Udp4Service;\r
-  CopyMem (&Instance->Udp4Proto, &mUdp4Protocol, sizeof (EFI_UDP4_PROTOCOL));\r
+  CopyMem (&Instance->Udp4Proto, &mUdp4Protocol, sizeof (Instance->Udp4Proto));\r
   Instance->IcmpError   = EFI_SUCCESS;\r
   Instance->Configured  = FALSE;\r
   Instance->IsNoMapping = FALSE;\r
@@ -612,7 +612,7 @@ Udp4BuildIp4ConfigData (
   IN EFI_IP4_CONFIG_DATA   *Ip4ConfigData\r
   )\r
 {\r
-  CopyMem (Ip4ConfigData, &mIpIoDefaultIpConfigData, sizeof (EFI_IP4_CONFIG_DATA));\r
+  CopyMem (Ip4ConfigData, &mIpIoDefaultIpConfigData, sizeof (*Ip4ConfigData));\r
 \r
   Ip4ConfigData->DefaultProtocol   = EFI_IP_PROTO_UDP;\r
   Ip4ConfigData->AcceptBroadcast   = Udp4ConfigData->AcceptBroadcast;\r
@@ -817,7 +817,7 @@ Udp4Checksum (
 \r
   Checksum  = NetAddChecksum (Checksum, HTONS ((UINT16) Packet->TotalSize));\r
 \r
-  return ~Checksum;\r
+  return (UINT16) ~Checksum;\r
 }\r
 \r
 \r
@@ -964,7 +964,7 @@ Udp4LeaveGroup (
 \r
   if ((McastIp != NULL) && (!EFI_IP4_EQUAL (*McastIp, (UINTN) Item->Key))) {\r
     //\r
-    // McastIp is not NULL and the multicast address contained in the Item \r
+    // McastIp is not NULL and the multicast address contained in the Item\r
     // is not the same as McastIp.\r
     //\r
     return EFI_SUCCESS;\r
@@ -1284,7 +1284,7 @@ Udp4WrapRxData (
 \r
   NetListInit (&Wrap->Link);\r
 \r
-  CopyMem (&Wrap->RxData, RxData, sizeof (EFI_UDP4_RECEIVE_DATA));\r
+  CopyMem (&Wrap->RxData, RxData, sizeof (Wrap->RxData));\r
 \r
   //\r
   // Create the Recycle event.\r
@@ -1349,7 +1349,7 @@ Udp4EnqueueDgram (
       //\r
       // Wrap the RxData and put this Wrap into the instances RcvdDgramQue.\r
       //\r
-      CopyMem (&Wrap, Udp4WrapRxData (Instance, Packet, RxData), sizeof (UDP4_RXDATA_WRAP));\r
+      CopyMem (&Wrap, Udp4WrapRxData (Instance, Packet, RxData), sizeof (Wrap));\r
       if (Wrap == NULL) {\r
         continue;\r
       }\r
@@ -1636,7 +1636,7 @@ Udp4SendPortUnreach (
   //\r
   // Calculate the checksum.\r
   //\r
-  IcmpErrHdr->Head.Checksum = ~(NetbufChecksum (Packet));\r
+  IcmpErrHdr->Head.Checksum = (UINT16) ~(NetbufChecksum (Packet));\r
 \r
   //\r
   // Fill the override data.\r

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c
index b3daacba231d80d18f29a31dafecdfcdd77fc37f..adfd011b7fdffb059e899cbd7232cafbee617c6e 100644 (file)
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c
@@ -86,7 +86,7 @@ Udp4GetModeData (
     //\r
     // Set the Udp4ConfigData.\r
     //\r
-    CopyMem (Udp4ConfigData, &Instance->ConfigData, sizeof (EFI_UDP4_CONFIG_DATA));\r
+    CopyMem (Udp4ConfigData, &Instance->ConfigData, sizeof (*Udp4ConfigData));\r
   }\r
 \r
   Ip = Instance->IpInfo->Ip;\r
@@ -239,7 +239,7 @@ Udp4Configure (
       //\r
       // Save the configuration data.\r
       //\r
-      CopyMem (&Instance->ConfigData, UdpConfigData, sizeof (EFI_UDP4_CONFIG_DATA));\r
+      CopyMem (&Instance->ConfigData, UdpConfigData, sizeof (Instance->ConfigData));\r
       Instance->ConfigData.StationAddress = Ip4ConfigData.StationAddress;\r
       Instance->ConfigData.SubnetMask     = Ip4ConfigData.SubnetMask;\r
 \r
@@ -351,7 +351,7 @@ Udp4Groups (
   if (JoinFlag) {\r
     NetCopyMem (&McastIp, MulticastAddress, sizeof (IP4_ADDR));\r
 \r
-    if (IP4_IS_MULTICAST (NTOHL (McastIp))) {\r
+    if (!IP4_IS_MULTICAST (NTOHL (McastIp))) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r