giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #49 from simonduq/pr/rpl-lite-fixes

Browse Source 
RPL-lite fixes
This commit is contained in:
Simon Duquennoy 2017-06-30 19:36:07 +02:00 committed by GitHub
commit 9dd2bc91ad
11 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/platform/cooja/contiki-conf.h
View File

@ -90,9 +90,9 @@
#define UIP_CONF_ROUTER 1
/* configure network size and density */
#ifndef NETSTCK_ROUTING_STATE_SIZE
#define NETSTCK_ROUTING_STATE_SIZE 300
#endif /* NETSTCK_ROUTING_STATE_SIZE */
#ifndef NETSTACK_MAX_ROUTE_ENTRIES
#define NETSTACK_MAX_ROUTE_ENTRIES 300
#endif /* NETSTACK_MAX_ROUTE_ENTRIES */
#ifndef NBR_TABLE_CONF_MAX_NEIGHBORS
#define NBR_TABLE_CONF_MAX_NEIGHBORS 300
#endif /* NBR_TABLE_CONF_MAX_NEIGHBORS */

8
core/contiki-default-conf.h
View File

@ -96,12 +96,12 @@
#define NBR_TABLE_CONF_MAX_NEIGHBORS 16
#endif /* NBR_TABLE_CONF_MAX_NEIGHBORS */
/* NETSTCK_ROUTING_STATE_SIZE specifies the maximum number of entries
/* NETSTACK_MAX_ROUTE_ENTRIES specifies the maximum number of entries
the routing module will handle. Applies to uIP routing tables if they are
used, or to RPL non-storing mode links instead */
#ifndef NETSTCK_ROUTING_STATE_SIZE
#define NETSTCK_ROUTING_STATE_SIZE 16
#endif /* NETSTCK_ROUTING_STATE_SIZE */
#ifndef NETSTACK_MAX_ROUTE_ENTRIES
#define NETSTACK_MAX_ROUTE_ENTRIES 16
#endif /* NETSTACK_MAX_ROUTE_ENTRIES */
/* NETSTACK_CONF_WITH_IPV6 specifies whether or not IPv6 should be used. If IPv6
is not used, IPv4 is used instead. */

2
core/net/ipv6/uip-ds6-route.h
View File

@ -56,7 +56,7 @@
#define UIP_MAX_ROUTES UIP_CONF_MAX_ROUTES
#else /* UIP_CONF_MAX_ROUTES */
#if RPL_WITH_STORING
#define UIP_MAX_ROUTES NETSTCK_ROUTING_STATE_SIZE
#define UIP_MAX_ROUTES NETSTACK_MAX_ROUTE_ENTRIES
#else
#define UIP_MAX_ROUTES 0
#endif

2
core/net/rpl-lite/rpl-conf.h
View File

@ -63,7 +63,7 @@
#define RPL_NS_LINK_NUM RPL_NS_CONF_LINK_NUM
#else /* RPL_NS_CONF_LINK_NUM */
#if RPL_WITH_NON_STORING
#define RPL_NS_LINK_NUM NETSTCK_ROUTING_STATE_SIZE
#define RPL_NS_LINK_NUM NETSTACK_MAX_ROUTE_ENTRIES
#else
#define RPL_NS_LINK_NUM 0
#endif

2
core/net/rpl/rpl-ns.h
View File

@ -47,7 +47,7 @@
#define RPL_NS_LINK_NUM RPL_NS_CONF_LINK_NUM
#else /* RPL_NS_CONF_LINK_NUM */
#if RPL_WITH_NON_STORING
#define RPL_NS_LINK_NUM NETSTCK_ROUTING_STATE_SIZE
#define RPL_NS_LINK_NUM NETSTACK_MAX_ROUTE_ENTRIES
#else
#define RPL_NS_LINK_NUM 0
#endif

4
examples/ipv6/json-ws/project-conf.h
View File

