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

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Dhcp4Dxe / Dhcp4Option.c

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