deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #354 from lab11/core-net-fixes

Browse source 
Small fixes to networking files
This commit is contained in:
Adam Dunkels 2013-09-26 23:43:07 -07:00
commit bf7edf6c4c
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/net/tcpip.c
View file

@ -693,7 +693,7 @@ tcpip_ipv6_output(void)
return;
}
/* Send in parallel if we are running NUD (nbc state is either STALE,
DELAY, or PROBE). See RFC 4861, section 7.7.3 on node behavior. */
DELAY, or PROBE). See RFC 4861, section 7.3.3 on node behavior. */
if(nbr->state == NBR_STALE) {
nbr->state = NBR_DELAY;
stimer_set(&nbr->reachable, UIP_ND6_DELAY_FIRST_PROBE_TIME);

5
core/net/uip-ds6-nbr.c
View file

@ -205,8 +205,9 @@ uip_ds6_link_neighbor_callback(int status, int numtx)
uip_ds6_nbr_t *nbr;
nbr = uip_ds6_nbr_ll_lookup((uip_lladdr_t *)dest);
if(nbr != NULL &&
(nbr->state == STALE || nbr->state == DELAY || nbr->state == PROBE)) {
nbr->state = REACHABLE;
(nbr->state == NBR_STALE || nbr->state == NBR_DELAY ||
nbr->state == NBR_PROBE)) {
nbr->state = NBR_REACHABLE;
stimer_set(&nbr->reachable, UIP_ND6_REACHABLE_TIME / 1000);
PRINTF("uip-ds6-neighbor : received a link layer ACK : ");
PRINTLLADDR((uip_lladdr_t *)dest);

1
core/net/uip-ds6-route.h
View file

@ -32,6 +32,7 @@
#ifndef UIP_DS6_ROUTE_H
#define UIP_DS6_ROUTE_H
#include "sys/stimer.h"
#include "lib/list.h"
void uip_ds6_route_init(void);