1. Update the UdpIo to a combined UdpIo to support both v4 and v6 stack.

2. Update Dhcp4 and Mtftp4 driver to adopt the combined UdpIo.
3. Clean up coding style problems in combined IpIoLib/NetLib. Update Tcp4 and Udp4 to adopt the changes.


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

1 files changed, 4 insertions, 4 deletions

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
index 872b295..87ec0c1 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
@@ -329,7 +329,7 @@ Mtftp4WrqHandleOack (
   The input process routine for MTFTP upload.

 

   @param  UdpPacket             The received MTFTP packet.

-  @param  Points                The local/remote access point

+  @param  EndPoint              The local/remote access point

   @param  IoStatus              The result of the packet receiving

   @param  Context               Opaque parameter for the callback, which is the

                                 MTFTP session.

@@ -337,7 +337,7 @@ Mtftp4WrqHandleOack (
 VOID

 Mtftp4WrqInput (

   IN NET_BUF                *UdpPacket,

-  IN UDP_POINTS             *Points,

+  IN UDP_END_POINT          *EndPoint,

   IN EFI_STATUS             IoStatus,

   IN VOID                   *Context

   )

@@ -371,11 +371,11 @@ Mtftp4WrqInput (
   // Client send initial request to server's listening port. Server

   // will select a UDP port to communicate with the client.

   //

-  if (Points->RemotePort != Instance->ConnectedPort) {

+  if (EndPoint->RemotePort != Instance->ConnectedPort) {

     if (Instance->ConnectedPort != 0) {

       goto ON_EXIT;

     } else {

-      Instance->ConnectedPort = Points->RemotePort;

+      Instance->ConnectedPort = EndPoint->RemotePort;

     }

   }