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

Merge pull request #6623 from smlng/pr/net/add_static_ipv6_lladdr

Browse Source 
add static IPv6 lladdr for tests
This commit is contained in:
Martine Lenders 2017-02-28 22:37:40 +01:00 committed by GitHub
commit ae0d0a2634
3 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/gnrc_networking/Makefile
View File

@ -40,6 +40,12 @@ USEMODULE += netstats_rpl
# development process:
CFLAGS += -DDEVELHELP
# Comment the following 2 lines out to specify static link lokal IPv6 address
# this might be useful for testing, in cases whre 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)
# Comment this out to join RPL DODAGs even if DIOs do not contain
# DODAG Configuration Options (see the doc for more info)
# CFLAGS += -DGNRC_RPL_DODAG_CONF_OPTIONAL_ON_JOIN

19
sys/include/net/gnrc/ipv6.h
View File

@ -68,6 +68,25 @@ extern "C" {
#define GNRC_IPV6_MSG_QUEUE_SIZE (8U)
#endif
#ifdef DOXYGEN
/**
* @brief Add a static IPv6 link local address to any network interface
*
* This macro allows to specify a certain link local IPv6 address to be assigned
* to a network interface on startup, which might be handy for testing.
* Note: a) a interface will keep its auto-generated link local address, too
* b) the address is incremented by 1, if multiple interfaces are present
*
* To use the macro just add it to `CFLAGS` in the application's Makefile, like:
*
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {.mk}
* IPV6_STATIC_LLADDR ?= '"fe80::cafe:cafe:cafe:1"'
* CFLAGS += -DGNRC_IPV6_STATIC_LLADDR=$(STATIC_IPV6_LLADDR)
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*/
#define GNRC_IPV6_STATIC_LLADDR
#endif /* DOXYGEN */
/**
* @brief The PID to the IPv6 thread.
*

14
sys/net/gnrc/network_layer/ipv6/netif/gnrc_ipv6_netif.c
View File

@ -852,7 +852,19 @@ void gnrc_ipv6_netif_init_by_dev(void)
_add_addr_to_entry(ipv6_if, &addr, 64, 0);
}
#ifdef GNRC_IPV6_STATIC_LLADDR
/* parse addr from string and explicitely set a link lokal prefix
* if ifnum > 1 each interface will get its own link local address
* with GNRC_IPV6_STATIC_LLADDR + i
*/
char lladdr_str[] = GNRC_IPV6_STATIC_LLADDR;
ipv6_addr_t lladdr;
if(ipv6_addr_from_str(&lladdr, lladdr_str) != NULL) {
lladdr.u8[15] += i;
assert(ipv6_addr_is_link_local(&lladdr));
_add_addr_to_entry(ipv6_if, &lladdr, 64, 0);
}
#endif
/* set link MTU */
if ((gnrc_netapi_get(ifs[i], NETOPT_MAX_PACKET_SIZE, 0, &tmp,
sizeof(uint16_t)) >= 0)) {