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

Fix a number of leftover mentions of aaaa as a prefix (now fd00)

Browse source
This commit is contained in:
Simon Duquennoy 2016-03-14 13:56:00 +01:00
parent cd981b23d5
commit 4bf868fd99
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/ipso-objects/README.md
View file

@ -26,10 +26,10 @@ First program a device with the examples/ipso-objects/example-ipso-objects.c
>... >...
``` ```
After that start up a native-border router or other border router on aaaa::1/64 After that start up a native-border router or other border router on fd00::1/64
or another prefix - NOTE: if you use another prefix you will need to change LWM2M_SERVER_ADDRESS for which the device will register - in project-conf.h: or another prefix - NOTE: if you use another prefix you will need to change LWM2M_SERVER_ADDRESS for which the device will register - in project-conf.h:
``` ```
#define LWM2M_SERVER_ADDRESS "aaaa::1" #define LWM2M_SERVER_ADDRESS "fd00::1"
``` ```
Then when everything is setup you can download a Leshan and use that to Then when everything is setup you can download a Leshan and use that to

2
examples/ipso-objects/example-ipso-objects.c
View file

@ -52,7 +52,7 @@
#endif #endif
#ifndef LWM2M_SERVER_ADDRESS #ifndef LWM2M_SERVER_ADDRESS
#define LWM2M_SERVER_ADDRESS "aaaa::1" #define LWM2M_SERVER_ADDRESS "fd00::1"
#endif #endif
PROCESS(example_ipso_objects, "IPSO object example"); PROCESS(example_ipso_objects, "IPSO object example");

12
examples/ipso-objects/example-server.c
View file

@ -229,19 +229,19 @@ setup_network(void)
* Obviously the choice made here must also be selected in udp-client.c. * Obviously the choice made here must also be selected in udp-client.c.
* *
* For correct Wireshark decoding using a sniffer, add the /64 prefix to the 6LowPAN protocol preferences, * For correct Wireshark decoding using a sniffer, add the /64 prefix to the 6LowPAN protocol preferences,
* e.g. set Context 0 to aaaa::. At present Wireshark copies Context/128 and then overwrites it. * e.g. set Context 0 to fd00::. At present Wireshark copies Context/128 and then overwrites it.
* (Setting Context 0 to aaaa::1111:2222:3333:4444 will report a 16 bit compressed address of aaaa::1111:22ff:fe33:xxxx) * (Setting Context 0 to fd00::1111:2222:3333:4444 will report a 16 bit compressed address of fd00::1111:22ff:fe33:xxxx)
* Note Wireshark's IPCMV6 checksum verification depends on the correct uncompressed addresses. * Note Wireshark's IPCMV6 checksum verification depends on the correct uncompressed addresses.
*/ */
#if 0 #if 0
/* Mode 1 - 64 bits inline */ /* Mode 1 - 64 bits inline */
uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 1); uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 1);
#elif 1 #elif 1
/* Mode 2 - 16 bits inline */ /* Mode 2 - 16 bits inline */
uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0x00ff, 0xfe00, 1); uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0x00ff, 0xfe00, 1);
#else #else
/* Mode 3 - derived from link local (MAC) address */ /* Mode 3 - derived from link local (MAC) address */
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);
#endif #endif
@ -249,7 +249,7 @@ setup_network(void)
root_if = uip_ds6_addr_lookup(&ipaddr); root_if = uip_ds6_addr_lookup(&ipaddr);
if(root_if != NULL) { if(root_if != NULL) {
dag = rpl_set_root(RPL_DEFAULT_INSTANCE, &ipaddr); dag = rpl_set_root(RPL_DEFAULT_INSTANCE, &ipaddr);
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);
rpl_set_prefix(dag, &ipaddr, 64); rpl_set_prefix(dag, &ipaddr, 64);
PRINTF("created a new RPL dag\n"); PRINTF("created a new RPL dag\n");
} else { } else {

2
examples/ipv6/rpl-tsch/node.c
View file

@ -187,7 +187,7 @@ PROCESS_THREAD(node_process, ev, data)
if(is_coordinator) { if(is_coordinator) {
uip_ipaddr_t prefix; uip_ipaddr_t prefix;
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);
net_init(&prefix); net_init(&prefix);
} else { } else {
net_init(NULL); net_init(NULL);

2
examples/jn516x/tsch/tx-power-verification/node/node.c
View file

@ -105,7 +105,7 @@ PROCESS_THREAD(start_app, ev, data)
/* Start network stack */ /* Start network stack */
if(is_coordinator) { if(is_coordinator) {
uip_ipaddr_t prefix; uip_ipaddr_t prefix;
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_tools_init(&prefix); rpl_tools_init(&prefix);
} else { } else {
rpl_tools_init(NULL); rpl_tools_init(NULL);

2
examples/jn516x/tsch/uart1-test-node/uart1-test-node.c
View file

@ -145,7 +145,7 @@ PROCESS_THREAD(start_app, ev, data)
/* Start network stack */ /* Start network stack */
if(is_coordinator) { if(is_coordinator) {
uip_ipaddr_t prefix; uip_ipaddr_t prefix;
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_tools_init(&prefix); rpl_tools_init(&prefix);
} else { } else {
rpl_tools_init(NULL); rpl_tools_init(NULL);