Removed almost duplicate mle entry discover for ll64

Author: Juha Heiskanen

source/MLE/mle.c

@@ -409,7 +409,6 @@ bool mle_class_get_entry_index(int8_t interface_id, addrtype_t addr_type, const
     return true;
 }
 
-
 mle_neigh_table_entry_t *mle_class_get_entry_by_ll64(int8_t interface_id, const uint8_t *ipv6Address, bool allocateNew, bool *new_entry_allocated)
 {
 
@@ -430,26 +429,6 @@ mle_neigh_table_entry_t *mle_class_get_entry_by_ll64(int8_t interface_id, const
     return mle_class_get_entry_by_mac64(interface_id, temporary_mac64, allocateNew, new_entry_allocated);
 }
 
-mle_neigh_table_entry_t *mle_class_discover_entry_by_ll64(int8_t interface_id, const uint8_t *ipv6Address)
-{
-
-    // Check it really is LL64 (not LL16)
-
-    if (memcmp(ipv6Address, ADDR_LINK_LOCAL_PREFIX , 8) != 0) {
-        return NULL;    //Mot Link Local Address
-    }
-
-    if (memcmp((ipv6Address + 8), ADDR_SHORT_ADR_SUFFIC , 6) == 0) {
-        return NULL;
-    }
-    // map
-    uint8_t temporary_mac64[8];
-    memcpy(temporary_mac64, (ipv6Address + 8), 8);
-    temporary_mac64[0] ^= 2;
-
-    return mle_class_get_by_link_address(interface_id, temporary_mac64, ADDR_802_15_4_LONG);
-}
-
 
 mle_neigh_table_entry_t *mle_class_get_entry_by_mac64(int8_t interface_id, const uint8_t *mac64, bool allocateNew, bool *new_entry_allocated)
 {

source/MLE/mle.h

@@ -201,8 +201,6 @@ bool mle_class_get_entry_index(int8_t interface_id, addrtype_t addr_type, const
 
 mle_neigh_table_entry_t *mle_class_get_entry_by_ll64(int8_t interface_id, const uint8_t *ipv6Address, bool allocateNew, bool *new_entry_allocated);
 
-mle_neigh_table_entry_t *mle_class_discover_entry_by_ll64(int8_t interface_id, const uint8_t *ipv6Address);
-
 mle_neigh_table_entry_t *mle_class_get_entry_by_mac64(int8_t interface_id, const uint8_t *mac64, bool allocateNew, bool *new_entry_allocated);
 
 mle_neigh_table_entry_t *mle_class_get_by_link_address(int8_t interface_id, const uint8_t *address, addrtype_t type);

source/Service_Libs/mle_service/mle_service.c

@@ -657,7 +657,7 @@ static int mle_service_build_packet_send(service_instance_t *srv_ptr, mle_securi
 
 static mle_neighbor_security_counter_info_t *mle_service_get_neighbour_info(int8_t interface_id, uint8_t *ll64)
 {
-    mle_neigh_table_entry_t *neighbour = mle_class_discover_entry_by_ll64(interface_id,ll64);
+    mle_neigh_table_entry_t *neighbour = mle_class_get_entry_by_ll64(interface_id,ll64, false, NULL);
     if (!neighbour) {
         return NULL;
     }

test/nanostack/unittest/mle/mle/mle_test.cpp

@@ -52,13 +52,6 @@ TEST(mle, test_mle_class_get_entry_by_ll64)
     CHECK(test_mle_class_get_entry_by_ll64());
 }
 
-TEST(mle, test_mle_class_discover_entry_by_ll64)
-{
-    CHECK(test_mle_class_discover_entry_by_ll64());
-}
-
-
-
 TEST(mle, test_mle_class_get_by_link_address)
 {
     CHECK(test_mle_class_get_by_link_address());

test/nanostack/unittest/mle/mle/test_mle.c

@@ -313,52 +313,6 @@ bool test_mle_class_get_entry_by_ll64()
     return true;
 }
 
-bool test_mle_class_discover_entry_by_ll64()
-{
-    uint8_t ll64[16];
-    memset(ll64, 0, 16);
-    mle_neigh_table_entry_t *mle_entry;
-    mle_entry = mle_class_discover_entry_by_ll64(0,ll64);
-    if (mle_entry) {
-        return false;
-    }
-    memset(ll64, 0, 16);
-    ll64[0] = 0xfe;
-    ll64[1] = 0x80;
-    memcpy(&ll64[8], ADDR_SHORT_ADR_SUFFIC, 6);
-    mle_entry = mle_class_discover_entry_by_ll64(0,ll64);
-    if (mle_entry) {
-        return false;
-    }
-    memset(&ll64[8], 0, 6);
-    ll64[8] = 0x02;
-    mle_entry = mle_class_discover_entry_by_ll64(0,ll64);
-    if (mle_entry) {
-        return false;
-    }
-    event_stub.int8_value = 0;
-    nsdynmemlib_stub.returnCounter = 2;
-    mle_class_init(0, 32, &tester_mle_entry_user_entry_remove_notify, &tester_mle_entry_link_keep_alive, &tester_interface_is_active);
-
-    mle_entry = mle_class_discover_entry_by_ll64(0,ll64);
-    if (mle_entry) {
-        return false;
-    }
-    //add address
-    mle_entry = mle_class_get_entry_by_ll64(0,ll64 ,true, NULL);
-
-    uint8_t test_tribute = mle_entry->attribute_index;
-    mle_entry = mle_class_discover_entry_by_ll64(0,ll64);
-    if (!mle_entry || test_tribute != mle_entry->attribute_index) {
-        return false;
-    }
-
-    mle_class_deallocate(0);
-    return true;
-}
-
-
-
 bool test_mle_class_get_by_link_address()
 {
     uint8_t mac64[8];

test/nanostack/unittest/mle/mle/test_mle.h

@@ -30,7 +30,6 @@ bool test_mle_class_mode_set();
 bool test_mle_class_list_clean();
 
 bool test_mle_class_get_entry_by_ll64();
-bool test_mle_class_discover_entry_by_ll64();
 bool test_mle_class_get_by_link_address();
 bool test_mle_class_get_by_device_attribute_id();
 bool test_mle_class_remove_entry();

test/nanostack/unittest/stub/mle_stub.c

@@ -353,11 +353,6 @@ bool mle_class_exists_for_interface(int8_t interface_id)
     return mle_stub.bool_value;
 }
 
-mle_neigh_table_entry_t *mle_class_discover_entry_by_ll64(int8_t interface_id, const uint8_t *ipv6Address)
-{
-    return NULL;
-}
-
 int16_t mle_class_sleepy_entry_count_get(int8_t interface_id)
 {
     return 0;