Skip to content

Commit add63fe

Browse files
author
Mika Tervonen
committed
Modified advertisiement trickle handling to remove congestion
Removed routing cost inconsistency to reduce advertisement sending Added flag for ERRATA fixes to track modifications to specifications
1 parent 7683bef commit add63fe

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

source/6LoWPAN/ws/ws_bootstrap.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -883,12 +883,17 @@ static void ws_bootstrap_pan_advertisement_analyse_active(struct protocol_interf
883883
*
884884
*/
885885

886-
// Wi-SUN specified functionality, causes extra inconsistencies when we hear higher rank advertisements
886+
#ifdef WISUN_1_0_ERRATA_FIX
887+
// All messages are considered as consistent only Solicit will cause inconsistent
888+
trickle_consistent_heard(&cur->ws_info->trickle_pan_advertisement);
889+
#else
890+
// Wi-SUN 1.0 specified functionality, causes extra inconsistencies when we hear higher rank advertisements
887891
if (pan_information->routing_cost >= ws_bootstrap_routing_cost_calculate(cur)) {
888892
trickle_consistent_heard(&cur->ws_info->trickle_pan_advertisement);
889893
} else {
890894
trickle_inconsistent_heard(&cur->ws_info->trickle_pan_advertisement, &cur->ws_info->trickle_params_pan_discovery);
891895
}
896+
#endif
892897
}
893898

894899
static parent_info_t *ws_bootstrap_candidate_parent_get_best(protocol_interface_info_entry_t *cur)

source/6LoWPAN/ws/ws_config.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,4 +156,11 @@ extern uint8_t DEVICE_MIN_SENS;
156156
#define WS_PARENT_LIST_MAX_PAN_IN_DISCOVERY 5 // During discovery state how many neighbours per pan
157157
#define WS_PARENT_LIST_MAX_PAN_IN_ACTIVE 2 // During active state two nodes per pan is allowed
158158

159+
/*
160+
* Modifications for base specification.
161+
*
162+
* ERRATA changes after 1.0 specification release.
163+
*/
164+
#define WISUN_1_0_ERRATA_FIX
165+
159166
#endif /* WS_CONFIG_H_ */

0 commit comments

Comments
 (0)