Skip to content

Commit

Permalink
sys/shell/lwip: fix coding style using uncrustify with RIOT rules
Browse files Browse the repository at this point in the history
  • Loading branch information
krzysztof-cabaj committed Apr 2, 2024
1 parent d279024 commit 67abda0
Showing 1 changed file with 43 additions and 42 deletions.
85 changes: 43 additions & 42 deletions sys/shell/cmds/lwip_netif.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,20 @@ static void _netif_list_ipv6(struct netif *netif, int addr_index, uint8_t state)
printf(" scope: ");
if (ip6_addr_isglobal(netif_ip6_addr(netif, addr_index))) {
printf("global");
} else if (ip6_addr_islinklocal(netif_ip6_addr(netif, addr_index))) {
}
else if (ip6_addr_islinklocal(netif_ip6_addr(netif, addr_index))) {
printf("link");
} else if (ip6_addr_issitelocal(netif_ip6_addr(netif, addr_index))) {
}
else if (ip6_addr_issitelocal(netif_ip6_addr(netif, addr_index))) {
printf("site");
} else {
}
else {
printf("unknown");
}
printf(" state:");
if (ip6_addr_istentative(state)) {
printf(" tentative (%u probes send)",
(unsigned)(state & IP6_ADDR_TENTATIVE_COUNT_MASK));
(unsigned)(state & IP6_ADDR_TENTATIVE_COUNT_MASK));
}
if (ip6_addr_isvalid(state)) {
printf(" valid");
Expand All @@ -73,20 +76,21 @@ static void _netif_list(struct netif *netif)
char name[CONFIG_NETIF_NAMELENMAX];
struct netdev *dev = netif->state;
lwip_netif_t *compat = container_of(netif, lwip_netif_t, lwip_netif);

netif_get_name(&compat->common_netif, name);
printf("Iface %s HWaddr: ", name);
for (i = 0; i < netif->hwaddr_len; i++) {
printf("%02x", netif->hwaddr[i]);
if ((i+1) < netif->hwaddr_len) {
if ((i + 1) < netif->hwaddr_len) {
printf(":");
}
}
printf(" Link: %s State: %s\n",
netif_is_link_up(netif) ? "up" : "down",
netif_is_up(netif) ? "up" : "down");
netif_is_link_up(netif) ? "up" : "down",
netif_is_up(netif) ? "up" : "down");
printf(" Link type: %s\n",
(dev->driver->get(dev, NETOPT_IS_WIRED, &i, sizeof(i)) > 0) ?
"wired" : "wireless");
(dev->driver->get(dev, NETOPT_IS_WIRED, &i, sizeof(i)) > 0) ?
"wired" : "wireless");
#ifdef MODULE_LWIP_IPV4
printf(" inet addr: ");
ip_addr_debug_print(LWIP_DBG_ON, netif_ip_addr4(netif));
Expand Down Expand Up @@ -125,12 +129,11 @@ static void _lwip_prefix_to_subnet(int prefix, ip4_addr_t *subnet)
uint32_t value = 0;
uint32_t tmp = 0x80000000;

for (int i = 0; i < prefix; i++)
{
for (int i = 0; i < prefix; i++) {
value += tmp;
tmp = tmp >> 1;
tmp = tmp >> 1;
}
subnet->addr = htonl(value);
subnet->addr = htonl(value);
}

static int _lwip_netif_add4(int argc, char **argv)
Expand All @@ -141,10 +144,10 @@ static int _lwip_netif_add4(int argc, char **argv)
int prefix;

if (argc != 4 && argc != 6) {
printf("error: invalid number of parameters\n");
_usage_add4(argv[0]);
return 1;
}
printf("error: invalid number of parameters\n");
_usage_add4(argv[0]);
return 1;
}

sys_lock_tcpip_core();
iface = netif_find(argv[2]);
Expand All @@ -163,50 +166,50 @@ static int _lwip_netif_add4(int argc, char **argv)
}

ip_ptr++;
}
}
ip_ptr = argv[3];

if (prefix_ptr == NULL) {
printf("error: invalid IPv4 prefix notation\n");
_usage_add4(argv[0]);
sys_unlock_tcpip_core();
return 1;
}
}

if (inet_pton(AF_INET, ip_ptr, &ip.addr) != 1) {
printf("error:invalid IPv4 address\n");
sys_unlock_tcpip_core();
return 1;
}
}

prefix = atoi(prefix_ptr);

if ( prefix < 0 || prefix > 32) {
if (prefix < 0 || prefix > 32) {
printf("error:invalid prefix, should be in range <0, 32>\n");
sys_unlock_tcpip_core();
return 1;
}
}

_lwip_prefix_to_subnet(prefix, &subnet);
_lwip_prefix_to_subnet(prefix, &subnet);

if (argc == 4) {
netif_set_addr(iface, &ip, &subnet, NULL);
}
netif_set_addr(iface, &ip, &subnet, NULL);
}
else {
if (strcmp("gw", argv[4]) != 0) {
printf("error: invalid subcommand \"%s\"\n", argv[4]);
_usage_add4(argv[0]);
sys_unlock_tcpip_core();
printf("error: invalid subcommand \"%s\"\n", argv[4]);
_usage_add4(argv[0]);
sys_unlock_tcpip_core();
return 1;
}
}

if (inet_pton(AF_INET, argv[5], &gw.addr) != 1) {
printf("error: invalid gateway address\n");
sys_unlock_tcpip_core();
return 1;
}
netif_set_addr(iface, &ip, &subnet, &gw);
}
netif_set_addr(iface, &ip, &subnet, &gw);
}

sys_unlock_tcpip_core();
return 0;
Expand Down Expand Up @@ -261,24 +264,22 @@ static int _lwip_netif_config(int argc, char **argv)
return 0;
}
else {
if (strcmp("help", argv[1]) == 0)
{
_lwip_netif_help(argv[0]);
if (strcmp("help", argv[1]) == 0) {
_lwip_netif_help(argv[0]);
}
#ifdef MODULE_LWIP_IPV4
else if (strcmp("add4", argv[1]) == 0)
{
_lwip_netif_add4(argc, argv);
else if (strcmp("add4", argv[1]) == 0) {
_lwip_netif_add4(argc, argv);
}
#endif
#ifdef MODULE_LWIP_IPV6
else if (strcmp("add6", argv[1]) == 0)
{
_lwip_netif_add6(argc, argv);
else if (strcmp("add6", argv[1]) == 0) {
_lwip_netif_add6(argc, argv);
}
#endif
else
printf("error: invalid subcommand - use help\n");
else {
printf("error: invalid subcommand - use help\n");
}
}
return 1;
}
Expand Down

0 comments on commit 67abda0

Please sign in to comment.