Add network time vendor data element to DHCPv6 reply message

Mika Tervonen · Mika Tervonen · commit 560619d85d90 · 2021-06-11T13:37:23.000+03:00
New ARM vendor data specified where Network time can be distributed
Added support for Dynamic vendor data for individual request
changed vendor data length to uint16
Removed static variables from border router
diff --git a/source/6LoWPAN/ws/ws_bbr_api.c b/source/6LoWPAN/ws/ws_bbr_api.c
@@ -42,6 +42,7 @@
 #include "ws_management_api.h"
 #include "net_rpl.h"
 #include "Service_Libs/nd_proxy/nd_proxy.h"
+#include "Service_Libs/utils/ns_time.h"
 #include "6LoWPAN/ws/ws_bbr_api_internal.h"
 #include "6LoWPAN/ws/ws_pae_controller.h"
 #include "6LoWPAN/lowpan_adaptation_interface.h"
@@ -96,9 +97,6 @@ static uint8_t current_global_prefix[16] = {0}; // DHCP requires 16 bytes prefix
 static uint32_t bbr_delay_timer = BBR_CHECK_INTERVAL; // initial delay.
 static uint32_t global_prefix_unavailable_timer = 0; // initial delay.
 
-static uint8_t *dhcp_vendor_data_ptr = NULL;
-static uint8_t dhcp_vendor_data_len = 0;
-
 static rpl_dodag_conf_t rpl_conf = {
     // Lifetime values
     .default_lifetime = 120,
@@ -485,9 +483,38 @@ static bool wisun_dhcp_address_add_cb(int8_t interfaceId, dhcp_address_cache_upd
     return true;
 }
 
+static uint8_t *ws_bbr_dhcp_server_dynamic_vendor_data_write(int8_t interfaceId, uint8_t *ptr, uint16_t *data_len)
+{
+    // If local time is not available vendor data is not written and data_len is not modified
+    (void)interfaceId;
+
+    uint64_t time_read;
+
+    if (0 != ns_time_system_time_read(&time_read)) {
+        return ptr;
+    }
+
+    if (data_len) {
+        *data_len += net_vendor_option_current_time_length();
+    }
+    if (!ptr) {
+        return ptr;
+    }
+    time_read += 2208988800; // Time starts now from the 0 era instead of First day of Unix (1 Jan 1970)
+
+    uint32_t era = time_read / (uint64_t)(4294967296);
+    uint32_t timestamp = time_read - (era * (uint64_t)(4294967296));
+    ptr = net_vendor_option_current_time_write(ptr, era, timestamp, 0);
+
+    return ptr;
+}
+
+
 static void ws_bbr_dhcp_server_dns_info_update(protocol_interface_info_entry_t *cur, uint8_t *global_id)
 {
     //add DNS server information to DHCP server that is learned from the backbone interface.
+    uint8_t *dhcp_vendor_data_ptr = NULL;
+    uint8_t dhcp_vendor_data_len = 0;
     uint8_t dns_server_address[16];
     uint8_t *dns_search_list_ptr = NULL;
     uint8_t dns_search_list_len = 0;
@@ -497,33 +524,40 @@ static void ws_bbr_dhcp_server_dns_info_update(protocol_interface_info_entry_t *
         DHCPv6_server_service_set_dns_server(cur->id, global_id, dns_server_address, dns_search_list_ptr, dns_search_list_len);
     }
 
-    //TODO Generate vendor data in Wi-SUN network include the cached DNS query results in some sort of TLV format
+    //Generate ARM specific vendor data in Wi-SUN network
+    // Cached DNS query results
+    // Network Time
+
     int vendor_data_len = 0;
     for (int n = 0; n < MAX_DNS_RESOLUTIONS; n++) {
         if (pre_resolved_dns_queries[n].domain_name != NULL) {
             vendor_data_len += net_dns_option_vendor_option_data_dns_query_length(pre_resolved_dns_queries[n].domain_name);
         }
     }
+
     if (vendor_data_len) {
-        ns_dyn_mem_free(dhcp_vendor_data_ptr);
-        dhcp_vendor_data_ptr = ns_dyn_mem_alloc(vendor_data_len);
+        dhcp_vendor_data_ptr = ns_dyn_mem_temporary_alloc(vendor_data_len);
         if (!dhcp_vendor_data_ptr) {
             tr_warn("Vendor info set fail");
             return;
         }
         dhcp_vendor_data_len = vendor_data_len;
     }
+    // Write ARM vendor data
+    uint8_t *ptr = dhcp_vendor_data_ptr;
+
     if (dhcp_vendor_data_ptr) {
         // Write vendor data
-        uint8_t *ptr = dhcp_vendor_data_ptr;
         for (int n = 0; n < MAX_DNS_RESOLUTIONS; n++) {
             if (pre_resolved_dns_queries[n].domain_name != NULL) {
                 ptr = net_dns_option_vendor_option_data_dns_query_write(ptr, pre_resolved_dns_queries[n].address, pre_resolved_dns_queries[n].domain_name);
             }
         }
     }
+    DHCPv6_server_service_set_vendor_data_callback(cur->id, global_id, ARM_ENTERPRISE_NUMBER, ws_bbr_dhcp_server_dynamic_vendor_data_write);
 
     DHCPv6_server_service_set_vendor_data(cur->id, global_id, ARM_ENTERPRISE_NUMBER, dhcp_vendor_data_ptr, dhcp_vendor_data_len);
+    ns_dyn_mem_free(dhcp_vendor_data_ptr);
 }
 
 static void wisun_dhcp_address_remove_cb(int8_t interfaceId, uint8_t *targetAddress, void *prefix_info)
diff --git a/source/6LoWPAN/ws/ws_bootstrap.c b/source/6LoWPAN/ws/ws_bootstrap.c
@@ -49,6 +49,7 @@
 #include "Common_Protocols/ip.h"
 #include "Service_Libs/Trickle/trickle.h"
 #include "Service_Libs/fhss/channel_list.h"
+#include "Service_Libs/utils/ns_time.h"
 #include "6LoWPAN/ws/ws_common_defines.h"
 #include "6LoWPAN/ws/ws_common_defines.h"
 #include "6LoWPAN/ws/ws_config.h"
@@ -999,6 +1000,34 @@ static void ws_bootstrap_dhcp_info_notify_cb(int8_t interface, dhcp_option_notif
                         net_dns_query_result_set(interface, address, domain, server_info->life_time);
                     }
                 }
