Merge pull request RIOT-OS#4721 from cgundogan/pr/nc/enhance

ipv6/nc: doc fix and unittest for unmanaged nc entries
Yonezawa-T2 · Feb 1, 2016 · e6f3349 · e6f3349
2 parents fa273b1 + e0bf46c
commit e6f3349
Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/sys/include/net/gnrc/ipv6/nc.h b/sys/include/net/gnrc/ipv6/nc.h
@@ -88,7 +88,6 @@ extern "C" {
 #define GNRC_IPV6_NC_IS_ROUTER          (0x08)  /**< The neighbor is a router */
 
 #define GNRC_IPV6_NC_TYPE_MASK          (0x30)  /**< Mask for neighbor cache state */
-#define GNRC_IPV6_NC_TYPE_POS           (4)     /**< Shift of neighbor cache state */
 
 /**
  * @{
@@ -232,7 +231,7 @@ gnrc_ipv6_nc_t *gnrc_ipv6_nc_get_next(gnrc_ipv6_nc_t *prev);
 gnrc_ipv6_nc_t *gnrc_ipv6_nc_get_next_router(gnrc_ipv6_nc_t *prev);
 
 /**
- * @brief   Returns the state of a neigbor cache entry.
+ * @brief   Returns the state of a neighbor cache entry.
  *
  * @param[in] entry A neighbor cache entry
  *
@@ -244,7 +243,7 @@ static inline uint8_t gnrc_ipv6_nc_get_state(const gnrc_ipv6_nc_t *entry)
 }
 
 /**
- * @brief   Returns the type of a neigbor cache entry.
+ * @brief   Returns the type of a neighbor cache entry.
  *
  * @param[in] entry A neighbor cache entry
  *

diff --git a/tests/unittests/tests-ipv6_nc/tests-ipv6_nc.c b/tests/unittests/tests-ipv6_nc/tests-ipv6_nc.c
@@ -345,6 +345,18 @@ static void test_ipv6_nc_is_reachable__reachable(void)
     TEST_ASSERT(gnrc_ipv6_nc_is_reachable(entry));
 }
 
+static void test_ipv6_nc_is_reachable__unmanaged(void)
+{
+    ipv6_addr_t addr = DEFAULT_TEST_IPV6_ADDR;
+    gnrc_ipv6_nc_t *entry = NULL;
+
+    test_ipv6_nc_add__success(); /* adds DEFAULT_TEST_IPV6_ADDR to DEFAULT_TEST_NETIF */
+
+    TEST_ASSERT_NOT_NULL((entry = gnrc_ipv6_nc_get(DEFAULT_TEST_NETIF, &addr)));
+    entry->flags = (GNRC_IPV6_NC_STATE_UNMANAGED << GNRC_IPV6_NC_STATE_POS);
+    TEST_ASSERT(gnrc_ipv6_nc_is_reachable(entry));
+}
+
 static void test_ipv6_nc_still_reachable__incomplete(void)
 {
     ipv6_addr_t addr = DEFAULT_TEST_IPV6_ADDR;
@@ -449,6 +461,7 @@ Test *tests_ipv6_nc_tests(void)
         new_TestFixture(test_ipv6_nc_get_next_router__second_entry),
         new_TestFixture(test_ipv6_nc_is_reachable__incomplete),
         new_TestFixture(test_ipv6_nc_is_reachable__reachable),
+        new_TestFixture(test_ipv6_nc_is_reachable__unmanaged),
         new_TestFixture(test_ipv6_nc_still_reachable__incomplete),
         new_TestFixture(test_ipv6_nc_still_reachable__success),
         new_TestFixture(test_ipv6_nc_get_l2_addr__NULL_entry),