sys/shell/gnrc_netif: print v6 addresses based on ipv6 module

yarrick · yarrick · commit e22fe428b4da · 2022-05-06T21:40:47.000+02:00
To support lwIP better (dont require gnrc_ipv6)

Also don't require IPv6 for printing link type

With this sc_gnrc_netif can compile and work when using lwIP
(with l2util module added):

```
&gt; ifconfig
Iface  ET1  HWaddr: 24:0A:C4:E6:0E:9C  Channel: 6  Link: up
          L2-PDU:1500  Source address length: 6
          Link type: wireless
          inet6 addr: fe80::260a:c4ff:fee6:e9c  scope: link
          inet6 addr: 2001:db8::260a:c4ff:fee6:e9c  scope: global

Iface  ET0  HWaddr: 24:0A:C4:E6:0E:9F  Link: up
          L2-PDU:1500  Source address length: 6
          Link type: wired
          inet6 addr: fe80::260a:c4ff:fee6:e9f  scope: link
          inet6 addr: 2001:db8::260a:c4ff:fee6:e9f  scope: global

&gt;
```
diff --git a/sys/shell/commands/sc_gnrc_netif.c b/sys/shell/commands/sc_gnrc_netif.c
@@ -542,7 +542,7 @@ static unsigned _netif_list_flag(netif_t *iface, netopt_t opt, char *str,
     return line_thresh;
 }
 
-#ifdef MODULE_GNRC_IPV6
+#ifdef MODULE_IPV6
 static void _netif_list_ipv6(ipv6_addr_t *addr, uint8_t flags)
 {
     char addr_str[IPV6_ADDR_MAX_STR_LEN];
@@ -562,6 +562,7 @@ static void _netif_list_ipv6(ipv6_addr_t *addr, uint8_t flags)
     else {
         printf("unknown");
     }
+#if MODULE_GNRC_IPV6
     if (flags & GNRC_NETIF_IPV6_ADDRS_FLAGS_ANYCAST) {
         printf(" [anycast]");
     }
@@ -582,6 +583,7 @@ static void _netif_list_ipv6(ipv6_addr_t *addr, uint8_t flags)
                 break;
         }
     }
+#endif
     _newline(0U, _LINE_THRESHOLD);
 }
 
@@ -598,7 +600,7 @@ static void _netif_list_groups(ipv6_addr_t *addr)
 
 static void _netif_list(netif_t *iface)
 {
-#ifdef MODULE_GNRC_IPV6
+#ifdef MODULE_IPV6
     ipv6_addr_t ipv6_addrs[CONFIG_GNRC_NETIF_IPV6_ADDRS_NUMOF];
     ipv6_addr_t ipv6_groups[GNRC_NETIF_IPV6_GROUPS_NUMOF];
 #endif
@@ -853,11 +855,11 @@ static void _netif_list(netif_t *iface)
         line_thresh++;
     }
     line_thresh = _newline(0U, line_thresh);
-#ifdef MODULE_GNRC_IPV6
     printf("Link type: %s",
            (netif_get_opt(iface, NETOPT_IS_WIRED, 0, &u16, sizeof(u16)) > 0) ?
             "wired" : "wireless");
     _newline(0U, ++line_thresh);
+#ifdef MODULE_IPV6
     res = netif_get_opt(iface, NETOPT_IPV6_ADDR, 0, ipv6_addrs,
                           sizeof(ipv6_addrs));
     if (res >= 0) {

Original file line number	Diff line number	Diff line change
`@@ -542,7 +542,7 @@ static unsigned _netif_list_flag(netif_t iface, netopt_t opt, char str,`
`542`	`542`	`return line_thresh;`
`543`	`543`	`}`
`544`	`544`
`545`		`-#ifdef MODULE_GNRC_IPV6`
	`545`	`+#ifdef MODULE_IPV6`
`546`	`546`	`static void _netif_list_ipv6(ipv6_addr_t *addr, uint8_t flags)`
`547`	`547`	`{`
`548`	`548`	`char addr_str[IPV6_ADDR_MAX_STR_LEN];`
`@@ -562,6 +562,7 @@ static void _netif_list_ipv6(ipv6_addr_t *addr, uint8_t flags)`
`562`	`562`	`else {`
`563`	`563`	`printf("unknown");`
`564`	`564`	`}`
	`565`	`+#if MODULE_GNRC_IPV6`
`565`	`566`	`if (flags & GNRC_NETIF_IPV6_ADDRS_FLAGS_ANYCAST) {`
`566`	`567`	`printf(" [anycast]");`
`567`	`568`	`}`
`@@ -582,6 +583,7 @@ static void _netif_list_ipv6(ipv6_addr_t *addr, uint8_t flags)`
`582`	`583`	`break;`
`583`	`584`	`}`
`584`	`585`	`}`
	`586`	`+#endif`
`585`	`587`	`_newline(0U, _LINE_THRESHOLD);`
`586`	`588`	`}`
`587`	`589`
`@@ -598,7 +600,7 @@ static void _netif_list_groups(ipv6_addr_t *addr)`
`598`	`600`
`599`	`601`	`static void _netif_list(netif_t *iface)`
`600`	`602`	`{`
`601`		`-#ifdef MODULE_GNRC_IPV6`
	`603`	`+#ifdef MODULE_IPV6`
`602`	`604`	`ipv6_addr_t ipv6_addrs[CONFIG_GNRC_NETIF_IPV6_ADDRS_NUMOF];`
`603`	`605`	`ipv6_addr_t ipv6_groups[GNRC_NETIF_IPV6_GROUPS_NUMOF];`
`604`	`606`	`#endif`
`@@ -853,11 +855,11 @@ static void _netif_list(netif_t *iface)`
`853`	`855`	`line_thresh++;`
`854`	`856`	`}`
`855`	`857`	`line_thresh = _newline(0U, line_thresh);`
`856`		`-#ifdef MODULE_GNRC_IPV6`
`857`	`858`	`printf("Link type: %s",`
`858`	`859`	`(netif_get_opt(iface, NETOPT_IS_WIRED, 0, &u16, sizeof(u16)) > 0) ?`
`859`	`860`	`"wired" : "wireless");`
`860`	`861`	`_newline(0U, ++line_thresh);`
	`862`	`+#ifdef MODULE_IPV6`
`861`	`863`	`res = netif_get_opt(iface, NETOPT_IPV6_ADDR, 0, ipv6_addrs,`
`862`	`864`	`sizeof(ipv6_addrs));`
`863`	`865`	`if (res >= 0) {`