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

gnrc_netif: introduce gnrc_netif_ipv6 pseudo-module for IPv6 members

Browse Source 
This aims to reduce circular dependencies in GNRC.
This commit is contained in:
Martine S. Lenders 2020-05-05 18:56:17 +02:00
parent 9801a439fc
commit a48629b395
No known key found for this signature in database
GPG Key ID: CCD317364F63286F
6 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.dep
View File

@ -352,6 +352,7 @@ ifneq (,$(filter gnrc_ipv6,$(USEMODULE)))
USEMODULE += gnrc_ipv6_hdr USEMODULE += gnrc_ipv6_hdr
USEMODULE += gnrc_ipv6_nib USEMODULE += gnrc_ipv6_nib
USEMODULE += gnrc_netif USEMODULE += gnrc_netif
USEMODULE += gnrc_netif_ipv6
USEMODULE += gnrc_nettype_ipv6 USEMODULE += gnrc_nettype_ipv6
endif endif

1
makefiles/pseudomodules.inc.mk
View File

@ -34,6 +34,7 @@ PSEUDOMODULES += gnrc_netapi_mbox
PSEUDOMODULES += gnrc_netif_events PSEUDOMODULES += gnrc_netif_events
PSEUDOMODULES += gnrc_pktbuf_cmd PSEUDOMODULES += gnrc_pktbuf_cmd
PSEUDOMODULES += gnrc_netif_6lo PSEUDOMODULES += gnrc_netif_6lo
PSEUDOMODULES += gnrc_netif_ipv6
PSEUDOMODULES += gnrc_netif_cmd_% PSEUDOMODULES += gnrc_netif_cmd_%
PSEUDOMODULES += gnrc_netif_dedup PSEUDOMODULES += gnrc_netif_dedup
PSEUDOMODULES += gnrc_nettype_% PSEUDOMODULES += gnrc_nettype_%

4
sys/include/net/gnrc/netif.h
View File

