From 1025e7337c844f9093162eb09bde72a3892f4937 Mon Sep 17 00:00:00 2001
From: nifi <nifi>
Date: Mon, 1 Mar 2010 14:46:57 +0000
Subject: [PATCH] Added configurable router module

---
 platform/sky/contiki-sky-main.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/platform/sky/contiki-sky-main.c b/platform/sky/contiki-sky-main.c
index c391f2da2..cce22ee6c 100644
--- a/platform/sky/contiki-sky-main.c
+++ b/platform/sky/contiki-sky-main.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: contiki-sky-main.c,v 1.73 2010/03/01 13:30:21 nifi Exp $
+ * @(#)$Id: contiki-sky-main.c,v 1.74 2010/03/01 14:46:57 nifi Exp $
  */
 
 #include <signal.h>
@@ -55,9 +55,6 @@
 #include "net/sicslowpan.h"
 #include "net/uip-netif.h"
 #include "net/mac/sicslowmac.h"
-#if UIP_CONF_ROUTER
-#include "net/routing/rimeroute.h"
-#endif /* UIP_CONF_ROUTER*/
 #endif /* WITH_UIP6 */
 
 #include "net/rime.h"
@@ -76,6 +73,20 @@
 
 SENSORS(&button_sensor);
 
+#if UIP_CONF_ROUTER
+
+#ifndef UIP_ROUTER_MODULE
+#ifdef UIP_CONF_ROUTER_MODULE
+#define UIP_ROUTER_MODULE UIP_CONF_ROUTER_MODULE
+#else /* UIP_CONF_ROUTER_MODULE */
+#define UIP_ROUTER_MODULE rimeroute
+#endif /* UIP_CONF_ROUTER_MODULE */
+#endif /* UIP_ROUTER_MODULE */
+
+extern const struct uip_router UIP_ROUTER_MODULE;
+
+#endif /* UIP_CONF_ROUTER */
+
 #if DCOSYNCH_CONF_ENABLED
 static struct timer mgt_timer;
 #endif
@@ -318,7 +329,7 @@ main(int argc, char **argv)
 
   
 #if UIP_CONF_ROUTER
-  uip_router_register(&rimeroute);
+  uip_router_register(&UIP_ROUTER_MODULE);
 #endif /* UIP_CONF_ROUTER */
 #else /* WITH_UIP6 */