Re: [edk2] [PATCH v2] ShellPkg: Enhance ping6 to select the interface automatically
Reviewed-by: Fu Siyuan
> -Original Message-
> From: Wu, Jiaxin
> Sent: Thursday, April 28, 2016 4:18 PM
> To: edk2-devel@lists.01.org
> Cc: Bhupesh Sharma ; Carsey, Jaben
> ; Ye, Ting ; Fu, Siyuan
>
> Subject: [PATCH v2] ShellPkg: Enhance ping6 to select the interface
> automatically
>
> 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
> Cc: Jaben Carsey
> Cc: Ye Ting
> Cc: Fu Siyuan
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Jiaxin Wu
> ---
> .../Library/UefiShellNetwork2CommandsLib/Ping6.c | 166 -
>
> 1 file changed, 95 insertions(+), 71 deletions(-)
>
> diff --git a/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ping6.c
> b/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ping6.c
> index af7d08f..e4ae977 100644
> --- a/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ping6.c
> +++ b/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ping6.c
> @@ -661,22 +661,26 @@ Ping6CreateIpInstance (
> {
>EFI_STATUS Status;
>UINTNHandleIndex;
>UINTNHandleNum;
>EFI_HANDLE *HandleBuffer;
> + BOOLEAN UnspecifiedSrc;
> + BOOLEAN MediaPresent;
>EFI_SERVICE_BINDING_PROTOCOL *Ip6Sb;
>EFI_IP6_CONFIG_PROTOCOL *Ip6Cfg;
>EFI_IP6_CONFIG_DATA Ip6Config;
>EFI_IP6_CONFIG_INTERFACE_INFO*IfInfo;
>UINTNIfInfoSize;
>EFI_IPv6_ADDRESS *Addr;
>UINTNAddrIndex;
>
> - HandleBuffer = NULL;
> - Ip6Sb= NULL;
> - IfInfo = NULL;
> - IfInfoSize = 0;
> + HandleBuffer = NULL;
> + UnspecifiedSrc= FALSE;
> + MediaPresent = TRUE;
> + Ip6Sb = NULL;
> + IfInfo= NULL;
> + IfInfoSize= 0;
>
>//
>// Locate all the handles with ip6 service binding protocol.
>//
>Status = gBS->LocateHandleBuffer (
> @@ -687,113 +691,133 @@ Ping6CreateIpInstance (
>&HandleBuffer
>);
>if (EFI_ERROR (Status) || (HandleNum == 0)) {
> return EFI_ABORTED;
>}
> +
> + if (NetIp6IsUnspecifiedAddr (&Private->SrcAddress)) {
> +//
> +// SrcAddress is unspecified. So, both connected and configured interface
> will be automatic selected.
> +//
> +UnspecifiedSrc = TRUE;
> + }
> +
>//
> - // Source address is required when pinging a link-local address on multi-
> - // interfaces host.
> + // Source address is required when pinging a link-local address.
>//
> - if (NetIp6IsLinkLocalAddr (&Private->DstAddress) &&
> - NetIp6IsUnspecifiedAddr (&Private->SrcAddress) &&
> - (HandleNum > 1)) {
> + if (NetIp6IsLinkLocalAddr (&Private->DstAddress) && UnspecifiedSrc) {
> ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN
> (STR_PING6_INVALID_SOURCE), gShellNetwork2HiiHandle);
> Status = EFI_INVALID_PARAMETER;
> goto ON_ERROR;
>}
> +
>//
>// For each ip6 protocol, check interface addresses list.
>//
>for (HandleIndex = 0; HandleIndex < HandleNum; HandleIndex++) {
>
> Ip6Sb = NULL;
> IfInfo = NULL;
> IfInfoSize = 0;
>
> +if (UnspecifiedSrc) {
> + //
> + // Check media.
> + //
> + NetLibDetectMedia (HandleBuffer[HandleIndex], &MediaPresent);
> + if (!MediaPresent) {
> +//
> +// Skip this one.
> +//
> +continue;
> + }
> +}
> +
> Status = gBS->HandleProtocol (
> HandleBuffer[HandleIndex],
> &gEfiIp6ServiceBindingProtocolGuid,
> (VOID **) &Ip6Sb
> );
> if (EFI_ERROR (Status)) {
>goto ON_ERROR;
> }
>
> -if (NetIp6IsUnspecifiedAddr (&Private->SrcAddress)) {
> - //
> - // No need to match interface address.
> - //
> - break;
> -} else {
> - //
> - // Ip6config protocol and ip6 service binding protocol are installed
> - // on the same handle.
> - //
> - Status = gBS->HandleProtocol (
> - HandleBuffer[HandleIndex],
> - &gEfiIp6ConfigProtocolGuid,
> - (VOID **) &Ip6Cfg
> - );
> +//
> +// Ip6config protocol and ip6 service binding protocol are installed
> +// on the same handle.
> +//
> +Status = gBS->HandleProtocol (
> +HandleBuffer[HandleIndex],
> +&gEfiIp6ConfigProtocolGuid,
> +(VOID **) &Ip6Cfg
> +);
>
> - if
[edk2] [PATCH v2] ShellPkg: Enhance ping6 to select the interface automatically
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
Cc: Jaben Carsey
Cc: Ye Ting
Cc: Fu Siyuan
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiaxin Wu
---
.../Library/UefiShellNetwork2CommandsLib/Ping6.c | 166 -
1 file changed, 95 insertions(+), 71 deletions(-)
diff --git a/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ping6.c
b/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ping6.c
index af7d08f..e4ae977 100644
--- a/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ping6.c
+++ b/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ping6.c
@@ -661,22 +661,26 @@ Ping6CreateIpInstance (
{
EFI_STATUS Status;
UINTNHandleIndex;
UINTNHandleNum;
EFI_HANDLE *HandleBuffer;
+ BOOLEAN UnspecifiedSrc;
+ BOOLEAN MediaPresent;
EFI_SERVICE_BINDING_PROTOCOL *Ip6Sb;
EFI_IP6_CONFIG_PROTOCOL *Ip6Cfg;
EFI_IP6_CONFIG_DATA Ip6Config;
EFI_IP6_CONFIG_INTERFACE_INFO*IfInfo;
UINTNIfInfoSize;
EFI_IPv6_ADDRESS *Addr;
UINTNAddrIndex;
- HandleBuffer = NULL;
- Ip6Sb= NULL;
- IfInfo = NULL;
- IfInfoSize = 0;
+ HandleBuffer = NULL;
+ UnspecifiedSrc= FALSE;
+ MediaPresent = TRUE;
+ Ip6Sb = NULL;
+ IfInfo= NULL;
+ IfInfoSize= 0;
//
// Locate all the handles with ip6 service binding protocol.
//
Status = gBS->LocateHandleBuffer (
@@ -687,113 +691,133 @@ Ping6CreateIpInstance (
&HandleBuffer
);
if (EFI_ERROR (Status) || (HandleNum == 0)) {
return EFI_ABORTED;
}
+
+ if (NetIp6IsUnspecifiedAddr (&Private->SrcAddress)) {
+//
+// SrcAddress is unspecified. So, both connected and configured interface
will be automatic selected.
+//
+UnspecifiedSrc = TRUE;
+ }
+
//
- // Source address is required when pinging a link-local address on multi-
- // interfaces host.
+ // Source address is required when pinging a link-local address.
//
- if (NetIp6IsLinkLocalAddr (&Private->DstAddress) &&
- NetIp6IsUnspecifiedAddr (&Private->SrcAddress) &&
- (HandleNum > 1)) {
+ if (NetIp6IsLinkLocalAddr (&Private->DstAddress) && UnspecifiedSrc) {
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_PING6_INVALID_SOURCE),
gShellNetwork2HiiHandle);
Status = EFI_INVALID_PARAMETER;
goto ON_ERROR;
}
+
//
// For each ip6 protocol, check interface addresses list.
//
for (HandleIndex = 0; HandleIndex < HandleNum; HandleIndex++) {
Ip6Sb = NULL;
IfInfo = NULL;
IfInfoSize = 0;
+if (UnspecifiedSrc) {
+ //
+ // Check media.
+ //
+ NetLibDetectMedia (HandleBuffer[HandleIndex], &MediaPresent);
+ if (!MediaPresent) {
+//
+// Skip this one.
+//
+continue;
+ }
+}
+
Status = gBS->HandleProtocol (
HandleBuffer[HandleIndex],
&gEfiIp6ServiceBindingProtocolGuid,
(VOID **) &Ip6Sb
);
if (EFI_ERROR (Status)) {
goto ON_ERROR;
}
-if (NetIp6IsUnspecifiedAddr (&Private->SrcAddress)) {
- //
- // No need to match interface address.
- //
- break;
-} else {
- //
- // Ip6config protocol and ip6 service binding protocol are installed
- // on the same handle.
- //
- Status = gBS->HandleProtocol (
- HandleBuffer[HandleIndex],
- &gEfiIp6ConfigProtocolGuid,
- (VOID **) &Ip6Cfg
- );
+//
+// Ip6config protocol and ip6 service binding protocol are installed
+// on the same handle.
+//
+Status = gBS->HandleProtocol (
+HandleBuffer[HandleIndex],
+&gEfiIp6ConfigProtocolGuid,
+(VOID **) &Ip6Cfg
+);
- if (EFI_ERROR (Status)) {
-goto ON_ERROR;
- }
- //
- // Get the interface information size.
- //
- Status = Ip6Cfg->GetData (
- Ip6Cfg,
- Ip6ConfigDataTypeInterfaceInfo,
- &IfInfoSize,
- NULL
- );
-
- if (Status != EFI_BUFFER_TOO_SMALL) {
-ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN
(STR_PING6_IP6CFG_GETDATA), gShellNetwork2HiiHandle, Status);
-goto ON_ERROR;
- }
+if (EFI_ERROR (Status))
