diff --git a/examples/gnrc_networking/Makefile b/examples/gnrc_networking/Makefile index e31b39635e..555b89eee5 100644 --- a/examples/gnrc_networking/Makefile +++ b/examples/gnrc_networking/Makefile @@ -54,7 +54,7 @@ endif # this might be useful for testing, in cases where you cannot or do not want to # run a shell with ifconfig to get the real link lokal address. #IPV6_STATIC_LLADDR ?= '"fe80::cafe:cafe:cafe:1"' -#CFLAGS += -DGNRC_IPV6_STATIC_LLADDR=$(IPV6_STATIC_LLADDR) +#CFLAGS += -DCONFIG_GNRC_IPV6_STATIC_LLADDR=$(IPV6_STATIC_LLADDR) # Uncomment this to join RPL DODAGs even if DIOs do not contain # DODAG Configuration Options (see the doc for more info) diff --git a/examples/gnrc_networking_mac/Makefile b/examples/gnrc_networking_mac/Makefile index cbc17f611c..a3ce6a3758 100644 --- a/examples/gnrc_networking_mac/Makefile +++ b/examples/gnrc_networking_mac/Makefile @@ -49,7 +49,7 @@ DEVELHELP ?= 1 # this might be useful for testing, in cases where you cannot or do not want to # run a shell with ifconfig to get the real link lokal address. #IPV6_STATIC_LLADDR ?= '"fe80::cafe:cafe:cafe:1"' -#CFLAGS += -DGNRC_IPV6_STATIC_LLADDR=$(IPV6_STATIC_LLADDR) +#CFLAGS += -DCONFIG_GNRC_IPV6_STATIC_LLADDR=$(IPV6_STATIC_LLADDR) # Uncomment this to join RPL DODAGs even if DIOs do not contain # DODAG Configuration Options (see the doc for more info) diff --git a/sys/include/net/gnrc/ipv6.h b/sys/include/net/gnrc/ipv6.h index 20b999d683..f0a27847cf 100644 --- a/sys/include/net/gnrc/ipv6.h +++ b/sys/include/net/gnrc/ipv6.h @@ -164,18 +164,18 @@ extern "C" { * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {.mk} * IPV6_STATIC_LLADDR ?= '"fe80::cafe:cafe:cafe:1"' - * CFLAGS += -DGNRC_IPV6_STATIC_LLADDR=$(STATIC_IPV6_LLADDR) + * CFLAGS += -DCONFIG_GNRC_IPV6_STATIC_LLADDR=$(STATIC_IPV6_LLADDR) * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#define GNRC_IPV6_STATIC_LLADDR +#define CONFIG_GNRC_IPV6_STATIC_LLADDR #endif /* DOXYGEN */ /** @} */ /** * @brief Use the same static IPv6 link local address on every network interface * - * When GNRC_IPV6_STATIC_LLADDR is used, to not add the interface pid to the set - * static address but use the same static link local address for all interfaces. + * When CONFIG_GNRC_IPV6_STATIC_LLADDR is used, to not add the interface pid to the + * set static address but use the same static link local address for all interfaces. */ #ifndef CONFIG_GNRC_IPV6_STATIC_LLADDR_IS_FIXED #define CONFIG_GNRC_IPV6_STATIC_LLADDR_IS_FIXED 0 diff --git a/sys/net/gnrc/network_layer/ipv6/Kconfig b/sys/net/gnrc/network_layer/ipv6/Kconfig index d3a5007a4a..cb2396e9ee 100644 --- a/sys/net/gnrc/network_layer/ipv6/Kconfig +++ b/sys/net/gnrc/network_layer/ipv6/Kconfig @@ -22,6 +22,29 @@ config GNRC_IPV6_MSG_QUEUE_SIZE_EXP represents the exponent of 2^n, which will be used as the size of the queue. +config GNRC_IPV6_STATIC_LLADDR_ENABLE + bool "Add a static IPv6 link local address to any network interface" + help + This allows to specify a certain link local IPv6 address to be assigned + to a network interface on startup, which might be handy for testing. + + A interface will keep its auto-generated link local address, too. + +config GNRC_IPV6_STATIC_LLADDR + string "Static link-local address" + depends on GNRC_IPV6_STATIC_LLADDR_ENABLE + default "fe80::cafe:cafe:cafe:1" + help + The address is configured on each interface and incremented by the + interface PID. + +config GNRC_IPV6_STATIC_LLADDR_IS_FIXED + bool "Same link-local address on every interface" + depends on GNRC_IPV6_STATIC_LLADDR_ENABLE + help + Don't add the interface PID to the least significant byte + of the address. + endif # KCONFIG_USEMODULE_GNRC_IPV6 rsource "blacklist/Kconfig" diff --git a/sys/net/gnrc/network_layer/ipv6/nib/nib.c b/sys/net/gnrc/network_layer/ipv6/nib/nib.c index a6a1dda77d..a269a80991 100644 --- a/sys/net/gnrc/network_layer/ipv6/nib/nib.c +++ b/sys/net/gnrc/network_layer/ipv6/nib/nib.c @@ -115,12 +115,12 @@ void gnrc_ipv6_nib_init(void) static void _add_static_lladdr(gnrc_netif_t *netif) { -#ifdef GNRC_IPV6_STATIC_LLADDR +#ifdef CONFIG_GNRC_IPV6_STATIC_LLADDR /* parse addr from string and explicitly set a link local prefix * if ifnum > 1 each interface will get its own link local address - * with GNRC_IPV6_STATIC_LLADDR + i + * with CONFIG_GNRC_IPV6_STATIC_LLADDR + i */ - char lladdr_str[] = GNRC_IPV6_STATIC_LLADDR; + const char lladdr_str[] = CONFIG_GNRC_IPV6_STATIC_LLADDR; ipv6_addr_t lladdr; if (ipv6_addr_from_str(&lladdr, lladdr_str) != NULL) {