Skip to content

Commit 06e3243

Browse files
propagation of reserved bit in network data implemented. (ARMmbed#1827)
1 parent e7fa605 commit 06e3243

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

source/6LoWPAN/Thread/thread_bootstrap.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,7 @@ static void thread_bootstrap_ml_address_update(protocol_interface_info_entry_t *
674674

675675
// Generate new ML64 address
676676
thread_generate_ml64_address(cur);
677+
677678
// Generate new domain address
678679
thread_extension_address_generate(cur);
679680

@@ -2523,6 +2524,7 @@ int thread_bootstrap_network_data_process(protocol_interface_info_entry_t *cur,
25232524
genericService.P_slaac = ((flags >> THREAD_P_SLAAC_BIT_MOVE) & 1);
25242525
genericService.P_on_mesh = ((flags >> THREAD_P_ON_MESH_BIT_MOVE) & 1);
25252526
genericService.P_nd_dns = ((flags >> THREAD_P_ND_DNS_BIT_MOVE) & 1);
2527+
genericService.P_res1 = ((flags >> THREAD_P_ND_RES_BIT_MOVE) & 1);
25262528
if (thread_nd_local_list_add_on_mesh_prefix(networkDataStorage, &prefixTlv, &genericService) == 0) {
25272529
if (networkDataStorage->stableUpdatePushed || networkDataStorage->temporaryUpdatePushed) {
25282530
if (!genericService.P_slaac) {
@@ -2770,7 +2772,6 @@ int thread_bootstrap_network_data_save(protocol_interface_info_entry_t *cur, thr
27702772
return 0;
27712773
}
27722774

2773-
27742775
void thread_bootstrap_network_prefixes_process(protocol_interface_info_entry_t *cur)
27752776
{
27762777
// Route prefix is variable-length, so need to zero pad for ip6tos

source/6LoWPAN/Thread/thread_network_data_storage.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ static uint16_t thread_nd_service_border_router_flags_read(thread_network_server
193193
flags |= (cur->P_default_route << THREAD_P_DEF_ROUTE_BIT_MOVE);
194194
flags |= (cur->P_on_mesh << THREAD_P_ON_MESH_BIT_MOVE);
195195
flags |= (cur->P_nd_dns << THREAD_P_ND_DNS_BIT_MOVE);
196+
flags |= (cur->P_res1 << THREAD_P_ND_RES_BIT_MOVE);
196197
return flags;
197198
}
198199

@@ -1628,6 +1629,7 @@ int thread_nd_local_list_add_on_mesh_prefix(thread_network_data_cache_entry_t *n
16281629
server_entry->P_nd_dns = service->P_nd_dns;
16291630
trigDataPropagate = true;
16301631
}
1632+
16311633
}
16321634

16331635
if (trigDataPropagate) {
@@ -1707,9 +1709,9 @@ int thread_nd_local_list_del_on_mesh_server(thread_network_data_cache_entry_t *n
17071709
int thread_local_server_list_add_on_mesh_server(thread_network_local_data_cache_entry_t *networkDataList, thread_prefix_tlv_t *prefixTlv, thread_border_router_tlv_entry_t *service)
17081710
{
17091711
int retVal = -1;
1710-
tr_debug("Add prefix: %s prf:%d %s%s%s%s%s", trace_ipv6_prefix(prefixTlv->Prefix, prefixTlv->PrefixLen), service->Prf,
1712+
tr_debug("Add prefix: %s prf:%d %s%s%s%s%s%s", trace_ipv6_prefix(prefixTlv->Prefix, prefixTlv->PrefixLen), service->Prf,
17111713
service->P_default_route?"Default Route ":"",service->P_dhcp?"DHCPv6 Server ":"", service->P_configure?"DHCPv6 Configuration ":"",
1712-
service->P_slaac?"SLAAC ":"",service->P_preferred?"Preferred ":"");
1714+
service->P_slaac?"SLAAC ":"",service->P_preferred?"Preferred ":"",service->P_res1?"P_res1 ":"");
17131715

17141716
if (networkDataList) {
17151717
thread_network_local_data_entry_t *prefix_entry = thread_local_prefix_entry_get(&networkDataList->prefix_list, prefixTlv);

0 commit comments

Comments
 (0)