Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tos/lib/net/rpl/RPLDAORoutingEngineP.nc
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@ generic module RPLDAORoutingEngineP() {
if (memcmp_rpl((uint8_t*)entry->next_hop.s6_addr,
(uint8_t*)iph->ip6_src.s6_addr, 16) == TRUE) {
// same old destination with same DTSN
new_key = entry->key;
} else {
// new next hop for an existing downswards node
call RPLRouteInfo.setDTSN((call RPLRouteInfo.getDTSN()) + 1);
Expand Down
5 changes: 2 additions & 3 deletions tos/lib/net/rpl/RPLOF0P.nc
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,8 @@ implementation{

parentNode = call ParentTable.get(min);

while ((!parentNode->valid) &&
(min < MAX_PARENT) &&
(parentNode->rank != INFINITE_RANK)) {
while ((min < MAX_PARENT) &&
(!parentNode->valid || parentNode->rank >= nodeRank)) {
min++;
parentNode = call ParentTable.get(min);
}
Expand Down
2 changes: 1 addition & 1 deletion tos/lib/net/rpl/RPLRankP.nc
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ implementation {
tempEtx_hop = parentSet[indexset].etx_hop;
parentSet[indexset] = parent;

if (tempEtx_hop > INIT_ETX && tempEtx_hop < BLIP_L2_RETRIES) {
if (tempEtx_hop > INIT_ETX && tempEtx_hop < BLIP_L2_RETRIES*divideRank) {
tempEtx_hop = tempEtx_hop-INIT_ETX;
if (tempEtx_hop < divideRank)
tempEtx_hop = INIT_ETX;
Expand Down