From 4bf868fd99c948fd9189490e1f5735f4deafa181 Mon Sep 17 00:00:00 2001 From: Simon Duquennoy Date: Mon, 14 Mar 2016 13:56:00 +0100 Subject: [PATCH] Fix a number of leftover mentions of aaaa as a prefix (now fd00) --- examples/ipso-objects/README.md | 4 ++-- examples/ipso-objects/example-ipso-objects.c | 2 +- examples/ipso-objects/example-server.c | 12 ++++++------ examples/ipv6/rpl-tsch/node.c | 2 +- .../jn516x/tsch/tx-power-verification/node/node.c | 2 +- .../jn516x/tsch/uart1-test-node/uart1-test-node.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/ipso-objects/README.md b/examples/ipso-objects/README.md index 6d1eb5871..e9be82dcb 100644 --- a/examples/ipso-objects/README.md +++ b/examples/ipso-objects/README.md @@ -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: ``` -#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 diff --git a/examples/ipso-objects/example-ipso-objects.c b/examples/ipso-objects/example-ipso-objects.c index 66a31a0bb..bbb7aa464 100644 --- a/examples/ipso-objects/example-ipso-objects.c +++ b/examples/ipso-objects/example-ipso-objects.c @@ -52,7 +52,7 @@ #endif #ifndef LWM2M_SERVER_ADDRESS -#define LWM2M_SERVER_ADDRESS "aaaa::1" +#define LWM2M_SERVER_ADDRESS "fd00::1" #endif PROCESS(example_ipso_objects, "IPSO object example"); diff --git a/examples/ipso-objects/example-server.c b/examples/ipso-objects/example-server.c index 2d48c738b..605e3295a 100644 --- a/examples/ipso-objects/example-server.c +++ b/examples/ipso-objects/example-server.c @@ -229,19 +229,19 @@ setup_network(void) * 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, - * e.g. set Context 0 to aaaa::. 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) + * e.g. set Context 0 to fd00::. At present Wireshark copies Context/128 and then overwrites it. + * (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. */ #if 0 /* 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 /* 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 /* 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); #endif @@ -249,7 +249,7 @@ setup_network(void) root_if = uip_ds6_addr_lookup(&ipaddr); if(root_if != NULL) { 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); PRINTF("created a new RPL dag\n"); } else { diff --git a/examples/ipv6/rpl-tsch/node.c b/examples/ipv6/rpl-tsch/node.c index 2aee41d81..203dfd9a9 100644 --- a/examples/ipv6/rpl-tsch/node.c +++ b/examples/ipv6/rpl-tsch/node.c @@ -187,7 +187,7 @@ PROCESS_THREAD(node_process, ev, data) if(is_coordinator) { 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); } else { net_init(NULL); diff --git a/examples/jn516x/tsch/tx-power-verification/node/node.c b/examples/jn516x/tsch/tx-power-verification/node/node.c index 1e77d3a2e..1b2c75dfe 100644 --- a/examples/jn516x/tsch/tx-power-verification/node/node.c +++ b/examples/jn516x/tsch/tx-power-verification/node/node.c @@ -105,7 +105,7 @@ PROCESS_THREAD(start_app, ev, data) /* Start network stack */ if(is_coordinator) { 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); } else { rpl_tools_init(NULL); diff --git a/examples/jn516x/tsch/uart1-test-node/uart1-test-node.c b/examples/jn516x/tsch/uart1-test-node/uart1-test-node.c index 0a4259f95..f2fbacafa 100644 --- a/examples/jn516x/tsch/uart1-test-node/uart1-test-node.c +++ b/examples/jn516x/tsch/uart1-test-node/uart1-test-node.c @@ -145,7 +145,7 @@ PROCESS_THREAD(start_app, ev, data) /* Start network stack */ if(is_coordinator) { 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); } else { rpl_tools_init(NULL);