fix for valgrind reported error. (ARMmbed#1842)

nxp-archive · Oct 1, 2018 · d6b4111 · d6b4111
1 parent 8160d86
commit d6b4111
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/source/6LoWPAN/Thread/thread_extension.c b/source/6LoWPAN/Thread/thread_extension.c
@@ -623,7 +623,7 @@ void thread_extension_address_registration(struct protocol_interface_info_entry
 #endif
 }
 
-void thread_extension_dua_address_generate(protocol_interface_info_entry_t *cur, uint8_t *domain_prefix, uint8_t domain_prefix_len)
+void thread_extension_dua_address_generate(protocol_interface_info_entry_t *cur, const uint8_t *domain_prefix, uint8_t domain_prefix_len)
 {
     if_address_entry_t *def_address = NULL;
     uint8_t domain_address[16];

diff --git a/source/6LoWPAN/Thread/thread_extension.h b/source/6LoWPAN/Thread/thread_extension.h
@@ -49,7 +49,7 @@ void thread_extension_mtd_service_register(protocol_interface_info_entry_t *cur)
 void thread_extension_network_data_process(struct protocol_interface_info_entry *cur);
 int thread_extension_primary_bbr_get(struct protocol_interface_info_entry *cur, uint8_t *addr_ptr, uint8_t *seq_ptr, uint32_t *timer1_ptr, uint32_t *timer2_ptr);
 void thread_extension_address_registration(struct protocol_interface_info_entry *interface, const uint8_t *addr, const uint8_t *child_mac64, bool refresh_child_entry, bool duplicate_child_detected);
-void thread_extension_dua_address_generate(protocol_interface_info_entry_t *cur, uint8_t *domain_prefix, uint8_t domain_prefix_len);
+void thread_extension_dua_address_generate(protocol_interface_info_entry_t *cur, const uint8_t *domain_prefix, uint8_t domain_prefix_len);
 void thread_extension_aloc_generate(struct protocol_interface_info_entry *cur);
 bool thread_extension_aloc_map(protocol_interface_info_entry_t *cur, uint16_t *addr16);
 void thread_extension_mcast_subscrition_change(protocol_interface_info_entry_t *interface);

diff --git a/source/6LoWPAN/Thread/thread_nd.c b/source/6LoWPAN/Thread/thread_nd.c
@@ -294,7 +294,7 @@ static void thread_nd_address_error(int8_t interface_id, const uint8_t ip_addr[1
     if_address_entry_t *addr_entry = addr_get_entry(cur, ip_addr);
     if (addr_entry && memcmp(ml_eid, cur->iid_slaac, 8)) {
         addr_duplicate_detected(cur, ip_addr);
-        thread_extension_dua_address_generate(cur, addr_entry->address, 64);
+        thread_extension_dua_address_generate(cur, ip_addr, 64);
     }
 
     /* Scan IPv6 neighbour cache for registered entries of children */

diff --git a/test/nanostack/unittest/stub/thread_extension_stub.c b/test/nanostack/unittest/stub/thread_extension_stub.c
@@ -174,7 +174,7 @@ int thread_extension_service_init(protocol_interface_info_entry_t *cur)
     return 0;
 }
 
-void thread_extension_dua_address_generate(protocol_interface_info_entry_t *cur, uint8_t *domain_prefix, uint8_t domain_prefix_len)
+void thread_extension_dua_address_generate(protocol_interface_info_entry_t *cur, const uint8_t *domain_prefix, uint8_t domain_prefix_len)
 {
     return;
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         return 0;
     }
-    void thread_extension_dua_address_generate(protocol_interface_info_entry_t *cur, uint8_t *domain_prefix, uint8_t domain_prefix_len)
+    void thread_extension_dua_address_generate(protocol_interface_info_entry_t *cur, const uint8_t *domain_prefix, uint8_t domain_prefix_len)
     {
         return;
     }
@@ Expand Down @@