From 0531d9bd8293c412a35a3e25cf14566f64932564 Mon Sep 17 00:00:00 2001
From: joxe <joxe>
Date: Sat, 1 May 2010 12:02:25 +0000
Subject: [PATCH] moved RPL routing state struct into uip-ds6

---
 core/net/uip-ds6.h | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/core/net/uip-ds6.h b/core/net/uip-ds6.h
index 268e7d1b8..5f0a21bc6 100755
--- a/core/net/uip-ds6.h
+++ b/core/net/uip-ds6.h
@@ -220,6 +220,26 @@ typedef struct uip_ds6_maddr {
   uip_ipaddr_t ipaddr;
 } uip_ds6_maddr_t;
 
+/** \brief define some additional RPL related route state and 
+ *  neighbor callback for RPL if RPL is defined */
+#if UIP_CONF_IPV6_RPL
+#ifndef UIP_DS6_ROUTE_STATE_TYPE
+#define UIP_DS6_ROUTE_STATE_TYPE rpl_route_entry_t
+/* Needed for the extended route entry state when using ContikiRPL */
+typedef struct rpl_route_entry {
+  uint32_t lifetime;
+  uint32_t saved_lifetime;
+  void *dag;
+  uint8_t learned_from;
+} rpl_route_entry_t;
+#endif /* UIP_DS6_ROUTE_STATE_TYPE */
+#ifndef UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED
+#define UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED rpl_ds6_neighbor_callback
+#endif /* UIP_CONF_DS6_NEIGHBOR_STATE_CHANGED */
+#endif /* UIP_CONF_IPV6_RPL */
+
+
+
 /** \brief An entry in the routing table */
 typedef struct uip_ds6_route {
   uint8_t isused;