Enable wi-sun dhcp relay service.

artokin · Oct 18, 2018 · c2d0e14 · c2d0e14
1 parent 70e56b1
commit c2d0e14
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/source/6LoWPAN/ws/ws_bootstrap.c b/source/6LoWPAN/ws/ws_bootstrap.c
@@ -1494,6 +1494,14 @@ static void ws_bootstrap_rpl_callback(rpl_event_t event, void *handle)
     if (event == RPL_EVENT_DAO_DONE) {
         // Trigger statemachine check
         cur->bootsrap_state_machine_cnt = 1;
+        rpl_dodag_info_t dodag_info;
+        struct rpl_instance *instance = rpl_control_enumerate_instances(cur->rpl_domain, NULL);
+
+        if (instance && rpl_control_read_dodag_info(instance, &dodag_info)) {
+            tr_debug("Enable DHCPv6 relay");
+            dhcp_relay_agent_enable(cur->id, dodag_info.dodag_id);
+        }
+
         ws_set_fhss_hop(cur);
 
     } else if(event == RPL_EVENT_LOCAL_REPAIR_NO_MORE_DIS) {

diff --git a/source/DHCPv6_client/dhcpv6_client_api.h b/source/DHCPv6_client/dhcpv6_client_api.h
@@ -81,5 +81,8 @@ void dhcp_client_global_address_renew(int8_t interface);
 void dhcp_client_global_address_delete(int8_t interface, uint8_t dhcp_addr[static 16], uint8_t prefix[static 16]);
 
 
+void dhcp_relay_agent_enable(int8_t interface, uint8_t border_router_address[static 16]);
+
+
 
 #endif /* DHCPV6_CLIENT_API_H_ */
diff --git a/source/DHCPv6_client/dhcpv6_client_service.c b/source/DHCPv6_client/dhcpv6_client_service.c
@@ -34,6 +34,7 @@
 typedef struct {
     dhcp_client_global_adress_cb *global_address_cb;
     uint16_t service_instance;
+    uint16_t relay_instance;
     uint8_t libDhcp_instance;
     int8_t interface;
 } dhcp_client_class_t;
@@ -53,6 +54,12 @@ void dhcp_client_init(int8_t interface)
     return;
 }
 
+void dhcp_relay_agent_enable(int8_t interface, uint8_t border_router_address[static 16])
+{
+    dhcp_client.relay_instance = dhcp_service_init(interface, DHCP_INTANCE_RELAY_AGENT, NULL);
+    dhcp_service_relay_instance_enable(dhcp_client.relay_instance, border_router_address);
+}
+
 void dhcp_client_delete(int8_t interface)
 {
     protocol_interface_info_entry_t *cur = NULL;