sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nshlib/ifconfig: Add error print for inet_pton fail

Browse Source 
> ifconfig wlan0 inet6 add fb
nsh: ifconfig: argument invalid

Signed-off-by: Zhe Weng <wengzhe@xiaomi.com>
This commit is contained in:
Zhe Weng 2023-12-12 19:50:18 +08:00 committed by Xiang Xiao
parent 7768e72d94
commit b7c5bdbdc9
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
nshlib/nsh_netcmds.c
View File

@ -812,7 +812,12 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
} }
ninfo("Host IP: %s\n", hostip); ninfo("Host IP: %s\n", hostip);
inet_pton(AF_INET6, hostip, &addr6); ret = inet_pton(AF_INET6, hostip, &addr6);
if (ret <= 0)
{
nsh_error(vtbl, g_fmtarginvalid, argv[0]);
return ERROR;
}
} }
#ifndef CONFIG_NETDEV_MULTIPLE_IPv6 #ifndef CONFIG_NETDEV_MULTIPLE_IPv6
@ -870,7 +875,12 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
if (mask != NULL) if (mask != NULL)
{ {
ninfo("Netmask: %s\n", mask); ninfo("Netmask: %s\n", mask);
inet_pton(AF_INET6, mask, &mask6); ret = inet_pton(AF_INET6, mask, &mask6);
if (ret <= 0)
{
nsh_error(vtbl, g_fmtarginvalid, argv[0]);
return ERROR;
}
} }
else if (preflen != NULL) else if (preflen != NULL)
{ {
@ -941,7 +951,12 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
if (gwip != NULL) if (gwip != NULL)
{ {
ninfo("Gateway: %s\n", gwip); ninfo("Gateway: %s\n", gwip);
inet_pton(AF_INET6, gwip, &addr6); ret = inet_pton(AF_INET6, gwip, &addr6);
if (ret <= 0)
{
nsh_error(vtbl, g_fmtarginvalid, argv[0]);
return ERROR;
}
netlib_set_dripv6addr(ifname, &addr6); netlib_set_dripv6addr(ifname, &addr6);
gip6 = addr6; gip6 = addr6;
@ -988,7 +1003,12 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
if (dns != NULL) if (dns != NULL)
{ {
ninfo("DNS: %s\n", dns); ninfo("DNS: %s\n", dns);
inet_pton(AF_INET6, dns, &addr6); ret = inet_pton(AF_INET6, dns, &addr6);
if (ret <= 0)
{
nsh_error(vtbl, g_fmtarginvalid, argv[0]);
return ERROR;
}
} }
else else
{ {