1. Support inconsistent if opcode used in string/password opcode.

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Ip4Dxe / Ip4Output.c

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c
index dcbead5993465d967b1870acc1fee4938abf2b4e..85dffe0643584c7b6c2ad7bbf995fffa786c54a9 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Output.c
@@ -1,8 +1,8 @@
 /** @file\r
   Transmit the IP4 packet.\r
   \r
-Copyright (c) 2005 - 2009, Intel Corporation.<BR>\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 http://opensource.org/licenses/bsd-license.php\r
@@ -250,6 +250,31 @@ Ip4Output (
     Head->Src = IpIf->Ip;\r
   }\r
 \r
+  //\r
+  // Before IPsec process, prepared the IP head.\r
+  //\r
+  HeadLen        = sizeof (IP4_HEAD) + ((OptLen + 3) & (~0x03));\r
+  Head->HeadLen  = (UINT8) (HeadLen >> 2);\r
+  Head->Id       = mIp4Id++;\r
+  Head->Ver      = 4;\r
+  \r
+  //\r
+  // Call IPsec process.\r
+  //\r
+  Status = Ip4IpSecProcessPacket (\r
+             IpSb, \r
+             &Head, \r
+             &Packet, \r
+             &Option, \r
+             &OptLen, \r
+             EfiIPsecOutBound,\r
+             Context\r
+             );\r
+\r
+  if (EFI_ERROR(Status)) {\r
+    return Status;\r
+  }\r
+\r
   //\r
   // Route the packet unless overrided, that is, GateWay isn't zero.\r
   //\r
@@ -291,33 +316,11 @@ Ip4Output (
     }\r
   }\r
 \r
-  //\r
-  // TODO: currently Option/OptLen are not included into encryption scope.\r
-  //\r
-  Status = Ip4IpSecProcessPacket (\r
-             IpSb, \r
-             Head, \r
-             &Packet, \r
-             Option, \r
-             OptLen, \r
-             EfiIPsecOutBound,\r
-             Context\r
-             );\r
-\r
-  if (EFI_ERROR(Status)) {\r
-    return Status;\r
-  }\r
-\r
   //\r
   // OK, selected the source and route, fragment the packet then send\r
   // them. Tag each fragment other than the first one as spawn from it.\r
-\r
-  //\r
-  // IPsec payload has been appended, so use IpSb->SnpMode.MaxPacketSize here.\r
   //\r
-  Mtu            = IpSb->SnpMode.MaxPacketSize;\r
-  HeadLen        = sizeof (IP4_HEAD) + ((OptLen + 3) & (~0x03));\r
-  Head->Id       = mIp4Id++;\r
+  Mtu = IpSb->MaxPacketSize + sizeof (IP4_HEAD);  \r
 \r
   if (Packet->TotalSize + HeadLen > Mtu) {\r
     //\r