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

Rename routing module flags

This commit is contained in:
Simon Duquennoy 2017-12-10 12:20:24 -08:00
parent 0fc93b6d37
commit 65cbc45145
9 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.include
View File

@ -151,13 +151,13 @@ MAKE_ROUTING ?= MAKE_ROUTING_NULLROUTING
endif
ifeq ($(MAKE_ROUTING),MAKE_ROUTING_RPL_CLASSIC)
CFLAGS += -DUIP_CONF_IPV6_RPL_CLASSIC=1
CFLAGS += -DROUTING_CONF_RPL_CLASSIC=1
MODULES += os/net/routing/rpl-classic
else ifeq ($(MAKE_ROUTING),MAKE_ROUTING_RPL_LITE)
CFLAGS += -DUIP_CONF_IPV6_RPL_LITE=1
CFLAGS += -DROUTING_CONF_RPL_LITE=1
MODULES += os/net/routing/rpl-lite
else ifeq ($(MAKE_ROUTING),MAKE_ROUTING_NULLROUTING)
CFLAGS += -DUIP_CONF_IPV6_NULLROUTING=1
CFLAGS += -DROUTING_CONF_NULLROUTING=1
MODULES += os/net/routing/nullrouting
endif

4
examples/rpl-border-router/webserver/webserver.c
View File

@ -33,9 +33,9 @@
#include "contiki.h"
#include "net/routing/routing.h"
/* For RPL-specific data inclusion, in particular non-storing routing link */
#if UIP_CONF_IPV6_RPL_LITE
#if ROUTING_CONF_RPL_LITE
#include "net/routing/rpl-lite/rpl.h"
#elif UIP_CONF_IPV6_RPL_CLASSIC
#elif ROUTING_CONF_RPL_CLASSIC
#include "net/routing/rpl-classic/rpl.h"
#endif

2
os/contiki-default-conf.h
View File

@ -83,7 +83,7 @@
/* UIP_CONF_IPV6_RPL tells whether the RPL routing protocol is running,
whether implemented as RPL Lite or RPL Classic */
#define UIP_CONF_IPV6_RPL (UIP_CONF_IPV6_RPL_LITE || UIP_CONF_IPV6_RPL_CLASSIC)
#define UIP_CONF_IPV6_RPL (ROUTING_CONF_RPL_LITE || ROUTING_CONF_RPL_CLASSIC)
/* If RPL is enabled also enable the RPL NBR Policy */
#if UIP_CONF_IPV6_RPL

8
os/net/ipv6/multicast/esmrf.c
View File

@ -50,12 +50,12 @@
#include "net/ipv6/uip.h"
#include "net/netstack.h"
#include "net/packetbuf.h"
#if UIP_CONF_IPV6_RPL_LITE
#if ROUTING_CONF_RPL_LITE
#include "net/routing/rpl-lite/rpl.h"
#endif /* UIP_CONF_IPV6_RPL_LITE */
#if UIP_CONF_IPV6_RPL_CLASSIC
#endif /* ROUTING_CONF_RPL_LITE */
#if ROUTING_CONF_RPL_CLASSIC
#include "net/routing/rpl-classic/rpl.h"
#endif /* UIP_CONF_IPV6_RPL_CLASSIC */
#endif /* ROUTING_CONF_RPL_CLASSIC */
#include <string.h>
extern uint16_t uip_slen;

8
os/net/ipv6/multicast/smrf.c
View File

@ -50,12 +50,12 @@
#include "net/routing/routing.h"
#include "net/netstack.h"
#include "net/packetbuf.h"
#if UIP_CONF_IPV6_RPL_LITE
#if ROUTING_CONF_RPL_LITE
#include "net/routing/rpl-lite/rpl.h"
#endif /* UIP_CONF_IPV6_RPL_LITE */
#if UIP_CONF_IPV6_RPL_CLASSIC
#endif /* ROUTING_CONF_RPL_LITE */
#if ROUTING_CONF_RPL_CLASSIC
#include "net/routing/rpl-classic/rpl.h"
#endif /* UIP_CONF_IPV6_RPL_CLASSIC */
#endif /* ROUTING_CONF_RPL_CLASSIC */
#include <string.h>
#define DEBUG DEBUG_NONE

4
os/net/ipv6/uip-ds6-route.h
View File