@ -45,7 +45,7 @@
#include "net/gnrc/netif/dedup.h" #include "net/gnrc/netif/dedup.h"
#endif #endif
#include "net/gnrc/netif/flags.h" #include "net/gnrc/netif/flags.h"
#ifdef MODULE_GNRC_IPV6 #if IS_USED(MODULE_GNRC_NETIF_IPV6)
#include "net/gnrc/netif/ipv6.h" #include "net/gnrc/netif/ipv6.h"
#endif #endif
#ifdef MODULE_GNRC_MAC #ifdef MODULE_GNRC_MAC
@ -83,7 +83,7 @@ typedef struct {
#if IS_USED(MODULE_GNRC_NETIF_LORAWAN) || defined(DOXYGEN) #if IS_USED(MODULE_GNRC_NETIF_LORAWAN) || defined(DOXYGEN)
gnrc_netif_lorawan_t lorawan; /**< LoRaWAN component */ gnrc_netif_lorawan_t lorawan; /**< LoRaWAN component */
#endif #endif
#if defined(MODULE_GNRC_IPV6) || DOXYGEN #if IS_USED(MODULE_GNRC_NETIF_IPV6) || defined(DOXYGEN)
gnrc_netif_ipv6_t ipv6; /**< IPv6 component */ gnrc_netif_ipv6_t ipv6; /**< IPv6 component */
#endif #endif
#if defined(MODULE_GNRC_MAC) || DOXYGEN #if defined(MODULE_GNRC_MAC) || DOXYGEN

10
sys/include/net/gnrc/netif/internal.h
View File

@ -58,7 +58,7 @@ void gnrc_netif_acquire(gnrc_netif_t *netif);
*/ */
void gnrc_netif_release(gnrc_netif_t *netif); void gnrc_netif_release(gnrc_netif_t *netif);
#if defined(MODULE_GNRC_IPV6) || DOXYGEN #if IS_USED(MODULE_GNRC_NETIF_IPV6) || DOXYGEN
/** /**
* @brief Adds an IPv6 address to the interface * @brief Adds an IPv6 address to the interface
* *
@ -284,7 +284,7 @@ void gnrc_netif_ipv6_group_leave_internal(gnrc_netif_t *netif,
*/ */
int gnrc_netif_ipv6_group_idx(gnrc_netif_t *netif, int gnrc_netif_ipv6_group_idx(gnrc_netif_t *netif,
const ipv6_addr_t *addr); const ipv6_addr_t *addr);
#endif /* MODULE_GNRC_IPV6 */ #endif /* IS_USED(MODULE_GNRC_NETIF_IPV6) || defined(DOXYGEN) */
/** /**
* @brief Checks if the interface represents a router according to RFC 4861 * @brief Checks if the interface represents a router according to RFC 4861
@ -536,7 +536,7 @@ static inline int gnrc_netif_get_eui64(gnrc_netif_t *netif, eui64_t *eui64)
*/ */
void gnrc_netif_init_6ln(gnrc_netif_t *netif); void gnrc_netif_init_6ln(gnrc_netif_t *netif);
#if defined(MODULE_GNRC_IPV6) || defined(DOXYGEN) #if IS_USED(MODULE_GNRC_NETIF_IPV6) || defined(DOXYGEN)
/** /**
* @brief Initialize IPv6 MTU and other packet length related members of * @brief Initialize IPv6 MTU and other packet length related members of
* @ref gnrc_netif_t based on gnrc_netif_t::device_type * @ref gnrc_netif_t based on gnrc_netif_t::device_type
@ -669,13 +669,13 @@ static inline int gnrc_netif_ndp_addr_len_from_l2ao(gnrc_netif_t *netif,
assert(netif->flags & GNRC_NETIF_FLAGS_HAS_L2ADDR); assert(netif->flags & GNRC_NETIF_FLAGS_HAS_L2ADDR);
return l2util_ndp_addr_len_from_l2ao(netif->device_type, opt); return l2util_ndp_addr_len_from_l2ao(netif->device_type, opt);
} }
#else /* defined(MODULE_GNRC_IPV6) || defined(DOXYGEN) */ #else /* IS_USED(MODULE_GNRC_NETIF_IPV6) || defined(DOXYGEN) */
#define gnrc_netif_ipv6_init_mtu(netif) (void)netif #define gnrc_netif_ipv6_init_mtu(netif) (void)netif
#define gnrc_netif_ipv6_iid_from_addr(netif, addr, addr_len, iid) (-ENOTSUP) #define gnrc_netif_ipv6_iid_from_addr(netif, addr, addr_len, iid) (-ENOTSUP)
#define gnrc_netif_ipv6_iid_to_addr(netif, iid, addr) (-ENOTSUP) #define gnrc_netif_ipv6_iid_to_addr(netif, iid, addr) (-ENOTSUP)
#define gnrc_netif_ndp_addr_len_from_l2ao(netif, opt) (-ENOTSUP) #define gnrc_netif_ndp_addr_len_from_l2ao(netif, opt) (-ENOTSUP)
#define gnrc_netif_ipv6_get_iid(netif, iid) (-ENOTSUP) #define gnrc_netif_ipv6_get_iid(netif, iid) (-ENOTSUP)
#endif /* defined(MODULE_GNRC_IPV6) || defined(DOXYGEN) */ #endif /* IS_USED(MODULE_GNRC_NETIF_IPV6) || defined(DOXYGEN) */
/** @} */ /** @} */
#ifdef __cplusplus #ifdef __cplusplus

30
sys/net/gnrc/netif/gnrc_netif.c
View File

@ -135,7 +135,7 @@ int gnrc_netif_get_from_netdev(gnrc_netif_t *netif, gnrc_netapi_opt_t *opt)
case NETOPT_STATS: case NETOPT_STATS:
/* XXX discussed this with Oleg, it's supposed to be a pointer */ /* XXX discussed this with Oleg, it's supposed to be a pointer */
switch ((int16_t)opt->context) { switch ((int16_t)opt->context) {
#if defined(MODULE_NETSTATS_IPV6) && defined(MODULE_GNRC_IPV6) #if IS_USED(MODULE_NETSTATS_IPV6) && IS_USED(MODULE_GNRC_NETIF_IPV6)
case NETSTATS_IPV6: case NETSTATS_IPV6:
assert(opt->data_len == sizeof(netstats_t *)); assert(opt->data_len == sizeof(netstats_t *));
*((netstats_t **)opt->data) = &netif->ipv6.stats; *((netstats_t **)opt->data) = &netif->ipv6.stats;
@ -154,7 +154,7 @@ int gnrc_netif_get_from_netdev(gnrc_netif_t *netif, gnrc_netapi_opt_t *opt)
break; break;
} }
break; break;
#ifdef MODULE_GNRC_IPV6 #if IS_USED(MODULE_GNRC_NETIF_IPV6)
case NETOPT_IPV6_ADDR: { case NETOPT_IPV6_ADDR: {
assert(opt->data_len >= sizeof(ipv6_addr_t)); assert(opt->data_len >= sizeof(ipv6_addr_t));
ipv6_addr_t *tgt = opt->data; ipv6_addr_t *tgt = opt->data;
@ -233,7 +233,7 @@ int gnrc_netif_get_from_netdev(gnrc_netif_t *netif, gnrc_netapi_opt_t *opt)
res = sizeof(netopt_enable_t); res = sizeof(netopt_enable_t);
break; break;
#endif /* CONFIG_GNRC_IPV6_NIB_ROUTER */ #endif /* CONFIG_GNRC_IPV6_NIB_ROUTER */
#endif /* MODULE_GNRC_IPV6 */ #endif /* IS_USED(MODULE_GNRC_NETIF_IPV6) */
#ifdef MODULE_GNRC_SIXLOWPAN_IPHC #ifdef MODULE_GNRC_SIXLOWPAN_IPHC
case NETOPT_6LO_IPHC: case NETOPT_6LO_IPHC:
assert(opt->data_len == sizeof(netopt_enable_t)); assert(opt->data_len == sizeof(netopt_enable_t));
@ -266,7 +266,7 @@ int gnrc_netif_set_from_netdev(gnrc_netif_t *netif,
netif->cur_hl = *((uint8_t *)opt->data); netif->cur_hl = *((uint8_t *)opt->data);
res = sizeof(uint8_t); res = sizeof(uint8_t);
break; break;
#ifdef MODULE_GNRC_IPV6 #if IS_USED(MODULE_GNRC_NETIF_IPV6)
case NETOPT_IPV6_ADDR: { case NETOPT_IPV6_ADDR: {
assert(opt->data_len == sizeof(ipv6_addr_t)); assert(opt->data_len == sizeof(ipv6_addr_t));
/* always assume manually added */ /* always assume manually added */
@ -335,7 +335,7 @@ int gnrc_netif_set_from_netdev(gnrc_netif_t *netif,
res = sizeof(netopt_enable_t); res = sizeof(netopt_enable_t);
break; break;
#endif /* CONFIG_GNRC_IPV6_NIB_ROUTER */ #endif /* CONFIG_GNRC_IPV6_NIB_ROUTER */
#endif /* MODULE_GNRC_IPV6 */ #endif /* IS_USED(MODULE_GNRC_NETIF_IPV6) */
#ifdef MODULE_GNRC_SIXLOWPAN_IPHC #ifdef MODULE_GNRC_SIXLOWPAN_IPHC
case NETOPT_6LO_IPHC: case NETOPT_6LO_IPHC:
assert(opt->data_len == sizeof(netopt_enable_t)); assert(opt->data_len == sizeof(netopt_enable_t));
@ -497,7 +497,7 @@ void gnrc_netif_release(gnrc_netif_t *netif)
} }
} }
#ifdef MODULE_GNRC_IPV6 #if IS_USED(MODULE_GNRC_NETIF_IPV6)
static int _addr_idx(const gnrc_netif_t *netif, const ipv6_addr_t *addr); static int _addr_idx(const gnrc_netif_t *netif, const ipv6_addr_t *addr);
static int _group_idx(const gnrc_netif_t *netif, const ipv6_addr_t *addr); static int _group_idx(const gnrc_netif_t *netif, const ipv6_addr_t *addr);
@ -1189,7 +1189,7 @@ static ipv6_addr_t *_src_addr_selection(gnrc_netif_t *netif,
return &netif->ipv6.addrs[idx]; return &netif->ipv6.addrs[idx];
} }
} }
#endif /* MODULE_GNRC_IPV6 */ #endif /* IS_USED(MODULE_GNRC_NETIF_IPV6) */
static void _update_l2addr_from_dev(gnrc_netif_t *netif) static void _update_l2addr_from_dev(gnrc_netif_t *netif)
{ {
@ -1273,7 +1273,7 @@ static void _test_options(gnrc_netif_t *netif)
case NETDEV_TYPE_ESP_NOW: case NETDEV_TYPE_ESP_NOW:
assert(netif->flags & GNRC_NETIF_FLAGS_HAS_L2ADDR); assert(netif->flags & GNRC_NETIF_FLAGS_HAS_L2ADDR);
assert(ETHERNET_ADDR_LEN == netif->l2addr_len); assert(ETHERNET_ADDR_LEN == netif->l2addr_len);
#ifdef MODULE_GNRC_IPV6 #if IS_USED(MODULE_GNRC_NETIF_IPV6)
switch (netif->device_type) { switch (netif->device_type) {
case NETDEV_TYPE_BLE: case NETDEV_TYPE_BLE:
assert(netif->ipv6.mtu == IPV6_MIN_MTU); assert(netif->ipv6.mtu == IPV6_MIN_MTU);
@ -1284,7 +1284,7 @@ static void _test_options(gnrc_netif_t *netif)
case NETDEV_TYPE_ESP_NOW: case NETDEV_TYPE_ESP_NOW:
assert(netif->ipv6.mtu <= ETHERNET_DATA_LEN); assert(netif->ipv6.mtu <= ETHERNET_DATA_LEN);
} }
#endif /* MODULE GNRC_IPV6 */ #endif /* IS_USED(MODULE GNRC_NETIF_IPV6) */
break; break;
case NETDEV_TYPE_IEEE802154: case NETDEV_TYPE_IEEE802154:
case NETDEV_TYPE_NRFMIN: { case NETDEV_TYPE_NRFMIN: {
@ -1295,7 +1295,7 @@ static void _test_options(gnrc_netif_t *netif)
assert(netif->flags & GNRC_NETIF_FLAGS_HAS_L2ADDR); assert(netif->flags & GNRC_NETIF_FLAGS_HAS_L2ADDR);
assert((IEEE802154_SHORT_ADDRESS_LEN == netif->l2addr_len) || assert((IEEE802154_SHORT_ADDRESS_LEN == netif->l2addr_len) ||
(IEEE802154_LONG_ADDRESS_LEN == netif->l2addr_len)); (IEEE802154_LONG_ADDRESS_LEN == netif->l2addr_len));
#ifdef MODULE_GNRC_IPV6 #if IS_USED(MODULE_GNRC_NETIF_IPV6)
#if IS_USED(MODULE_GNRC_NETIF_6LO) #if IS_USED(MODULE_GNRC_NETIF_6LO)
assert(netif->ipv6.mtu == IPV6_MIN_MTU); assert(netif->ipv6.mtu == IPV6_MIN_MTU);
assert(netif->sixlo.max_frag_size > 0); assert(netif->sixlo.max_frag_size > 0);
@ -1304,7 +1304,7 @@ static void _test_options(gnrc_netif_t *netif)
#else /* IS_USED(MODULE_GNRC_NETIF_6LO) */ #else /* IS_USED(MODULE_GNRC_NETIF_6LO) */
assert(netif->ipv6.mtu < UINT16_MAX); assert(netif->ipv6.mtu < UINT16_MAX);
#endif /* IS_USED(MODULE_GNRC_NETIF_6LO) */ #endif /* IS_USED(MODULE_GNRC_NETIF_6LO) */
#endif /* MODULE_GNRC_IPV6 */ #endif /* IS_USED(MODULE_GNRC_NETIF_IPV6) */
#ifdef MODULE_GNRC_SIXLOWPAN_ND #ifdef MODULE_GNRC_SIXLOWPAN_ND
assert((netif->device_type != NETDEV_TYPE_IEEE802154) || assert((netif->device_type != NETDEV_TYPE_IEEE802154) ||
(-ENOTSUP != netif->dev->driver->get(netif->dev, (-ENOTSUP != netif->dev->driver->get(netif->dev,
@ -1317,9 +1317,9 @@ static void _test_options(gnrc_netif_t *netif)
case NETDEV_TYPE_CC110X: case NETDEV_TYPE_CC110X:
assert(netif->flags & GNRC_NETIF_FLAGS_HAS_L2ADDR); assert(netif->flags & GNRC_NETIF_FLAGS_HAS_L2ADDR);
assert(1U == netif->l2addr_len); assert(1U == netif->l2addr_len);
#ifdef MODULE_GNRC_IPV6 #if IS_USED(MODULE_GNRC_NETIF_IPV6)
assert(netif->ipv6.mtu < UINT16_MAX); assert(netif->ipv6.mtu < UINT16_MAX);
#endif /* MODULE_GNRC_IPV6 */ #endif /* IS_USED(MODULE_GNRC_NETIF_IPV6) */
break; break;
case NETDEV_TYPE_LORA: /* LoRa doesn't provide L2 ADDR */ case NETDEV_TYPE_LORA: /* LoRa doesn't provide L2 ADDR */
case NETDEV_TYPE_SLIP: case NETDEV_TYPE_SLIP:
@ -1335,11 +1335,11 @@ static void _test_options(gnrc_netif_t *netif)
} }
/* These functions only apply to network devices having link-layers */ /* These functions only apply to network devices having link-layers */
if (netif->flags & GNRC_NETIF_FLAGS_HAS_L2ADDR) { if (netif->flags & GNRC_NETIF_FLAGS_HAS_L2ADDR) {
#ifdef MODULE_GNRC_IPV6 #if IS_USED(MODULE_GNRC_NETIF_IPV6)
assert(-ENOTSUP != gnrc_netif_ipv6_get_iid(netif, (eui64_t *)&tmp64)); assert(-ENOTSUP != gnrc_netif_ipv6_get_iid(netif, (eui64_t *)&tmp64));
assert(-ENOTSUP != gnrc_netif_ndp_addr_len_from_l2ao(netif, assert(-ENOTSUP != gnrc_netif_ndp_addr_len_from_l2ao(netif,
&dummy_opt)); &dummy_opt));
#endif /* MODULE_GNRC_IPV6 */ #endif /* IS_USED(MODULE_GNRC_NETIF_IPV6) */
#if IS_ACTIVE(CONFIG_GNRC_IPV6_NIB_6LN) #if IS_ACTIVE(CONFIG_GNRC_IPV6_NIB_6LN)
assert(-ENOTSUP != gnrc_netif_ipv6_iid_to_addr(netif, (eui64_t *)&tmp64, assert(-ENOTSUP != gnrc_netif_ipv6_iid_to_addr(netif, (eui64_t *)&tmp64,
dummy_addr)); dummy_addr));

10
sys/net/gnrc/netif/gnrc_netif_device_type.c
View File

@ -18,7 +18,7 @@
#include <kernel_defines.h> #include <kernel_defines.h>
#include "log.h" #include "log.h"
#ifdef MODULE_GNRC_IPV6 #if IS_USED(MODULE_GNRC_NETIF_IPV6)
#include "net/ipv6.h" #include "net/ipv6.h"
#endif #endif
#include "net/gnrc/netif.h" #include "net/gnrc/netif.h"
@ -121,10 +121,9 @@ void gnrc_netif_init_6ln(gnrc_netif_t *netif)
} }
} }
#ifdef MODULE_GNRC_IPV6 #if IS_USED(MODULE_GNRC_NETIF_IPV6)
void gnrc_netif_ipv6_init_mtu(gnrc_netif_t *netif) void gnrc_netif_ipv6_init_mtu(gnrc_netif_t *netif)
{ {
#ifdef MODULE_GNRC_IPV6
netdev_t *dev = netif->dev; netdev_t *dev = netif->dev;
int res; int res;
uint16_t tmp; uint16_t tmp;
@ -155,9 +154,7 @@ void gnrc_netif_ipv6_init_mtu(gnrc_netif_t *netif)
* defined(MODULE_XBEE) || defined(MODULE_ESP_NOW) */ * defined(MODULE_XBEE) || defined(MODULE_ESP_NOW) */
#ifdef MODULE_NETDEV_ETH #ifdef MODULE_NETDEV_ETH
case NETDEV_TYPE_ETHERNET: case NETDEV_TYPE_ETHERNET:
#ifdef MODULE_GNRC_IPV6
netif->ipv6.mtu = ETHERNET_DATA_LEN; netif->ipv6.mtu = ETHERNET_DATA_LEN;
#endif
#ifdef MODULE_GNRC_SIXLOENC #ifdef MODULE_GNRC_SIXLOENC
netif->flags |= GNRC_NETIF_FLAGS_6LO; netif->flags |= GNRC_NETIF_FLAGS_6LO;
#ifdef MODULE_GNRC_SIXLOWPAN_IPHC #ifdef MODULE_GNRC_SIXLOWPAN_IPHC
@ -190,7 +187,6 @@ void gnrc_netif_ipv6_init_mtu(gnrc_netif_t *netif)
} }
break; break;
} }
#endif
} }
int gnrc_netif_ipv6_iid_from_addr(const gnrc_netif_t *netif, int gnrc_netif_ipv6_iid_from_addr(const gnrc_netif_t *netif,
@ -206,6 +202,6 @@ int gnrc_netif_ipv6_iid_from_addr(const gnrc_netif_t *netif,
return -ENOTSUP; return -ENOTSUP;
} }
#endif /* MODULE_GNRC_IPV6 */ #endif /* IS_USED(MODULE_GNRC_NETIF_IPV6) */
/** @} */ /** @} */