riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16741 from benpicco/net_lwip_netif_get_name

Browse Source 
pkg/lwip: implement netif_get_name()
This commit is contained in:
benpicco 2021-08-26 14:37:58 +02:00 committed by GitHub
commit 149de73160
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/lwip/Makefile.dep
View File

@ -85,6 +85,14 @@ ifneq (,$(filter lwip_contrib,$(USEMODULE)))
USEMODULE += xtimer USEMODULE += xtimer
endif endif
ifneq (,$(filter lwip_netif,$(USEMODULE)))
USEMODULE += netif
endif
ifneq (,$(filter lwip_dhcp_auto,$(USEMODULE))) ifneq (,$(filter lwip_dhcp_auto,$(USEMODULE)))
USEMODULE += lwip_dhcp USEMODULE += lwip_dhcp
endif endif
ifneq (,$(filter netif,$(USEMODULE)))
USEMODULE += fmt
endif

34
pkg/lwip/contrib/_netif.c Normal file
View File

@ -0,0 +1,34 @@
/*
* Copyright (C) 2021 ML!PA Consulting GmbH
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/
/**
* @{
*
* Implements @ref net_netif for @ref net_lwip
*
* @file
* @author Benjamin Valentin <benjamin.valentin@ml-pa.com>
*/
#include "fmt.h"
#include "lwip/netif.h"
#include "net/netif.h"
int netif_get_name(netif_t *iface, char *name)
{
struct netif *netif = (struct netif *)iface;
int res = 2;
name[0] = netif->name[0];
name[1] = netif->name[1];
res += fmt_u16_dec(&name[res], netif->num);
name[res] = '\0';
return res;
}
/** @} */

5
sys/shell/commands/sc_lwip_netif.c
View File

@ -43,9 +43,10 @@ static void _netif_list_ipv6(struct netif *netif, int addr_index) {
static void _netif_list(struct netif *netif) { static void _netif_list(struct netif *netif) {
int i; int i;
char name[8];
struct netdev *dev = netif->state; struct netdev *dev = netif->state;
printf("Iface %c%c%u ", netif->name[0], netif->name[1], netif->num); netif_get_name((netif_t *)netif, name);
printf("HWaddr: "); printf("Iface %s HWaddr: ", name);
for (i = 0; i < netif->hwaddr_len; i++) { for (i = 0; i < netif->hwaddr_len; i++) {
printf("%02x", netif->hwaddr[i]); printf("%02x", netif->hwaddr[i]);
if ((i+1) < netif->hwaddr_len) { if ((i+1) < netif->hwaddr_len) {