@ -50,8 +50,8 @@
#undef QUEUEBUF_CONF_NUM
#define QUEUEBUF_CONF_NUM 4
#undef NETSTCK_ROUTING_STATE_SIZE
#define NETSTCK_ROUTING_STATE_SIZE 7
#undef NETSTACK_MAX_ROUTE_ENTRIES
#define NETSTACK_MAX_ROUTE_ENTRIES 7
#undef NBR_TABLE_CONF_MAX_NEIGHBORS
#define NBR_TABLE_CONF_MAX_NEIGHBORS 7

4
examples/ipv6/multicast/project-conf.h
View File

@ -60,8 +60,8 @@
#define UIP_CONF_TCP 0
/* Code/RAM footprint savings so that things will fit on our device */
#undef NETSTCK_ROUTING_STATE_SIZE
#define NETSTCK_ROUTING_STATE_SIZE 10
#undef NETSTACK_MAX_ROUTE_ENTRIES
#define NETSTACK_MAX_ROUTE_ENTRIES 10
#undef NBR_TABLE_CONF_MAX_NEIGHBORS
#define NBR_TABLE_CONF_MAX_NEIGHBORS 10

4
examples/ipv6/rpl-simple/project-conf.h
View File

@ -35,8 +35,8 @@
#undef NBR_TABLE_CONF_MAX_NEIGHBORS
#define NBR_TABLE_CONF_MAX_NEIGHBORS 25
#undef NETSTCK_ROUTING_STATE_SIZE
#define NETSTCK_ROUTING_STATE_SIZE 25
#undef NETSTACK_MAX_ROUTE_ENTRIES
#define NETSTACK_MAX_ROUTE_ENTRIES 25
#undef IEEE802154_CONF_PANID
#define IEEE802154_CONF_PANID 0xf123

4
examples/ipv6/rpl-udp/project-conf.h
View File

@ -37,11 +37,11 @@
#ifdef TEST_MORE_ROUTES
/* configure number of neighbors and routes */
#define NBR_TABLE_CONF_MAX_NEIGHBORS 10
#define NETSTCK_ROUTING_STATE_SIZE 30
#define NETSTACK_MAX_ROUTE_ENTRIES 30
#else
/* configure number of neighbors and routes */
#define NBR_TABLE_CONF_MAX_NEIGHBORS 10
#define NETSTCK_ROUTING_STATE_SIZE 10
#define NETSTACK_MAX_ROUTE_ENTRIES 10
#endif /* TEST_MORE_ROUTES */
#undef CSMA_CONF_802154_AUTOACK

4
examples/ipv6/rpl-udp/udp-client.c
View File

@ -154,7 +154,7 @@ set_global_address(void)
* Note the IPCMV6 checksum verification depends on the correct uncompressed
* addresses.
*/
#if 0
/* Mode 1 - 64 bits inline */
uip_ip6addr(&server_ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 1);
@ -182,7 +182,7 @@ PROCESS_THREAD(udp_client_process, ev, data)
set_global_address();
PRINTF("UDP client process started nbr:%d routes:%d\n",
NBR_TABLE_CONF_MAX_NEIGHBORS, UIP_CONF_MAX_ROUTES);
NBR_TABLE_CONF_MAX_NEIGHBORS, NETSTACK_MAX_ROUTE_ENTRIES);
print_local_addresses();

3
examples/ipv6/rpl-udp/udp-server.c
View File

@ -100,7 +100,6 @@ print_local_addresses(void)
PROCESS_THREAD(udp_server_process, ev, data)
{
uip_ipaddr_t ipaddr;
struct uip_ds6_addr *root_if;
PROCESS_BEGIN();
@ -109,7 +108,7 @@ PROCESS_THREAD(udp_server_process, ev, data)
SENSORS_ACTIVATE(button_sensor);
PRINTF("UDP server started. nbr:%d routes:%d\n",
NBR_TABLE_CONF_MAX_NEIGHBORS, UIP_CONF_MAX_ROUTES);
NBR_TABLE_CONF_MAX_NEIGHBORS, NETSTACK_MAX_ROUTE_ENTRIES);
#if UIP_CONF_ROUTER
/* The choice of server address determines its 6LoWPAN header compression.