diff --git a/core/contiki-default-conf.h b/core/contiki-default-conf.h index b3780a952..ded2df5ff 100644 --- a/core/contiki-default-conf.h +++ b/core/contiki-default-conf.h @@ -174,6 +174,11 @@ #define UIP_CONF_TCP_SPLIT 0 #endif /* UIP_CONF_TCP_SPLIT */ +/* NEIGHBOR_CONF_MAX_NEIGHBORS specifies the maximum number of neighbors + that each node will be able to handle. */ +#ifndef NEIGHBOR_CONF_MAX_NEIGHBORS +#define NEIGHBOR_CONF_MAX_NEIGHBORS 8 +#endif /* NEIGHBOR_CONF_MAX_NEIGHBORS */ /*---------------------------------------------------------------------------*/ /* 6lowpan configuration options. diff --git a/core/net/uipopt.h b/core/net/uipopt.h index ab31737ca..bf3097a0a 100644 --- a/core/net/uipopt.h +++ b/core/net/uipopt.h @@ -213,11 +213,6 @@ #define UIP_CONF_DS6_PREFIX_NBU 2 #endif -#ifndef UIP_CONF_DS6_NBR_NBU -/** Default number of neighbors that can be stored in the %neighbor cache */ -#define UIP_CONF_DS6_NBR_NBU 4 -#endif - #ifndef UIP_CONF_DS6_DEFRT_NBU /** Minimum number of default routers */ #define UIP_CONF_DS6_DEFRT_NBU 2 diff --git a/examples/er-rest-example/project-conf.h b/examples/er-rest-example/project-conf.h index 9ba0f0000..ff76fde14 100644 --- a/examples/er-rest-example/project-conf.h +++ b/examples/er-rest-example/project-conf.h @@ -73,8 +73,8 @@ */ /* Save some memory for the sky platform. */ -#undef UIP_CONF_DS6_NBR_NBU -#define UIP_CONF_DS6_NBR_NBU 10 +#undef NEIGHBOR_CONF_MAX_NEIGHBORS +#define NEIGHBOR_CONF_MAX_NEIGHBORS 10 #undef UIP_CONF_MAX_ROUTES #define UIP_CONF_MAX_ROUTES 10 diff --git a/examples/ipv6/json-ws/project-conf.h b/examples/ipv6/json-ws/project-conf.h index a62582357..d67f1bbba 100644 --- a/examples/ipv6/json-ws/project-conf.h +++ b/examples/ipv6/json-ws/project-conf.h @@ -43,8 +43,6 @@ #define NETSTACK_CONF_RDC nullrdc_driver /* #define NETSTACK_CONF_RDC contikimac_driver */ -#define CONTIKIMAC_CONF_MAX_PHASE_NEIGHBORS 7 - #undef NULLRDC_CONF_802154_AUTOACK #define NULLRDC_CONF_802154_AUTOACK 1 @@ -56,8 +54,8 @@ #undef QUEUEBUF_CONF_NUM #define QUEUEBUF_CONF_NUM 4 -#undef UIP_CONF_DS6_NBR_NBU -#define UIP_CONF_DS6_NBR_NBU 7 +#undef NEIGHBOR_CONF_MAX_NEIGHBORS +#define NEIGHBOR_CONF_MAX_NEIGHBORS 7 #undef UIP_CONF_MAX_ROUTES #define UIP_CONF_MAX_ROUTES 7 diff --git a/examples/udp-stream/project-conf.h b/examples/udp-stream/project-conf.h index 605772c00..f4357d5ca 100644 --- a/examples/udp-stream/project-conf.h +++ b/examples/udp-stream/project-conf.h @@ -33,8 +33,8 @@ /* Free some code and RAM space */ #define UIP_CONF_TCP 0 -#undef UIP_CONF_DS6_NBR_NBU -#define UIP_CONF_DS6_NBR_NBU 8 +#undef NEIGHBOR_CONF_MAX_NEIGHBORS +#define NEIGHBOR_CONF_MAX_NEIGHBORS 8 #undef UIP_CONF_MAX_ROUTES #define UIP_CONF_MAX_ROUTES 8 diff --git a/platform/avr-atmega128rfa1/contiki-conf.h b/platform/avr-atmega128rfa1/contiki-conf.h index d08d0590b..09c3f6679 100644 --- a/platform/avr-atmega128rfa1/contiki-conf.h +++ b/platform/avr-atmega128rfa1/contiki-conf.h @@ -221,7 +221,7 @@ typedef unsigned short uip_stats_t; /* 25 bytes per UDP connection */ #define UIP_CONF_UDP_CONNS 10 /* See uip-ds6.h */ -#define UIP_CONF_DS6_NBR_NBU 20 +#define NEIGHBOR_CONF_MAX_NEIGHBORS 20 #define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_PREFIX_NBU 3 #define UIP_CONF_MAX_ROUTES 20 @@ -266,7 +266,7 @@ typedef unsigned short uip_stats_t; #define UIP_CONF_MAX_CONNECTIONS 2 #define UIP_CONF_MAX_LISTENPORTS 4 #define UIP_CONF_UDP_CONNS 5 -#define UIP_CONF_DS6_NBR_NBU 20 +#define NEIGHBOR_CONF_MAX_NEIGHBORS 20 #define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_PREFIX_NBU 3 #define UIP_CONF_MAX_ROUTES 4 @@ -302,7 +302,7 @@ typedef unsigned short uip_stats_t; #define UIP_CONF_MAX_CONNECTIONS 2 #define UIP_CONF_MAX_LISTENPORTS 4 #define UIP_CONF_UDP_CONNS 5 -#define UIP_CONF_DS6_NBR_NBU 4 +#define NEIGHBOR_CONF_MAX_NEIGHBORS 4 #define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_PREFIX_NBU 3 #define UIP_CONF_MAX_ROUTES 4 diff --git a/platform/avr-raven/contiki-conf.h b/platform/avr-raven/contiki-conf.h index 395280877..c1b58c75f 100644 --- a/platform/avr-raven/contiki-conf.h +++ b/platform/avr-raven/contiki-conf.h @@ -238,7 +238,7 @@ typedef unsigned short uip_stats_t; /* 25 bytes per UDP connection */ #define UIP_CONF_UDP_CONNS 10 /* See uip-ds6.h */ -#define UIP_CONF_DS6_NBR_NBU 20 +#define NEIGHBOR_CONF_MAX_NEIGHBORS 20 #define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_PREFIX_NBU 3 #define UIP_CONF_MAX_ROUTES 20 @@ -281,7 +281,7 @@ typedef unsigned short uip_stats_t; #define UIP_CONF_MAX_CONNECTIONS 2 #define UIP_CONF_MAX_LISTENPORTS 2 #define UIP_CONF_UDP_CONNS 4 -#define UIP_CONF_DS6_NBR_NBU 10 +#define NEIGHBOR_CONF_MAX_NEIGHBORS 10 #define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_PREFIX_NBU 2 #define UIP_CONF_MAX_ROUTES 4 @@ -314,7 +314,7 @@ typedef unsigned short uip_stats_t; #define UIP_CONF_MAX_CONNECTIONS 2 #define UIP_CONF_MAX_LISTENPORTS 4 #define UIP_CONF_UDP_CONNS 5 -#define UIP_CONF_DS6_NBR_NBU 4 +#define NEIGHBOR_CONF_MAX_NEIGHBORS 4 #define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_PREFIX_NBU 3 #define UIP_CONF_MAX_ROUTES 4 diff --git a/platform/avr-ravenusb/contiki-conf.h b/platform/avr-ravenusb/contiki-conf.h index a6382eb27..26a1aebf4 100644 --- a/platform/avr-ravenusb/contiki-conf.h +++ b/platform/avr-ravenusb/contiki-conf.h @@ -232,7 +232,7 @@ extern void mac_log_802_15_4_rx(const uint8_t* buffer, size_t total_len); #endif /* UIP_CONF_IPV6 */ /* See uip-ds6.h */ -#define UIP_CONF_DS6_NBR_NBU 2 +#define NEIGHBOR_CONF_MAX_NEIGHBORS 2 #define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_PREFIX_NBU 3 #define UIP_CONF_MAX_ROUTES 2 @@ -360,8 +360,8 @@ typedef unsigned short uip_stats_t; #define NETSTACK_CONF_RDC_CHANNEL_CHECK_RATE 8 #undef QUEUEBUF_CONF_NUM #define QUEUEBUF_CONF_NUM 8 -#undef UIP_CONF_DS6_NBR_NBU -#define UIP_CONF_DS6_NBR_NBU 5 +#undef NEIGHBOR_CONF_MAX_NEIGHBORS +#define NEIGHBOR_CONF_MAX_NEIGHBORS 5 #undef UIP_CONF_MAX_ROUTES #define UIP_CONF_MAX_ROUTES 5 @@ -409,7 +409,7 @@ typedef unsigned short uip_stats_t; #endif #define RPL_CONF_STATS 0 #define UIP_CONF_BUFFER_SIZE 1300 -//#define UIP_CONF_DS6_NBR_NBU 12 +//#define NEIGHBOR_CONF_MAX_NEIGHBORS 12 //#define UIP_CONF_MAX_ROUTES 12 #ifdef RPL_BORDER_ROUTER @@ -446,8 +446,8 @@ typedef unsigned short uip_stats_t; #define UIP_CONF_TCP 1 #define UIP_CONF_TCP_MSS 48 #define UIP_CONF_RECEIVE_WINDOW 48 -#undef UIP_CONF_DS6_NBR_NBU -#define UIP_CONF_DS6_NBR_NBU 5 +#undef NEIGHBOR_CONF_MAX_NEIGHBORS +#define NEIGHBOR_CONF_MAX_NEIGHBORS 5 #undef UIP_CONF_MAX_ROUTES #define UIP_CONF_MAX_ROUTES 5 #undef UIP_CONF_MAX_CONNECTIONS diff --git a/platform/avr-rcb/contiki-conf.h b/platform/avr-rcb/contiki-conf.h index b2cc0053e..e8170bdd9 100644 --- a/platform/avr-rcb/contiki-conf.h +++ b/platform/avr-rcb/contiki-conf.h @@ -123,7 +123,6 @@ void clock_adjust_ticks(clock_time_t howmany); #define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3 -#define UIP_CONF_ND6_MAX_NEIGHBORS 4 #define UIP_CONF_ND6_MAX_DEFROUTERS 2 #if UIP_CONF_IPV6 //tcpip.c error on ipv4 build if UIP_CONF_ICMP6 defined #define UIP_CONF_ICMP6 1 diff --git a/platform/avr-zigbit/contiki-conf.h b/platform/avr-zigbit/contiki-conf.h index 32d3e1d5b..c0e8ca305 100644 --- a/platform/avr-zigbit/contiki-conf.h +++ b/platform/avr-zigbit/contiki-conf.h @@ -163,7 +163,6 @@ void clock_adjust_ticks(clock_time_t howmany); #define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3 -#define UIP_CONF_ND6_MAX_NEIGHBORS 4 #define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_UDP_CHECKSUMS 1 #define UIP_CONF_TCP_SPLIT 1 diff --git a/platform/cc2530dk/contiki-conf.h b/platform/cc2530dk/contiki-conf.h index 4c9804dd1..51a0faa9f 100644 --- a/platform/cc2530dk/contiki-conf.h +++ b/platform/cc2530dk/contiki-conf.h @@ -232,8 +232,8 @@ #define UIP_CONF_ND6_REACHABLE_TIME 600000 #define UIP_CONF_ND6_RETRANS_TIMER 10000 -#ifndef UIP_CONF_DS6_NBR_NBU -#define UIP_CONF_DS6_NBR_NBU 4 /* Handle n Neighbors */ +#ifndef NEIGHBOR_CONF_MAX_NEIGHBORS +#define NEIGHBOR_CONF_MAX_NEIGHBORS 4 /* Handle n Neighbors */ #endif #ifndef UIP_CONF_MAX_ROUTES #define UIP_CONF_MAX_ROUTES 4 /* Handle n Routes */ diff --git a/platform/cc2538dk/contiki-conf.h b/platform/cc2538dk/contiki-conf.h index 0251553e9..779f32904 100644 --- a/platform/cc2538dk/contiki-conf.h +++ b/platform/cc2538dk/contiki-conf.h @@ -341,8 +341,8 @@ typedef uint32_t rtimer_clock_t; #define UIP_CONF_ND6_REACHABLE_TIME 600000 #define UIP_CONF_ND6_RETRANS_TIMER 10000 -#ifndef UIP_CONF_DS6_NBR_NBU -#define UIP_CONF_DS6_NBR_NBU 20 +#ifndef NEIGHBOR_CONF_MAX_NEIGHBORS +#define NEIGHBOR_CONF_MAX_NEIGHBORS 20 #endif #ifndef UIP_CONF_MAX_ROUTES #define UIP_CONF_MAX_ROUTES 20 diff --git a/platform/cooja/contiki-conf.h b/platform/cooja/contiki-conf.h index e43a13ce7..07141aa13 100644 --- a/platform/cooja/contiki-conf.h +++ b/platform/cooja/contiki-conf.h @@ -129,9 +129,9 @@ #endif /* UIP_CONF_IPV6_RPL */ /* configure number of neighbors and routes */ -#ifndef UIP_CONF_DS6_NBR_NBU -#define UIP_CONF_DS6_NBR_NBU 300 -#endif /* UIP_CONF_DS6_NBR_NBU */ +#ifndef NEIGHBOR_CONF_MAX_NEIGHBORS +#define NEIGHBOR_CONF_MAX_NEIGHBORS 300 +#endif /* NEIGHBOR_CONF_MAX_NEIGHBORS */ #ifndef UIP_CONF_MAX_ROUTES #define UIP_CONF_MAX_ROUTES 300 #endif /* UIP_CONF_MAX_ROUTES */ @@ -145,7 +145,6 @@ #define RIMEADDR_CONF_SIZE 8 #define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3 -#define UIP_CONF_ND6_MAX_NEIGHBORS 4 #define UIP_CONF_ND6_MAX_DEFROUTERS 2 #ifndef UIP_CONF_IPV6_QUEUE_PKT @@ -155,7 +154,6 @@ #define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3 -#define UIP_CONF_ND6_MAX_NEIGHBORS 4 #define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_IP_FORWARD 0 #ifndef UIP_CONF_BUFFER_SIZE diff --git a/platform/econotag/contiki-conf.h b/platform/econotag/contiki-conf.h index 9264af915..a9d5d00d5 100644 --- a/platform/econotag/contiki-conf.h +++ b/platform/econotag/contiki-conf.h @@ -184,7 +184,7 @@ #define UIP_CONF_IPV6_RPL 1 #endif -#define UIP_CONF_DS6_NBR_NBU 30 +#define NEIGHBOR_CONF_MAX_NEIGHBORS 30 #define UIP_CONF_MAX_ROUTES 30 #define UIP_CONF_ND6_SEND_RA 0 @@ -197,7 +197,6 @@ #define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3 -#define UIP_CONF_ND6_MAX_NEIGHBORS 4 #define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_BUFFER_SIZE 1300 diff --git a/platform/exp5438/contiki-conf.h b/platform/exp5438/contiki-conf.h index e968df31d..af0e60624 100644 --- a/platform/exp5438/contiki-conf.h +++ b/platform/exp5438/contiki-conf.h @@ -137,9 +137,9 @@ #endif /* UIP_CONF_IPV6_RPL */ /* configure number of neighbors and routes */ -#ifndef UIP_CONF_DS6_NBR_NBU -#define UIP_CONF_DS6_NBR_NBU 30 -#endif /* UIP_CONF_DS6_NBR_NBU */ +#ifndef NEIGHBOR_CONF_MAX_NEIGHBORS +#define NEIGHBOR_CONF_MAX_NEIGHBORS 30 +#endif /* NEIGHBOR_CONF_MAX_NEIGHBORS */ #ifndef UIP_CONF_MAX_ROUTES #define UIP_CONF_MAX_ROUTES 30 #endif /* UIP_CONF_MAX_ROUTES */ @@ -156,7 +156,6 @@ #define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3 -#define UIP_CONF_ND6_MAX_NEIGHBORS 4 #define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_IP_FORWARD 0 #ifndef UIP_CONF_BUFFER_SIZE diff --git a/platform/iris/contiki-conf.h b/platform/iris/contiki-conf.h index 2651b6ea9..267173de1 100644 --- a/platform/iris/contiki-conf.h +++ b/platform/iris/contiki-conf.h @@ -113,7 +113,7 @@ #define UIP_CONF_IPV6_RPL 1 /* configure number of neighbors and routes */ -#define UIP_CONF_DS6_NBR_NBU 5 +#define NEIGHBOR_CONF_MAX_NEIGHBORS 5 #define UIP_CONF_MAX_ROUTES 5 #define RPL_CONF_MAX_PARENTS 4 @@ -129,7 +129,6 @@ #define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3 -#define UIP_CONF_ND6_MAX_NEIGHBORS 4 #define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_BUFFER_SIZE 240 diff --git a/platform/mbxxx/contiki-conf.h b/platform/mbxxx/contiki-conf.h index 7331f32a7..3a2513c19 100644 --- a/platform/mbxxx/contiki-conf.h +++ b/platform/mbxxx/contiki-conf.h @@ -108,7 +108,7 @@ #define ENERGEST_CONF_ON 0 #define QUEUEBUF_CONF_NUM 2 #define QUEUEBUF_CONF_REF_NUM 0 -#define UIP_CONF_DS6_NBR_NBU 4 +#define NEIGHBOR_CONF_MAX_NEIGHBORS 4 #define UIP_CONF_DS6_ROUTE_NBU 4 #define RPL_CONF_MAX_PARENTS_PER_DAG 4 #define RPL_CONF_MAX_INSTANCES 1 @@ -144,7 +144,6 @@ #define UIP_CONF_IPV6_CHECKS 1 #define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_ND6_MAX_PREFIXES 2 -#define UIP_CONF_ND6_MAX_NEIGHBORS 2 #define UIP_CONF_ND6_MAX_DEFROUTERS 1 #define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_BUFFER_SIZE 140 diff --git a/platform/micaz/contiki-conf.h b/platform/micaz/contiki-conf.h index 437674498..19294e518 100644 --- a/platform/micaz/contiki-conf.h +++ b/platform/micaz/contiki-conf.h @@ -118,7 +118,7 @@ #define UIP_CONF_IPV6_RPL 1 /* configure number of neighbors and routes */ -#define UIP_CONF_DS6_NBR_NBU 5 +#define NEIGHBOR_CONF_MAX_NEIGHBORS 5 #define UIP_CONF_MAX_ROUTES 5 #define RPL_CONF_MAX_PARENTS 4 @@ -134,7 +134,6 @@ #define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3 -#define UIP_CONF_ND6_MAX_NEIGHBORS 4 #define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_BUFFER_SIZE 240 diff --git a/platform/minimal-net/contiki-conf.h b/platform/minimal-net/contiki-conf.h index 9f132ead8..fb78993bd 100644 --- a/platform/minimal-net/contiki-conf.h +++ b/platform/minimal-net/contiki-conf.h @@ -160,9 +160,8 @@ typedef unsigned short uip_stats_t; #define UIP_CONF_IPV6_REASSEMBLY 1 //#define UIP_CONF_NETIF_MAX_ADDRESSES 5 //#define UIP_CONF_ND6_MAX_PREFIXES 3 -//#define UIP_CONF_ND6_MAX_NEIGHBORS 40 //#define UIP_CONF_ND6_MAX_DEFROUTERS 2 -#define UIP_CONF_DS6_NBR_NBU 100 +#define NEIGHBOR_CONF_MAX_NEIGHBORS 100 #define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_PREFIX_NBU 5 #define UIP_CONF_MAX_ROUTES 100 diff --git a/platform/native/contiki-conf.h b/platform/native/contiki-conf.h index 952c90658..763fffe6b 100644 --- a/platform/native/contiki-conf.h +++ b/platform/native/contiki-conf.h @@ -125,14 +125,13 @@ typedef unsigned short uip_stats_t; #define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3 -#define UIP_CONF_ND6_MAX_NEIGHBORS 4 #define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_ICMP6 1 /* configure number of neighbors and routes */ -#ifndef UIP_CONF_DS6_NBR_NBU -#define UIP_CONF_DS6_NBR_NBU 30 -#endif /* UIP_CONF_DS6_NBR_NBU */ +#ifndef NEIGHBOR_CONF_MAX_NEIGHBORS +#define NEIGHBOR_CONF_MAX_NEIGHBORS 30 +#endif /* NEIGHBOR_CONF_MAX_NEIGHBORS */ #ifndef UIP_CONF_MAX_ROUTES #define UIP_CONF_MAX_ROUTES 30 #endif /* UIP_CONF_MAX_ROUTES */ diff --git a/platform/redbee-dev/contiki-conf.h b/platform/redbee-dev/contiki-conf.h index 8110ec5e2..a25669a30 100644 --- a/platform/redbee-dev/contiki-conf.h +++ b/platform/redbee-dev/contiki-conf.h @@ -178,7 +178,7 @@ typedef unsigned long rtimer_clock_t; #define UIP_CONF_ROUTER 1 #define UIP_CONF_IPV6_RPL 1 -#define UIP_CONF_DS6_NBR_NBU 30 +#define NEIGHBOR_CONF_MAX_NEIGHBORS 30 #define UIP_CONF_MAX_ROUTES 30 #define UIP_CONF_ND6_SEND_RA 0 @@ -191,7 +191,6 @@ typedef unsigned long rtimer_clock_t; #define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3 -#define UIP_CONF_ND6_MAX_NEIGHBORS 4 #define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_BUFFER_SIZE 1300 diff --git a/platform/redbee-econotag/contiki-conf.h b/platform/redbee-econotag/contiki-conf.h index b7c125c51..08eab1282 100644 --- a/platform/redbee-econotag/contiki-conf.h +++ b/platform/redbee-econotag/contiki-conf.h @@ -196,7 +196,7 @@ typedef unsigned long rtimer_clock_t; #define UIP_CONF_ROUTER 1 #define UIP_CONF_IPV6_RPL 1 -#define UIP_CONF_DS6_NBR_NBU 30 +#define NEIGHBOR_CONF_MAX_NEIGHBORS 30 #define UIP_CONF_MAX_ROUTES 30 #define UIP_CONF_ND6_SEND_RA 0 @@ -209,7 +209,6 @@ typedef unsigned long rtimer_clock_t; #define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3 -#define UIP_CONF_ND6_MAX_NEIGHBORS 4 #define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_BUFFER_SIZE 1300 diff --git a/platform/seedeye/contiki-conf.h b/platform/seedeye/contiki-conf.h index 80ca80947..2bb2db3d7 100644 --- a/platform/seedeye/contiki-conf.h +++ b/platform/seedeye/contiki-conf.h @@ -97,7 +97,7 @@ typedef uint32_t rtimer_clock_t; /* IPv6 configuration options */ #define UIP_CONF_IPV6 1 -#define UIP_CONF_DS6_NBR_NBU 20 /* number of neighbors */ +#define NEIGHBOR_CONF_MAX_NEIGHBORS 20 /* number of neighbors */ #define UIP_CONF_DS6_ROUTE_NBU 20 /* number of routes */ #define UIP_CONF_ND6_SEND_RA 0 #define UIP_CONF_ND6_REACHABLE_TIME 600000 diff --git a/platform/sensinode/contiki-conf.h b/platform/sensinode/contiki-conf.h index f327b3ee2..d176284a7 100644 --- a/platform/sensinode/contiki-conf.h +++ b/platform/sensinode/contiki-conf.h @@ -230,8 +230,8 @@ #define UIP_CONF_ND6_REACHABLE_TIME 600000 #define UIP_CONF_ND6_RETRANS_TIMER 10000 -#ifndef UIP_CONF_DS6_NBR_NBU -#define UIP_CONF_DS6_NBR_NBU 4 /* Handle n Neighbors */ +#ifndef NEIGHBOR_CONF_MAX_NEIGHBORS +#define NEIGHBOR_CONF_MAX_NEIGHBORS 4 /* Handle n Neighbors */ #endif #ifndef UIP_CONF_MAX_ROUTES #define UIP_CONF_MAX_ROUTES 4 /* Handle n Routes */ diff --git a/platform/sky/contiki-conf.h b/platform/sky/contiki-conf.h index 753cc0063..9c3bd202e 100644 --- a/platform/sky/contiki-conf.h +++ b/platform/sky/contiki-conf.h @@ -137,9 +137,9 @@ #endif /* UIP_CONF_IPV6_RPL */ /* configure number of neighbors and routes */ -#ifndef UIP_CONF_DS6_NBR_NBU -#define UIP_CONF_DS6_NBR_NBU 20 -#endif /* UIP_CONF_DS6_NBR_NBU */ +#ifndef NEIGHBOR_CONF_MAX_NEIGHBORS +#define NEIGHBOR_CONF_MAX_NEIGHBORS 20 +#endif /* NEIGHBOR_CONF_MAX_NEIGHBORS */ #ifndef UIP_CONF_MAX_ROUTES #define UIP_CONF_MAX_ROUTES 20 #endif /* UIP_CONF_MAX_ROUTES */ @@ -156,7 +156,6 @@ #define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3 -#define UIP_CONF_ND6_MAX_NEIGHBORS 4 #define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_IP_FORWARD 0 #ifndef UIP_CONF_BUFFER_SIZE diff --git a/platform/stk500/contiki-conf.h b/platform/stk500/contiki-conf.h index aac315295..46491d44e 100644 --- a/platform/stk500/contiki-conf.h +++ b/platform/stk500/contiki-conf.h @@ -45,7 +45,7 @@ void clock_adjust_ticks(clock_time_t howmany); //#define UIP_CONF_IPV6_RPL 0 /* See uip-ds6.h */ -#define UIP_CONF_DS6_NBR_NBU 20 +#define NEIGHBOR_CONF_MAX_NEIGHBORS 20 #define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_PREFIX_NBU 3 #define UIP_CONF_MAX_ROUTES 20 diff --git a/platform/win32/contiki-conf.h b/platform/win32/contiki-conf.h index 638e9a637..66af5f47c 100644 --- a/platform/win32/contiki-conf.h +++ b/platform/win32/contiki-conf.h @@ -63,7 +63,7 @@ typedef unsigned short uip_stats_t; #define UIP_CONF_TCP_SPLIT 1 #if UIP_CONF_IPV6 #define UIP_CONF_IP_FORWARD 0 -#define UIP_CONF_DS6_NBR_NBU 100 +#define NEIGHBOR_CONF_MAX_NEIGHBORS 100 #define UIP_CONF_DS6_DEFRT_NBU 2 #define UIP_CONF_DS6_PREFIX_NBU 5 #define UIP_CONF_MAX_ROUTES 100 diff --git a/platform/wismote/contiki-conf.h b/platform/wismote/contiki-conf.h index 95568d27a..9678b9d24 100644 --- a/platform/wismote/contiki-conf.h +++ b/platform/wismote/contiki-conf.h @@ -133,9 +133,9 @@ #endif /* UIP_CONF_IPV6_RPL */ /* configure number of neighbors and routes */ -#ifndef UIP_CONF_DS6_NBR_NBU -#define UIP_CONF_DS6_NBR_NBU 30 -#endif /* UIP_CONF_DS6_NBR_NBU */ +#ifndef NEIGHBOR_CONF_MAX_NEIGHBORS +#define NEIGHBOR_CONF_MAX_NEIGHBORS 30 +#endif /* NEIGHBOR_CONF_MAX_NEIGHBORS */ #ifndef UIP_CONF_MAX_ROUTES #define UIP_CONF_MAX_ROUTES 30 #endif /* UIP_CONF_MAX_ROUTES */ @@ -152,7 +152,6 @@ #define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3 -#define UIP_CONF_ND6_MAX_NEIGHBORS 4 #define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_IP_FORWARD 0 #ifndef UIP_CONF_BUFFER_SIZE diff --git a/platform/z1/contiki-conf.h b/platform/z1/contiki-conf.h index 383bd12c6..44a7f1f71 100644 --- a/platform/z1/contiki-conf.h +++ b/platform/z1/contiki-conf.h @@ -134,7 +134,7 @@ #define UIP_CONF_IPV6_RPL 1 /* Handle 10 neighbors */ -#define UIP_CONF_DS6_NBR_NBU 15 +#define NEIGHBOR_CONF_MAX_NEIGHBORS 15 /* Handle 10 routes */ #define UIP_CONF_MAX_ROUTES 15 @@ -148,7 +148,6 @@ #define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3 -#define UIP_CONF_ND6_MAX_NEIGHBORS 4 #define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_BUFFER_SIZE 140 diff --git a/platform/z1sp/contiki-conf.h b/platform/z1sp/contiki-conf.h index 93d56474c..ca818c212 100644 --- a/platform/z1sp/contiki-conf.h +++ b/platform/z1sp/contiki-conf.h @@ -133,7 +133,7 @@ #define UIP_CONF_IPV6_RPL 1 /* Handle 10 neighbors */ -#define UIP_CONF_DS6_NBR_NBU 15 +#define NEIGHBOR_CONF_MAX_NEIGHBORS 15 /* Handle 10 routes */ #define UIP_CONF_MAX_ROUTES 15 @@ -147,7 +147,6 @@ #define UIP_CONF_IPV6_REASSEMBLY 0 #define UIP_CONF_NETIF_MAX_ADDRESSES 3 #define UIP_CONF_ND6_MAX_PREFIXES 3 -#define UIP_CONF_ND6_MAX_NEIGHBORS 4 #define UIP_CONF_ND6_MAX_DEFROUTERS 2 #define UIP_CONF_IP_FORWARD 0 #define UIP_CONF_BUFFER_SIZE 140