Incorporate latest changes on rpl tests to 23-rpl-non-storing
This commit is contained in:
parent
d5e74b9579
commit
819916668e
|
@ -323,11 +323,11 @@ while(true) {
|
|||
lostMsgs += numMissed; 
|
||||
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
|
||||
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");
|
||||
lastMsg = num;
|
||||
}
|
||||
|
|
|
@ -323,11 +323,11 @@ while(true) {
|
|||
lostMsgs += numMissed; 
|
||||
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
|
||||
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");
|
||||
lastMsg = num;
|
||||
}
|
||||
|
|
|
@ -272,11 +272,11 @@ while(true) {
|
|||
lostMsgs += numMissed; 
|
||||
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
|
||||
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");
|
||||
lastMsg = num;
|
||||
}
|
||||
|
|
|
@ -7038,11 +7038,11 @@ while(true) {
|
|||
lostMsgs += numMissed; 
|
||||
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
|
||||
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");
|
||||
lastMsg = num;
|
||||
}
|
||||
|
|
|
@ -321,11 +321,11 @@ while(true) {
|
|||
lostMsgs += numMissed; 
|
||||
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
|
||||
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");
|
||||
lastMsg = num;
|
||||
}
|
||||
|
|
|
@ -327,11 +327,11 @@ while(true) {
|
|||
lostMsgs += numMissed; 
|
||||
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
|
||||
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");
|
||||
lastMsg = num;
|
||||
}
|
||||
|
|
|
@ -339,11 +339,11 @@ while(true) {
|
|||
lostMsgs += numMissed; 
|
||||
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
|
||||
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");
|
||||
lastMsg = num;
|
||||
}
|
||||
|
|
|
@ -339,11 +339,11 @@ while(true) {
|
|||
lostMsgs += numMissed; 
|
||||
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
|
||||
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");
|
||||
lastMsg = num;
|
||||
}
|
||||
|
|
|
@ -339,11 +339,11 @@ while(true) {
|
|||
lostMsgs += numMissed; 
|
||||
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
|
||||
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");
|
||||
lastMsg = num;
|
||||
}
|
||||
|
|
|
@ -339,11 +339,11 @@ while(true) {
|
|||
lostMsgs += numMissed; 
|
||||
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
|
||||
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");
|
||||
lastMsg = num;
|
||||
}
|
||||
|
|
|
@ -339,11 +339,11 @@ while(true) {
|
|||
lostMsgs += numMissed; 
|
||||
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
|
||||
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");
|
||||
lastMsg = num;
|
||||
}
|
||||
|
|
|
@ -339,11 +339,11 @@ while(true) {
|
|||
lostMsgs += numMissed; 
|
||||
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
|
||||
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");
|
||||
lastMsg = num;
|
||||
}
|
||||
|
|
|
@ -234,12 +234,12 @@ while(true) {
|
|||
lostMsgs += numMissed; 
|
||||
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
|
||||
for(i = 0; i < numMissed; i++) {
|
||||
packets = packets.substr(0, lastMsg + i + 1) + "_"; 
|
||||
packets = packets.substr(0, lastMsg + i + 1).concat("_"); 
|
||||
}
|
||||
} 
|
||||
}
|
||||
lastMsgHops = hops;
|
||||
packets = packets.substr(0, num) + "*";
|
||||
packets = packets.substr(0, num).concat("*");
|
||||
log.log("" + hops + " " + packets + "\n");
|
||||
lastMsg = num;
|
||||
}
|
||||
|
|
|
@ -368,11 +368,11 @@ while(true) {
|
|||
lostMsgs += numMissed; 
|
||||
log.log("Missed messages " + numMissed + " before " + num + "\n"); 
|
||||
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");
|
||||
lastMsg = num;
|
||||
}
|
||||
|
|
|
@ -73,7 +73,7 @@ set_global_address(void)
|
|||
int i;
|
||||
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_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
|
||||
|
||||
|
|
|
@ -77,7 +77,7 @@ set_global_address(void)
|
|||
int i;
|
||||
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_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
|
||||
|
||||
|
@ -106,7 +106,7 @@ create_rpl_dag(uip_ipaddr_t *ipaddr)
|
|||
|
||||
rpl_set_root(RPL_DEFAULT_INSTANCE, ipaddr);
|
||||
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);
|
||||
PRINTF("created a new RPL dag\n");
|
||||
} else {
|
||||
|
|
|
@ -72,7 +72,7 @@ set_global_address(void)
|
|||
int i;
|
||||
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_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));
|
||||
|
||||
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;
|
||||
|
|
Loading…
Reference in a new issue