/** @file\r
IpIo Library.\r
\r
-Copyright (c) 2005 - 2009, Intel Corporation.<BR>\r
-All rights reserved. This program and the accompanying materials\r
+(C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>\r
+Copyright (c) 2005 - 2016, 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
#include <Library/DpcLib.h>\r
\r
\r
-LIST_ENTRY mActiveIpIoList = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED LIST_ENTRY mActiveIpIoList = {\r
&mActiveIpIoList,\r
&mActiveIpIoList\r
};\r
\r
-EFI_IP4_CONFIG_DATA mIp4IoDefaultIpConfigData = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_IP4_CONFIG_DATA mIp4IoDefaultIpConfigData = {\r
EFI_IP_PROTO_UDP,\r
FALSE,\r
TRUE,\r
0\r
};\r
\r
-EFI_IP6_CONFIG_DATA mIp6IoDefaultIpConfigData = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_IP6_CONFIG_DATA mIp6IoDefaultIpConfigData = {\r
EFI_IP_PROTO_UDP,\r
FALSE,\r
TRUE,\r
0\r
};\r
\r
-ICMP_ERROR_INFO mIcmpErrMap[10] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED ICMP_ERROR_INFO mIcmpErrMap[10] = {\r
{FALSE, TRUE }, // ICMP_ERR_UNREACH_NET\r
{FALSE, TRUE }, // ICMP_ERR_UNREACH_HOST\r
{TRUE, TRUE }, // ICMP_ERR_UNREACH_PROTOCOL\r
{FALSE, TRUE } // ICMP_ERR_PARAMPROB\r
};\r
\r
-ICMP_ERROR_INFO mIcmp6ErrMap[10] = {\r
+GLOBAL_REMOVE_IF_UNREFERENCED ICMP_ERROR_INFO mIcmp6ErrMap[10] = {\r
{FALSE, TRUE}, // ICMP6_ERR_UNREACH_NET\r
{FALSE, TRUE}, // ICMP6_ERR_UNREACH_HOST\r
{TRUE, TRUE}, // ICMP6_ERR_UNREACH_PROTOCOL\r
IN EFI_HANDLE ControllerHandle,\r
IN EFI_HANDLE ImageHandle,\r
IN EFI_HANDLE *ChildHandle,\r
- IN IP_VERSION IpVersion, \r
+ IN UINT8 IpVersion,\r
OUT VOID **Interface\r
)\r
{\r
IN EFI_HANDLE ControllerHandle,\r
IN EFI_HANDLE ImageHandle,\r
IN EFI_HANDLE ChildHandle,\r
- IN IP_VERSION IpVersion\r
+ IN UINT8 IpVersion\r
)\r
{\r
EFI_STATUS Status;\r
{\r
IP4_ICMP_ERROR_HEAD *IcmpHdr;\r
EFI_IP4_HEADER *IpHdr;\r
- ICMP_ERROR IcmpErr;\r
+ UINT8 IcmpErr;\r
UINT8 *PayLoadHdr;\r
UINT8 Type;\r
UINT8 Code;\r
case ICMP_CODE_UNREACH_PROTOCOL:\r
case ICMP_CODE_UNREACH_PORT:\r
case ICMP_CODE_UNREACH_SRCFAIL:\r
- IcmpErr = (ICMP_ERROR) (ICMP_ERR_UNREACH_NET + Code);\r
+ IcmpErr = (UINT8) (ICMP_ERR_UNREACH_NET + Code);\r
\r
break;\r
\r
return EFI_ABORTED;\r
}\r
\r
- IcmpErr = (ICMP_ERROR) (Code + ICMP_ERR_TIMXCEED_INTRANS);\r
+ IcmpErr = (UINT8) (Code + ICMP_ERR_TIMXCEED_INTRANS);\r
\r
break;\r
\r
{\r
IP6_ICMP_ERROR_HEAD *IcmpHdr;\r
EFI_IP6_HEADER *IpHdr;\r
- ICMP6_ERROR IcmpErr;\r
+ UINT8 IcmpErr;\r
UINT8 *PayLoadHdr;\r
UINT8 Type;\r
UINT8 Code;\r
return EFI_ABORTED;\r
}\r
\r
- IcmpErr = (ICMP6_ERROR) (ICMP6_ERR_TIMXCEED_HOPLIMIT + Code);\r
+ IcmpErr = (UINT8) (ICMP6_ERR_TIMXCEED_HOPLIMIT + Code);\r
\r
break;\r
\r
return EFI_ABORTED;\r
}\r
\r
- IcmpErr = (ICMP6_ERROR) (ICMP6_ERR_PARAMPROB_HEADER + Code);\r
+ IcmpErr = (UINT8) (ICMP6_ERR_PARAMPROB_HEADER + Code);\r
\r
break;\r
\r
\r
NetbufTrim (Pkt, TrimBytes, TRUE);\r
\r
- IpIo->PktRcvdNotify (EFI_ICMP_ERROR, (ICMP_ERROR) IcmpErr, Session, Pkt, IpIo->RcvdContext);\r
+ IpIo->PktRcvdNotify (EFI_ICMP_ERROR, IcmpErr, Session, Pkt, IpIo->RcvdContext);\r
\r
return EFI_SUCCESS;\r
}\r
\r
**/\r
VOID\r
+EFIAPI\r
IpIoExtFree (\r
IN VOID *Event\r
)\r
IpIoCreateSndEntry (\r
IN OUT IP_IO *IpIo,\r
IN OUT NET_BUF *Pkt,\r
- IN VOID *Sender,\r
+ IN IP_IO_IP_PROTOCOL Sender,\r
IN VOID *Context OPTIONAL,\r
IN VOID *NotifyData OPTIONAL,\r
IN EFI_IP_ADDRESS *Dest OPTIONAL,\r
\r
Ip4TxData = &TxData->Ip4TxData;\r
\r
- CopyMem (&Ip4TxData->DestinationAddress, Dest, sizeof (EFI_IPv4_ADDRESS));\r
+ IP4_COPY_ADDRESS (&Ip4TxData->DestinationAddress, Dest);\r
\r
Ip4TxData->OverrideData = &OverrideData->Ip4OverrideData;\r
Ip4TxData->OptionsLength = 0;\r
// Continue the receive.\r
//\r
if (IpInfo->IpVersion == IP_VERSION_4) {\r
- ((EFI_IP4_PROTOCOL *) (IpInfo->Ip))->Receive (\r
- (EFI_IP4_PROTOCOL *) (IpInfo->Ip),\r
- &IpInfo->DummyRcvToken.Ip4Token\r
- );\r
+ IpInfo->Ip.Ip4->Receive (\r
+ IpInfo->Ip.Ip4,\r
+ &IpInfo->DummyRcvToken.Ip4Token\r
+ );\r
} else {\r
- ((EFI_IP6_PROTOCOL *) (IpInfo->Ip))->Receive (\r
- (EFI_IP6_PROTOCOL *) (IpInfo->Ip),\r
- &IpInfo->DummyRcvToken.Ip6Token\r
- );\r
+ IpInfo->Ip.Ip6->Receive (\r
+ IpInfo->Ip.Ip6,\r
+ &IpInfo->DummyRcvToken.Ip6Token\r
+ );\r
}\r
}\r
\r
IP_IO *IpIo;\r
EFI_STATUS Status;\r
IP_IO_IP_RX_DATA *RxData;\r
- VOID *Ip;\r
EFI_NET_SESSION_DATA Session;\r
NET_BUF *Pkt;\r
\r
IpIo = (IP_IO *) Context;\r
- Ip = IpIo->Ip;\r
\r
if (IpIo->IpVersion == IP_VERSION_4) {\r
Status = IpIo->RcvToken.Ip4Token.Status;\r
\r
if (IpIo->IpVersion == IP_VERSION_4) {\r
if ((EFI_IP4 (RxData->Ip4RxData.Header->SourceAddress) != 0) &&\r
- !Ip4IsUnicast (EFI_NTOHL (((EFI_IP4_RECEIVE_DATA *) RxData)->Header->SourceAddress), 0)) {\r
+ (IpIo->SubnetMask != 0) &&\r
+ IP4_NET_EQUAL (IpIo->StationIp, EFI_NTOHL (((EFI_IP4_RECEIVE_DATA *) RxData)->Header->SourceAddress), IpIo->SubnetMask) &&\r
+ !NetIp4IsUnicast (EFI_NTOHL (((EFI_IP4_RECEIVE_DATA *) RxData)->Header->SourceAddress), IpIo->SubnetMask)) {\r
+ //\r
+ // The source address is not zero and it's not a unicast IP address, discard it.\r
+ //\r
+ goto CleanUp;\r
+ }\r
+\r
+ if (RxData->Ip4RxData.DataLength == 0) {\r
+ //\r
+ // Discard zero length data payload packet.\r
+ //\r
+ goto CleanUp;\r
+ }\r
+\r
//\r
- // The source address is not zero and it's not a unicast IP address, discard it.\r
+ // Create a netbuffer representing IPv4 packet\r
//\r
- goto CleanUp;\r
- }\r
-\r
- //\r
- // Create a netbuffer representing IPv4 packet\r
- //\r
- Pkt = NetbufFromExt (\r
- (NET_FRAGMENT *) RxData->Ip4RxData.FragmentTable,\r
- RxData->Ip4RxData.FragmentCount,\r
- 0,\r
- 0,\r
- IpIoExtFree,\r
- RxData->Ip4RxData.RecycleSignal\r
- );\r
- if (NULL == Pkt) {\r
- goto CleanUp;\r
- }\r
+ Pkt = NetbufFromExt (\r
+ (NET_FRAGMENT *) RxData->Ip4RxData.FragmentTable,\r
+ RxData->Ip4RxData.FragmentCount,\r
+ 0,\r
+ 0,\r
+ IpIoExtFree,\r
+ RxData->Ip4RxData.RecycleSignal\r
+ );\r
+ if (NULL == Pkt) {\r
+ goto CleanUp;\r
+ }\r
\r
- //\r
- // Create a net session\r
- //\r
- Session.Source.Addr[0] = EFI_IP4 (RxData->Ip4RxData.Header->SourceAddress);\r
- Session.Dest.Addr[0] = EFI_IP4 (RxData->Ip4RxData.Header->DestinationAddress);\r
- Session.IpHdr.Ip4Hdr = RxData->Ip4RxData.Header;\r
- Session.IpVersion = IP_VERSION_4;\r
+ //\r
+ // Create a net session\r
+ //\r
+ Session.Source.Addr[0] = EFI_IP4 (RxData->Ip4RxData.Header->SourceAddress);\r
+ Session.Dest.Addr[0] = EFI_IP4 (RxData->Ip4RxData.Header->DestinationAddress);\r
+ Session.IpHdr.Ip4Hdr = RxData->Ip4RxData.Header;\r
+ Session.IpHdrLen = RxData->Ip4RxData.HeaderLength;\r
+ Session.IpVersion = IP_VERSION_4;\r
} else {\r
\r
- if (!Ip6IsValidUnicast(&RxData->Ip6RxData.Header->SourceAddress)) {\r
+ if (!NetIp6IsValidUnicast(&RxData->Ip6RxData.Header->SourceAddress)) {\r
+ goto CleanUp;\r
+ }\r
+ \r
+ if (RxData->Ip6RxData.DataLength == 0) {\r
+ //\r
+ // Discard zero length data payload packet.\r
+ //\r
goto CleanUp;\r
}\r
\r
sizeof(EFI_IPv6_ADDRESS)\r
);\r
Session.IpHdr.Ip6Hdr = RxData->Ip6RxData.Header;\r
+ Session.IpHdrLen = RxData->Ip6RxData.HeaderLength;\r
Session.IpVersion = IP_VERSION_6;\r
} \r
\r
if (EFI_SUCCESS == Status) {\r
\r
- IpIo->PktRcvdNotify (EFI_SUCCESS, (ICMP_ERROR) 0, &Session, Pkt, IpIo->RcvdContext);\r
+ IpIo->PktRcvdNotify (EFI_SUCCESS, 0, &Session, Pkt, IpIo->RcvdContext);\r
} else {\r
//\r
// Status is EFI_ICMP_ERROR\r
Resume:\r
\r
if (IpIo->IpVersion == IP_VERSION_4){\r
- ((EFI_IP4_PROTOCOL *) Ip)->Receive (Ip, &(IpIo->RcvToken.Ip4Token));\r
+ IpIo->Ip.Ip4->Receive (IpIo->Ip.Ip4, &(IpIo->RcvToken.Ip4Token));\r
} else {\r
- ((EFI_IP6_PROTOCOL *) Ip)->Receive (Ip, &(IpIo->RcvToken.Ip6Token));\r
+ IpIo->Ip.Ip6->Receive (IpIo->Ip.Ip6, &(IpIo->RcvToken.Ip6Token));\r
}\r
}\r
\r
IpIoCreate (\r
IN EFI_HANDLE Image,\r
IN EFI_HANDLE Controller,\r
- IN IP_VERSION IpVersion \r
+ IN UINT8 IpVersion\r
)\r
{\r
EFI_STATUS Status;\r
)\r
{\r
EFI_STATUS Status;\r
- VOID *Ip;\r
- IP_VERSION IpVersion;\r
+ UINT8 IpVersion;\r
\r
if (IpIo->IsConfigured) {\r
return EFI_ACCESS_DENIED;\r
\r
ASSERT ((IpVersion == IP_VERSION_4) || (IpVersion == IP_VERSION_6));\r
\r
- Ip = IpIo->Ip;\r
-\r
//\r
// configure ip\r
//\r
if (IpVersion == IP_VERSION_4){\r
- Status = ((EFI_IP4_PROTOCOL *) Ip)->Configure (\r
- (EFI_IP4_PROTOCOL *) Ip,\r
- &OpenData->IpConfigData.Ip4CfgData\r
- );\r
+ //\r
+ // RawData mode is no supported.\r
+ //\r
+ ASSERT (!OpenData->IpConfigData.Ip4CfgData.RawData);\r
+ if (OpenData->IpConfigData.Ip4CfgData.RawData) {\r
+ return EFI_UNSUPPORTED;\r
+ }\r
+\r
+ if (!OpenData->IpConfigData.Ip4CfgData.UseDefaultAddress) {\r
+ IpIo->StationIp = EFI_NTOHL (OpenData->IpConfigData.Ip4CfgData.StationAddress);\r
+ IpIo->SubnetMask = EFI_NTOHL (OpenData->IpConfigData.Ip4CfgData.SubnetMask);\r
+ }\r
+ \r
+ Status = IpIo->Ip.Ip4->Configure (\r
+ IpIo->Ip.Ip4,\r
+ &OpenData->IpConfigData.Ip4CfgData\r
+ );\r
} else {\r
\r
- Status = ((EFI_IP6_PROTOCOL *) Ip)->Configure (\r
- (EFI_IP6_PROTOCOL *) Ip, \r
- &OpenData->IpConfigData.Ip6CfgData\r
- );\r
+ Status = IpIo->Ip.Ip6->Configure (\r
+ IpIo->Ip.Ip6, \r
+ &OpenData->IpConfigData.Ip6CfgData\r
+ );\r
}\r
\r
if (EFI_ERROR (Status)) {\r
// @bug its code\r
//\r
if (IpVersion == IP_VERSION_4){\r
- Status = ((EFI_IP4_PROTOCOL *) Ip)->Routes (\r
- (EFI_IP4_PROTOCOL *) Ip,\r
- TRUE,\r
- &mZeroIp4Addr,\r
- &mZeroIp4Addr,\r
- &mZeroIp4Addr\r
- );\r
+ Status = IpIo->Ip.Ip4->Routes (\r
+ IpIo->Ip.Ip4,\r
+ TRUE,\r
+ &mZeroIp4Addr,\r
+ &mZeroIp4Addr,\r
+ &mZeroIp4Addr\r
+ );\r
\r
if (EFI_ERROR (Status) && (EFI_NOT_FOUND != Status)) {\r
return Status;\r
//\r
// start to listen incoming packet\r
//\r
- Status = ((EFI_IP4_PROTOCOL *) Ip)->Receive (\r
- (EFI_IP4_PROTOCOL *) Ip,\r
- &(IpIo->RcvToken.Ip4Token)\r
- );\r
+ Status = IpIo->Ip.Ip4->Receive (\r
+ IpIo->Ip.Ip4,\r
+ &(IpIo->RcvToken.Ip4Token)\r
+ );\r
if (EFI_ERROR (Status)) {\r
- ((EFI_IP4_PROTOCOL *) Ip)->Configure ((EFI_IP4_PROTOCOL *) Ip, NULL);\r
+ IpIo->Ip.Ip4->Configure (IpIo->Ip.Ip4, NULL);\r
goto ErrorExit;\r
}\r
\r
} else {\r
\r
IpIo->Protocol = OpenData->IpConfigData.Ip6CfgData.DefaultProtocol;\r
- Status = ((EFI_IP6_PROTOCOL *) Ip)->Receive (\r
- (EFI_IP6_PROTOCOL *) Ip,\r
- &(IpIo->RcvToken.Ip6Token)\r
- );\r
+ Status = IpIo->Ip.Ip6->Receive (\r
+ IpIo->Ip.Ip6,\r
+ &(IpIo->RcvToken.Ip6Token)\r
+ );\r
if (EFI_ERROR (Status)) {\r
- ((EFI_IP6_PROTOCOL *) Ip)->Configure ((EFI_IP6_PROTOCOL *) Ip, NULL);\r
+ IpIo->Ip.Ip6->Configure (IpIo->Ip.Ip6, NULL);\r
goto ErrorExit;\r
}\r
}\r
)\r
{\r
EFI_STATUS Status;\r
- VOID *Ip;\r
IP_IO_IP_INFO *IpInfo;\r
- IP_VERSION IpVersion;\r
+ UINT8 IpVersion;\r
\r
if (!IpIo->IsConfigured) {\r
return EFI_SUCCESS;\r
//\r
RemoveEntryList (&IpIo->Entry);\r
\r
- Ip = IpIo->Ip;\r
-\r
//\r
// Configure NULL Ip\r
//\r
if (IpVersion == IP_VERSION_4) {\r
- Status = ((EFI_IP4_PROTOCOL *) Ip)->Configure ((EFI_IP4_PROTOCOL *) Ip, NULL);\r
+ Status = IpIo->Ip.Ip4->Configure (IpIo->Ip.Ip4, NULL);\r
} else {\r
- Status = ((EFI_IP6_PROTOCOL *) Ip)->Configure ((EFI_IP6_PROTOCOL *) Ip, NULL);\r
+ Status = IpIo->Ip.Ip6->Configure (IpIo->Ip.Ip6, NULL);\r
}\r
if (EFI_ERROR (Status)) {\r
return Status;\r
}\r
\r
//\r
- // All pending send tokens should be flushed by reseting the IP instances.\r
+ // All pending send tokens should be flushed by resetting the IP instances.\r
//\r
ASSERT (IsListEmpty (&IpIo->PendingSndList));\r
\r
)\r
{\r
EFI_STATUS Status;\r
- VOID *Ip;\r
+ IP_IO_IP_PROTOCOL Ip;\r
IP_IO_SEND_ENTRY *SndEntry;\r
\r
ASSERT ((IpIo->IpVersion != IP_VERSION_4) || (Dest != NULL));\r
// Send this Packet\r
//\r
if (IpIo->IpVersion == IP_VERSION_4){\r
- Status = ((EFI_IP4_PROTOCOL *) Ip)->Transmit (\r
- (EFI_IP4_PROTOCOL *) Ip,\r
- &SndEntry->SndToken.Ip4Token\r
- );\r
+ Status = Ip.Ip4->Transmit (\r
+ Ip.Ip4,\r
+ &SndEntry->SndToken.Ip4Token\r
+ );\r
} else {\r
- Status = ((EFI_IP6_PROTOCOL *) Ip)->Transmit (\r
- (EFI_IP6_PROTOCOL *) Ip,\r
- &SndEntry->SndToken.Ip6Token\r
- );\r
+ Status = Ip.Ip6->Transmit (\r
+ Ip.Ip6,\r
+ &SndEntry->SndToken.Ip6Token\r
+ );\r
}\r
\r
if (EFI_ERROR (Status)) {\r
{\r
LIST_ENTRY *Node;\r
IP_IO_SEND_ENTRY *SndEntry;\r
- VOID *Ip;\r
+ IP_IO_IP_PROTOCOL Ip;\r
\r
ASSERT ((IpIo != NULL) && (Packet != NULL));\r
\r
Ip = SndEntry->Ip;\r
\r
if (IpIo->IpVersion == IP_VERSION_4) {\r
- ((EFI_IP4_PROTOCOL *) Ip)->Cancel (\r
- (EFI_IP4_PROTOCOL *) Ip,\r
- &SndEntry->SndToken.Ip4Token\r
- );\r
+ Ip.Ip4->Cancel (\r
+ Ip.Ip4,\r
+ &SndEntry->SndToken.Ip4Token\r
+ );\r
} else {\r
- ((EFI_IP6_PROTOCOL *) Ip)->Cancel (\r
- (EFI_IP6_PROTOCOL *) Ip,\r
- &SndEntry->SndToken.Ip6Token\r
- );\r
+ Ip.Ip6->Cancel (\r
+ Ip.Ip6,\r
+ &SndEntry->SndToken.Ip6Token\r
+ );\r
}\r
\r
break;\r
)\r
{\r
EFI_STATUS Status;\r
- VOID *Ip;\r
- IP_VERSION IpVersion;\r
+ IP_IO_IP_PROTOCOL Ip;\r
+ UINT8 IpVersion;\r
EFI_IP4_MODE_DATA Ip4ModeData;\r
EFI_IP6_MODE_DATA Ip6ModeData;\r
\r
Ip = IpInfo->Ip;\r
\r
if (IpInfo->IpVersion == IP_VERSION_4) {\r
- Status = ((EFI_IP4_PROTOCOL *) Ip)->Configure ((EFI_IP4_PROTOCOL *) Ip, IpConfigData);\r
+ Status = Ip.Ip4->Configure (Ip.Ip4, IpConfigData);\r
} else {\r
- Status = ((EFI_IP6_PROTOCOL *) Ip)->Configure ((EFI_IP6_PROTOCOL *) Ip, IpConfigData);\r
+ Status = Ip.Ip6->Configure (Ip.Ip6, IpConfigData);\r
}\r
\r
if (EFI_ERROR (Status)) {\r
if (IpInfo->IpVersion == IP_VERSION_4){\r
\r
if (((EFI_IP4_CONFIG_DATA *) IpConfigData)->UseDefaultAddress) {\r
- ((EFI_IP4_PROTOCOL *) Ip)->GetModeData (\r
- (EFI_IP4_PROTOCOL *) Ip, \r
- &Ip4ModeData, \r
- NULL, \r
- NULL\r
- );\r
-\r
- ((EFI_IP4_CONFIG_DATA*) IpConfigData)->StationAddress = Ip4ModeData.ConfigData.StationAddress;\r
- ((EFI_IP4_CONFIG_DATA*) IpConfigData)->SubnetMask = Ip4ModeData.ConfigData.SubnetMask;\r
+ Ip.Ip4->GetModeData (\r
+ Ip.Ip4, \r
+ &Ip4ModeData, \r
+ NULL, \r
+ NULL\r
+ );\r
+\r
+ IP4_COPY_ADDRESS (&((EFI_IP4_CONFIG_DATA*) IpConfigData)->StationAddress, &Ip4ModeData.ConfigData.StationAddress);\r
+ IP4_COPY_ADDRESS (&((EFI_IP4_CONFIG_DATA*) IpConfigData)->SubnetMask, &Ip4ModeData.ConfigData.SubnetMask);\r
}\r
\r
CopyMem (\r
sizeof (IP4_ADDR)\r
);\r
\r
- Status = ((EFI_IP4_PROTOCOL *) Ip)->Receive (\r
- (EFI_IP4_PROTOCOL *) Ip,\r
- &IpInfo->DummyRcvToken.Ip4Token\r
- );\r
+ Status = Ip.Ip4->Receive (\r
+ Ip.Ip4,\r
+ &IpInfo->DummyRcvToken.Ip4Token\r
+ );\r
if (EFI_ERROR (Status)) {\r
- ((EFI_IP4_PROTOCOL*)Ip)->Configure (Ip, NULL);\r
+ Ip.Ip4->Configure (Ip.Ip4, NULL);\r
}\r
} else {\r
-\r
- ((EFI_IP6_PROTOCOL *) Ip)->GetModeData (\r
- (EFI_IP6_PROTOCOL *) Ip,\r
- &Ip6ModeData,\r
- NULL,\r
- NULL\r
- );\r
+ Ip.Ip6->GetModeData (\r
+ Ip.Ip6,\r
+ &Ip6ModeData,\r
+ NULL,\r
+ NULL\r
+ );\r
\r
if (Ip6ModeData.IsConfigured) {\r
CopyMem (\r
sizeof (EFI_IPv6_ADDRESS)\r
);\r
\r
- Status = ((EFI_IP6_PROTOCOL *) Ip)->Receive (\r
- (EFI_IP6_PROTOCOL *) Ip,\r
- &IpInfo->DummyRcvToken.Ip6Token\r
- );\r
+ Status = Ip.Ip6->Receive (\r
+ Ip.Ip6,\r
+ &IpInfo->DummyRcvToken.Ip6Token\r
+ );\r
if (EFI_ERROR (Status)) {\r
- ((EFI_IP6_PROTOCOL *) Ip)->Configure ((EFI_IP6_PROTOCOL *) Ip, NULL);\r
+ Ip.Ip6->Configure (Ip.Ip6, NULL);\r
}\r
} \r
} else {\r
)\r
{\r
\r
- IP_VERSION IpVersion;\r
+ UINT8 IpVersion;\r
\r
ASSERT (IpInfo->RefCnt > 0);\r
\r
RemoveEntryList (&IpInfo->Entry);\r
\r
if (IpVersion == IP_VERSION_4){\r
- ((EFI_IP4_PROTOCOL *) (IpInfo->Ip))->Configure (\r
- (EFI_IP4_PROTOCOL *) (IpInfo->Ip),\r
- NULL\r
- );\r
+ IpInfo->Ip.Ip4->Configure (\r
+ IpInfo->Ip.Ip4,\r
+ NULL\r
+ );\r
IpIoCloseProtocolDestroyIpChild (\r
IpIo->Controller,\r
IpIo->Image,\r
\r
} else {\r
\r
- ((EFI_IP6_PROTOCOL *) (IpInfo->Ip))->Configure (\r
- (EFI_IP6_PROTOCOL *) (IpInfo->Ip),\r
- NULL\r
- );\r
+ IpInfo->Ip.Ip6->Configure (\r
+ IpInfo->Ip.Ip6,\r
+ NULL\r
+ );\r
\r
IpIoCloseProtocolDestroyIpChild (\r
IpIo->Controller,\r
EFIAPI\r
IpIoFindSender (\r
IN OUT IP_IO **IpIo,\r
- IN IP_VERSION IpVersion,\r
+ IN UINT8 IpVersion,\r
IN EFI_IP_ADDRESS *Src\r
)\r
{\r
\r
@param[in] IcmpError IcmpError Type.\r
@param[in] IpVersion The version of the IP protocol to use,\r
- either IPv4 or IPv6.\r
- \r
- @param[out] IsHard Whether it is a hard error.\r
- @param[out] Notify Whether it need to notify SockError.\r
+ either IPv4 or IPv6. \r
+ @param[out] IsHard If TRUE, indicates that it is a hard error.\r
+ @param[out] Notify If TRUE, SockError needs to be notified.\r
\r
@return ICMP Error Status, such as EFI_NETWORK_UNREACHABLE.\r
\r
EFI_STATUS\r
EFIAPI\r
IpIoGetIcmpErrStatus (\r
- IN ICMP_ERROR IcmpError,\r
- IN IP_VERSION IpVersion,\r
+ IN UINT8 IcmpError,\r
+ IN UINT8 IpVersion,\r
OUT BOOLEAN *IsHard OPTIONAL,\r
OUT BOOLEAN *Notify OPTIONAL\r
)\r
{\r
if (IpVersion == IP_VERSION_4 ) {\r
- ASSERT ((IcmpError >= ICMP_ERR_UNREACH_NET) && (IcmpError <= ICMP_ERR_PARAMPROB));\r
+ ASSERT (IcmpError <= ICMP_ERR_PARAMPROB);\r
\r
if (IsHard != NULL) {\r
*IsHard = mIcmpErrMap[IcmpError].IsHard;\r
\r
} else if (IpVersion == IP_VERSION_6) {\r
\r
- ASSERT ((IcmpError >= ICMP6_ERR_UNREACH_NET) && (IcmpError <= ICMP6_ERR_PARAMPROB_IPV6OPTION));\r
+ ASSERT (IcmpError <= ICMP6_ERR_PARAMPROB_IPV6OPTION);\r
\r
if (IsHard != NULL) {\r
*IsHard = mIcmp6ErrMap[IcmpError].IsHard;\r
return EFI_NOT_STARTED;\r
}\r
\r
- Ip = (EFI_IP6_PROTOCOL *) (IpIo->Ip);\r
+ Ip = IpIo->Ip.Ip6;\r
\r
return Ip->Neighbors (Ip, FALSE, &Neighbor->v6, NULL, Timeout, TRUE);\r
}\r
projects / mirror_edk2.git / blobdiff