+                if (option_type == ARM_DHCP_VENDOR_DATA_NETWORK_TIME) {
+                    // Process ARM Network Time
+                    // Get Current time
+                    // Get Round trip time of the DHCP request
+                    // Estimated error is elapsed time of request
+                    // If current time difference is larger than estimated error update current time
+                    //     set the time for server time + *.5 RTT
+                    int32_t era;
+                    uint32_t offset;
+                    if (net_vendor_option_current_time_read(options->option.vendor_spesific.data, options->option.vendor_spesific.data_length, &era, &offset, NULL)) {
+                        uint32_t estimated_error = 10;
+                        uint64_t current_time;
+                        uint64_t network_time = (era * (uint64_t)(4294967296)) + offset - 2208988800; //Convert to First day of Unix (1 Jan 1970)
+                        if (0 == ns_time_system_time_read(&current_time)) {
+                            uint64_t difference;
+                            if (current_time > network_time) {
+                                difference = current_time - network_time;
+                            } else {
+                                difference = network_time - current_time;
+                            }
+                            if (difference > estimated_error) {
+                                // Larger than 10 second difference update the time
+                                int ret = ns_time_system_time_write(network_time);
+                                tr_info("Network Time %s: Era:%"PRId32" Offset:%"PRIu32" old time: %"PRIu64" time: %"PRIu64, ret == 0 ? "updated" : "update FAILED", era, offset, current_time, network_time);
+                            }
+                        }
+                    }
+                }
 
                 options->option.vendor_spesific.data_length -= option_len;
                 options->option.vendor_spesific.data += option_len;
