Hello Bhupesh, Can you also help to verify the ping6 command for the same case as ping?
Thanks and Best Regards! Jiaxin > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of > Jiaxin Wu > Sent: Friday, April 22, 2016 10:57 AM > To: edk2-devel@lists.01.org > Cc: Carsey, Jaben <jaben.car...@intel.com>; Ye, Ting <ting...@intel.com>; > Fu, Siyuan <siyuan...@intel.com> > Subject: [edk2] [Patch] ShellPkg: Enhance ping6 to select the interface > automatically > > 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. > > Cc: Bhupesh Sharma <bhupesh.sha...@nxp.com> > Cc: Jaben Carsey <jaben.car...@intel.com> > Cc: Ye Ting <ting...@intel.com> > Cc: Fu Siyuan <siyuan...@intel.com> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Jiaxin Wu <jiaxin...@intel.com> > --- > .../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..f129612 100644 > --- a/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ping6.c > +++ b/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ping6.c > @@ -661,22 +661,26 @@ Ping6CreateIpInstance ( { > EFI_STATUS Status; > UINTN HandleIndex; > UINTN HandleNum; > 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; > UINTN IfInfoSize; > EFI_IPv6_ADDRESS *Addr; > UINTN AddrIndex; > > - 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,115 +691,135 @@ 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. > // > if (NetIp6IsLinkLocalAddr (&Private->DstAddress) && > - NetIp6IsUnspecifiedAddr (&Private->SrcAddress) && > - (HandleNum > 1)) { > + UnspecifiedSrc && (HandleNum > 1)) { > 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)) { > + 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; > + } > > - IfInfo = AllocateZeroPool (IfInfoSize); > + IfInfo = AllocateZeroPool (IfInfoSize); > > - if (IfInfo == NULL) { > - Status = EFI_OUT_OF_RESOURCES; > - goto ON_ERROR; > - } > - // > - // Get the interface info. > - // > - Status = Ip6Cfg->GetData ( > - Ip6Cfg, > - Ip6ConfigDataTypeInterfaceInfo, > - &IfInfoSize, > - IfInfo > - ); > + if (IfInfo == NULL) { > + Status = EFI_OUT_OF_RESOURCES; > + goto ON_ERROR; > + } > + // > + // Get the interface info. > + // > + Status = Ip6Cfg->GetData ( > + Ip6Cfg, > + Ip6ConfigDataTypeInterfaceInfo, > + &IfInfoSize, > + IfInfo > + ); > > - if (EFI_ERROR (Status)) { > - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > (STR_PING6_IP6CFG_GETDATA), gShellNetwork2HiiHandle, Status); > - goto ON_ERROR; > - } > - // > - // Check whether the source address is one of the interface addresses. > - // > - for (AddrIndex = 0; AddrIndex < IfInfo->AddressInfoCount; AddrIndex++) > { > - > - Addr = &(IfInfo->AddressInfo[AddrIndex].Address); > - if (EFI_IP6_EQUAL (&Private->SrcAddress, Addr)) { > - // > - // Match a certain interface address. > - // > - break; > - } > - } > + if (EFI_ERROR (Status)) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > (STR_PING6_IP6CFG_GETDATA), gShellNetwork2HiiHandle, Status); > + goto ON_ERROR; > + } > + // > + // Check whether the source address is one of the interface addresses. > + // > + for (AddrIndex = 0; AddrIndex < IfInfo->AddressInfoCount; > + AddrIndex++) { > + > + Addr = &(IfInfo->AddressInfo[AddrIndex].Address); > > - if (AddrIndex < IfInfo->AddressInfoCount) { > + if (UnspecifiedSrc && !NetIp6IsUnspecifiedAddr (Addr) > && !NetIp6IsLinkLocalAddr (Addr)) { > + CopyMem(&Private->SrcAddress, Addr, sizeof(Private->SrcAddress)); > + break; > + } > + > + if (!UnspecifiedSrc && EFI_IP6_EQUAL (&Private->SrcAddress, > + Addr)) { > // > - // Found a nic handle with right interface address. > + // Match a certain interface address. > // > break; > } > } > > + if (AddrIndex < IfInfo->AddressInfoCount) { > + // > + // Found a nic handle with right interface address. > + // > + break; > + } > + > FreePool (IfInfo); > IfInfo = NULL; > } > // > // No exact interface address matched. > -- > 1.9.5.msysgit.1 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
