Remove all instances when domain is disbaled and clear EAPOL relay.

Change-Id: I727f653389f4113fbe6f0595c7c9d524f0c683da

Author: Juha Heiskanen

source/6LoWPAN/ws/ws_bootstrap.c

@@ -2116,7 +2116,9 @@ static void ws_bootstrap_start_discovery(protocol_interface_info_entry_t *cur)
     ws_bootstrap_neighbor_list_clean(cur);
 
     // Clear RPL information
-    rpl_control_remove_domain_from_interface(cur);
+    rpl_control_free_domain_instances_from_interface(cur);
+    // Clear EAPOL relay address
+    ws_eapol_relay_delete(cur);
 
     // Clear ip stack from old information
     ws_bootstrap_ip_stack_reset(cur);

source/RPL/rpl_control.c

@@ -350,16 +350,24 @@ void rpl_control_delete_domain(rpl_domain_t *domain)
     rpl_free(domain, sizeof * domain);
 }
 
-static void rpl_control_remove_interface_from_domain(protocol_interface_info_entry_t *cur, rpl_domain_t *domain)
+static void rpl_control_remove_interface_from_domain(protocol_interface_info_entry_t *cur, rpl_domain_t *domain, bool free_instances)
 {
     ns_list_foreach(rpl_instance_t, instance, &domain->instances) {
         rpl_instance_remove_interface(instance, cur->id);
     }
+
     ns_list_foreach(if_address_entry_t, addr, &cur->ip_addresses) {
         if (!addr_is_ipv6_link_local(addr->address)) {
             rpl_control_unpublish_address(domain, addr->address);
         }
     }
+
+    if (free_instances) {
+        ns_list_foreach_safe(rpl_instance_t, instance, &domain->instances) {
+            rpl_delete_instance(instance);
+        }
+    }
+
     if (domain->non_storing_downstream_interface == cur->id) {
         domain->non_storing_downstream_interface = -1;
     }
@@ -384,7 +392,16 @@ void rpl_control_set_domain_on_interface(protocol_interface_info_entry_t *cur, r
 void rpl_control_remove_domain_from_interface(protocol_interface_info_entry_t *cur)
 {
     if (cur->rpl_domain) {
-        rpl_control_remove_interface_from_domain(cur, cur->rpl_domain);
+        rpl_control_remove_interface_from_domain(cur, cur->rpl_domain, false);
+        addr_delete_group(cur, ADDR_LINK_LOCAL_ALL_RPL_NODES);
+        cur->rpl_domain = NULL;
+    }
+}
+
+void rpl_control_free_domain_instances_from_interface(protocol_interface_info_entry_t *cur)
+{
+    if (cur->rpl_domain) {
+        rpl_control_remove_interface_from_domain(cur, cur->rpl_domain, true);
         addr_delete_group(cur, ADDR_LINK_LOCAL_ALL_RPL_NODES);
         cur->rpl_domain = NULL;
     }

source/RPL/rpl_control.h

@@ -145,6 +145,7 @@ rpl_domain_t *rpl_control_create_domain(void);
 void rpl_control_delete_domain(rpl_domain_t *domain);
 void rpl_control_set_domain_on_interface(struct protocol_interface_info_entry *cur, rpl_domain_t *domain, bool downstream);
 void rpl_control_remove_domain_from_interface(struct protocol_interface_info_entry *cur);
+void rpl_control_free_domain_instances_from_interface(struct protocol_interface_info_entry *cur);
 void rpl_control_set_callback(rpl_domain_t *domain, rpl_domain_callback_t callback, rpl_prefix_callback_t prefix_learn_cb, rpl_new_parent_callback_t new_parent_add,  void *cb_handle);
 
 /* Target publishing */
@@ -180,6 +181,7 @@ uint16_t rpl_control_current_rank(const struct rpl_instance *instance);
 #define rpl_control_fast_timer(ticks) ((void) 0)
 #define rpl_control_slow_timer(seconds) ((void) 0)
 #define rpl_control_remove_domain_from_interface(cur) ((void) 0)
+#define rpl_control_free_domain_instances_from_interface(cur) ((void) 0)
 #define rpl_control_register_address(interface, addr) ((void) 0)
 #define rpl_control_address_register_done(interface, ll_addr, status) ((void) 0)
 

test/nanostack/unittest/stub/rpl_control_stub.c

@@ -99,6 +99,11 @@ void rpl_control_remove_domain_from_interface(protocol_interface_info_entry_t *c
 
 }
 
+void rpl_control_free_domain_instances_from_interface(protocol_interface_info_entry_t *cur)
+{
+
+}
+
 void rpl_control_set_callback(rpl_domain_t *domain, rpl_domain_callback_t callback, rpl_prefix_callback_t prefix_learn_cb, rpl_new_parent_callback_t new_parent_add, void *cb_handle)
 {