Change the re-registration delay (ARMmbed#2016)

Re-registration delay needs to be coded with two bytes
artokin · Mar 18, 2019 · 1d7693b · 1d7693b
1 parent 9640ec0
commit 1d7693b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/source/6LoWPAN/Thread/thread_extension.c b/source/6LoWPAN/Thread/thread_extension.c
@@ -451,7 +451,7 @@ int thread_extension_primary_bbr_get(struct protocol_interface_info_entry *cur,
  //tr_info("BBR server TLV: %s\r\n", trace_array(server_tlv_ptr, server_tlv_len));
  do {
  found_tlv_len = thread_meshcop_tlv_find_next(server_tlv_ptr, server_tlv_len, THREAD_NWK_DATA_TYPE_SERVER_DATA | THREAD_NWK_STABLE_DATA, &found_tlv);
- if (found_tlv && found_tlv_len > 10) {
+ if (found_tlv && found_tlv_len > 8) {
  //tr_info("BBR server TLV: %s\r\n", trace_array(found_tlv, found_tlv_len));
  if (addr_ptr) {
  thread_addr_write_mesh_local_16(addr_ptr, common_read_16_bit(found_tlv), cur->thread_info);
@@ -460,10 +460,10 @@ int thread_extension_primary_bbr_get(struct protocol_interface_info_entry *cur,
  *seq_ptr = found_tlv[2];
  }
  if (delay_timer_ptr) {
- *delay_timer_ptr = common_read_32_bit(&found_tlv[3]);
+ *delay_timer_ptr = common_read_16_bit(&found_tlv[3]);
  }
  if (mlr_timer_ptr) {
- *mlr_timer_ptr = common_read_32_bit(&found_tlv[7]);
+ *mlr_timer_ptr = common_read_32_bit(&found_tlv[5]);
  if (*mlr_timer_ptr < THREAD_DEFAULT_MIN_MLR_TIMEOUT) {
  *mlr_timer_ptr = THREAD_DEFAULT_MIN_MLR_TIMEOUT;
  }

diff --git a/source/6LoWPAN/Thread/thread_extension_bbr.c b/source/6LoWPAN/Thread/thread_extension_bbr.c
@@ -1077,17 +1077,17 @@ static int thread_border_router_pbbr_nw_data_register(thread_pbbr_t *this)
 {
  // Create Primary BBR network data and send to leader
  uint8_t service_data[1];
- uint8_t server_data[9];
+ uint8_t server_data[7];
  uint8_t *ptr = server_data;
 
  service_data[0] = THREAD_SERVICE_DATA_BBR;
  *ptr++ = this->sequence_number;
- ptr = common_write_32_bit(this->delay_timer, ptr);
+ ptr = common_write_16_bit(this->delay_timer, ptr);
  ptr = common_write_32_bit(this->mlr_timeout, ptr);
 
  if (thread_border_router_service_add(this->interface_id, service_data,
  1, 0, THREAD_ENTERPRISE_NUMBER,
- server_data, 9, true) != 0) {
+ server_data, 7, true) != 0) {
  tr_error("Adding service data failed!");
  return -1;
  }