diff --git a/source/DHCPv6_Server/DHCPv6_Server_service.c b/source/DHCPv6_Server/DHCPv6_Server_service.c
@@ -464,7 +464,7 @@ int DHCPv6_server_service_set_dns_server(int8_t interface, uint8_t guaPrefix[sta
     return 0;
 }
 
-int DHCPv6_server_service_set_vendor_data(int8_t interface, uint8_t guaPrefix[static 16], uint32_t enterprise_number, uint8_t *dhcp_vendor_data_ptr, uint8_t dhcp_vendor_data_len)
+int DHCPv6_server_service_set_vendor_data(int8_t interface, uint8_t guaPrefix[static 16], uint32_t enterprise_number, uint8_t *dhcp_vendor_data_ptr, uint16_t dhcp_vendor_data_len)
 {
     dhcpv6_gua_server_entry_s *serverInfo = libdhcpv6_server_data_get_by_prefix_and_interfaceid(interface, guaPrefix);
     if (!serverInfo) {
@@ -496,6 +496,21 @@ int DHCPv6_server_service_set_vendor_data(int8_t interface, uint8_t guaPrefix[st
     return 0;
 }
 
+int DHCPv6_server_service_set_vendor_data_callback(int8_t interface, uint8_t guaPrefix[static 16], uint32_t enterprise_number, dhcp_vendor_data_cb *vendor_data_cb)
+{
+    dhcpv6_gua_server_entry_s *serverInfo = libdhcpv6_server_data_get_by_prefix_and_interfaceid(interface, guaPrefix);
+    if (!serverInfo) {
+        return -1;
+    }
+
+    dhcpv6_vendor_data_t *vendor_data_entry = libdhcpv6_vendor_data_allocate(serverInfo, enterprise_number);
+
+    if (!vendor_data_entry) {
+        return -1;
+    }
+    vendor_data_entry->vendor_data_cb = vendor_data_cb;
+    return 0;
+}
 #else
 
 int DHCPv6_server_service_init(int8_t interface, uint8_t guaPrefix[static 16], uint8_t serverDUID[static 8], uint16_t serverDUIDType)
diff --git a/source/DHCPv6_Server/DHCPv6_server_service.h b/source/DHCPv6_Server/DHCPv6_server_service.h
@@ -98,7 +98,9 @@ int DHCPv6_server_service_set_address_validlifetime(int8_t interface, uint8_t gu
 
 int DHCPv6_server_service_set_dns_server(int8_t interface, uint8_t guaPrefix[static 16], uint8_t dns_server_address[static 16], uint8_t *dns_search_list_ptr, uint8_t dns_search_list_len);
 
-int DHCPv6_server_service_set_vendor_data(int8_t interface, uint8_t guaPrefix[static 16], uint32_t enterprise_number, uint8_t *dhcp_vendor_data_ptr, uint8_t dhcp_vendor_data_len);
+int DHCPv6_server_service_set_vendor_data(int8_t interface, uint8_t guaPrefix[static 16], uint32_t enterprise_number, uint8_t *dhcp_vendor_data_ptr, uint16_t dhcp_vendor_data_len);
+
+int DHCPv6_server_service_set_vendor_data_callback(int8_t interface, uint8_t guaPrefix[static 16], uint32_t enterprise_number, dhcp_vendor_data_cb *vendor_data_cb);
 
 #else
 #define DHCPv6_server_service_delete(interface, guaPrefix, delete_gua_addresses)
diff --git a/source/libDHCPv6/libDHCPv6_server.c b/source/libDHCPv6/libDHCPv6_server.c
@@ -461,12 +461,12 @@ dhcpv6_vendor_data_t *libdhcpv6_vendor_data_allocate(dhcpv6_gua_server_entry_s *
     }
     ns_list_add_to_end(&serverInfo->vendorDataList, entry);
     entry->enterprise_number = enterprise_number;
+    entry->vendor_data_cb = NULL;
     entry->vendor_data = NULL;
     entry->vendor_data_length = 0;
     return entry;
 }
 
-
 uint16_t libdhcpv6_dns_server_message_sizes(dhcpv6_gua_server_entry_s *serverInfo)
 {
     uint16_t message_size = 0;
@@ -482,7 +482,13 @@ uint16_t libdhcpv6_vendor_data_message_sizes(dhcpv6_gua_server_entry_s *serverIn
 {
     uint16_t message_size = 0;
     ns_list_foreach(dhcpv6_vendor_data_t, cur, &serverInfo->vendorDataList) {
-        message_size += 4 + 4 + cur->vendor_data_length; //Type + Length + enterprise + vendor_data_length
+        uint16_t size = cur->vendor_data_length; //Type + Length + enterprise + vendor_data_length
+        if (cur->vendor_data_cb) {
+            cur->vendor_data_cb(serverInfo->interfaceId, NULL, &size);
+        }
+        if (size != 0) {
+            message_size += 2 + 2 + 4 + size;
+        }
     }
     return message_size;
 }
@@ -510,14 +516,27 @@ uint8_t *libdhcpv6_vendor_data_message_writes(dhcpv6_gua_server_entry_s *serverI
 {
     ns_list_foreach(dhcpv6_vendor_data_t, cur, &serverInfo->vendorDataList) {
 
-        uint16_t length = cur->vendor_data_length + 4;
+        uint16_t length = cur->vendor_data_length;
+
+        if (cur->vendor_data_cb) {
+            cur->vendor_data_cb(serverInfo->interfaceId, NULL, &length);
+        }
+        if (length == 0) {
+            // No vendor data
+            continue;
+        }
+        length += 4;
+
         ptr = common_write_16_bit(DHCPV6_OPTION_VENDOR_SPECIFIC_INFO, ptr);
         ptr = common_write_16_bit(length, ptr); //Length
         ptr = common_write_32_bit(cur->enterprise_number, ptr);
         if (cur->vendor_data_length) {
             memcpy(ptr, cur->vendor_data, cur->vendor_data_length);
             ptr += cur->vendor_data_length;
         }
+        if (cur->vendor_data_cb) {
+            ptr = cur->vendor_data_cb(serverInfo->interfaceId, ptr, NULL);
+        }
     }
     return ptr;
 }
diff --git a/source/libDHCPv6/libDHCPv6_server.h b/source/libDHCPv6/libDHCPv6_server.h
@@ -32,6 +32,8 @@
 #define DHCP_ADDRESS_ID_START 2
 
 typedef void (dhcp_address_prefer_remove_cb)(int8_t interfaceId, uint8_t *targetAddress, void *prefix_info);
+typedef uint8_t *(dhcp_vendor_data_cb)(int8_t interfaceId, uint8_t *ptr, uint16_t *dhcp_vendor_data_len);
+
 
 typedef struct dhcpv6_allocated_address_entry_s {
     uint8_t             linkId[8];  /*!< Services UL64 */
@@ -54,8 +56,9 @@ typedef struct dhcpv6_dns_server_data_s {
 
 typedef struct dhcpv6_vendor_data_s {
     uint32_t            enterprise_number;
+    dhcp_vendor_data_cb *vendor_data_cb;    // Additional vendor data that can be set for individual reply
     uint8_t             *vendor_data;
-    uint8_t             vendor_data_length;
+    uint16_t             vendor_data_length;
     ns_list_link_t      link;               /*!< List link entry */
 } dhcpv6_vendor_data_t;
 
diff --git a/source/libDHCPv6/libDHCPv6_vendordata.c b/source/libDHCPv6/libDHCPv6_vendordata.c
@@ -98,3 +98,61 @@ uint16_t net_dns_option_vendor_option_data_dns_query_read(uint8_t *ptr, uint16_t
     }
     return option_len;
 }
+
+uint16_t net_vendor_option_current_time_length(void)
+{
+    return 4 + 3 * sizeof(uint32_t);
+}
+
+uint8_t *net_vendor_option_current_time_write(uint8_t *ptr, int32_t era, uint32_t offset, uint32_t fraction)
+{
+    /*
+     * Time value written using NTP time format
+     * Following rfc5905
+     */
+
+    ptr = common_write_16_bit(ARM_DHCP_VENDOR_DATA_NETWORK_TIME, ptr);
+    ptr = common_write_16_bit(3 * sizeof(uint32_t), ptr);
+    ptr = common_write_32_bit((uint32_t)era, ptr);
+    ptr = common_write_32_bit(offset, ptr);
+    ptr = common_write_32_bit(fraction, ptr);
+    return ptr;
+}
+
+uint8_t *net_vendor_option_current_time_read(uint8_t *ptr, uint16_t length, int32_t *era, uint32_t *offset, uint32_t *fraction)
+{
+    /*
+     * Time value written using NTP time format
+     * Following rfc5905
+     */
+    uint16_t option_len;
+
+    if (length < net_vendor_option_current_time_length()) {
+        // Corrupted as there is no room for all fields
+        return 0;
+    }
+
+    if (common_read_16_bit(ptr) != ARM_DHCP_VENDOR_DATA_NETWORK_TIME) {
+        return 0;
+    }
+
+    option_len = common_read_16_bit(ptr + 2);
+    ptr += 4;
+
+    if (option_len < 3 * sizeof(uint32_t)) {
+        // Corrupted as not enough room for fields
+        return 0;
+    }
+
+    if (era) {
+        *era = (int32_t)common_read_32_bit(ptr);
+    }
+    if (offset) {
+        *offset = common_read_32_bit(ptr + sizeof(uint32_t));
+    }
+    if (fraction) {
+        *fraction = common_read_32_bit(ptr + 2 * sizeof(uint32_t));
+    }
+
+    return ptr;
+}
diff --git a/source/libDHCPv6/libDHCPv6_vendordata.h b/source/libDHCPv6/libDHCPv6_vendordata.h
@@ -32,6 +32,40 @@
  * */
 #define ARM_DHCP_VENDOR_DATA_DNS_QUERY_RESULT 297
 
+/* ARM Defined vendor data option to distribute network time through DHCP server
+ * Format. This can be used to syncronice the times of Wi-SUN devices to match the
+ * time of border router.
+ *
+ * Following rfc5905 date format.
+ *  +-------------+------------+-----+---------------+------------------+
+ *  | Date        | MJD        | NTP | NTP Timestamp | Epoch            |
+ *  |             |            | Era | Era Offset    |                  |
+ *  +-------------+------------+-----+---------------+------------------+
+ *  | 1 Jan -4712 | -2,400,001 | -49 | 1,795,583,104 | 1st day Julian   |
+ *  | 1 Jan -1    | -679,306   | -14 | 139,775,744   | 2 BCE            |
+ *  | 1 Jan 0     | -678,491   | -14 | 171,311,744   | 1 BCE            |
+ *  | 1 Jan 1     | -678,575   | -14 | 202,939,144   | 1 CE             |
+ *  | 4 Oct 1582  | -100,851   | -3  | 2,873,647,488 | Last day Julian  |
+ *  | 15 Oct 1582 | -100,840   | -3  | 2,874,597,888 | First day        |
+ *  |             |            |     |               | Gregorian        |
+ *  | 31 Dec 1899 | 15019      | -1  | 4,294,880,896 | Last day NTP Era |
+ *  |             |            |     |               | -1               |
+ *  | 1 Jan 1900  | 15020      | 0   | 0             | First day NTP    |
+ *  |             |            |     |               | Era 0            |
+ *  | 1 Jan 1970  | 40,587     | 0   | 2,208,988,800 | First day UNIX   |
+ *  | 1 Jan 1972  | 41,317     | 0   | 2,272,060,800 | First day UTC    |
+ *  | 31 Dec 1999 | 51,543     | 0   | 3,155,587,200 | Last day 20th    |
+ *  |             |            |     |               | Century          |
+ *  | 8 Feb 2036  | 64,731     | 1   | 63,104        | First day NTP    |
+ *  |             |            |     |               | Era 1            |
+ *  +-------------+------------+-----+---------------+------------------+
+ * int32_t Era
+ * uint32_t offset
+ * uint32_t fraction
+ *
+ * */
+#define ARM_DHCP_VENDOR_DATA_NETWORK_TIME 298
+
 /* DHCPv6 vendor options to distribute ARM vendor data*/
 
 uint16_t net_dns_option_vendor_option_data_dns_query_length(char *domain);
@@ -40,5 +74,9 @@ uint8_t *net_dns_option_vendor_option_data_dns_query_write(uint8_t *ptr, uint8_t
 uint16_t net_dns_option_vendor_option_data_get_next(uint8_t *ptr, uint16_t length, uint16_t *type);
 uint16_t net_dns_option_vendor_option_data_dns_query_read(uint8_t *ptr, uint16_t length, uint8_t **address, char **domain);
 
+uint16_t net_vendor_option_current_time_length(void);
+uint8_t *net_vendor_option_current_time_write(uint8_t *ptr, int32_t era, uint32_t offset, uint32_t fraction);
+uint8_t *net_vendor_option_current_time_read(uint8_t *ptr, uint16_t length, int32_t *era, uint32_t *offset, uint32_t *fraction);
+
 
 #endif /* LIBDHCPV6_VENDOR_DATA_H_ */
diff --git a/test/nanostack/unittest/stub/dhcpv6_server_service_stub.c b/test/nanostack/unittest/stub/dhcpv6_server_service_stub.c
@@ -140,8 +140,14 @@ int DHCPv6_server_service_set_dns_server(int8_t interface, uint8_t guaPrefix[sta
     return 0;
 }
 
-int DHCPv6_server_service_set_vendor_data(int8_t interface, uint8_t guaPrefix[static 16], uint32_t enterprise_number, uint8_t *dhcp_vendor_data_ptr, uint8_t dhcp_vendor_data_len)
+int DHCPv6_server_service_set_vendor_data(int8_t interface, uint8_t guaPrefix[static 16], uint32_t enterprise_number, uint8_t *dhcp_vendor_data_ptr, uint16_t dhcp_vendor_data_len)
 {
     return 0;
 }
+
+int DHCPv6_server_service_set_vendor_data_callback(int8_t interface, uint8_t guaPrefix[static 16], uint32_t enterprise_number, dhcp_vendor_data_cb *vendor_data_cb)
+{
+    return 0;
+}
+
 #endif

Original file line number	Diff line number	Diff line change
`@@ -461,12 +461,12 @@ dhcpv6_vendor_data_t libdhcpv6_vendor_data_allocate(dhcpv6_gua_server_entry_s `
`461`	`461`	`}`
`462`	`462`	`ns_list_add_to_end(&serverInfo->vendorDataList, entry);`
`463`	`463`	`entry->enterprise_number = enterprise_number;`
	`464`	`+ entry->vendor_data_cb = NULL;`
`464`	`465`	`entry->vendor_data = NULL;`
`465`	`466`	`entry->vendor_data_length = 0;`
`466`	`467`	`return entry;`
`467`	`468`	`}`
`468`	`469`
`469`		`-`
`470`	`470`	`uint16_t libdhcpv6_dns_server_message_sizes(dhcpv6_gua_server_entry_s *serverInfo)`
`471`	`471`	`{`
`472`	`472`	`uint16_t message_size = 0;`
`@@ -482,7 +482,13 @@ uint16_t libdhcpv6_vendor_data_message_sizes(dhcpv6_gua_server_entry_s *serverIn`
`482`	`482`	`{`
`483`	`483`	`uint16_t message_size = 0;`
`484`	`484`	`ns_list_foreach(dhcpv6_vendor_data_t, cur, &serverInfo->vendorDataList) {`
`485`		`- message_size += 4 + 4 + cur->vendor_data_length; //Type + Length + enterprise + vendor_data_length`
	`485`	`+ uint16_t size = cur->vendor_data_length; //Type + Length + enterprise + vendor_data_length`
	`486`	`+ if (cur->vendor_data_cb) {`
	`487`	`+ cur->vendor_data_cb(serverInfo->interfaceId, NULL, &size);`
	`488`	`+ }`
	`489`	`+ if (size != 0) {`
	`490`	`+ message_size += 2 + 2 + 4 + size;`
	`491`	`+ }`
`486`	`492`	`}`
`487`	`493`	`return message_size;`
`488`	`494`	`}`
`@@ -510,14 +516,27 @@ uint8_t libdhcpv6_vendor_data_message_writes(dhcpv6_gua_server_entry_s serverI`
`510`	`516`	`{`
`511`	`517`	`ns_list_foreach(dhcpv6_vendor_data_t, cur, &serverInfo->vendorDataList) {`
`512`	`518`
`513`		`- uint16_t length = cur->vendor_data_length + 4;`
	`519`	`+ uint16_t length = cur->vendor_data_length;`
	`520`	`+`
	`521`	`+ if (cur->vendor_data_cb) {`
	`522`	`+ cur->vendor_data_cb(serverInfo->interfaceId, NULL, &length);`
	`523`	`+ }`
	`524`	`+ if (length == 0) {`
	`525`	`+ // No vendor data`
	`526`	`+ continue;`
	`527`	`+ }`
	`528`	`+ length += 4;`
	`529`	`+`
`514`	`530`	`ptr = common_write_16_bit(DHCPV6_OPTION_VENDOR_SPECIFIC_INFO, ptr);`
`515`	`531`	`ptr = common_write_16_bit(length, ptr); //Length`
`516`	`532`	`ptr = common_write_32_bit(cur->enterprise_number, ptr);`
`517`	`533`	`if (cur->vendor_data_length) {`
`518`	`534`	`memcpy(ptr, cur->vendor_data, cur->vendor_data_length);`
`519`	`535`	`ptr += cur->vendor_data_length;`
`520`	`536`	`}`
	`537`	`+ if (cur->vendor_data_cb) {`
	`538`	`+ ptr = cur->vendor_data_cb(serverInfo->interfaceId, ptr, NULL);`
	`539`	`+ }`
`521`	`540`	`}`
`522`	`541`	`return ptr;`
`523`	`542`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,8 +140,14 @@ int DHCPv6_server_service_set_dns_server(int8_t interface, uint8_t guaPrefix[sta`
`140`	`140`	`return 0;`
`141`	`141`	`}`
`142`	`142`
`143`		`-int DHCPv6_server_service_set_vendor_data(int8_t interface, uint8_t guaPrefix[static 16], uint32_t enterprise_number, uint8_t *dhcp_vendor_data_ptr, uint8_t dhcp_vendor_data_len)`
	`143`	`+int DHCPv6_server_service_set_vendor_data(int8_t interface, uint8_t guaPrefix[static 16], uint32_t enterprise_number, uint8_t *dhcp_vendor_data_ptr, uint16_t dhcp_vendor_data_len)`
`144`	`144`	`{`
`145`	`145`	`return 0;`
`146`	`146`	`}`
	`147`	`+`
	`148`	`+int DHCPv6_server_service_set_vendor_data_callback(int8_t interface, uint8_t guaPrefix[static 16], uint32_t enterprise_number, dhcp_vendor_data_cb *vendor_data_cb)`
	`149`	`+{`
	`150`	`+ return 0;`
	`151`	`+}`
	`152`	`+`
`147`	`153`	`#endif`