Updates to Network1 profile commands response output.
Updating Network1 profile commands source code to include command name as a prefix in error message.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Tapan Shah <tapandshah@hp.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16731
6f19259b-4bc3-4df7-8a09-
765794883524
/** @file\r
The implementation for ifcommand shell command.\r
\r
/** @file\r
The implementation for ifcommand shell command.\r
\r
- Copyright (c) 2013 Hewlett-Packard Development Company, L.P.\r
+ Copyright (c) 2013 - 2015, Hewlett-Packard Development Company, L.P.<BR>\r
Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
\r
This program and the accompanying materials\r
Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
\r
This program and the accompanying materials\r
// Validate the parameter for DHCP, two valid forms: eth0 DHCP and eth0 DHCP permanent\r
//\r
if ((Argc != 2) && (Argc!= 3)) {\r
// Validate the parameter for DHCP, two valid forms: eth0 DHCP and eth0 DHCP permanent\r
//\r
if ((Argc != 2) && (Argc!= 3)) {\r
- ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellNetwork1HiiHandle, Temp);\r
+ ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_GEN_PARAM_INV), gShellNetwork1HiiHandle, L"ifconfig", Temp); \r
ASSERT(ShellStatus == SHELL_INVALID_PARAMETER);\r
goto ON_EXIT;\r
}\r
ASSERT(ShellStatus == SHELL_INVALID_PARAMETER);\r
goto ON_EXIT;\r
}\r
\r
PermTemp = PermanentString;\r
if (StringNoCaseCompare(&Temp, &PermTemp) != 0) {\r
\r
PermTemp = PermanentString;\r
if (StringNoCaseCompare(&Temp, &PermTemp) != 0) {\r
- ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_GEN_PROBLEM_OP2), gShellNetwork1HiiHandle, Temp, PermanentString, L"Nothing");\r
+ ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_GEN_PROBLEM_OP2), gShellNetwork1HiiHandle, L"ifconfig", Temp, PermanentString, L"Nothing"); \r
ASSERT(ShellStatus == SHELL_INVALID_PARAMETER);\r
goto ON_EXIT;\r
}\r
ASSERT(ShellStatus == SHELL_INVALID_PARAMETER);\r
goto ON_EXIT;\r
}\r
// eth0 static IP NETMASK GATEWAY permanent \r
//\r
if ((Argc != 5) && (Argc != 6)) {\r
// eth0 static IP NETMASK GATEWAY permanent \r
//\r
if ((Argc != 5) && (Argc != 6)) {\r
- ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellNetwork1HiiHandle, Temp);\r
+ ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_GEN_PARAM_INV), gShellNetwork1HiiHandle, L"ifconfig", Temp); \r
ASSERT(ShellStatus == SHELL_INVALID_PARAMETER);\r
goto ON_EXIT;\r
}\r
ASSERT(ShellStatus == SHELL_INVALID_PARAMETER);\r
goto ON_EXIT;\r
}\r
\r
PermTemp = PermanentString;\r
if (StringNoCaseCompare(&Temp, &PermTemp) != 0) {\r
\r
PermTemp = PermanentString;\r
if (StringNoCaseCompare(&Temp, &PermTemp) != 0) {\r
- ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_GEN_PROBLEM_OP2), gShellNetwork1HiiHandle, Temp, PermanentString, L"Nothing");\r
+ ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_GEN_PROBLEM_OP2), gShellNetwork1HiiHandle, L"ifconfig", Temp, PermanentString, L"Nothing"); \r
ASSERT(ShellStatus == SHELL_INVALID_PARAMETER);\r
goto ON_EXIT;\r
}\r
ASSERT(ShellStatus == SHELL_INVALID_PARAMETER);\r
goto ON_EXIT;\r
}\r
CopyMem (&Config->Ip4Info.RouteTable[1].GatewayAddress, &Gateway.v4, sizeof (EFI_IPv4_ADDRESS));\r
} else {\r
// neither static or DHCP. error.\r
CopyMem (&Config->Ip4Info.RouteTable[1].GatewayAddress, &Gateway.v4, sizeof (EFI_IPv4_ADDRESS));\r
} else {\r
// neither static or DHCP. error.\r
- ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_GEN_TOO_FEW), gShellNetwork1HiiHandle);\r
+ ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_GEN_TOO_FEW), gShellNetwork1HiiHandle, L"ifconfig"); \r
ASSERT(ShellStatus == SHELL_INVALID_PARAMETER);\r
goto ON_EXIT;\r
}\r
ASSERT(ShellStatus == SHELL_INVALID_PARAMETER);\r
goto ON_EXIT;\r
}\r
Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);\r
if (EFI_ERROR(Status)) {\r
if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);\r
if (EFI_ERROR(Status)) {\r
if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellNetwork1HiiHandle, ProblemParam);\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellNetwork1HiiHandle, L"ifconfig", ProblemParam); \r
FreePool(ProblemParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
FreePool(ProblemParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
||(SetOperation && ListOperation)\r
||(ClearOperation && SetOperation)\r
) {\r
||(SetOperation && ListOperation)\r
||(ClearOperation && SetOperation)\r
) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CON), gShellNetwork1HiiHandle);\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CON), gShellNetwork1HiiHandle, L"ifconfig"); \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
} else if (!ClearOperation && !ListOperation && !SetOperation) {\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
} else if (!ClearOperation && !ListOperation && !SetOperation) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellNetwork1HiiHandle);\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellNetwork1HiiHandle, L"ifconfig"); \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
}\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
}\r
if (mIp4ConfigExist) {\r
ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_IFCONFIG_GET_NIC_FAIL), gShellNetwork1HiiHandle, Status);\r
} else {\r
if (mIp4ConfigExist) {\r
ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_IFCONFIG_GET_NIC_FAIL), gShellNetwork1HiiHandle, Status);\r
} else {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROTOCOL_NF), gShellNetwork1HiiHandle, L"gEfiIp4ConfigProtocolGuid", &gEfiIp4ConfigProtocolGuid);\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROTOCOL_NF), gShellNetwork1HiiHandle, L"ifconfig", L"gEfiIp4ConfigProtocolGuid", &gEfiIp4ConfigProtocolGuid); \r
}\r
\r
return SHELL_NOT_FOUND;\r
}\r
\r
return SHELL_NOT_FOUND;\r
Item = ShellCommandLineGetValue (Package, L"-l");\r
\r
if (Item != NULL && CountSubItems(Item) > 1) {\r
Item = ShellCommandLineGetValue (Package, L"-l");\r
\r
if (Item != NULL && CountSubItems(Item) > 1) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellNetwork1HiiHandle, L"-l");\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellNetwork1HiiHandle, L"ifconfig", Item, L"-l"); \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
} \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
} \r
// IfConfig -s eth0 static ip netmask gateway [permanent]\r
//\r
if (Item == NULL || (CountSubItems(Item) < 2) || (CountSubItems(Item) > 6) || (CountSubItems(Item) == 4)) {\r
// IfConfig -s eth0 static ip netmask gateway [permanent]\r
//\r
if (Item == NULL || (CountSubItems(Item) < 2) || (CountSubItems(Item) > 6) || (CountSubItems(Item) == 4)) {\r
- ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellNetwork1HiiHandle, L"-s");\r
+ ShellPrintHiiEx(-1, -1, NULL,STRING_TOKEN (STR_GEN_NO_VALUE), gShellNetwork1HiiHandle, L"ifconfig", L"-s"); \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
}\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
}\r
Item = ShellCommandLineGetValue (Package, L"-c");\r
\r
if (Item != NULL && CountSubItems(Item) > 1) {\r
Item = ShellCommandLineGetValue (Package, L"-c");\r
\r
if (Item != NULL && CountSubItems(Item) > 1) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellNetwork1HiiHandle, L"-c");\r
+ ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_VAL), gShellNetwork1HiiHandle, L"ifconfig", Item, L"-c"); \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
}\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto Done;\r
}\r
/** @file\r
The implementation for Ping shell command.\r
\r
/** @file\r
The implementation for Ping shell command.\r
\r
+ Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>\r
Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>\r
\r
This program and the accompanying materials\r
Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR>\r
\r
This program and the accompanying materials\r
if (NetIp6IsLinkLocalAddr ((EFI_IPv6_ADDRESS*)&Private->DstAddress) &&\r
NetIp6IsUnspecifiedAddr ((EFI_IPv6_ADDRESS*)&Private->SrcAddress) &&\r
(HandleNum > 1)) {\r
if (NetIp6IsLinkLocalAddr ((EFI_IPv6_ADDRESS*)&Private->DstAddress) &&\r
NetIp6IsUnspecifiedAddr ((EFI_IPv6_ADDRESS*)&Private->SrcAddress) &&\r
(HandleNum > 1)) {\r
- ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellNetwork1HiiHandle, mSrcString);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellNetwork1HiiHandle, L"ping", mSrcString); \r
Status = EFI_INVALID_PARAMETER;\r
goto ON_ERROR;\r
}\r
Status = EFI_INVALID_PARAMETER;\r
goto ON_ERROR;\r
}\r
if (PingNetIp4IsLinkLocalAddr ((EFI_IPv4_ADDRESS*)&Private->DstAddress) &&\r
PingNetIp4IsUnspecifiedAddr ((EFI_IPv4_ADDRESS*)&Private->SrcAddress) &&\r
(HandleNum > 1)) {\r
if (PingNetIp4IsLinkLocalAddr ((EFI_IPv4_ADDRESS*)&Private->DstAddress) &&\r
PingNetIp4IsUnspecifiedAddr ((EFI_IPv4_ADDRESS*)&Private->SrcAddress) &&\r
(HandleNum > 1)) {\r
- ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellNetwork1HiiHandle, mSrcString);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellNetwork1HiiHandle, L"ping", mSrcString); \r
Status = EFI_INVALID_PARAMETER;\r
goto ON_ERROR;\r
}\r
Status = EFI_INVALID_PARAMETER;\r
goto ON_ERROR;\r
}\r
//\r
\r
if (HandleIndex == HandleNum) {\r
//\r
\r
if (HandleIndex == HandleNum) {\r
- ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellNetwork1HiiHandle, mSrcString);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_PING_CONFIGD_NIC_NF), gShellNetwork1HiiHandle, L"ping"); \r
Status = EFI_NOT_FOUND;\r
goto ON_ERROR;\r
}\r
Status = EFI_NOT_FOUND;\r
goto ON_ERROR;\r
}\r
} else if (Status == RETURN_NO_MAPPING) {\r
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_PING_NOROUTE_FOUND), gShellNetwork1HiiHandle, mDstString, mSrcString);\r
} else {\r
} else if (Status == RETURN_NO_MAPPING) {\r
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_PING_NOROUTE_FOUND), gShellNetwork1HiiHandle, mDstString, mSrcString);\r
} else {\r
- ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_PING_NETWORK_ERROR), gShellNetwork1HiiHandle, Status);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_PING_NETWORK_ERROR), gShellNetwork1HiiHandle, L"ping", Status); \r
CONST CHAR16 *ValueStr;\r
UINTN NonOptionCount;\r
UINT32 IpChoice;\r
CONST CHAR16 *ValueStr;\r
UINTN NonOptionCount;\r
UINT32 IpChoice;\r
+ CHAR16 *ProblemParam;\r
\r
//\r
// we use IPv6 buffers to hold items... \r
\r
//\r
// we use IPv6 buffers to hold items... \r
IpChoice = PING_IP_CHOICE_IP4;\r
\r
ShellStatus = SHELL_SUCCESS;\r
IpChoice = PING_IP_CHOICE_IP4;\r
\r
ShellStatus = SHELL_SUCCESS;\r
- Status = ShellCommandLineParseEx (PingParamList, &ParamPackage, NULL, TRUE, FALSE);\r
+ Status = ShellCommandLineParseEx (PingParamList, &ParamPackage, &ProblemParam, TRUE, FALSE);\r
if (EFI_ERROR(Status)) {\r
if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellNetwork1HiiHandle);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellNetwork1HiiHandle, L"ping", ProblemParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto ON_EXIT;\r
}\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto ON_EXIT;\r
}\r
// ShellStrToUintn will return 0 when input is 0 or an invalid input string.\r
//\r
if ((SendNumber == 0) || (SendNumber > MAX_SEND_NUMBER)) {\r
// ShellStrToUintn will return 0 when input is 0 or an invalid input string.\r
//\r
if ((SendNumber == 0) || (SendNumber > MAX_SEND_NUMBER)) {\r
- ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellNetwork1HiiHandle, ValueStr);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellNetwork1HiiHandle, L"ping", ValueStr); \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto ON_EXIT;\r
}\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto ON_EXIT;\r
}\r
// ShellStrToUintn will return 0 when input is 0 or an invalid input string.\r
//\r
if ((BufferSize < 16) || (BufferSize > MAX_BUFFER_SIZE)) {\r
// ShellStrToUintn will return 0 when input is 0 or an invalid input string.\r
//\r
if ((BufferSize < 16) || (BufferSize > MAX_BUFFER_SIZE)) {\r
- ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellNetwork1HiiHandle, ValueStr);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellNetwork1HiiHandle, L"ping", ValueStr); \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto ON_EXIT;\r
}\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto ON_EXIT;\r
}\r
Status = NetLibStrToIp4 (ValueStr, (EFI_IPv4_ADDRESS*)&SrcAddress);\r
}\r
if (EFI_ERROR (Status)) {\r
Status = NetLibStrToIp4 (ValueStr, (EFI_IPv4_ADDRESS*)&SrcAddress);\r
}\r
if (EFI_ERROR (Status)) {\r
- ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellNetwork1HiiHandle, ValueStr);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellNetwork1HiiHandle, L"ping", ValueStr); \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto ON_EXIT;\r
}\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto ON_EXIT;\r
}\r
//\r
NonOptionCount = ShellCommandLineGetCount(ParamPackage);\r
if (NonOptionCount < 2) {\r
//\r
NonOptionCount = ShellCommandLineGetCount(ParamPackage);\r
if (NonOptionCount < 2) {\r
- ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellNetwork1HiiHandle);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellNetwork1HiiHandle, L"ping"); \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto ON_EXIT;\r
}\r
if (NonOptionCount > 2) {\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto ON_EXIT;\r
}\r
if (NonOptionCount > 2) {\r
- ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellNetwork1HiiHandle);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellNetwork1HiiHandle, L"ping"); \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto ON_EXIT;\r
}\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto ON_EXIT;\r
}\r
Status = NetLibStrToIp4 (ValueStr, (EFI_IPv4_ADDRESS*)&DstAddress);\r
}\r
if (EFI_ERROR (Status)) {\r
Status = NetLibStrToIp4 (ValueStr, (EFI_IPv4_ADDRESS*)&DstAddress);\r
}\r
if (EFI_ERROR (Status)) {\r
- ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellNetwork1HiiHandle, ValueStr);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellNetwork1HiiHandle, L"ping", ValueStr); \r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto ON_EXIT;\r
}\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
goto ON_EXIT;\r
}\r