sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
tye
2009-10-30 05:11:38 +00:00
parent 72f01d4b4a
commit b45b45b2d2
24 changed files with 1006 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Driver.c
View File

@@ -106,16 +106,16 @@ Dhcp4DriverBindingSupported (
Configure the default UDP child to receive all the DHCP traffics
on this network interface.
@param[in] UdpIo The UDP IO port to configure
@param[in] UdpIo The UDP IO to configure
@param[in] Context The context to the function
@retval EFI_SUCCESS The UDP IO port is successfully configured.
@retval EFI_SUCCESS The UDP IO is successfully configured.
@retval Others Failed to configure the UDP child.
**/
EFI_STATUS
DhcpConfigUdpIo (
IN UDP_IO_PORT *UdpIo,
IN UDP_IO *UdpIo,
IN VOID *Context
)
{
@@ -139,7 +139,7 @@ DhcpConfigUdpIo (
ZeroMem (&UdpConfigData.SubnetMask, sizeof (EFI_IPv4_ADDRESS));
ZeroMem (&UdpConfigData.RemoteAddress, sizeof (EFI_IPv4_ADDRESS));
return UdpIo->Udp->Configure (UdpIo->Udp, &UdpConfigData);;
return UdpIo->Protocol.Udp4->Configure (UdpIo->Protocol.Udp4, &UdpConfigData);;
}
@@ -162,7 +162,7 @@ Dhcp4CloseService (
DhcpCleanLease (DhcpSb);
if (DhcpSb->UdpIo != NULL) {
UdpIoFreePort (DhcpSb->UdpIo);
UdpIoFreeIo (DhcpSb->UdpIo);
DhcpSb->UdpIo = NULL;
}
@@ -237,7 +237,13 @@ Dhcp4CreateService (
goto ON_ERROR;
}
DhcpSb->UdpIo = UdpIoCreatePort (Controller, ImageHandle, DhcpConfigUdpIo, NULL);
DhcpSb->UdpIo = UdpIoCreateIo (
Controller,
ImageHandle,
DhcpConfigUdpIo,
UDP_IO_UDP4_VERSION,
NULL
);
if (DhcpSb->UdpIo == NULL) {
Status = EFI_OUT_OF_RESOURCES;

4
MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
View File

@@ -1,7 +1,7 @@
#/** @file
# Component name for module Dhcp4
#
# Copyright (c) 2007, Intel Corporation
# Copyright (c) 2007 - 2009, Intel Corporation
#
# All rights reserved. This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -63,4 +63,6 @@
gEfiDhcp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiUdp4ProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiDhcp4ProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiUdp6ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiUdp6ProtocolGuid # PROTOCOL ALWAYS_CONSUMED

52
MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
View File

@@ -826,7 +826,7 @@ EfiDhcp4Start (
if (CompletionEvent == NULL) {
while (DhcpSb->IoStatus == EFI_ALREADY_STARTED) {
DhcpSb->UdpIo->Udp->Poll (DhcpSb->UdpIo->Udp);
DhcpSb->UdpIo->Protocol.Udp4->Poll (DhcpSb->UdpIo->Protocol.Udp4);
}
return DhcpSb->IoStatus;
@@ -951,7 +951,8 @@ EfiDhcp4RenewRebind (
if (CompletionEvent == NULL) {
while (DhcpSb->IoStatus == EFI_ALREADY_STARTED) {
DhcpSb->UdpIo->Udp->Poll (DhcpSb->UdpIo->Udp);
DhcpSb->UdpIo->Protocol.Udp4->Poll (DhcpSb->UdpIo->Protocol.Udp4);
}
return DhcpSb->IoStatus;
@@ -1173,7 +1174,7 @@ EfiDhcp4Build (
**/
EFI_STATUS
Dhcp4InstanceConfigUdpIo (
IN UDP_IO_PORT *UdpIo,
IN UDP_IO *UdpIo,
IN VOID *Context
)
{
@@ -1206,7 +1207,7 @@ Dhcp4InstanceConfigUdpIo (
UdpConfigData.StationPort = Token->ListenPoints[0].ListenPort;
}
return UdpIo->Udp->Configure (UdpIo->Udp, &UdpConfigData);
return UdpIo->Protocol.Udp4->Configure (UdpIo->Protocol.Udp4, &UdpConfigData);
}
/**
@@ -1228,7 +1229,13 @@ Dhcp4InstanceCreateUdpIo (
ASSERT (Instance->Token != NULL);
DhcpSb = Instance->Service;
Instance->UdpIo = UdpIoCreatePort (DhcpSb->Controller, DhcpSb->Image, Dhcp4InstanceConfigUdpIo, Instance);
Instance->UdpIo = UdpIoCreateIo (
DhcpSb->Controller,
DhcpSb->Image,
Dhcp4InstanceConfigUdpIo,
UDP_IO_UDP4_VERSION,
Instance
);
if (Instance->UdpIo == NULL) {
return EFI_OUT_OF_RESOURCES;
} else {
@@ -1256,7 +1263,7 @@ DhcpDummyExtFree (
sent out. The packet will be queued to the response queue.
@param UdpPacket The Dhcp4 packet.
@param Points Udp4 address pair.
@param EndPoint Udp4 address pair.
@param IoStatus Status of the input.
@param Context Extra info for the input.
@@ -1264,7 +1271,7 @@ DhcpDummyExtFree (
VOID
PxeDhcpInput (
NET_BUF *UdpPacket,
UDP_POINTS *Points,
UDP_END_POINT *EndPoint,
EFI_STATUS IoStatus,
VOID *Context
)
@@ -1397,8 +1404,8 @@ SIGNAL_USER:
// Clean up the resources dedicated for this transmit receive transaction.
//
NetbufQueFlush (&Instance->ResponseQueue);
UdpIoCleanPort (Instance->UdpIo);
UdpIoFreePort (Instance->UdpIo);
UdpIoCleanIo (Instance->UdpIo);
UdpIoFreeIo (Instance->UdpIo);
Instance->UdpIo = NULL;
Instance->Token = NULL;
@@ -1439,10 +1446,10 @@ EfiDhcp4TransmitReceive (
EFI_STATUS Status;
NET_FRAGMENT Frag;
NET_BUF *Wrap;
UDP_POINTS EndPoint;
UDP_END_POINT EndPoint;
IP4_ADDR Ip;
DHCP_SERVICE *DhcpSb;
IP4_ADDR Gateway;
EFI_IP_ADDRESS Gateway;
IP4_ADDR SubnetMask;
if ((This == NULL) || (Token == NULL) || (Token->Packet == NULL)) {
@@ -1516,16 +1523,15 @@ EfiDhcp4TransmitReceive (
}
//
// Set the local address and local port.
// Set the local address and local port to ZERO.
//
EndPoint.LocalAddr = 0;
EndPoint.LocalPort = 0;
ZeroMem (&EndPoint, sizeof (UDP_END_POINT));
//
// Set the destination address and destination port.
//
CopyMem (&Ip, &Token->RemoteAddress, sizeof (EFI_IPv4_ADDRESS));
EndPoint.RemoteAddr = NTOHL (Ip);
EndPoint.RemoteAddr.Addr[0] = NTOHL (Ip);
if (Token->RemotePort == 0) {
EndPoint.RemotePort = DHCP_SERVER_PORT;
@@ -1537,16 +1543,16 @@ EfiDhcp4TransmitReceive (
// Get the gateway.
//
SubnetMask = DhcpSb->Netmask;
Gateway = 0;
if (!IP4_NET_EQUAL (DhcpSb->ClientAddr, EndPoint.RemoteAddr, SubnetMask)) {
CopyMem (&Gateway, &Token->GatewayAddress, sizeof (EFI_IPv4_ADDRESS));
Gateway = NTOHL (Gateway);
ZeroMem (&Gateway, sizeof (Gateway));
if (!IP4_NET_EQUAL (DhcpSb->ClientAddr, EndPoint.RemoteAddr.Addr[0], SubnetMask)) {
CopyMem (&Gateway.v4, &Token->GatewayAddress, sizeof (EFI_IPv4_ADDRESS));
Gateway.Addr[0] = NTOHL (Gateway.Addr[0]);
}
//
// Transmit the DHCP packet.
//
Status = UdpIoSendDatagram (Instance->UdpIo, Wrap, &EndPoint, Gateway, DhcpOnPacketSent, NULL);
Status = UdpIoSendDatagram (Instance->UdpIo, Wrap, &EndPoint, &Gateway, DhcpOnPacketSent, NULL);
if (EFI_ERROR (Status)) {
NetbufFree (Wrap);
goto ON_ERROR;
@@ -1563,8 +1569,8 @@ EfiDhcp4TransmitReceive (
ON_ERROR:
if (EFI_ERROR (Status) && (Instance->UdpIo != NULL)) {
UdpIoCleanPort (Instance->UdpIo);
UdpIoFreePort (Instance->UdpIo);
UdpIoCleanIo (Instance->UdpIo);
UdpIoFreeIo (Instance->UdpIo);
Instance->UdpIo = NULL;
Instance->Token = NULL;
}
@@ -1583,7 +1589,7 @@ ON_ERROR:
// free it when timeout.
//
if (Instance->Timeout > 0) {
Instance->UdpIo->Udp->Poll (Instance->UdpIo->Udp);
Instance->UdpIo->Protocol.Udp4->Poll (Instance->UdpIo->Protocol.Udp4);
gBS->RestoreTPL (OldTpl);
} else {
gBS->RestoreTPL (OldTpl);

6
MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.h
View File

@@ -69,7 +69,7 @@ struct _DHCP_PROTOCOL {
EFI_EVENT RenewRebindEvent;
EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN *Token;
UDP_IO_PORT *UdpIo; // The UDP IO used for TransmitReceive.
UDP_IO *UdpIo; // The UDP IO used for TransmitReceive.
UINT32 Timeout;
NET_BUF_QUEUE ResponseQueue;
};
@@ -108,8 +108,8 @@ struct _DHCP_SERVICE {
UINT32 T2;
INTN ExtraRefresh; // This refresh is reqested by user
UDP_IO_PORT *UdpIo; // Udp child receiving all DHCP message
UDP_IO_PORT *LeaseIoPort; // Udp child with lease IP
UDP_IO *UdpIo; // Udp child receiving all DHCP message
UDP_IO *LeaseIoPort; // Udp child with lease IP
EFI_DHCP4_PACKET *LastPacket; // The last sent packet for retransmission
EFI_MAC_ADDRESS Mac;
UINT8 HwType;

67
MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
View File

@@ -305,7 +305,7 @@ DhcpComputeLease (
DHCP driver needs this port to unicast packet to the server
such as DHCP release.
@param[in] UdpIo The UDP IO port to configure
@param[in] UdpIo The UDP IO to configure
@param[in] Context Dhcp service instance.
@retval EFI_SUCCESS The UDP IO port is successfully configured.
@@ -314,7 +314,7 @@ DhcpComputeLease (
**/
EFI_STATUS
DhcpConfigLeaseIoPort (
IN UDP_IO_PORT *UdpIo,
IN UDP_IO *UdpIo,
IN VOID *Context
)
{
@@ -349,7 +349,7 @@ DhcpConfigLeaseIoPort (
ZeroMem (&UdpConfigData.RemoteAddress, sizeof (EFI_IPv4_ADDRESS));
Status = UdpIo->Udp->Configure (UdpIo->Udp, &UdpConfigData);
Status = UdpIo->Protocol.Udp4->Configure (UdpIo->Protocol.Udp4, &UdpConfigData);
if (EFI_ERROR (Status)) {
return Status;
@@ -364,7 +364,7 @@ DhcpConfigLeaseIoPort (
Ip = HTONL (DhcpSb->Para->Router);
CopyMem (&Gateway, &Ip, sizeof (EFI_IPv4_ADDRESS));
UdpIo->Udp->Routes (UdpIo->Udp, FALSE, &Subnet, &Subnet, &Gateway);
UdpIo->Protocol.Udp4->Routes (UdpIo->Protocol.Udp4, FALSE, &Subnet, &Subnet, &Gateway);
}
return EFI_SUCCESS;
@@ -402,7 +402,7 @@ DhcpLeaseAcquired (
}
if (DhcpSb->LeaseIoPort != NULL) {
UdpIoFreePort (DhcpSb->LeaseIoPort);
UdpIoFreeIo (DhcpSb->LeaseIoPort);
}
//
@@ -410,10 +410,11 @@ DhcpLeaseAcquired (
// and transmit unicast packet with it as source address. Don't
// start receive on this port, the queued packet will be timeout.
//
DhcpSb->LeaseIoPort = UdpIoCreatePort (
DhcpSb->LeaseIoPort = UdpIoCreateIo (
DhcpSb->Controller,
DhcpSb->Image,
DhcpConfigLeaseIoPort,
UDP_IO_UDP4_VERSION,
DhcpSb
);
@@ -467,7 +468,7 @@ DhcpCleanLease (
DhcpSb->ExtraRefresh = FALSE;
if (DhcpSb->LeaseIoPort != NULL) {
UdpIoFreePort (DhcpSb->LeaseIoPort);
UdpIoFreeIo (DhcpSb->LeaseIoPort);
DhcpSb->LeaseIoPort = NULL;
}
@@ -935,7 +936,7 @@ ON_EXIT:
state machine.
@param UdpPacket The UDP packets received.
@param Points The local/remote UDP access points
@param EndPoint The local/remote UDP access point
@param IoStatus The status of the UDP receive
@param Context The opaque parameter to the function.
@@ -943,7 +944,7 @@ ON_EXIT:
VOID
DhcpInput (
NET_BUF *UdpPacket,
UDP_POINTS *Points,
UDP_END_POINT *EndPoint,
EFI_STATUS IoStatus,
VOID *Context
)
@@ -1106,7 +1107,7 @@ DhcpReleasePacket (
Release the net buffer when packet is sent.
@param UdpPacket The UDP packets received.
@param Points The local/remote UDP access points
@param EndPoint The local/remote UDP access point
@param IoStatus The status of the UDP receive
@param Context The opaque parameter to the function.
@@ -1114,7 +1115,7 @@ DhcpReleasePacket (
VOID
DhcpOnPacketSent (
NET_BUF *Packet,
UDP_POINTS *Points,
UDP_END_POINT *EndPoint,
EFI_STATUS IoStatus,
VOID *Context
)
@@ -1157,8 +1158,8 @@ DhcpSendMessage (
EFI_DHCP4_PACKET *NewPacket;
EFI_DHCP4_HEADER *Head;
EFI_DHCP4_HEADER *SeedHead;
UDP_IO_PORT *UdpIo;
UDP_POINTS EndPoint;
UDP_IO *UdpIo;
UDP_END_POINT EndPoint;
NET_BUF *Wrap;
NET_FRAGMENT Frag;
EFI_STATUS Status;
@@ -1363,16 +1364,16 @@ DhcpSendMessage (
// Broadcast the message, unless we know the server address.
// Use the lease UdpIo port to send the unicast packet.
//
EndPoint.RemoteAddr = 0xffffffff;
EndPoint.LocalAddr = 0;
EndPoint.RemotePort = DHCP_SERVER_PORT;
EndPoint.LocalPort = DHCP_CLIENT_PORT;
UdpIo = DhcpSb->UdpIo;
EndPoint.RemoteAddr.Addr[0] = 0xffffffff;
EndPoint.LocalAddr.Addr[0] = 0;
EndPoint.RemotePort = DHCP_SERVER_PORT;
EndPoint.LocalPort = DHCP_CLIENT_PORT;
UdpIo = DhcpSb->UdpIo;
if ((DhcpSb->DhcpState == Dhcp4Renewing) || (Type == DHCP_MSG_RELEASE)) {
EndPoint.RemoteAddr = DhcpSb->ServerAddr;
EndPoint.LocalAddr = DhcpSb->ClientAddr;
UdpIo = DhcpSb->LeaseIoPort;
EndPoint.RemoteAddr.Addr[0] = DhcpSb->ServerAddr;
EndPoint.LocalAddr.Addr[0] = DhcpSb->ClientAddr;
UdpIo = DhcpSb->LeaseIoPort;
}
ASSERT (UdpIo != NULL);
@@ -1382,7 +1383,7 @@ DhcpSendMessage (
UdpIo,
Wrap,
&EndPoint,
0,
NULL,
DhcpOnPacketSent,
DhcpSb
);
@@ -1411,8 +1412,8 @@ DhcpRetransmit (
IN DHCP_SERVICE *DhcpSb
)
{
UDP_IO_PORT *UdpIo;
UDP_POINTS EndPoint;
UDP_IO *UdpIo;
UDP_END_POINT EndPoint;
NET_BUF *Wrap;
NET_FRAGMENT Frag;
EFI_STATUS Status;
@@ -1435,16 +1436,16 @@ DhcpRetransmit (
//
// Broadcast the message, unless we know the server address.
//
EndPoint.RemotePort = DHCP_SERVER_PORT;
EndPoint.LocalPort = DHCP_CLIENT_PORT;
EndPoint.RemoteAddr = 0xffffffff;
EndPoint.LocalAddr = 0;
UdpIo = DhcpSb->UdpIo;
EndPoint.RemotePort = DHCP_SERVER_PORT;
EndPoint.LocalPort = DHCP_CLIENT_PORT;
EndPoint.RemoteAddr.Addr[0] = 0xffffffff;
EndPoint.LocalAddr.Addr[0] = 0;
UdpIo = DhcpSb->UdpIo;
if (DhcpSb->DhcpState == Dhcp4Renewing) {
EndPoint.RemoteAddr = DhcpSb->ServerAddr;
EndPoint.LocalAddr = DhcpSb->ClientAddr;
UdpIo = DhcpSb->LeaseIoPort;
EndPoint.RemoteAddr.Addr[0] = DhcpSb->ServerAddr;
EndPoint.LocalAddr.Addr[0] = DhcpSb->ClientAddr;
UdpIo = DhcpSb->LeaseIoPort;
}
ASSERT (UdpIo != NULL);
@@ -1454,7 +1455,7 @@ DhcpRetransmit (
UdpIo,
Wrap,
&EndPoint,
0,
NULL,
DhcpOnPacketSent,
DhcpSb
);

10
MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h
View File

@@ -1,7 +1,7 @@
/** @file
The DHCP4 protocol implementation.
Copyright (c) 2006 - 2008, Intel Corporation.<BR>
Copyright (c) 2006 - 2009, Intel Corporation.<BR>
All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -140,7 +140,7 @@ DhcpOnTimerTick (
state machine.
@param UdpPacket The UDP packets received.
@param Points The local/remote UDP access points
@param EndPoint The local/remote UDP access point
@param IoStatus The status of the UDP receive
@param Context The opaque parameter to the function.
@@ -148,7 +148,7 @@ DhcpOnTimerTick (
VOID
DhcpInput (
NET_BUF *UdpPacket,
UDP_POINTS *Points,
UDP_END_POINT *EndPoint,
EFI_STATUS IoStatus,
VOID *Context
);
@@ -183,7 +183,7 @@ DhcpCleanLease (
Release the net buffer when packet is sent.
@param UdpPacket The UDP packets received.
@param Points The local/remote UDP access points
@param EndPoint The local/remote UDP access point
@param IoStatus The status of the UDP receive
@param Context The opaque parameter to the function.
@@ -191,7 +191,7 @@ DhcpCleanLease (
VOID
DhcpOnPacketSent (
NET_BUF *Packet,
UDP_POINTS *Points,
UDP_END_POINT *EndPoint,
EFI_STATUS IoStatus,
VOID *Context
);

23
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
View File

@@ -1,7 +1,7 @@
/** @file
Implementation of Mtftp drivers.
Copyright (c) 2006 - 2007, Intel Corporation<BR>
Copyright (c) 2006 - 2009, Intel Corporation<BR>
All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -107,7 +107,7 @@ Mtftp4DriverBindingSupported (
Just leave the Udp child unconfigured. When UDP is unloaded,
MTFTP will be informed with DriverBinding Stop.
@param UdpIo The UDP port to configure
@param UdpIo The UDP_IO to configure
@param Context The opaque parameter to the callback
@retval EFI_SUCCESS It always return EFI_SUCCESS directly.
@@ -115,7 +115,7 @@ Mtftp4DriverBindingSupported (
**/
EFI_STATUS
Mtftp4ConfigNullUdp (
IN UDP_IO_PORT *UdpIo,
IN UDP_IO *UdpIo,
IN VOID *Context
)
{
@@ -201,7 +201,13 @@ Mtftp4CreateService (
return Status;
}
MtftpSb->ConnectUdp = UdpIoCreatePort (Controller, Image, Mtftp4ConfigNullUdp, NULL);
MtftpSb->ConnectUdp = UdpIoCreateIo (
Controller,
Image,
Mtftp4ConfigNullUdp,
UDP_IO_UDP4_VERSION,
NULL
);
if (MtftpSb->ConnectUdp == NULL) {
gBS->CloseEvent (MtftpSb->TimerToGetMap);
@@ -226,7 +232,7 @@ Mtftp4CleanService (
IN MTFTP4_SERVICE *MtftpSb
)
{
UdpIoFreePort (MtftpSb->ConnectUdp);
UdpIoFreeIo (MtftpSb->ConnectUdp);
gBS->CloseEvent (MtftpSb->TimerToGetMap);
gBS->CloseEvent (MtftpSb->Timer);
}
@@ -467,10 +473,11 @@ Mtftp4ServiceBindingCreateChild (
Mtftp4InitProtocol (MtftpSb, Instance);
Instance->UnicastPort = UdpIoCreatePort (
Instance->UnicastPort = UdpIoCreateIo (
MtftpSb->Controller,
MtftpSb->Image,
Mtftp4ConfigNullUdp,
UDP_IO_UDP4_VERSION,
Instance
);
@@ -530,7 +537,7 @@ Mtftp4ServiceBindingCreateChild (
ON_ERROR:
if (EFI_ERROR (Status)) {
UdpIoFreePort (Instance->UnicastPort);
UdpIoFreeIo (Instance->UnicastPort);
gBS->FreePool (Instance);
}
@@ -623,7 +630,7 @@ Mtftp4ServiceBindingDestroyChild (
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
Mtftp4CleanOperation (Instance, EFI_DEVICE_ERROR);
UdpIoFreePort (Instance->UnicastPort);
UdpIoFreeIo (Instance->UnicastPort);
RemoveEntryList (&Instance->Link);
MtftpSb->ChildrenNum--;

4
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
View File

@@ -1,7 +1,7 @@
#/** @file
# Component name for module Mtftp4
#
# Copyright (c) 2007, Intel Corporation
# Copyright (c) 2007 - 2009, Intel Corporation
#
# All rights reserved. This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -67,4 +67,6 @@
gEfiMtftp4ProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiUdp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiUdp4ProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiUdp6ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiUdp6ProtocolGuid # PROTOCOL ALWAYS_CONSUMED

31
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
View File

@@ -50,7 +50,7 @@ Mtftp4CleanOperation (
}
ASSERT (Instance->UnicastPort != NULL);
UdpIoCleanPort (Instance->UnicastPort);
UdpIoCleanIo (Instance->UnicastPort);
if (Instance->LastPacket != NULL) {
NetbufFree (Instance->LastPacket);
@@ -58,7 +58,7 @@ Mtftp4CleanOperation (
}
if (Instance->McastUdpPort != NULL) {
UdpIoFreePort (Instance->McastUdpPort);
UdpIoFreeIo (Instance->McastUdpPort);
Instance->McastUdpPort = NULL;
}
@@ -211,9 +211,8 @@ Mtftp4OverrideValid (
the UDP is reconfigured.
@param Instance The Mtftp instance
@param UdpPort The UDP port to poll
@param UdpCfgData The UDP configure data to reconfigure the UDP
port.
@param UdpIo The UDP_IO to poll
@param UdpCfgData The UDP configure data to reconfigure the UDP_IO
@retval TRUE The default address is retrieved and UDP is reconfigured.
@retval FALSE Some error occured.
@@ -222,7 +221,7 @@ Mtftp4OverrideValid (
BOOLEAN
Mtftp4GetMapping (
IN MTFTP4_PROTOCOL *Instance,
IN UDP_IO_PORT *UdpPort,
IN UDP_IO *UdpIo,
IN EFI_UDP4_CONFIG_DATA *UdpCfgData
)
{
@@ -234,7 +233,7 @@ Mtftp4GetMapping (
ASSERT (Instance->Config.UseDefaultSetting);
Service = Instance->Service;
Udp = UdpPort->Udp;
Udp = UdpIo->Protocol.Udp4;
Status = gBS->SetTimer (
Service->TimerToGetMap,
@@ -263,7 +262,7 @@ Mtftp4GetMapping (
/**
Configure the UDP port for unicast receiving.
@param UdpIo The UDP port
@param UdpIo The UDP_IO instance
@param Instance The MTFTP session
@retval EFI_SUCCESS The UDP port is successfully configured for the
@@ -272,7 +271,7 @@ Mtftp4GetMapping (
**/
EFI_STATUS
Mtftp4ConfigUnicastPort (
IN UDP_IO_PORT *UdpIo,
IN UDP_IO *UdpIo,
IN MTFTP4_PROTOCOL *Instance
)
{
@@ -301,7 +300,7 @@ Mtftp4ConfigUnicastPort (
Ip = HTONL (Instance->ServerIp);
CopyMem (&UdpConfig.RemoteAddress, &Ip, sizeof (EFI_IPv4_ADDRESS));
Status = UdpIo->Udp->Configure (UdpIo->Udp, &UdpConfig);
Status = UdpIo->Protocol.Udp4->Configure (UdpIo->Protocol.Udp4, &UdpConfig);
if ((Status == EFI_NO_MAPPING) && Mtftp4GetMapping (Instance, UdpIo, &UdpConfig)) {
return EFI_SUCCESS;
@@ -312,9 +311,15 @@ Mtftp4ConfigUnicastPort (
// The station IP address is manually configured and the Gateway IP is not 0.
// Add the default route for this UDP instance.
//
Status = UdpIo->Udp->Routes (UdpIo->Udp, FALSE, &mZeroIp4Addr, &mZeroIp4Addr, &Config->GatewayIp);
Status = UdpIo->Protocol.Udp4->Routes (
UdpIo->Protocol.Udp4,
FALSE,
&mZeroIp4Addr,
&mZeroIp4Addr,
&Config->GatewayIp
);
if (EFI_ERROR (Status)) {
UdpIo->Udp->Configure (UdpIo->Udp, NULL);
UdpIo->Protocol.Udp4->Configure (UdpIo->Protocol.Udp4, NULL);
}
}
return Status;
@@ -1070,7 +1075,7 @@ EfiMtftp4Poll (
return EFI_DEVICE_ERROR;
}
Udp = Instance->UnicastPort->Udp;
Udp = Instance->UnicastPort->Protocol.Udp4;
return Udp->Poll (Udp);
}

6
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.h
View File

@@ -85,7 +85,7 @@ struct _MTFTP4_SERVICE {
// This UDP child is used to keep the connection between the UDP
// and MTFTP, so MTFTP will be notified when UDP is uninstalled.
//
UDP_IO_PORT *ConnectUdp;
UDP_IO *ConnectUdp;
};
@@ -131,7 +131,7 @@ struct _MTFTP4_PROTOCOL {
UINT16 ListeningPort;
UINT16 ConnectedPort;
IP4_ADDR Gateway;
UDP_IO_PORT *UnicastPort;
UDP_IO *UnicastPort;
//
// Timeout and retransmit status
@@ -148,7 +148,7 @@ struct _MTFTP4_PROTOCOL {
IP4_ADDR McastIp;
UINT16 McastPort;
BOOLEAN Master;
UDP_IO_PORT *McastUdpPort;
UDP_IO *McastUdpPort;
};
/**

41
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
View File

@@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
The packet process callback for MTFTP download.
@param UdpPacket The packet received
@param Points The local/remote access point of the packet
@param EndPoint The local/remote access point of the packet
@param IoStatus The status of the receiving
@param Context Opaque parameter, which is the MTFTP session
@@ -28,7 +28,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
VOID
Mtftp4RrqInput (
IN NET_BUF *UdpPacket,
IN UDP_POINTS *Points,
IN UDP_END_POINT *EndPoint,
IN EFI_STATUS IoStatus,
IN VOID *Context
);
@@ -370,7 +370,7 @@ Mtftp4RrqOackValid (
/**
Configure a UDP IO port to receive the multicast.
@param McastIo The UDP IO port to configure
@param McastIo The UDP IO to configure
@param Context The opaque parameter to the function which is the
MTFTP session.
@@ -380,7 +380,7 @@ Mtftp4RrqOackValid (
**/
EFI_STATUS
Mtftp4RrqConfigMcastPort (
IN UDP_IO_PORT *McastIo,
IN UDP_IO *McastIo,
IN VOID *Context
)
{
@@ -412,7 +412,7 @@ Mtftp4RrqConfigMcastPort (
Ip = HTONL (Instance->ServerIp);
CopyMem (&UdpConfig.RemoteAddress, &Ip, sizeof (EFI_IPv4_ADDRESS));
Status = McastIo->Udp->Configure (McastIo->Udp, &UdpConfig);
Status = McastIo->Protocol.Udp4->Configure (McastIo->Protocol.Udp4, &UdpConfig);
if (EFI_ERROR (Status)) {
return Status;
@@ -424,16 +424,16 @@ Mtftp4RrqConfigMcastPort (
// The station IP address is manually configured and the Gateway IP is not 0.
// Add the default route for this UDP instance.
//
Status = McastIo->Udp->Routes (
McastIo->Udp,
FALSE,
&mZeroIp4Addr,
&mZeroIp4Addr,
&Config->GatewayIp
);
Status = McastIo->Protocol.Udp4->Routes (
McastIo->Protocol.Udp4,
FALSE,
&mZeroIp4Addr,
&mZeroIp4Addr,
&Config->GatewayIp
);
if (EFI_ERROR (Status)) {
McastIo->Udp->Configure (McastIo->Udp, NULL);
McastIo->Protocol.Udp4->Configure (McastIo->Protocol.Udp4, NULL);
return Status;
}
}
@@ -444,7 +444,7 @@ Mtftp4RrqConfigMcastPort (
Ip = HTONL (Instance->McastIp);
CopyMem (&Group, &Ip, sizeof (EFI_IPv4_ADDRESS));
return McastIo->Udp->Groups (McastIo->Udp, TRUE, &Group);
return McastIo->Protocol.Udp4->Groups (McastIo->Protocol.Udp4, TRUE, &Group);
}
@@ -539,10 +539,11 @@ Mtftp4RrqHandleOack (
//
Instance->McastIp = Reply.McastIp;
Instance->McastPort = Reply.McastPort;
Instance->McastUdpPort = UdpIoCreatePort (
Instance->McastUdpPort = UdpIoCreateIo (
Instance->Service->Controller,
Instance->Service->Image,
Mtftp4RrqConfigMcastPort,
UDP_IO_UDP4_VERSION,
Instance
);
@@ -598,7 +599,7 @@ Mtftp4RrqHandleOack (
The packet process callback for MTFTP download.
@param UdpPacket The packet received
@param Points The local/remote access point of the packet
@param EndPoint The local/remote access point of the packet
@param IoStatus The status of the receiving
@param Context Opaque parameter, which is the MTFTP session
@@ -606,7 +607,7 @@ Mtftp4RrqHandleOack (
VOID
Mtftp4RrqInput (
IN NET_BUF *UdpPacket,
IN UDP_POINTS *Points,
IN UDP_END_POINT *EndPoint,
IN EFI_STATUS IoStatus,
IN VOID *Context
)
@@ -637,7 +638,7 @@ Mtftp4RrqInput (
//
// Find the port this packet is from to restart receive correctly.
//
Multicast = (BOOLEAN) (Points->LocalAddr == Instance->McastIp);
Multicast = (BOOLEAN) (EndPoint->LocalAddr.Addr[0] == Instance->McastIp);
if (UdpPacket->TotalSize < MTFTP4_OPCODE_LEN) {
goto ON_EXIT;
@@ -649,11 +650,11 @@ Mtftp4RrqInput (
// is required to use the same port as RemotePort to multicast the
// data.
//
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;
}
}

26
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
View File

@@ -359,7 +359,7 @@ Mtftp4SendError (
It simply frees the packet.
@param Packet The transmitted (or failed to) packet
@param Points The local and remote UDP access point
@param EndPoint The local and remote UDP access point
@param IoStatus The result of the transmission
@param Context Opaque parameter to the callback
@@ -367,7 +367,7 @@ Mtftp4SendError (
VOID
Mtftp4OnPacketSent (
IN NET_BUF *Packet,
IN UDP_POINTS *Points,
IN UDP_END_POINT *EndPoint,
IN EFI_STATUS IoStatus,
IN VOID *Context
)
@@ -415,7 +415,7 @@ Mtftp4SendPacket (
IN OUT NET_BUF *Packet
)
{
UDP_POINTS UdpPoint;
UDP_END_POINT UdpPoint;
EFI_STATUS Status;
UINT16 OpCode;
UINT16 Value;
@@ -427,14 +427,13 @@ Mtftp4SendPacket (
NetbufFree (Instance->LastPacket);
}
Instance->LastPacket = Packet;
Instance->LastPacket = Packet;
Instance->CurRetry = 0;
Instance->CurRetry = 0;
Mtftp4SetTimeout (Instance);
UdpPoint.LocalAddr = 0;
UdpPoint.LocalPort = 0;
UdpPoint.RemoteAddr = Instance->ServerIp;
ZeroMem (&UdpPoint, sizeof (UdpPoint));
UdpPoint.RemoteAddr.Addr[0] = Instance->ServerIp;
//
// Send the requests to the listening port, other packets
@@ -457,7 +456,7 @@ Mtftp4SendPacket (
Instance->UnicastPort,
Packet,
&UdpPoint,
0,
NULL,
Mtftp4OnPacketSent,
Instance
);
@@ -484,16 +483,15 @@ Mtftp4Retransmit (
IN MTFTP4_PROTOCOL *Instance
)
{
UDP_POINTS UdpPoint;
UDP_END_POINT UdpPoint;
EFI_STATUS Status;
UINT16 OpCode;
UINT16 Value;
ASSERT (Instance->LastPacket != NULL);
UdpPoint.LocalAddr = 0;
UdpPoint.LocalPort = 0;
UdpPoint.RemoteAddr = Instance->ServerIp;
ZeroMem (&UdpPoint, sizeof (UdpPoint));
UdpPoint.RemoteAddr.Addr[0] = Instance->ServerIp;
//
// Set the requests to the listening port, other packets to the connected port
@@ -514,7 +512,7 @@ Mtftp4Retransmit (
Instance->UnicastPort,
Instance->LastPacket,
&UdpPoint,
0,
NULL,
Mtftp4OnPacketSent,
Instance
);

8
MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
View File

@@ -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;
}
}

4
MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.h
View File

@@ -1,7 +1,7 @@
/** @file
Tcp driver function header.
Copyright (c) 2005 - 2006, Intel Corporation<BR>
Copyright (c) 2005 - 2009, Intel Corporation<BR>
All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -78,7 +78,7 @@ typedef struct _TCP4_PROTO_DATA {
VOID
Tcp4RxCallback (
IN EFI_STATUS Status,
IN ICMP_ERROR IcmpErr,
IN UINT8 IcmpErr,
IN EFI_NET_SESSION_DATA *NetSession,
IN NET_BUF *Pkt,
IN VOID *Context OPTIONAL

4
MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Func.h
View File

@@ -1,7 +1,7 @@
/** @file
Tcp function header file.
Copyright (c) 2005 - 2006, Intel Corporation<BR>
Copyright (c) 2005 - 2009, Intel Corporation<BR>
All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -433,7 +433,7 @@ TcpGetMaxSndNxt (
VOID
TcpIcmpInput (
IN NET_BUF *Nbuf,
IN ICMP_ERROR IcmpErr,
IN UINT8 IcmpErr,
IN UINT32 Src,
IN UINT32 Dst
);

2
MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
View File

@@ -1407,7 +1407,7 @@ DISCARD:
VOID
TcpIcmpInput (
IN NET_BUF *Nbuf,
IN ICMP_ERROR IcmpErr,
IN UINT8 IcmpErr,
IN UINT32 Src,
IN UINT32 Dst
)

2
MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Io.c
View File

@@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
VOID
Tcp4RxCallback (
IN EFI_STATUS Status,
IN ICMP_ERROR IcmpErr,
IN UINT8 IcmpErr,
IN EFI_NET_SESSION_DATA *NetSession,
IN NET_BUF *Pkt,
IN VOID *Context OPTIONAL

8
MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
View File

@@ -86,7 +86,7 @@ Udp4DgramSent (
VOID
Udp4DgramRcvd (
IN EFI_STATUS Status,
IN ICMP_ERROR IcmpError,
IN UINT8 IcmpError,
IN EFI_NET_SESSION_DATA *NetSession,
IN NET_BUF *Packet,
IN VOID *Context
@@ -227,7 +227,7 @@ Udp4Demultiplex (
VOID
Udp4IcmpHandler (
IN UDP4_SERVICE_DATA *Udp4Service,
IN ICMP_ERROR IcmpError,
IN UINT8 IcmpError,
IN EFI_NET_SESSION_DATA *NetSession,
IN NET_BUF *Packet
);
@@ -1029,7 +1029,7 @@ Udp4DgramSent (
VOID
Udp4DgramRcvd (
IN EFI_STATUS Status,
IN ICMP_ERROR IcmpError,
IN UINT8 IcmpError,
IN EFI_NET_SESSION_DATA *NetSession,
IN NET_BUF *Packet,
IN VOID *Context
@@ -1780,7 +1780,7 @@ Udp4SendPortUnreach (
VOID
Udp4IcmpHandler (
IN UDP4_SERVICE_DATA *Udp4Service,
IN ICMP_ERROR IcmpError,
IN UINT8 IcmpError,
IN EFI_NET_SESSION_DATA *NetSession,
IN NET_BUF *Packet
)