tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-28 16:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

ShellPkg: Enhance ping6 to select the interface automatically

Browse Source 
v2:
* Refine the code to make it more readable.

This patch is used to support no source IP specified case while
multiple NICs existed in the platform. The command will select the
first both connected and configured interface automatically.
Note: Source address is always required when pinging a
link-local address.

Cc: Bhupesh Sharma <bhupesh.sharma@nxp.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiaxin Wu <jiaxin.wu@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
This commit is contained in:
Jiaxin Wu 2016-04-22 10:55:03 +08:00
parent 9ce14ca124
commit 76cd3ffab6
1 changed files with 94 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
ShellPkg/Library/UefiShellNetwork2CommandsLib/Ping6.c
View File

@ -663,6 +663,8 @@ Ping6CreateIpInstance (
UINTN HandleIndex; UINTN HandleIndex;
UINTN HandleNum; UINTN HandleNum;
EFI_HANDLE *HandleBuffer; EFI_HANDLE *HandleBuffer;
BOOLEAN UnspecifiedSrc;
BOOLEAN MediaPresent;
EFI_SERVICE_BINDING_PROTOCOL *Ip6Sb; EFI_SERVICE_BINDING_PROTOCOL *Ip6Sb;
EFI_IP6_CONFIG_PROTOCOL *Ip6Cfg; EFI_IP6_CONFIG_PROTOCOL *Ip6Cfg;
EFI_IP6_CONFIG_DATA Ip6Config; EFI_IP6_CONFIG_DATA Ip6Config;
@ -672,6 +674,8 @@ Ping6CreateIpInstance (
UINTN AddrIndex; UINTN AddrIndex;
HandleBuffer = NULL; HandleBuffer = NULL;
UnspecifiedSrc = FALSE;
MediaPresent = TRUE;
Ip6Sb = NULL; Ip6Sb = NULL;
IfInfo = NULL; IfInfo = NULL;
IfInfoSize = 0; IfInfoSize = 0;
@ -689,17 +693,23 @@ Ping6CreateIpInstance (
if (EFI_ERROR (Status) || (HandleNum == 0)) { if (EFI_ERROR (Status) || (HandleNum == 0)) {
return EFI_ABORTED; return EFI_ABORTED;
} }
if (NetIp6IsUnspecifiedAddr (&Private->SrcAddress)) {
// //
// Source address is required when pinging a link-local address on multi- // SrcAddress is unspecified. So, both connected and configured interface will be automatic selected.
// interfaces host.
// //
if (NetIp6IsLinkLocalAddr (&Private->DstAddress) && UnspecifiedSrc = TRUE;
NetIp6IsUnspecifiedAddr (&Private->SrcAddress) && }
(HandleNum > 1)) {
//
// Source address is required when pinging a link-local address.
//
if (NetIp6IsLinkLocalAddr (&Private->DstAddress) && UnspecifiedSrc) {
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_PING6_INVALID_SOURCE), gShellNetwork2HiiHandle); ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_PING6_INVALID_SOURCE), gShellNetwork2HiiHandle);
Status = EFI_INVALID_PARAMETER; Status = EFI_INVALID_PARAMETER;
goto ON_ERROR; goto ON_ERROR;
} }
// //
// For each ip6 protocol, check interface addresses list. // For each ip6 protocol, check interface addresses list.
// //
@ -709,6 +719,19 @@ Ping6CreateIpInstance (
IfInfo = NULL; IfInfo = NULL;
IfInfoSize = 0; IfInfoSize = 0;
if (UnspecifiedSrc) {
//
// Check media.
//
NetLibDetectMedia (HandleBuffer[HandleIndex], &MediaPresent);
if (!MediaPresent) {
//
// Skip this one.
//
continue;
}
}
Status = gBS->HandleProtocol ( Status = gBS->HandleProtocol (
HandleBuffer[HandleIndex], HandleBuffer[HandleIndex],
&gEfiIp6ServiceBindingProtocolGuid, &gEfiIp6ServiceBindingProtocolGuid,
@ -718,12 +741,6 @@ Ping6CreateIpInstance (
goto ON_ERROR; goto ON_ERROR;
} }
if (NetIp6IsUnspecifiedAddr (&Private->SrcAddress)) {
//
// No need to match interface address.
//
break;
} else {
// //
// Ip6config protocol and ip6 service binding protocol are installed // Ip6config protocol and ip6 service binding protocol are installed
// on the same handle. // on the same handle.
@ -776,9 +793,17 @@ Ping6CreateIpInstance (
// Check whether the source address is one of the interface addresses. // Check whether the source address is one of the interface addresses.
// //
for (AddrIndex = 0; AddrIndex < IfInfo->AddressInfoCount; AddrIndex++) { for (AddrIndex = 0; AddrIndex < IfInfo->AddressInfoCount; AddrIndex++) {
Addr = &(IfInfo->AddressInfo[AddrIndex].Address); Addr = &(IfInfo->AddressInfo[AddrIndex].Address);
if (EFI_IP6_EQUAL (&Private->SrcAddress, Addr)) {
if (UnspecifiedSrc) {
if (!NetIp6IsUnspecifiedAddr (Addr) && !NetIp6IsLinkLocalAddr (Addr)) {
//
// Select the interface automatically.
//
CopyMem(&Private->SrcAddress, Addr, sizeof(Private->SrcAddress));
break;
}
} else if (EFI_IP6_EQUAL (&Private->SrcAddress, Addr)) {
// //
// Match a certain interface address. // Match a certain interface address.
// //
@ -792,7 +817,6 @@ Ping6CreateIpInstance (
// //
break; break;
} }
}
FreePool (IfInfo); FreePool (IfInfo);
IfInfo = NULL; IfInfo = NULL;