ipv6: Initial import of IPv6 interfaces module

RIOT-OS · Nov 14, 2014 · 80432d0 · 80432d0
1 parent 8852a37
commit 80432d0
Show file tree

Hide file tree

Showing 13 changed files with 1,229 additions and 1 deletion.
diff --git a/Makefile.dep b/Makefile.dep
@@ -63,6 +63,19 @@ ifneq (,$(filter sixlowpan,$(USEMODULE)))
 	USEMODULE += vtimer
 endif
 
+ifneq (,$(filter ipv6_router,$(USEMODULE)))
+    USEMODULE += ipv6
+endif
+
+ifneq (,$(filter ipv6,$(USEMODULE)))
+    USEMODULE += ipv6_if
+    USEMODULE += ipv6_addr
+endif
+
+ifneq (,$(filter ipv6_if,$(USEMODULE)))
+    USEMODULE += ipv6_addr
+endif
+
 ifneq (,$(filter uart0,$(USEMODULE)))
 	USEMODULE += lib
 	USEMODULE += posix

diff --git a/Makefile.pseudomodules b/Makefile.pseudomodules
@@ -1,3 +1,4 @@
 PSEUDOMODULES += defaulttransceiver
 PSEUDOMODULES += transport_layer
 PSEUDOMODULES += pktqueue
+PSEUDOMODULES += ipv6_router
diff --git a/sys/Makefile b/sys/Makefile
@@ -51,11 +51,14 @@ ifneq (,$(filter sixlowpan_iphc_cbuf,$(USEMODULE)))
     DIRS += net/link_layer/sixlowpan/iphc_cbuf
 endif
 ifneq (,$(filter ipv6,$(USEMODULE)))
-    # TODO
+    DIRS += net/network_layer/ipv6
 endif
 ifneq (,$(filter ipv6_addr,$(USEMODULE)))
     DIRS += net/network_layer/ipv6/addr
 endif
+ifneq (,$(filter ipv6_if,$(USEMODULE)))
+    DIRS += net/network_layer/ipv6/if
+endif
 ifneq (,$(filter rpl,$(USEMODULE)))
     DIRS += net/routing/rpl
 endif

diff --git a/sys/Makefile.include b/sys/Makefile.include
@@ -42,9 +42,15 @@ endif
 ifneq (,$(filter sixlowpan_iphc_cbuf,$(USEMODULE)))
     USEMODULE_INCLUDES += $(RIOTBASE)/sys/net/include
 endif
+ifneq (,$(filter ipv6,$(USEMODULE)))
+    USEMODULE_INCLUDES += $(RIOTBASE)/sys/net/include
+endif
 ifneq (,$(filter ipv6_addr,$(USEMODULE)))
     USEMODULE_INCLUDES += $(RIOTBASE)/sys/net/include
 endif
+ifneq (,$(filter ipv6_if,$(USEMODULE)))
+    USEMODULE_INCLUDES += $(RIOTBASE)/sys/net/include
+endif
 ifneq (,$(filter rpl,$(USEMODULE)))
     USEMODULE_INCLUDES += $(RIOTBASE)/sys/net/include
     USEMODULE_INCLUDES += $(RIOTBASE)/sys/net/routing/rpl

diff --git a/sys/auto_init/auto_init.c b/sys/auto_init/auto_init.c
@@ -71,6 +71,10 @@
 #include "basic_mac.h"
 #endif
 
+#ifdef MODULE_IPV6_IF
+#include "ipv6/if.h"
+#endif
+
 #ifdef MODULE_NET_IF
 #include "cpu-conf.h"
 #include "cpu.h"
@@ -245,6 +249,10 @@ void auto_init(void)
     DEBUG("Auto init basic_mac module.\n");
     basic_mac_init_module();
 #endif
+#ifdef MODULE_IPV6_IF
+    DEBUG("Auto init ipv6_if module.\n");
+    ipv6_if_init();
+#endif
 #ifdef MODULE_NET_IF
     DEBUG("Auto init net_if module.\n");
     auto_init_net_if();