Skip to content
This repository was archived by the owner on May 23, 2023. It is now read-only.

Commit c176a9b

Browse files
Tero HeinonenArto Kinnunen
Tero Heinonen
authored and
Arto Kinnunen
committed
Thread BH code cleanup (ARMmbed#1478)
1 parent 3598f4a commit c176a9b

13 files changed

+59
-157
lines changed

‎nanostack/thread_bbr_api.h

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
* Publishes Default route with DHCP addressing
2626
* Enables ND proxy
2727
*
28-
* if Commercial mode primary BBR activated publishes the commercial primary backbone information to Leader.
29-
* Enables the Backbone address resolution.
30-
* Enables the DUA, MLR registrations.
31-
*
3228
* \param interface_id Thread network interface id.
3329
* \param backbone_interface_id backbone interface id.
3430
*
@@ -45,29 +41,28 @@ int thread_bbr_start(int8_t interface_id, int8_t backbone_interface_id);
4541
* refreshing of registrations.
4642
*
4743
* \param interface_id interface ID of the Thread network.
48-
* \param mlr_timeout Multicast registration timeout. 0 do not change.
49-
* \param dua_timeout Timeout when BBR updates the sequence number for network data. 0 do not change
50-
* \param dua_delay Jitter delay value for Domain Unicast Address (DUA) registrations. 0 do not change
44+
* \param timeout_a timeout a set. 0 = do not change.
45+
* \param timeout_b timeout_b set. 0 = do not change
46+
* \param delay Jitter delay value. 0 do not change
5147
*
5248
* \return 0 on success
5349
* \return <0 in case of errors
5450
*
5551
*/
56-
int thread_bbr_timeout_set(int8_t interface_id, uint32_t mlr_timeout, uint32_t dua_timeout, uint32_t dua_delay);
52+
int thread_bbr_timeout_set(int8_t interface_id, uint32_t timeout_a, uint32_t timeout_b, uint32_t delay);
5753

5854
/**
59-
* Set the Thread registration interface (TRI) destination address.
60-
* TRI address must be set to enable TRI relay.
55+
* Set the Thread validation interface destination address.
6156
*
6257
* \param interface_id interface ID of the Thread network.
63-
* \param tri_addr_ptr IPv6 address of the TRI server.
64-
* \param tri_port UDP port of the TRI server.
58+
* \param addr_ptr IPv6 address.
59+
* \param port UDP port.
6560
*
6661
* \return 0 on success
6762
* \return <0 in case of errors
6863
*
6964
*/
70-
int thread_bbr_tri_address_set(int8_t interface_id, const uint8_t *tri_addr_ptr, uint16_t tri_port);
65+
int thread_bbr_validation_interface_address_set(int8_t interface_id, const uint8_t *addr_ptr, uint16_t port);
7166

7267
/**
7368
* Stop backbone Border router.

‎source/6LoWPAN/Thread/thread_bbr_api.c

Lines changed: 17 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ typedef struct {
5454
uint8_t br_count;
5555
int8_t interface_id;
5656
int8_t coap_service_id;
57-
int8_t coap_nmkp_virtual_service_id;
57+
int8_t coap_extension_virtual_service_id;
5858
int8_t br_service_id;
5959
int8_t backbone_interface_id;
6060
int8_t udp_proxy_socket; /* socket to relay messages between BA and nodes */
@@ -65,15 +65,6 @@ typedef struct {
6565
ns_list_link_t link;
6666
} thread_bbr_t;
6767

68-
69-
typedef struct {
70-
int8_t interface_id;
71-
uint8_t target_eid[16];
72-
uint16_t request_msg_id;
73-
uint16_t ttl;
74-
ns_list_link_t link;
75-
} duplicate_dua_tr_t;
76-
7768
/* Neighbor discovery options according to RFC6106 (rfc4861) */
7869
#define RFC6106_RECURSIVE_DNS_SERVER_OPTION 25
7970
#define RFC6106_DNS_SEARCH_LIST_OPTION 31
@@ -977,6 +968,8 @@ int thread_bbr_proxy_state_update(int8_t caller_interface_id , int8_t handler_in
977968
/*Public API control*/
978969
int thread_bbr_start(int8_t interface_id, int8_t backbone_interface_id)
979970
{
971+
(void) interface_id;
972+
(void) backbone_interface_id;
980973
#ifdef HAVE_THREAD_BORDER_ROUTER
981974
thread_bbr_t *this = thread_bbr_find_by_interface(interface_id);
982975
link_configuration_s *link_configuration_ptr = thread_joiner_application_get_config(interface_id);
@@ -1009,42 +1002,41 @@ int thread_bbr_start(int8_t interface_id, int8_t backbone_interface_id)
10091002
thread_extension_bbr_init(interface_id,backbone_interface_id);
10101003
return 0;
10111004
#else
1012-
(void) interface_id;
1013-
(void) backbone_interface_id;
10141005
return -1;
10151006
#endif // HAVE_THREAD_BORDER_ROUTER
10161007
}
10171008

1018-
int thread_bbr_timeout_set(int8_t interface_id, uint32_t mlr_timeout, uint32_t dua_timeout, uint32_t dua_delay)
1009+
int thread_bbr_timeout_set(int8_t interface_id, uint32_t timeout_a, uint32_t timeout_b, uint32_t delay)
10191010
{
1011+
(void) interface_id;
1012+
(void) timeout_a;
1013+
(void) timeout_b;
1014+
(void) delay;
10201015
#ifdef HAVE_THREAD_BORDER_ROUTER
1021-
thread_extension_bbr_timeout_set(interface_id, mlr_timeout, dua_timeout, dua_delay);
1016+
thread_extension_bbr_timeout_set(interface_id, timeout_a, timeout_b, delay);
10221017
return 0;
10231018
#else
1024-
(void) interface_id;
1025-
(void) mlr_timeout;
1026-
(void) dua_timeout;
1027-
(void) dua_delay;
1028-
return -1;
1019+
return -1;
10291020
#endif // HAVE_THREAD_BORDER_ROUTER
10301021
}
10311022

1032-
int thread_bbr_tri_address_set(int8_t interface_id, const uint8_t *tri_addr_ptr, uint16_t tri_port)
1023+
int thread_bbr_validation_interface_address_set(int8_t interface_id, const uint8_t *addr_ptr, uint16_t port)
10331024
{
1025+
(void) interface_id;
1026+
(void) addr_ptr;
1027+
(void) port;
10341028
#ifdef HAVE_THREAD_BORDER_ROUTER
1035-
return thread_extension_bbr_address_set(interface_id, tri_addr_ptr, tri_port);
1029+
return thread_extension_bbr_address_set(interface_id, addr_ptr, port);
10361030
#else
1037-
(void) interface_id;
1038-
(void) tri_addr_ptr;
1039-
(void) tri_port;
1040-
return -1;
1031+
return -1;
10411032
#endif // HAVE_THREAD_BORDER_ROUTER
10421033
}
10431034

10441035

10451036

10461037
void thread_bbr_stop(int8_t interface_id)
10471038
{
1039+
(void) interface_id;
10481040
#ifdef HAVE_THREAD_BORDER_ROUTER
10491041

10501042
thread_bbr_t *this = thread_bbr_find_by_interface(interface_id);
@@ -1057,7 +1049,6 @@ void thread_bbr_stop(int8_t interface_id)
10571049
this->backbone_interface_id = -1;
10581050

10591051
#else
1060-
(void) interface_id;
10611052
return;
10621053
#endif // HAVE_THREAD_BORDER_ROUTER
10631054

‎source/6LoWPAN/Thread/thread_bootstrap.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,9 +1936,11 @@ static void thread_network_select_by_steering_data(device_configuration_s *devic
19361936
}
19371937
}
19381938

1939-
static void thread_network_select(struct protocol_interface_info_entry *interface_prt, device_configuration_s *device_configuration_ptr, thread_nwk_discovery_response_list_t *discover_response)
1939+
static void thread_network_select(struct protocol_interface_info_entry *interface_ptr, device_configuration_s *device_configuration_ptr, thread_nwk_discovery_response_list_t *discover_response)
19401940
{
1941-
discovery_response_list_t *discovered_network_ptr = thread_extension_bootstrap_network_select(interface_prt, discover_response);
1941+
(void) interface_ptr;
1942+
1943+
discovery_response_list_t *discovered_network_ptr = thread_extension_bootstrap_network_select(interface_ptr, discover_response);
19421944

19431945
/* If network found */
19441946
if (discovered_network_ptr) {
@@ -1950,7 +1952,6 @@ static void thread_network_select(struct protocol_interface_info_entry *interfac
19501952
}
19511953
}
19521954
} else {
1953-
// thread 1.1 device, or no CCM network found. Use normal attach
19541955
thread_network_select_by_steering_data(device_configuration_ptr, discover_response);
19551956
}
19561957
}

‎source/6LoWPAN/Thread/thread_common.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1883,6 +1883,8 @@ static void thread_address_notification_cb(struct protocol_interface_info_entry
18831883

18841884
void thread_mcast_group_change(struct protocol_interface_info_entry *interface, if_group_entry_t *group, bool addr_added)
18851885
{
1886+
(void) addr_added;
1887+
18861888
group->mld_timer = 0;
18871889

18881890
if (thread_attach_ready(interface) != 0) {

‎source/6LoWPAN/Thread/thread_constants.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,6 @@
153153
#define ROUTER_DOWNGRADE_THRESHOLD 23 // Define downGrade Threshold when active router is higher than this
154154
#define ROUTER_UPGRADE_THRESHOLD 16 // Define upgrade Threshold fort REED when Active Router Count is smaller than this upgrade is possible
155155

156-
#define THREAD_VERSION_1_2 3
157-
158-
/** Thread BBR service id */
159-
#define THREAD_SERVICE_DATA_BBR 0x01
160-
161156
/** Thread prefix minimum lifetime in seconds */
162157
#define THREAD_MIN_PREFIX_LIFETIME 3600
163158

‎source/6LoWPAN/Thread/thread_extension_constants.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,17 @@ typedef struct discovery_additional_info {
6565
/** NMKP Steering Data TLV. */
6666
#define MESHCOP_TLV_NMKP_PORT 66
6767

68+
/** Thread BBR service id */
69+
#define THREAD_SERVICE_DATA_BBR 0x01
70+
71+
72+
/* Thread 1.2 defines*/
73+
#define TMFCOP_TLV_TIMEOUT 11
74+
#define TMFCOP_TLV_NETWORK_NAME 12
75+
#define TMFCOP_TLV_SEQUENCE_NUMBER 13
76+
#define TMFCOP_TLV_IPV6_ADDRESS 14
77+
78+
79+
#define THREAD_VERSION_1_2 3
80+
6881
#endif /* THREAD_EXTENSION_CONSTANTS_H_ */

‎source/6LoWPAN/Thread/thread_host_bootstrap.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,7 @@ static void thread_child_synch_receive_cb(int8_t interface_id, mle_message_t *ml
407407
static bool thread_host_prefer_parent_response(protocol_interface_info_entry_t *cur, thread_scanned_parent_t *scanned_parent, uint16_t version, thread_connectivity_t *connectivity)
408408
{
409409
(void) connectivity;
410+
(void) cur;
410411

411412
if (!thread_extension_version_check(thread_info(cur)->version)) {
412413
return false;

‎source/6LoWPAN/Thread/thread_joiner_application.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ uint64_t thread_joiner_application_active_timestamp_get(int8_t interface_id);
4545
void thread_joiner_application_active_timestamp_set(int8_t interface_id, uint64_t timestamp);
4646
uint8_t *thread_joiner_application_active_config_tlv_list_get(uint8_t interface_id, uint16_t *length);
4747

48-
49-
/*
50-
* Thread 1.2 support*/
5148
uint8_t *thread_joiner_application_active_config_params_get(uint8_t interface_id, uint16_t *length);
5249

5350
/** Get device configuration

‎source/6LoWPAN/Thread/thread_management_if.c

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,6 +1319,11 @@ int8_t thread_management_get_request_full_nwk_data(int8_t interface_id, bool *fu
13191319

13201320
int thread_management_device_certificate_set(int8_t interface_id, const unsigned char *device_certificate_ptr, uint16_t device_certificate_len, const unsigned char *priv_key_ptr, uint16_t priv_key_len)
13211321
{
1322+
(void) interface_id;
1323+
(void) device_certificate_ptr;
1324+
(void) device_certificate_len;
1325+
(void) priv_key_ptr;
1326+
(void) priv_key_len;
13221327
#ifdef HAVE_THREAD
13231328
protocol_interface_info_entry_t *cur;
13241329

@@ -1331,14 +1336,16 @@ int thread_management_device_certificate_set(int8_t interface_id, const unsigned
13311336
return thread_extension_bootstrap_device_certificate_set(cur, device_certificate_ptr, device_certificate_len, priv_key_ptr, priv_key_len);
13321337

13331338
#else
1334-
(void) interface_id;
1335-
(void) device_certificate_ptr;
1336-
(void) device_certificate_len;
13371339
return -1;
13381340
#endif
13391341
}
13401342
int thread_management_network_certificate_set(int8_t interface_id, const unsigned char *network_certificate_ptr, uint16_t network_certificate_len, const unsigned char *priv_key_ptr, uint16_t priv_key_len)
13411343
{
1344+
(void) interface_id;
1345+
(void) network_certificate_ptr;
1346+
(void) network_certificate_len;
1347+
(void) priv_key_ptr;
1348+
(void) priv_key_len;
13421349
#ifdef HAVE_THREAD
13431350
protocol_interface_info_entry_t *cur;
13441351

@@ -1354,11 +1361,6 @@ int thread_management_network_certificate_set(int8_t interface_id, const unsigne
13541361

13551362
return thread_extension_bootstrap_network_private_key_set(cur, priv_key_ptr, priv_key_len);
13561363
#else
1357-
(void) interface_id;
1358-
(void) network_certificate_ptr;
1359-
(void) network_certificate_len;
1360-
(void) priv_key_ptr;
1361-
(void) priv_key_len;
13621364
return -1;
13631365
#endif
13641366
}

‎source/6LoWPAN/Thread/thread_network_data_storage.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1930,8 +1930,7 @@ uint8_t thread_nd_context_id_allocate(thread_network_data_cache_entry_t *network
19301930
}
19311931
}
19321932

1933-
//Allocate Free context id starting from number 1 for Thread 1.1
1934-
// Starting for 2 for Thread commercial.
1933+
//Allocate Free context id
19351934
if (thread_extension_version_check(thread_version)) {
19361935
tempId = 2;
19371936
} else {

‎source/6LoWPAN/Thread/thread_test_api.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,6 +1301,8 @@ int thread_test_mle_message_send(int8_t interface_id, uint8_t *dst_address, uint
13011301

13021302
int thread_test_extension_name_set(int8_t interface_id, char extension_name[16])
13031303
{
1304+
(void) interface_id;
1305+
(void) extension_name;
13041306
#ifdef HAVE_THREAD
13051307
protocol_interface_info_entry_t *cur;
13061308

@@ -1311,7 +1313,6 @@ int thread_test_extension_name_set(int8_t interface_id, char extension_name[16])
13111313

13121314
return thread_extension_bootstrap_thread_name_set(cur, extension_name);
13131315
#else
1314-
(void) interface_id;
1315-
(void) extension_name;
1316+
return -1;
13161317
#endif
13171318
}

‎source/6LoWPAN/Thread/thread_tmfcop_lib.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@
3030
#define TMFCOP_TLV_ND_DATA 9
3131
#define TMFCOP_TLV_NETWORK_DATA 10
3232

33-
/* Thread 1.2 defines*/
34-
#define TMFCOP_TLV_TIMEOUT 11
35-
#define TMFCOP_TLV_NETWORK_NAME 12
36-
#define TMFCOP_TLV_SEQUENCE_NUMBER 13
37-
#define TMFCOP_TLV_IPV6_ADDRESS 14
3833

3934
/**
4035
* Write array TLV.

0 commit comments

Comments
 (0)