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

Incorporate latest changes on rpl tests to 23-rpl-non-storing

Browse source
This commit is contained in:
Simon Duquennoy 2016-06-08 14:09:43 +02:00
parent d5e74b9579
commit 819916668e
17 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
regression-tests/23-rpl-non-storing/01-rpl-up-route.csc
View file

@ -323,11 +323,11 @@ while(true) {
lostMsgs += numMissed; 
 lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
 log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
 for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
 packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
 }
} 
 } 
}
 }
packets = packets.substr(0, num) + "*";
 packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
 log.log("" + hops + " " + packets + "\n");
lastMsg = num;
 lastMsg = num;
}
 }

4
regression-tests/23-rpl-non-storing/02-rpl-root-reboot.csc
View file

@ -323,11 +323,11 @@ while(true) {
lostMsgs += numMissed; 
 lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
 log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
 for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
 packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
 }
} 
 } 
}
 }
packets = packets.substr(0, num) + "*";
 packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
 log.log("" + hops + " " + packets + "\n");
lastMsg = num;
 lastMsg = num;
}
 }

4
regression-tests/23-rpl-non-storing/03-rpl-28-hours.csc
View file

@ -272,11 +272,11 @@ while(true) {
lostMsgs += numMissed; 
 lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
 log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
 for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
 packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
 }
} 
 } 
}
 }
packets = packets.substr(0, num) + "*";
 packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
 log.log("" + hops + " " + packets + "\n");
lastMsg = num;
 lastMsg = num;
}
 }

4
regression-tests/23-rpl-non-storing/04-rpl-large-network.csc
View file

@ -7038,11 +7038,11 @@ while(true) {
lostMsgs += numMissed; 
 lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
 log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
 for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
 packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
 }
} 
 } 
}
 }
packets = packets.substr(0, num) + "*";
 packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
 log.log("" + hops + " " + packets + "\n");
lastMsg = num;
 lastMsg = num;
}
 }

4
regression-tests/23-rpl-non-storing/05-rpl-up-and-down-routes.csc
View file

@ -321,11 +321,11 @@ while(true) {
lostMsgs += numMissed; 
 lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
 log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
 for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
 packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
 }
} 
 } 
}
 }
packets = packets.substr(0, num) + "*";
 packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
 log.log("" + hops + " " + packets + "\n");
lastMsg = num;
 lastMsg = num;
}
 }

4
regression-tests/23-rpl-non-storing/06-rpl-temporary-root-loss.csc
View file

@ -327,11 +327,11 @@ while(true) {
lostMsgs += numMissed; 
 lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
 log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
 for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
 packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
 }
} 
 } 
}
 }
packets = packets.substr(0, num) + "*";
 packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
 log.log("" + hops + " " + packets + "\n");
lastMsg = num;
 lastMsg = num;
}
 }

4
regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-0.csc
View file

@ -339,11 +339,11 @@ while(true) {
lostMsgs += numMissed; 
 lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
 log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
 for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
 packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
 }
} 
 } 
}
 }
packets = packets.substr(0, num) + "*";
 packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
 log.log("" + hops + " " + packets + "\n");
lastMsg = num;
 lastMsg = num;
}
 }

4
regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-1.csc
View file

@ -339,11 +339,11 @@ while(true) {
lostMsgs += numMissed; 
 lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
 log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
 for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
 packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
 }
} 
 } 
}
 }
packets = packets.substr(0, num) + "*";
 packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
 log.log("" + hops + " " + packets + "\n");
lastMsg = num;
 lastMsg = num;
}
 }

4
regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-2.csc
View file

@ -339,11 +339,11 @@ while(true) {
lostMsgs += numMissed; 
 lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
 log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
 for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
 packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
 }
} 
 } 
}
 }
packets = packets.substr(0, num) + "*";
 packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
 log.log("" + hops + " " + packets + "\n");
lastMsg = num;
 lastMsg = num;
}
 }

4
regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-3.csc
View file

@ -339,11 +339,11 @@ while(true) {
lostMsgs += numMissed; 
 lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
 log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
 for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
 packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
 }
} 
 } 
}
 }
