tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add a UNION definition (IP_IO_IP_PROTOOCL) for EFI_IP4/6_PROTOCOL and change IP_IO structure using this UNION to point the special IP Protocol. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10578 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qianouyang 2010-06-13 08:18:10 +00:00
parent 0ccabf7bab
commit 2a2e33b20f
6 changed files with 126 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
MdeModulePkg/Include/Library/IpIoLib.h
View File

@ -153,6 +153,11 @@ typedef union {
UINT8 PrefixLength;
} IP_IO_IP_MASK;
typedef union {
EFI_IP4_PROTOCOL *Ip4;
EFI_IP6_PROTOCOL *Ip6;
} IP_IO_IP_PROTOCOL;
///
/// The IP session for an IP receive packet.
///
@ -195,17 +200,18 @@ VOID
@param[in] Status Result of the IP packet being sent.
@param[in] Context The data provided by user for the received packet when
the callback is registered in IP_IO_OPEN_DATA::SndContext.
@param[in] Sender A pointer to EFI_IP4_PROTOCOL or EFI_IP6_PROTOCOL.
@param[in] Sender A Union type to specify a pointer of EFI_IP4_PROTOCOL
or EFI_IP6_PROTOCOL.
@param[in] NotifyData The Context data specified when calling IpIoSend()
**/
typedef
VOID
(EFIAPI *PKT_SENT_NOTIFY) (
IN EFI_STATUS Status,
IN VOID *Context,
IN VOID *Sender,
IN VOID *NotifyData
IN EFI_STATUS Status,
IN VOID *Context,
IN IP_IO_IP_PROTOCOL Sender,
IN VOID *NotifyData
);
///
@ -229,7 +235,7 @@ typedef struct _IP_IO {
//
// The IP instance consumed by this IP_IO
//
VOID *Ip;
IP_IO_IP_PROTOCOL Ip;
BOOLEAN IsConfigured;
///
@ -280,7 +286,7 @@ typedef struct _IP_IO_SEND_ENTRY {
IP_IO *IpIo;
VOID *Context;
VOID *NotifyData;
VOID *Ip;
IP_IO_IP_PROTOCOL Ip;
NET_BUF *Pkt;
IP_IO_IP_COMPLETION_TOKEN SndToken;
} IP_IO_SEND_ENTRY;
@ -294,7 +300,7 @@ typedef struct _IP_IO_IP_INFO {
IP_IO_IP_MASK PreMask;
LIST_ENTRY Entry;
EFI_HANDLE ChildHandle;
VOID *Ip;
IP_IO_IP_PROTOCOL Ip;
IP_IO_IP_COMPLETION_TOKEN DummyRcvToken;
INTN RefCnt;
UINT8 IpVersion;

189
MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
View File

@ -616,7 +616,7 @@ IP_IO_SEND_ENTRY *
IpIoCreateSndEntry (
IN OUT IP_IO *IpIo,
IN OUT NET_BUF *Pkt,
IN VOID *Sender,
IN IP_IO_IP_PROTOCOL Sender,
IN VOID *Context OPTIONAL,
IN VOID *NotifyData OPTIONAL,
IN EFI_IP_ADDRESS *Dest OPTIONAL,
@ -941,15 +941,15 @@ IpIoDummyHandlerDpc (
// Continue the receive.
//
if (IpInfo->IpVersion == IP_VERSION_4) {
((EFI_IP4_PROTOCOL *) (IpInfo->Ip))->Receive (
(EFI_IP4_PROTOCOL *) (IpInfo->Ip),
&IpInfo->DummyRcvToken.Ip4Token
);
IpInfo->Ip.Ip4->Receive (
IpInfo->Ip.Ip4,
&IpInfo->DummyRcvToken.Ip4Token
);
} else {
((EFI_IP6_PROTOCOL *) (IpInfo->Ip))->Receive (
(EFI_IP6_PROTOCOL *) (IpInfo->Ip),
&IpInfo->DummyRcvToken.Ip6Token
);
IpInfo->Ip.Ip6->Receive (
IpInfo->Ip.Ip6,
&IpInfo->DummyRcvToken.Ip6Token
);
}
}
@ -991,12 +991,10 @@ IpIoListenHandlerDpc (
IP_IO *IpIo;
EFI_STATUS Status;
IP_IO_IP_RX_DATA *RxData;
VOID *Ip;
EFI_NET_SESSION_DATA Session;
NET_BUF *Pkt;
IpIo = (IP_IO *) Context;
Ip = IpIo->Ip;
if (IpIo->IpVersion == IP_VERSION_4) {
Status = IpIo->RcvToken.Ip4Token.Status;
@ -1125,9 +1123,9 @@ CleanUp:
Resume:
if (IpIo->IpVersion == IP_VERSION_4){
((EFI_IP4_PROTOCOL *) Ip)->Receive (Ip, &(IpIo->RcvToken.Ip4Token));
IpIo->Ip.Ip4->Receive (IpIo->Ip.Ip4, &(IpIo->RcvToken.Ip4Token));
} else {
((EFI_IP6_PROTOCOL *) Ip)->Receive (Ip, &(IpIo->RcvToken.Ip6Token));
IpIo->Ip.Ip6->Receive (IpIo->Ip.Ip6, &(IpIo->RcvToken.Ip6Token));
}
}
@ -1266,7 +1264,6 @@ IpIoOpen (
)
{
EFI_STATUS Status;
VOID *Ip;
UINT8 IpVersion;
if (IpIo->IsConfigured) {
@ -1277,22 +1274,20 @@ IpIoOpen (
ASSERT ((IpVersion == IP_VERSION_4) || (IpVersion == IP_VERSION_6));
Ip = IpIo->Ip;
//
// configure ip
//
if (IpVersion == IP_VERSION_4){
Status = ((EFI_IP4_PROTOCOL *) Ip)->Configure (
(EFI_IP4_PROTOCOL *) Ip,
&OpenData->IpConfigData.Ip4CfgData
);
Status = IpIo->Ip.Ip4->Configure (
IpIo->Ip.Ip4,
&OpenData->IpConfigData.Ip4CfgData
);
} else {
Status = ((EFI_IP6_PROTOCOL *) Ip)->Configure (
(EFI_IP6_PROTOCOL *) Ip,
&OpenData->IpConfigData.Ip6CfgData
);
Status = IpIo->Ip.Ip6->Configure (
IpIo->Ip.Ip6,
&OpenData->IpConfigData.Ip6CfgData
);
}
if (EFI_ERROR (Status)) {
@ -1305,13 +1300,13 @@ IpIoOpen (
// @bug its code
//
if (IpVersion == IP_VERSION_4){
Status = ((EFI_IP4_PROTOCOL *) Ip)->Routes (
(EFI_IP4_PROTOCOL *) Ip,
TRUE,
&mZeroIp4Addr,
&mZeroIp4Addr,
&mZeroIp4Addr
);
Status = IpIo->Ip.Ip4->Routes (
IpIo->Ip.Ip4,
TRUE,
&mZeroIp4Addr,
&mZeroIp4Addr,
&mZeroIp4Addr
);
if (EFI_ERROR (Status) && (EFI_NOT_FOUND != Status)) {
return Status;
@ -1330,24 +1325,24 @@ IpIoOpen (
//
// start to listen incoming packet
//
Status = ((EFI_IP4_PROTOCOL *) Ip)->Receive (
(EFI_IP4_PROTOCOL *) Ip,
&(IpIo->RcvToken.Ip4Token)
);
Status = IpIo->Ip.Ip4->Receive (
IpIo->Ip.Ip4,
&(IpIo->RcvToken.Ip4Token)
);
if (EFI_ERROR (Status)) {
((EFI_IP4_PROTOCOL *) Ip)->Configure ((EFI_IP4_PROTOCOL *) Ip, NULL);
IpIo->Ip.Ip4->Configure (IpIo->Ip.Ip4, NULL);
goto ErrorExit;
}
} else {
IpIo->Protocol = OpenData->IpConfigData.Ip6CfgData.DefaultProtocol;
Status = ((EFI_IP6_PROTOCOL *) Ip)->Receive (
(EFI_IP6_PROTOCOL *) Ip,
&(IpIo->RcvToken.Ip6Token)
);
Status = IpIo->Ip.Ip6->Receive (
IpIo->Ip.Ip6,
&(IpIo->RcvToken.Ip6Token)
);
if (EFI_ERROR (Status)) {
((EFI_IP6_PROTOCOL *) Ip)->Configure ((EFI_IP6_PROTOCOL *) Ip, NULL);
IpIo->Ip.Ip6->Configure (IpIo->Ip.Ip6, NULL);
goto ErrorExit;
}
}
@ -1380,7 +1375,6 @@ IpIoStop (
)
{
EFI_STATUS Status;
VOID *Ip;
IP_IO_IP_INFO *IpInfo;
UINT8 IpVersion;
@ -1397,15 +1391,13 @@ IpIoStop (
//
RemoveEntryList (&IpIo->Entry);
Ip = IpIo->Ip;
//
// Configure NULL Ip
//
if (IpVersion == IP_VERSION_4) {
Status = ((EFI_IP4_PROTOCOL *) Ip)->Configure ((EFI_IP4_PROTOCOL *) Ip, NULL);
Status = IpIo->Ip.Ip4->Configure (IpIo->Ip.Ip4, NULL);
} else {
Status = ((EFI_IP6_PROTOCOL *) Ip)->Configure ((EFI_IP6_PROTOCOL *) Ip, NULL);
Status = IpIo->Ip.Ip6->Configure (IpIo->Ip.Ip6, NULL);
}
if (EFI_ERROR (Status)) {
return Status;
@ -1517,7 +1509,7 @@ IpIoSend (
)
{
EFI_STATUS Status;
VOID *Ip;
IP_IO_IP_PROTOCOL Ip;
IP_IO_SEND_ENTRY *SndEntry;
ASSERT ((IpIo->IpVersion != IP_VERSION_4) || (Dest != NULL));
@ -1540,15 +1532,15 @@ IpIoSend (
// Send this Packet
//
if (IpIo->IpVersion == IP_VERSION_4){
Status = ((EFI_IP4_PROTOCOL *) Ip)->Transmit (
(EFI_IP4_PROTOCOL *) Ip,
&SndEntry->SndToken.Ip4Token
);
Status = Ip.Ip4->Transmit (
Ip.Ip4,
&SndEntry->SndToken.Ip4Token
);
} else {
Status = ((EFI_IP6_PROTOCOL *) Ip)->Transmit (
(EFI_IP6_PROTOCOL *) Ip,
&SndEntry->SndToken.Ip6Token
);
Status = Ip.Ip6->Transmit (
Ip.Ip6,
&SndEntry->SndToken.Ip6Token
);
}
if (EFI_ERROR (Status)) {
@ -1575,7 +1567,7 @@ IpIoCancelTxToken (
{
LIST_ENTRY *Node;
IP_IO_SEND_ENTRY *SndEntry;
VOID *Ip;
IP_IO_IP_PROTOCOL Ip;
ASSERT ((IpIo != NULL) && (Packet != NULL));
@ -1588,15 +1580,15 @@ IpIoCancelTxToken (
Ip = SndEntry->Ip;
if (IpIo->IpVersion == IP_VERSION_4) {
((EFI_IP4_PROTOCOL *) Ip)->Cancel (
(EFI_IP4_PROTOCOL *) Ip,
&SndEntry->SndToken.Ip4Token
);
Ip.Ip4->Cancel (
Ip.Ip4,
&SndEntry->SndToken.Ip4Token
);
} else {
((EFI_IP6_PROTOCOL *) Ip)->Cancel (
(EFI_IP6_PROTOCOL *) Ip,
&SndEntry->SndToken.Ip6Token
);
Ip.Ip6->Cancel (
Ip.Ip6,
&SndEntry->SndToken.Ip6Token
);
}
break;
@ -1730,7 +1722,7 @@ IpIoConfigIp (
)
{
EFI_STATUS Status;
VOID *Ip;
IP_IO_IP_PROTOCOL Ip;
UINT8 IpVersion;
EFI_IP4_MODE_DATA Ip4ModeData;
EFI_IP6_MODE_DATA Ip6ModeData;
@ -1753,9 +1745,9 @@ IpIoConfigIp (
Ip = IpInfo->Ip;
if (IpInfo->IpVersion == IP_VERSION_4) {
Status = ((EFI_IP4_PROTOCOL *) Ip)->Configure ((EFI_IP4_PROTOCOL *) Ip, IpConfigData);
Status = Ip.Ip4->Configure (Ip.Ip4, IpConfigData);
} else {
Status = ((EFI_IP6_PROTOCOL *) Ip)->Configure ((EFI_IP6_PROTOCOL *) Ip, IpConfigData);
Status = Ip.Ip6->Configure (Ip.Ip6, IpConfigData);
}
if (EFI_ERROR (Status)) {
@ -1766,12 +1758,12 @@ IpIoConfigIp (
if (IpInfo->IpVersion == IP_VERSION_4){
if (((EFI_IP4_CONFIG_DATA *) IpConfigData)->UseDefaultAddress) {
((EFI_IP4_PROTOCOL *) Ip)->GetModeData (
(EFI_IP4_PROTOCOL *) Ip,
&Ip4ModeData,
NULL,
NULL
);
Ip.Ip4->GetModeData (
Ip.Ip4,
&Ip4ModeData,
NULL,
NULL
);
((EFI_IP4_CONFIG_DATA*) IpConfigData)->StationAddress = Ip4ModeData.ConfigData.StationAddress;
((EFI_IP4_CONFIG_DATA*) IpConfigData)->SubnetMask = Ip4ModeData.ConfigData.SubnetMask;
@ -1788,21 +1780,20 @@ IpIoConfigIp (
sizeof (IP4_ADDR)
);
Status = ((EFI_IP4_PROTOCOL *) Ip)->Receive (
(EFI_IP4_PROTOCOL *) Ip,
&IpInfo->DummyRcvToken.Ip4Token
);
Status = Ip.Ip4->Receive (
Ip.Ip4,
&IpInfo->DummyRcvToken.Ip4Token
);
if (EFI_ERROR (Status)) {
((EFI_IP4_PROTOCOL*)Ip)->Configure (Ip, NULL);
Ip.Ip4->Configure (Ip.Ip4, NULL);
}
} else {
((EFI_IP6_PROTOCOL *) Ip)->GetModeData (
(EFI_IP6_PROTOCOL *) Ip,
&Ip6ModeData,
NULL,
NULL
);
Ip.Ip6->GetModeData (
Ip.Ip6,
&Ip6ModeData,
NULL,
NULL
);
if (Ip6ModeData.IsConfigured) {
CopyMem (
@ -1846,12 +1837,12 @@ IpIoConfigIp (
sizeof (EFI_IPv6_ADDRESS)
);
Status = ((EFI_IP6_PROTOCOL *) Ip)->Receive (
(EFI_IP6_PROTOCOL *) Ip,
&IpInfo->DummyRcvToken.Ip6Token
);
Status = Ip.Ip6->Receive (
Ip.Ip6,
&IpInfo->DummyRcvToken.Ip6Token
);
if (EFI_ERROR (Status)) {
((EFI_IP6_PROTOCOL *) Ip)->Configure ((EFI_IP6_PROTOCOL *) Ip, NULL);
Ip.Ip6->Configure (Ip.Ip6, NULL);
}
}
} else {
@ -1906,10 +1897,10 @@ IpIoRemoveIp (
RemoveEntryList (&IpInfo->Entry);
if (IpVersion == IP_VERSION_4){
((EFI_IP4_PROTOCOL *) (IpInfo->Ip))->Configure (
(EFI_IP4_PROTOCOL *) (IpInfo->Ip),
NULL
);
IpInfo->Ip.Ip4->Configure (
IpInfo->Ip.Ip4,
NULL
);
IpIoCloseProtocolDestroyIpChild (
IpIo->Controller,
IpIo->Image,
@ -1921,10 +1912,10 @@ IpIoRemoveIp (
} else {
((EFI_IP6_PROTOCOL *) (IpInfo->Ip))->Configure (
(EFI_IP6_PROTOCOL *) (IpInfo->Ip),
NULL
);
IpInfo->Ip.Ip6->Configure (
IpInfo->Ip.Ip6,
NULL
);
IpIoCloseProtocolDestroyIpChild (
IpIo->Controller,
@ -2151,7 +2142,7 @@ IpIoRefreshNeighbor (
return EFI_NOT_STARTED;
}
Ip = (EFI_IP6_PROTOCOL *) (IpIo->Ip);
Ip = IpIo->Ip.Ip6;
return Ip->Neighbors (Ip, FALSE, &Neighbor->v6, NULL, Timeout, TRUE);
}

14
MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dispatcher.c
View File

@ -39,14 +39,14 @@ Tcp4Route (
IN TCP4_ROUTE_INFO *RouteInfo
)
{
EFI_IP4_PROTOCOL *Ip;
EFI_IP4_PROTOCOL *Ip4;
Ip = Tcb->IpInfo->Ip;
Ip4 = Tcb->IpInfo->Ip.Ip4;
ASSERT (Ip != NULL);
ASSERT (Ip4 != NULL);
return Ip->Routes (
Ip,
return Ip4->Routes (
Ip4,
RouteInfo->DeleteRoute,
RouteInfo->SubnetAddress,
RouteInfo->SubnetMask,
@ -131,7 +131,7 @@ Tcp4GetMode (
}
}
Ip = Tcb->IpInfo->Ip;
Ip = Tcb->IpInfo->Ip.Ip4;
ASSERT (Ip != NULL);
return Ip->GetModeData (Ip, Mode->Ip4ModeData, Mode->MnpConfigData, Mode->SnpModeData);
@ -607,7 +607,7 @@ Tcp4Dispatcher (
switch (Request) {
case SOCK_POLL:
Ip = (EFI_IP4_PROTOCOL *) (ProtoData->TcpService->IpIo->Ip);
Ip = ProtoData->TcpService->IpIo->Ip.Ip4;
Ip->Poll (Ip);
break;

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

@ -478,7 +478,7 @@ TcpGetRcvMss (
ASSERT (Sock != NULL);
TcpProto = (TCP4_PROTO_DATA *) Sock->ProtoReserved;
Ip = (EFI_IP4_PROTOCOL *) (TcpProto->TcpService->IpIo->Ip);
Ip = TcpProto->TcpService->IpIo->Ip.Ip4;
ASSERT (Ip != NULL);
Ip->GetModeData (Ip, &Ip4Mode, NULL, NULL);

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

@ -59,17 +59,17 @@ Udp4FindInstanceByPort (
@param[in] Status The completion status of the output udp datagram.
@param[in] Context Pointer to the context data.
@param[in] Sender Pointer to the Ip sender of the udp datagram.
@param[in] Sender Specify a pointer of EFI_IP4_PROTOCOL for sending.
@param[in] NotifyData Pointer to the notify data.
**/
VOID
EFIAPI
Udp4DgramSent (
IN EFI_STATUS Status,
IN VOID *Context,
IN VOID *Sender,
IN VOID *NotifyData
IN EFI_STATUS Status,
IN VOID *Context,
IN IP_IO_IP_PROTOCOL Sender,
IN VOID *NotifyData
);
/**
@ -989,17 +989,17 @@ Udp4RemoveToken (
@param[in] Status The completion status of the output udp datagram.
@param[in] Context Pointer to the context data.
@param[in] Sender Pointer to the Ip sender of the udp datagram.
@param[in] Sender Specify a pointer of EFI_IP4_PROTOCOL for sending.
@param[in] NotifyData Pointer to the notify data.
**/
VOID
EFIAPI
Udp4DgramSent (
IN EFI_STATUS Status,
IN VOID *Context,
IN VOID *Sender,
IN VOID *NotifyData
IN EFI_STATUS Status,
IN VOID *Context,
IN IP_IO_IP_PROTOCOL Sender,
IN VOID *NotifyData
)
{
UDP4_INSTANCE_DATA *Instance;

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

@ -79,7 +79,7 @@ Udp4GetModeData (
CopyMem (Udp4ConfigData, &Instance->ConfigData, sizeof (*Udp4ConfigData));
}
Ip = Instance->IpInfo->Ip;
Ip = Instance->IpInfo->Ip.Ip4;
//
// Get the underlying Ip4ModeData, MnpConfigData and SnpModeData.
@ -357,7 +357,7 @@ Udp4Groups (
return EFI_NOT_STARTED;
}
Ip = Instance->IpInfo->Ip;
Ip = Instance->IpInfo->Ip.Ip4;
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
@ -457,7 +457,7 @@ Udp4Routes (
return EFI_NOT_STARTED;
}
Ip = Instance->IpInfo->Ip;
Ip = Instance->IpInfo->Ip.Ip4;
//
// Invoke the Ip instance the Udp4 instance consumes to do the actual operation.
@ -900,7 +900,7 @@ Udp4Poll (
}
Instance = UDP4_INSTANCE_DATA_FROM_THIS (This);
Ip = Instance->IpInfo->Ip;
Ip = Instance->IpInfo->Ip.Ip4;
//
// Invode the Ip instance consumed by the udp instance to do the poll operation.