Skip to content

Commit 4a3c5c5

Browse files
author
Arto Kinnunen
committed
Merge remote-tracking branch 'origin/release_internal' into release_external
* origin/release_internal: (43 commits) Do not reset radio when MAC data request timeouts (ARMmbed#2647) Frame counters for nw keys are now stored to NVM only after send key is set (ARMmbed#2641) Adjusted stagger random to [min,min+max] and for small nw set the stagger value to 10 seconds Adjusted security protocol (EAP-TLS,4WH,2WH) retry timers High Priority timestamp compare overflow support fix. FHSS WS: Initialize broadcast channel count when enabling FHSS (ARMmbed#2642) Updated change log Changed initial EAPOL-key retries from trickle to exponential backup Add RTT calculation for DHCP Time calculation Traceroute bug fix. Fixed FHSS UFSI calculation unit tests Handle timer rollover in calculate_ufsi coding style Correct ufsi timing calculation Add network time vendor data element to DHCPv6 reply message System time read/write callbacks (ARMmbed#2637) Restart or remove transmission when MAC data request timeouts (ARMmbed#2636) Bug fix: EAPOL parent compare fix Fixed channel mask usage with OFDM configurations (ARMmbed#2633) Do not send too old packets (ARMmbed#2632) ...
2 parents 0903b81 + 2b8d2e1 commit 4a3c5c5

File tree

537 files changed

+2023
-1191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

537 files changed

+2023
-1191
lines changed

LICENSE-Apache-2.0

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2017 Arm Limited and its affiliates
1+
Copyright 2017, Pelion and affiliates.
22
SPDX-License-Identifier: Apache-2.0
33

44
Licensed under the Apache License, Version 2.0 (the "License");

LICENSE-BSD-3-Clause

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2017 Arm Limited and affiliates.
1+
Copyright 2017, Pelion and affiliates.
22
SPDX-License-Identifier: BSD-3-Clause
33

44
Redistribution and use in source and binary forms, with or without

nanostack/cca_api.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014-2017, Arm Limited and affiliates.
2+
* Copyright (c) 2014-2017, Pelion and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");

nanostack/ccmLIB.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014-2018, Arm Limited and affiliates.
2+
* Copyright (c) 2014-2018, Pelion and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");

nanostack/dhcp_service_api.h

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2013-2018, Arm Limited and affiliates.
2+
* Copyright (c) 2013-2021, Pelion and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -197,11 +197,12 @@ int dhcp_service_send_resp(uint32_t msg_tr_id, uint8_t options, uint8_t *msg_ptr
197197
* \param msg_ptr An allocated message pointer. This pointer is the responsibility of the service after this call.
198198
* \param msg_len The length of the message.
199199
* \param receive_resp_cb Callback pointer
200+
* \param delay_tx Transmit may be delayed and this parameter define that
200201
*
201202
* \return Transaction ID of the DHCP transaction
202203
* \return 0, if error occurred.
203204
*/
204-
uint32_t dhcp_service_send_req(uint16_t instance_id, uint8_t options, void *ptr, const uint8_t addr[static 16], uint8_t *msg_ptr, uint16_t msg_len, dhcp_service_receive_resp_cb *receive_resp_cb);
205+
uint32_t dhcp_service_send_req(uint16_t instance_id, uint8_t options, void *ptr, const uint8_t addr[static 16], uint8_t *msg_ptr, uint16_t msg_len, dhcp_service_receive_resp_cb *receive_resp_cb, uint16_t delay_tx);
205206

206207
/**
207208
* \brief Setting retransmission parameters.
@@ -225,6 +226,16 @@ void dhcp_service_set_retry_timers(uint32_t msg_tr_id, uint16_t timeout_init, ui
225226
*/
226227
void dhcp_service_update_server_address(uint32_t msg_tr_id, uint8_t *server_address);
227228

229+
/**
230+
* \brief Get Round Trip time of the request
231+
*
232+
* get the elapsed time of the request from last message sent to server.
233+
*
234+
* \param msg_tr_id The message transaction ID.
235+
*
236+
*/
237+
uint32_t dhcp_service_rtt_get(uint32_t msg_tr_id);
238+
228239
/**
229240
* \brief Stops transactions for a message (retransmissions).
230241
*

nanostack/ethernet_mac_api.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2018, Arm Limited and affiliates.
2+
* Copyright (c) 2016-2019, Pelion and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");

nanostack/fhss_api.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016-2018, Arm Limited and affiliates.
2+
* Copyright (c) 2016-2019, 2021, Pelion and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");

nanostack/fhss_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015-2018, Arm Limited and affiliates.
2+
* Copyright (c) 2015-2021, Pelion and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");

nanostack/fhss_test_api.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, Arm Limited and affiliates.
2+
* Copyright (c) 2020, Pelion and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");

nanostack/fhss_ws_extension.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, Arm Limited and affiliates.
2+
* Copyright (c) 2018, 2020-2021, Pelion and affiliates.
33
* SPDX-License-Identifier: Apache-2.0
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");

0 commit comments

Comments
 (0)