From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.20; helo=mga02.intel.com; envelope-from=jiaxin.wu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 08E9C21B00DC4 for ; Tue, 14 Nov 2017 22:01:21 -0800 (PST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Nov 2017 22:05:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,398,1505804400"; d="scan'208";a="2434672" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga003.jf.intel.com with ESMTP; 14 Nov 2017 22:05:29 -0800 Received: from FMSMSX109.amr.corp.intel.com (10.18.116.9) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 14 Nov 2017 22:05:29 -0800 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx109.amr.corp.intel.com (10.18.116.9) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 14 Nov 2017 22:05:29 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.213]) by shsmsx102.ccr.corp.intel.com ([169.254.2.175]) with mapi id 14.03.0319.002; Wed, 15 Nov 2017 14:05:26 +0800 From: "Wu, Jiaxin" To: "Fu, Siyuan" , "edk2-devel@lists.01.org" CC: "Ye, Ting" , "Ni, Ruiyu" Thread-Topic: [Patch] ShellPkg: Add error message if failed to place receive token in ping command. Thread-Index: AQHTXcebeMwP4sXvkU6VAfQV5rUiJqMU8voQ Date: Wed, 15 Nov 2017 06:05:25 +0000 Message-ID: <895558F6EA4E3B41AC93A00D163B7274163470B7@SHSMSX103.ccr.corp.intel.com> References: <20171115040953.19568-1-siyuan.fu@intel.com> In-Reply-To: <20171115040953.19568-1-siyuan.fu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYTkwOTM1YWItOWY2NC00OGEyLTkxNmEtNGJlMGQ4YzQ4Y2MxIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE2LjUuOS4zIiwiVHJ1c3RlZExhYmVsSGFzaCI6IlwvRkhaSTdPQ091T1VPTTMrYnpFYWZPZU8ySUE3XC92c0hTOWNOZ1JKT0N6ND0ifQ== x-ctpclassification: CTP_IC dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] ShellPkg: Add error message if failed to place receive token in ping command. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Nov 2017 06:01:22 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Wu Jiaxin > -----Original Message----- > From: Fu, Siyuan > Sent: Wednesday, November 15, 2017 12:10 PM > To: edk2-devel@lists.01.org > Cc: Wu, Jiaxin ; Ye, Ting ; Ni, > Ruiyu > Subject: [Patch] ShellPkg: Add error message if failed to place receive t= oken > in ping command. >=20 > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Fu Siyuan > Cc: Wu Jiaxin > Cc: Ye Ting > Cc: Ruiyu Ni > --- > ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c | 9 > +++++++-- > .../UefiShellNetwork1CommandsLib.uni | 1 + > ShellPkg/Library/UefiShellNetwork2CommandsLib/Ping6.c | 9 > +++++++-- > .../UefiShellNetwork2CommandsLib.uni | 1 + > 4 files changed, 16 insertions(+), 4 deletions(-) >=20 > diff --git a/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c > b/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c > index ca5c22a..10d291c 100644 > --- a/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c > +++ b/ShellPkg/Library/UefiShellNetwork1CommandsLib/Ping.c > @@ -2,7 +2,7 @@ > The implementation for Ping shell command. >=20 > (C) Copyright 2015 Hewlett-Packard Development Company, L.P.
> - Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.
> + Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.
> (C) Copyright 2016 Hewlett Packard Enterprise Development LP
>=20 > This program and the accompanying materials > @@ -629,6 +629,7 @@ ON_EXIT: > Status =3D Private->ProtocolPointers.Receive (Private->IpProtocol, &= Private- > >RxToken); >=20 > if (EFI_ERROR (Status)) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_PING_RECEIVE), > gShellNetwork1HiiHandle, Status); > Private->Status =3D EFI_ABORTED; > } > } else { > @@ -828,7 +829,11 @@ Ping6ReceiveEchoReply ( >=20 > Private->RxToken.Status =3D EFI_NOT_READY; >=20 > - return (Private->ProtocolPointers.Receive (Private->IpProtocol, &Priva= te- > >RxToken)); > + Status =3D Private->ProtocolPointers.Receive (Private->IpProtocol, &Pr= ivate- > >RxToken); > + if (EFI_ERROR (Status)) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_PING_RECEIVE), > gShellNetwork1HiiHandle, Status); > + } > + return Status; > } >=20 > /** > diff --git > a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1Com > mandsLib.uni > b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1Com > mandsLib.uni > index 70c3465..7a43ad5 100644 > --- > a/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1Com > mandsLib.uni > +++ > b/ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1Com > mandsLib.uni > @@ -50,6 +50,7 @@ > #string STR_PING_CONFIG #language en-US "Config %r\r\n" > #string STR_PING_GETMODE #language en-US > "GetModeData %r\r\n" > #string STR_PING_GETDATA #language en-US "GetData %r\r\n" > +#string STR_PING_RECEIVE #language en-US "Receive %r\r\n" > #string STR_PING_SEND_REQUEST #language en-US "Echo request > sequence %d did not complete successfully.\r\n" > #string STR_PING_NOSOURCE_INDO #language en-US "There are no > sources in %s's multicast domain.\r\n" > #string STR_PING_NETWORK_ERROR #language en-US "%H%s%N: > Network function failed with %r\r\n" > diff --git a/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ping6.c > b/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ping6.c > index 2961fd7..b784696 100644 > --- a/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ping6.c > +++ b/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ping6.c > @@ -1,7 +1,7 @@ > /** @file > The implementation for Ping6 application. >=20 > - Copyright (c) 2016, Intel Corporation. All rights reserved.
> + Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.
>=20 > This program and the accompanying materials > are licensed and made available under the terms and conditions of the = BSD > License > @@ -474,6 +474,7 @@ ON_EXIT: > Status =3D Private->Ip6->Receive (Private->Ip6, RxToken); >=20 > if (EFI_ERROR (Status)) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_PING6_IP6_RECEIVE= ), > gShellNetwork2HiiHandle, Status); > Private->Status =3D EFI_ABORTED; > } > } else { > @@ -658,7 +659,11 @@ Ping6OnReceiveEchoReply ( >=20 > Private->RxToken.Status =3D EFI_NOT_READY; >=20 > - return Private->Ip6->Receive (Private->Ip6, &Private->RxToken); > + Status =3D Private->Ip6->Receive (Private->Ip6, &Private->RxToken); > + if (EFI_ERROR (Status)) { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_PING6_IP6_RECEIVE), > gShellNetwork2HiiHandle, Status); > + } > + return Status; > } >=20 > /** > diff --git > a/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Com > mandsLib.uni > b/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Com > mandsLib.uni > index 2b2327b..9a535ad 100644 > --- > a/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Com > mandsLib.uni > +++ > b/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2Com > mandsLib.uni > @@ -33,6 +33,7 @@ > #string STR_PING6_INVALID_BUFFER_SIZE #language en-US "%Ping6: > Invalid buffer size, %s\r\n" > #string STR_PING6_INVALID_SOURCE #language en-US "%Ping6: > Require source interface option\r\n" > #string STR_PING6_IP6_CONFIG #language en-US "%Ping6: The > process of Ip6 Configure %r\r\n" > +#string STR_PING6_IP6_RECEIVE #language en-US "%Ping6: Pla= ce > the receive token %r\r\n" > #string STR_PING6_IP6CFG_GETDATA #language en-US "%Ping6: Get > data of the interface information %r\r\n" > #string STR_PING6_SEND_REQUEST #language en-US "Echo reques= t > sequence %d fails.\r\n" > #string STR_PING6_CONFIGD_NIC_NF #language en-US "%Ping6: No > configured interfaces were found.\r\n" > -- > 1.9.5.msysgit.1