packets = packets.substr(0, num) + "*";
 packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
 log.log("" + hops + " " + packets + "\n");
lastMsg = num;
 lastMsg = num;
}
 }

4
regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-4.csc
View file

@ -339,11 +339,11 @@ while(true) {
lostMsgs += numMissed; 
 lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
 log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
 for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
 packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
 }
} 
 } 
}
 }
packets = packets.substr(0, num) + "*";
 packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
 log.log("" + hops + " " + packets + "\n");
lastMsg = num;
 lastMsg = num;
}
 }

4
regression-tests/23-rpl-non-storing/08-rpl-dao-route-loss-5.csc
View file

@ -339,11 +339,11 @@ while(true) {
lostMsgs += numMissed; 
 lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
 log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
 for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
 packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
 }
} 
 } 
}
 }
packets = packets.substr(0, num) + "*";
 packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
 log.log("" + hops + " " + packets + "\n");
lastMsg = num;
 lastMsg = num;
}
 }

4
regression-tests/23-rpl-non-storing/09-rpl-probing.csc
View file

@ -234,12 +234,12 @@ while(true) {
lostMsgs += numMissed; 
 lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
 log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
 for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
 packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
 }
} 
 } 
}
 }
lastMsgHops = hops;
 lastMsgHops = hops;
packets = packets.substr(0, num) + "*";
 packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
 log.log("" + hops + " " + packets + "\n");
lastMsg = num;
 lastMsg = num;
}
 }

4
regression-tests/23-rpl-non-storing/10-rpl-multi-dodag.csc
View file

@ -368,11 +368,11 @@ while(true) {
lostMsgs += numMissed; 
 lostMsgs += numMissed; 
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
 log.log("Missed messages " + numMissed + " before " + num + "\n"); 
for(i = 0; i < numMissed; i++) {
 for(i = 0; i < numMissed; i++) {
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
 packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
}
 }
} 
 } 
}
 }
packets = packets.substr(0, num) + "*";
 packets = packets.substr(0, num).concat("*");
log.log("" + hops + " " + packets + "\n");
 log.log("" + hops + " " + packets + "\n");
lastMsg = num;
 lastMsg = num;
}
 }

2
regression-tests/23-rpl-non-storing/code/receiver-node.c
View file

@ -73,7 +73,7 @@ set_global_address(void)
int i; int i;
uint8_t state; uint8_t state;
uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0); uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr); uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF); uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);

4
regression-tests/23-rpl-non-storing/code/root-node.c
View file

@ -77,7 +77,7 @@ set_global_address(void)
int i; int i;
uint8_t state; uint8_t state;
uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0); uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr); uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF); uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
@ -106,7 +106,7 @@ create_rpl_dag(uip_ipaddr_t *ipaddr)
rpl_set_root(RPL_DEFAULT_INSTANCE, ipaddr); rpl_set_root(RPL_DEFAULT_INSTANCE, ipaddr);
dag = rpl_get_any_dag(); dag = rpl_get_any_dag();
uip_ip6addr(&prefix, 0xaaaa, 0, 0, 0, 0, 0, 0, 0); uip_ip6addr(&prefix, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
rpl_set_prefix(dag, &prefix, 64); rpl_set_prefix(dag, &prefix, 64);
PRINTF("created a new RPL dag\n"); PRINTF("created a new RPL dag\n");
} else { } else {

4
regression-tests/23-rpl-non-storing/code/sender-node.c
View file

@ -72,7 +72,7 @@ set_global_address(void)
int i; int i;
uint8_t state; uint8_t state;
uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0); uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr); uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF); uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
@ -109,7 +109,7 @@ PROCESS_THREAD(sender_node_process, ev, data)
PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&send_timer)); PROCESS_WAIT_EVENT_UNTIL(etimer_expired(&send_timer));
uip_ip6addr(&addr, 0xaaaa, 0, 0, 0, 0x0201, 0x001, 0x001, 0x001); uip_ip6addr(&addr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0x0201, 0x001, 0x001, 0x001);
{ {
static unsigned int message_number; static unsigned int message_number;