RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

gnrc_sixlowpan_nd: register new addresses for AAC

Browse Source
This commit is contained in:
Martine Lenders 2015-09-17 02:04:53 +02:00
parent 1682b76866
commit 802e229bcb
4 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/include/net/gnrc/ipv6/netif.h
View File

@ -120,6 +120,7 @@ extern "C" {
*/
#define GNRC_IPV6_NETIF_ADDR_FLAGS_UNICAST (0x00) /**< unicast address */
#define GNRC_IPV6_NETIF_ADDR_FLAGS_NON_UNICAST (0x01) /**< non-unicast address */
#define GNRC_IPV6_NETIF_ADDR_FLAGS_TENTATIVE (0x02) /**< address is not fully registered yet */
/**
* @brief A prefix information option that propagates the prefix of this

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

@ -87,6 +87,19 @@ static ipv6_addr_t *_add_addr_to_entry(gnrc_ipv6_netif_t *entry, const ipv6_addr
tmp_addr->prefix_len = prefix_len;
tmp_addr->flags = flags;
#ifdef MODULE_GNRC_SIXLOWPAN_ND
if (entry->flags & GNRC_IPV6_NETIF_FLAGS_SIXLOWPAN) {
ipv6_addr_t *router = gnrc_ndp_internal_default_router();
if (router != NULL) {
tmp_addr->flags |= GNRC_IPV6_NETIF_ADDR_FLAGS_TENTATIVE;
mutex_unlock(&entry->mutex); /* function below relocks mutex */
gnrc_ndp_internal_send_nbr_sol(entry->pid, &tmp_addr->addr, router, router);
mutex_lock(&entry->mutex); /* relock mutex */
}
/* otherwise there is no default router to register to */
}
#endif
if (ipv6_addr_is_multicast(addr)) {
tmp_addr->flags |= GNRC_IPV6_NETIF_ADDR_FLAGS_NON_UNICAST;
}
@ -391,6 +404,9 @@ ipv6_addr_t *gnrc_ipv6_netif_find_addr(kernel_pid_t pid, const ipv6_addr_t *addr
mutex_lock(&entry->mutex);
for (int i = 0; i < GNRC_IPV6_NETIF_ADDR_NUMOF; i++) {
if (entry->addrs[i].flags & GNRC_IPV6_NETIF_ADDR_FLAGS_TENTATIVE) {
continue;
}
if (ipv6_addr_equal(&(entry->addrs[i].addr), addr)) {
mutex_unlock(&entry->mutex);
DEBUG("ipv6 netif: Found %s on interface %" PRIkernel_pid "\n",
@ -423,6 +439,9 @@ static uint8_t _find_by_prefix_unsafe(ipv6_addr_t **res, gnrc_ipv6_netif_t *ifac
continue;
}
if (iface->addrs[i].flags & GNRC_IPV6_NETIF_ADDR_FLAGS_TENTATIVE) {
continue;
}
match = ipv6_addr_match_prefix(&(iface->addrs[i].addr), addr);
if ((only == NULL) && !ipv6_addr_is_multicast(addr) &&
@ -543,7 +562,8 @@ static int _create_candidate_set(gnrc_ipv6_netif_t *iface, const ipv6_addr_t *ds
/* "In any case, multicast addresses and the unspecified address MUST NOT
* be included in a candidate set."
*/
if (ipv6_addr_is_multicast(&(iter->addr)) ||
if ((iter->flags & GNRC_IPV6_NETIF_ADDR_FLAGS_TENTATIVE) ||
ipv6_addr_is_multicast(&(iter->addr)) ||
ipv6_addr_is_unspecified(&(iter->addr))) {
continue;
}

3
sys/net/gnrc/network_layer/sixlowpan/nd/gnrc_sixlowpan_nd.c
View File

@ -273,7 +273,10 @@ uint8_t gnrc_sixlowpan_nd_opt_ar_handle(kernel_pid_t iface, ipv6_hdr_t *ipv6, ui
switch (ar_opt->status) {
case SIXLOWPAN_ND_STATUS_SUCCESS:
DEBUG("6lo nd: address registration successful\n");
ipv6_addr_t *netif_addr_entry = gnrc_ipv6_netif_find_addr(iface, &(ipv6->dst));
gnrc_ipv6_netif_addr_t *netif_addr = gnrc_ipv6_netif_addr_get(netif_addr_entry);
mutex_lock(&ipv6_iface->mutex);
netif_addr->flags &= ~GNRC_IPV6_NETIF_ADDR_FLAGS_TENTATIVE;
/* reschedule 1 minute before lifetime expires */
timex_t t = { (uint32_t)(byteorder_ntohs(ar_opt->ltime) - 1) * 60, 0 };
vtimer_remove(&nc_entry->nbr_sol_timer);

12
sys/shell/commands/sc_netif.c
View File

@ -680,6 +680,7 @@ static int _netif_add(char *cmd_name, kernel_pid_t dev, int argc, char **argv)
} type = _UNICAST;
char *addr_str = argv[0];
ipv6_addr_t addr;
ipv6_addr_t *assigned_address;
uint8_t prefix_len;
if (argc > 1) {
@ -713,13 +714,16 @@ static int _netif_add(char *cmd_name, kernel_pid_t dev, int argc, char **argv)
return 1;
}
if (gnrc_ipv6_netif_add_addr(dev, &addr, prefix_len,
(type == _ANYCAST) ?
GNRC_IPV6_NETIF_ADDR_FLAGS_NON_UNICAST :
GNRC_IPV6_NETIF_ADDR_FLAGS_UNICAST) == NULL) {
if ((assigned_address = gnrc_ipv6_netif_add_addr(dev, &addr, prefix_len,
(type == _ANYCAST) ?
GNRC_IPV6_NETIF_ADDR_FLAGS_NON_UNICAST :
GNRC_IPV6_NETIF_ADDR_FLAGS_UNICAST))
== NULL) {
printf("error: unable to add IPv6 address\n");
return 1;
}
gnrc_ipv6_netif_addr_t *netif_addr = gnrc_ipv6_netif_addr_get(assigned_address);
netif_addr->flags &= ~GNRC_IPV6_NETIF_ADDR_FLAGS_TENTATIVE;
printf("success: added %s/%d to interface %" PRIkernel_pid "\n", addr_str,
prefix_len, dev);