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

Merge pull request #1883 from zhitaoh/fix-6LoWPAN-typo

Browse source 
fix comment with 6LoWPAN typo and break long lines
This commit is contained in:
Simon Duquennoy 2016-10-12 15:05:24 +02:00 committed by GitHub
parent 6157dce0b5 7bb10dc2a0
commit 14bfaffe00
6 changed files with 56 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
examples/avr-rss2/ipv6/dc-rpl-coap/coap-client.c
View file

@ -176,13 +176,17 @@ set_global_address(void)
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);
/* The choice of server address determines its 6LoPAN header compression. /* The choice of server address determines its 6LoWPAN header compression.
* (Our address will be compressed Mode 3 since it is derived from our link-local address) * (Our address will be compressed Mode 3 since it is derived from our
* link-local address)
* Obviously the choice made here must also be selected in udp-server.c. * Obviously the choice made here must also be selected in udp-server.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
* e.g. set Context 0 to aaaa::. At present Wireshark copies Context/128 and then overwrites it. * 6LowPAN protocol preferences,
* (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 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)
* *
* Note the IPCMV6 checksum verification depends on the correct uncompressed addresses. * Note the IPCMV6 checksum verification depends on the correct uncompressed addresses.
*/ */

14
examples/avr-rss2/ipv6/dc-rpl-coap/coap-server.c
View file

@ -220,13 +220,17 @@ PROCESS_THREAD(coap_server_process, ev, data)
PRINTF("CoAP server started\n"); PRINTF("CoAP server started\n");
#if UIP_CONF_ROUTER #if UIP_CONF_ROUTER
/* The choice of server address determines its 6LoPAN header compression. /* The choice of server address determines its 6LoWPAN header compression.
* 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
* e.g. set Context 0 to aaaa::. At present Wireshark copies Context/128 and then overwrites it. * 6LowPAN protocol preferences,
* (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 aaaa::. At present Wireshark copies Context/128 and
* Note Wireshark's IPCMV6 checksum verification depends on the correct uncompressed addresses. * 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)
* Note Wireshark's IPCMV6 checksum verification depends on the correct
* uncompressed addresses.
*/ */
#if 0 #if 0

14
examples/avr-rss2/ipv6/rpl-udp-report/report.c
View file

@ -147,15 +147,19 @@ set_global_address(void)
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);
/* The choice of server address determines its 6LoPAN header compression. /* The choice of server address determines its 6LoWPAN header compression.
* (Our address will be compressed Mode 3 since it is derived from our link-local address) * (Our address will be compressed Mode 3 since it is derived from our link-local address)
* Obviously the choice made here must also be selected in udp-server.c. * Obviously the choice made here must also be selected in udp-server.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
* e.g. set Context 0 to aaaa::. At present Wireshark copies Context/128 and then overwrites it. * 6LowPAN protocol preferences,
* (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 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)
* *
* Note the IPCMV6 checksum verification depends on the correct uncompressed addresses. * Note the IPCMV6 checksum verification depends on the correct uncompressed
* addresses.
*/ */
#if 0 #if 0

14
examples/avr-rss2/ipv6/rpl-udp-report/sink.c
View file

@ -117,13 +117,17 @@ PROCESS_THREAD(udp_server_process, ev, data)
#if UIP_CONF_ROUTER #if UIP_CONF_ROUTER
/* The choice of server address determines its 6LoPAN header compression. /* The choice of server address determines its 6LoWPAN header compression.
* 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
* e.g. set Context 0 to aaaa::. At present Wireshark copies Context/128 and then overwrites it. * 6LowPAN protocol preferences,
* (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 aaaa::. At present Wireshark copies Context/128 and
* Note Wireshark's IPCMV6 checksum verification depends on the correct uncompressed addresses. * 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)
* Note Wireshark's IPCMV6 checksum verification depends on the correct
* uncompressed addresses.
*/ */
#if 0 #if 0

17
examples/ipv6/rpl-udp/udp-client.c
View file

@ -144,15 +144,20 @@ set_global_address(void)
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);
/* The choice of server address determines its 6LoPAN header compression. /* The choice of server address determines its 6LoWPAN header compression.
* (Our address will be compressed Mode 3 since it is derived from our link-local address) * (Our address will be compressed Mode 3 since it is derived from our
* link-local address)
* Obviously the choice made here must also be selected in udp-server.c. * Obviously the choice made here must also be selected in udp-server.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
* e.g. set Context 0 to fd00::. At present Wireshark copies Context/128 and then overwrites it. * 6LowPAN protocol preferences,
* (Setting Context 0 to fd00::1111:2222:3333:4444 will report a 16 bit compressed address of fd00::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 the IPCMV6 checksum verification depends on the correct uncompressed addresses. * Note the IPCMV6 checksum verification depends on the correct uncompressed
* addresses.
*/ */
#if 0 #if 0

14
examples/ipv6/rpl-udp/udp-server.c
View file

@ -111,13 +111,17 @@ PROCESS_THREAD(udp_server_process, ev, data)
NBR_TABLE_CONF_MAX_NEIGHBORS, UIP_CONF_MAX_ROUTES); NBR_TABLE_CONF_MAX_NEIGHBORS, UIP_CONF_MAX_ROUTES);
#if UIP_CONF_ROUTER #if UIP_CONF_ROUTER
/* The choice of server address determines its 6LoPAN header compression. /* The choice of server address determines its 6LoWPAN header compression.
* 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
* e.g. set Context 0 to fd00::. At present Wireshark copies Context/128 and then overwrites it. * 6LowPAN protocol preferences,
* (Setting Context 0 to fd00::1111:2222:3333:4444 will report a 16 bit compressed address of fd00::1111:22ff:fe33:xxxx) * e.g. set Context 0 to fd00::. At present Wireshark copies Context/128 and
* Note Wireshark's IPCMV6 checksum verification depends on the correct uncompressed addresses. * 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 #if 0