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

Merge pull request #1610 from simonduq/pr/tsch-rime

Browse source 
TSCH with Rime
This commit is contained in:
Simon Duquennoy 2016-07-25 14:55:37 +02:00 • committed by GitHub
commit ff5a4751c8
5 changed files with 206 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/net/mac/tsch/tsch.c
View file

@ -45,6 +45,7 @@
#include "net/netstack.h"
#include "net/packetbuf.h"
#include "net/queuebuf.h"
#include "net/nbr-table.h"
#include "net/mac/framer-802154.h"
#include "net/mac/tsch/tsch.h"
#include "net/mac/tsch/tsch-slot-operation.h"
@ -69,8 +70,10 @@
/* Use to collect link statistics even on Keep-Alive, even though they were
* not sent from an upper layer and don't have a valid packet_sent callback */
#ifndef TSCH_LINK_NEIGHBOR_CALLBACK
#if NETSTACK_CONF_WITH_IPV6
void uip_ds6_link_neighbor_callback(int status, int numtx);
#define TSCH_LINK_NEIGHBOR_CALLBACK(dest, status, num) uip_ds6_link_neighbor_callback(status, num)
#endif /* NETSTACK_CONF_WITH_IPV6 */
#endif /* TSCH_LINK_NEIGHBOR_CALLBACK */
/* 802.15.4 duplicate frame detection */
@ -280,13 +283,13 @@ eb_input(struct input_packet *current_input)
#if TSCH_AUTOSELECT_TIME_SOURCE
if(!tsch_is_coordinator) {
/* Maintain EB received counter for every neighbor */
struct eb_stat *stat = (struct eb_stat *)nbr_table_get_from_lladdr(eb_stats, &frame.src_addr);
struct eb_stat *stat = (struct eb_stat *)nbr_table_get_from_lladdr(eb_stats, (linkaddr_t *)&frame.src_addr);
if(stat == NULL) {
stat = (struct eb_stat *)nbr_table_add_lladdr(eb_stats, &frame.src_addr);
stat = (struct eb_stat *)nbr_table_add_lladdr(eb_stats, (linkaddr_t *)&frame.src_addr, NBR_TABLE_REASON_MAC, NULL);
}
if(stat != NULL) {
stat->rx_count++;
stat->jp = eb_ies.join_priority;
stat->jp = eb_ies.ie_join_priority;
best_neighbor_eb_count = MAX(best_neighbor_eb_count, stat->rx_count);
}
/* Select best time source */