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

Merge pull request #1297 from simonduq/pr/default-prefix

Browse source 
Change the default IPv6 prefix from aaaa::/64 to fd00::/64
This commit is contained in:
Simon Duquennoy 2016-03-13 20:39:16 +01:00
commit cd981b23d5
78 changed files with 165 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

2
regression-tests/11-ipv6/code/receiver/udp-receiver.c
View file

@ -39,7 +39,7 @@ PROCESS_THREAD(udp_process, ev, data)
PROCESS_BEGIN();
uip_ip6addr(&addr, 0xaaaa, 0, 0, 0, 0, 0, 0, 2);
uip_ip6addr(&addr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 2);
uip_ds6_addr_add(&addr, 0, ADDR_AUTOCONF);
simple_udp_register(&broadcast_connection, UDP_PORT,

6
regression-tests/11-ipv6/code/sender/unicast-sender.c
View file

@ -40,12 +40,12 @@ PROCESS_THREAD(udp_process, ev, data)
PROCESS_BEGIN();
uip_ip6addr(&addr, 0xaaaa, 0, 0, 0, 0, 0, 0, 3);
uip_ip6addr(&addr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 3);
uip_ds6_addr_add(&addr, 0, ADDR_AUTOCONF);
rpl_set_root(RPL_DEFAULT_INSTANCE, &addr);
/* 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);*/
@ -63,7 +63,7 @@ PROCESS_THREAD(udp_process, ev, data)
etimer_reset(&periodic_timer);
printf("Sending unicast\n");
uip_ip6addr(&addr, 0xaaaa, 0, 0, 0, 0, 0, 0, 2);
uip_ip6addr(&addr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 2);
simple_udp_sendto(&broadcast_connection, buf, sizeof(buf), &addr);
}

2
regression-tests/12-rpl/code/receiver-node.c
View file

@ -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);

4
regression-tests/12-rpl/code/root-node.c
View file

@ -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 {

4
regression-tests/12-rpl/code/sender-node.c
View file

@ -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;

10
regression-tests/13-ipv6-apps/x02-sky-coap.csc
View file

@ -181,14 +181,14 @@ PROCESS_CONF_NO_PROCESS_NAMES=1
The test script communicates with the REST server via the RPL border router using external commands.
(* $ make connect-router-cooja)
* $ ping6 -c 10 -I tun0 aaaa::212:7401:1:101
* $ ping6 -c 10 -I tun0 aaaa::212:7402:2:202
* $ wget -t 1 -T 10 -O - http://[aaaa::212:7402:2:202]
* $ ping6 -c 10 -I tun0 fd00::212:7401:1:101
* $ ping6 -c 10 -I tun0 fd00::212:7402:2:202
* $ wget -t 1 -T 10 -O - http://[fd00::212:7402:2:202]
The final test uses the CoAP Java implementation by Matthias Kovatsch, downloaded from:
https://github.com/mkovatsc/Californium/blob/master/run/ExampleClient.jar
* $ java -jar ExampleClient.jar DISCOVER coap://[aaaa::212:7402:2:202]
* $ java -jar ExampleClient.jar GET coap://[aaaa::212:7402:2:202]/hello</notes>
* $ java -jar ExampleClient.jar DISCOVER coap://[fd00::212:7402:2:202]
* $ java -jar ExampleClient.jar GET coap://[fd00::212:7402:2:202]/hello</notes>
<decorations>true</decorations>
</plugin_config>
<width>751</width>