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

ifconfig: Support prefixlen/CIDR for IPv6

Browse Source 
Linux:
ifconfig eth0 [inet6] add 2022::2/96

FreeBSD:
ifconfig eth0 inet6 2022::2/96
ifconfig eth0 inet6 2022::2 prefixlen 96

NuttX newly supported:
ifconfig eth0 inet6 [add] 2022::2/96
ifconfig eth0 inet6 [add] 2022::2 prefixlen 96

Ref:
https://man7.org/linux/man-pages/man8/ifconfig.8.html
https://www.freebsd.org/cgi/man.cgi?ifconfig

Signed-off-by: Zhe Weng <wengzhe@xiaomi.com>
This commit is contained in:
Zhe Weng 2022-12-28 18:38:42 +08:00 committed by Xiang Xiao
parent 8f10dde6ad
commit 2ad05e3062
3 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netutils/netlib/netlib_prefix2ipv6netmask.c
View File

@ -69,7 +69,7 @@ void netlib_prefix2ipv6netmask(uint8_t preflen, FAR struct in6_addr *netmask)
* 1..6 7..2 3..8 9..4 5..0 1..6 7..2 3..8 * 1..6 7..2 3..8 9..4 5..0 1..6 7..2 3..8
*/ */
for (i = 0; i < 7; i++) for (i = 0; i < 8; i++)
{ {
/* bit = {0, 16, 32, 48, 64, 80, 96, 112} */ /* bit = {0, 16, 32, 48, 64, 80, 96, 112} */
@ -88,12 +88,12 @@ void netlib_prefix2ipv6netmask(uint8_t preflen, FAR struct in6_addr *netmask)
else else
{ {
/* Eg. preflen = 38, bit = {32} /* Eg. preflen = 38, bit = {32}
* bit - preflen = 6 * preflen - bit = 6
* make = 0xffff << (16-6) * make = 0xffff << (16-6)
* = 0xfc00 * = 0xfc00
*/ */
mask[i] = 0xffff << (16 - (bit - preflen)); mask[i] = htons(0xffff << (16 - (preflen - bit)));
} }
} }
else else

2
nshlib/README.md
View File

@ -670,7 +670,7 @@ system image.
Dump data in hexadecimal format from a file or character device. Dump data in hexadecimal format from a file or character device.
- `ifconfig [nic_name [address_family] [<ip-address>|dhcp]] [dr|gw|gateway <dr-address>] [netmask <net-mask>] [dns <dns-address>] [hw <hw-mac>]` - `ifconfig [nic_name [address_family] [<ip-address>|dhcp]] [dr|gw|gateway <dr-address>] [netmask <net-mask>] [prefixlen <len>] [dns <dns-address>] [hw <hw-mac>]`
Show the current configuration of the network, for example: Show the current configuration of the network, for example:

30
nshlib/nsh_netcmds.c
View File

@ -559,6 +559,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
struct in6_addr addr6; struct in6_addr addr6;
struct in6_addr gip6 = IN6ADDR_ANY_INIT; struct in6_addr gip6 = IN6ADDR_ANY_INIT;
FAR char *preflen = NULL;
#endif #endif
int i; int i;
FAR char *ifname = NULL; FAR char *ifname = NULL;
@ -665,6 +666,21 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
#endif #endif
} }
#ifdef CONFIG_NET_IPv6
else if (!strcmp(tmp, "prefixlen"))
{
if (argc - 1 >= i + 1)
{
preflen = argv[i + 1];
i++;
}
else
{
badarg = true;
}
}
#endif
#ifdef HAVE_HWADDR #ifdef HAVE_HWADDR
/* REVISIT: How will we handle Ethernet and SLIP together? */ /* REVISIT: How will we handle Ethernet and SLIP together? */
@ -753,6 +769,15 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
{ {
/* REVISIT: Should DHCPC check be used here too? */ /* REVISIT: Should DHCPC check be used here too? */
if ((tmp = strchr(hostip, '/')) != NULL)
{
*tmp = 0;
if (preflen == NULL)
{
preflen = tmp + 1;
}
}
ninfo("Host IP: %s\n", hostip); ninfo("Host IP: %s\n", hostip);
inet_pton(AF_INET6, hostip, &addr6); inet_pton(AF_INET6, hostip, &addr6);
} }
@ -856,6 +881,11 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
ninfo("Netmask: %s\n", mask); ninfo("Netmask: %s\n", mask);
inet_pton(AF_INET6, mask, &addr6); inet_pton(AF_INET6, mask, &addr6);
} }
else if (preflen != NULL)
{
ninfo("Prefixlen: %s\n", preflen);
netlib_prefix2ipv6netmask(atoi(preflen), &addr6);
}
else else
{ {
ninfo("Netmask: Default\n"); ninfo("Netmask: Default\n");