@ -51,9 +51,9 @@
#else /* UIP_CONF_MAX_ROUTES */
#if UIP_CONF_IPV6_RPL_LITE
#if ROUTING_CONF_RPL_LITE
#define UIP_MAX_ROUTES 0 /* RPL Lite only supports non-storing, no routes */
#elif UIP_CONF_IPV6_RPL_CLASSIC
#elif ROUTING_CONF_RPL_CLASSIC
#include "net/routing/rpl-classic/rpl-conf.h"
#if RPL_WITH_STORING

2
os/net/mac/tsch/tsch-rpl.c
View File

@ -87,7 +87,7 @@ tsch_rpl_callback_new_dio_interval(clock_time_t dio_interval)
rpl_dag_t *dag;
rpl_rank_t root_rank;
rpl_rank_t dag_rank;
#if UIP_CONF_IPV6_RPL_LITE
#if ROUTING_CONF_RPL_LITE
dag = &curr_instance.dag;
root_rank = ROOT_RANK;
dag_rank = DAG_RANK(dag->rank);

6
os/net/netstack.h
View File

@ -48,11 +48,11 @@
#ifdef NETSTACK_CONF_ROUTING
#define NETSTACK_ROUTING NETSTACK_CONF_ROUTING
#else /* NETSTACK_CONF_ROUTING */
#if UIP_CONF_IPV6_RPL_LITE
#if ROUTING_CONF_RPL_LITE
#define NETSTACK_ROUTING rpl_lite_driver
#elif UIP_CONF_IPV6_RPL_CLASSIC
#elif ROUTING_CONF_RPL_CLASSIC
#define NETSTACK_ROUTING rpl_classic_driver
#elif UIP_CONF_IPV6_NULLROUTING
#elif ROUTING_CONF_NULLROUTING
#define NETSTACK_ROUTING nullrouting_driver
#else
#error Unknown ROUTING configuration

12
os/services/shell/shell-commands.c
View File

@ -62,9 +62,9 @@
#include "net/mac/llsec802154.h"
/* For RPL-specific commands */
#if UIP_CONF_IPV6_RPL_LITE
#if ROUTING_CONF_RPL_LITE
#include "net/routing/rpl-lite/rpl.h"
#elif UIP_CONF_IPV6_RPL_CLASSIC
#elif ROUTING_CONF_RPL_CLASSIC
#include "net/routing/rpl-classic/rpl.h"
#endif
@ -100,7 +100,7 @@ ds6_nbr_state_to_str(uint8_t state)
return "Unknown";
}
}
#if UIP_CONF_IPV6_RPL_LITE
#if ROUTING_CONF_RPL_LITE
/*---------------------------------------------------------------------------*/
static const char *
rpl_state_to_str(enum rpl_dag_state state)
@ -192,7 +192,7 @@ PT_THREAD(cmd_rpl_status(struct pt *pt, shell_output_func output, char *args))
PT_END(pt);
}
#endif /* UIP_CONF_IPV6_RPL_LITE */
#endif /* ROUTING_CONF_RPL_LITE */
/*---------------------------------------------------------------------------*/
static void
echo_reply_handler(uip_ipaddr_t *source, uint8_t ttl, uint8_t *data, uint16_t datalen)
@ -726,9 +726,9 @@ struct shell_command_t shell_commands[] = {
{ "rpl-local-repair", cmd_rpl_local_repair, "'> rpl-local-repair': Triggers a RPL local repair" },
{ "rpl-global-repair", cmd_rpl_global_repair, "'> rpl-global-repair': Triggers a RPL global repair" },
#endif /* UIP_CONF_IPV6_RPL */
#if UIP_CONF_IPV6_RPL_LITE
#if ROUTING_CONF_RPL_LITE
{ "rpl-status", cmd_rpl_status, "'> rpl-status': Shows a summary of the current RPL state" },
#endif /* UIP_CONF_IPV6_RPL_LITE */
#endif /* ROUTING_CONF_RPL_LITE */
{ "routes", cmd_routes, "'> routes': Shows the route entries" },
#if MAC_CONF_WITH_TSCH
{ "tsch-set-coordinator", cmd_tsch_set_coordinator, "'> tsch-set-coordinator 0/1 [0/1]': Sets node as coordinator (1) or not (0). Second, optional parameter: enable (1) or disable (0) security." },