Skip to content

Commit

Permalink
Squashed 'features/nanostack/sal-stack-nanostack/' changes from 09d9e24
Browse files Browse the repository at this point in the history
…..3183d87

3183d87 Merge branch 'release_internal' into release_external
9e27a77 Disabled BR IID verify from DODAG ID
33ac791 Merge pull request ARMmbed#2548 from PelionIoT/sync_with_mbed_os
6f8b282 compile out trace when not available
825373d Add SPDX license identifier to Arm files
3ec3bc6 fixed warnings: static method defined but not used
ee34352 Check if RX channel needs to be updated when RX slot detected (ARMmbed#2540)
d59dc5d Fix doxygen 1.8.17 warnings (ARMmbed#2546)
1e0beb3 Update unit tests to support Ubuntu 2020_04 LTS (ARMmbed#2545)
b9b2ffd Fixed FHSS get retry period (ARMmbed#2543)
a0bf6ae Check if RX channel needs to be updated after broadcast received (ARMmbed#2539)
fde325e Wi-SUN Neighbour ARO registration failure handling update:
1e1f9c6 RPL dio Handler update:
0421502 Asynch message advertiment enable added to DAO done when disabled.
0374f74 Corrected memory leak on key storage allocation on low memory situation
23c2f7e Disable ASYNCH messages at enter Local repair state.
c1df6b0 Added Poison_count check for First DIO time blocker.
944f934 Added channel mask size to FHSS configuration (ARMmbed#2536)
20e79e0 RPL Local repair disable clear advertised_dodag_membership_since_last_repair state
8a46380 Fix doxygen comments (ARMmbed#2534)
fe06236 MAC ACK RX guarantee update
2388a80 MAC layer send ack allways when it requirement's
29b387b RPL dao dynamic timeout
00bbd02 Don't allow TX slot length go below allowed minimum (ARMmbed#2528)
8333faa Out of memory improvement to remove packets from routing
0a12aeb Support channel plan IDs 1, 2 and 5 with NA and BZ bands (ARMmbed#2526)
ee4333d Wi-SUN Timing configuration is selected based on network size and data rate
a5b2a26 WS: API to set PHY mode and Channel plan IDs as defined by FAN 1.1 (ARMmbed#2520)
b86a044 Update nanostack v12.7.0 changelog (ARMmbed#2525)
35b95da Remove unnecessary files from release
0717432 Merge remote-tracking branch 'origin/release_internal' into release_external
f68126b Adaptation layer MCPS confirmation handle update
e483a07 Added OFDM configurations and FEC in RF config structure (ARMmbed#2513)
b88abfa BUG fix: Fixed broken Brodcast MAC overflow handling
9cad478 Random early detection congestion API update
00aed73 Modified the Wi-SUN stack Latency estimates a bit slower
6b83d82 Remove periodic PAN version increase from Wi-SUN border router
ef670e2 Integrated ReD congestion packet drop to Wi-SUN bootstrap interface.
b956d9e Revert "Improved transmission in high traffic (ARMmbed#2511)" (ARMmbed#2512)
01749c2 Improved transmission in high traffic (ARMmbed#2511)
3158e96 Adaption layer queue trace update
5a32f4a Update changelog, random_early_detection_congestion_check nameupdate and minor comment fix.
b818f12 Extented network status for support dropped tx congestion packet.
11c0763 Added new service Random early detection
f2c358d Optimized medium NWK MPL parameters to 40 second multicast interval (ARMmbed#2508)
c013bc7 Added traces to EAPOL TX failure
c29ee94 Changed TLS return value to int32_t
501a2c8 Added trace for mbed TLS errors
9d7cd22 Updated change log
1290225 Corrected radius message memory allocation
7b1c596 Removed trace print's
efb8393 Adaptation layer MCPS confirmation handle update
ac1025e Bug Fix: Accept only next possible BSI for detect BR reboot and drop unkown's.
58f0e56 Updated change log
102e525 Nanostack now indicates connection down on RPL local repair start
395791d FHSS WS: Do not allow broadcast TX on unicast channel (ARMmbed#2501)
72f8ecb Updated changelog.md
2376208 Activated higher priority by traffic class CS6 for NS/NA and RPL, EAPOL/ DHCP Relay messages.
afbe906 Adaptation layer update
13fb2bf Update CHANGELOG.md
af81c48 DIO init TX filter update
13a872c Fix typos in github template (ARMmbed#2498)
1af20e1 Initial version of CHANGELOG (ARMmbed#2497)
d9874ed Feature update: Improved MAC TX queue purge
6926442 Wi-SUN Aro registration temporary address registation bug fix.
d3170ed Removed generic event and wrong trace info.
0db3486 Removed trace from place which is normal and not needed
a080f18 Added debug tarce for dropped unsecured and MPL packets.
51cd564 Wi-SUN NS probe update:
579f756 Adaptation layer: Do not push CCA failed packet back to MAC (Wi-SUN) (ARMmbed#2487)
715ae9a Merge remote-tracking branch 'origin/release_internal' into release_external
42c9807 Nanostak trace level configuration (ARMmbed#2489)
6f52171 Bug fix: socket reference count made 16-bit (ARMmbed#2490)
f51669a Bug fix: Do not print UFSI drift when fixed channel is used (ARMmbed#2488)
18fa048 RPL DAO timeout update:
660e178 Clear debug traces.
cbac0bb DIO init send block for node
fed5d1c Created different MPL configuration based on network size
7ad7e81 Wi-SUN recovery and BR BSI update:
d207f4d Merge branch 'release_internal' into release_external
d166c89 MPL: buffered max limit increased to 8k (ARMmbed#2482)
0f6666a Fixed Unit test's
1ff9b1d LLC drop a packet if FHSS shedule is not configured.
7cecc28 Fixed missing asynch trigle setup stop at if down process
7a8b2bf Wi-SUN fhss API default value setting fixes
164a370 Fixed coverity issues from management API
8b5b433 Corrected out of bounds access coverity warning (ARMmbed#2475)
4ffe6a1 Multicast forwarding is separated from the routing flag
30f4315 Wi-SUN discovery staten enter upxdate
083b84e Iotthd 4308 (ARMmbed#2473)
fcc33d5 Removed time increment from NVM time read function on interface up
9c8e3af fhss_tx_handle update
5491a6b Fixed UFSI update print function (ARMmbed#2470)
86f64c5 FHSS WS: Check if BC schedule is stopped before computing timeout delay (ARMmbed#2469)
a0b112a Corrected defects and coding style
2f4678a Corrected trace macro
5e96751 Distributed key storage NVM writes to longer time period
9b3891f FHSS WS: handle blocked interrupts (ARMmbed#2466)
a792e83 Added validation at MAC ack buffer handler
2a465b2 DNS configuration lifetime validation

git-subtree-dir: features/nanostack/sal-stack-nanostack
git-subtree-split: 3183d87
  • Loading branch information
Arto Kinnunen committed Jan 19, 2021
1 parent d2d0895 commit bb04880
Show file tree
Hide file tree
Showing 90 changed files with 2,742 additions and 679 deletions.
568 changes: 380 additions & 188 deletions Doxyfile

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions mbed_lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
"configuration": {
"help": "Build time configuration. Refer to Handbook for valid values. Default: full stack",
"value": "nanostack_full"
},
"trace_max_level": {
"help": "One of mbed-trace level defines: TRACE_LEVEL_DEBUG, TRACE_LEVEL_INFO, TRACE_LEVEL_WARN or TRACE_LEVEL_ERROR",
"value": null
}
},
"macros": ["NS_USE_EXTERNAL_MBED_TLS"],
Expand Down
3 changes: 3 additions & 0 deletions nanostack/fhss_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ typedef struct fhss_ws_configuration {
/** Wi-SUN specific unicast channel mask */
uint32_t unicast_channel_mask[8];

/** Channel mask size */
uint16_t channel_mask_size;

/** Vendor defined channel function. */
fhss_vendor_defined_cf *vendor_defined_cf;

Expand Down
4 changes: 2 additions & 2 deletions nanostack/mac_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ typedef enum {
} mlme_primitive;

/**
* \struct mac_description_storage_size_t
* \struct mac_description_storage_size_s
* \brief Container for MAC storage sizes.
*/
typedef struct mac_description_storage_size_s {
Expand Down Expand Up @@ -305,7 +305,7 @@ struct mac_api_s {
};

/**
* \struct mac_statistics_t
* \struct mac_statistics_s
* \brief MAC statistics structure.
*/
typedef struct mac_statistics_s {
Expand Down
3 changes: 2 additions & 1 deletion nanostack/net_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ typedef enum arm_library_event_type_e {
#define SOCKET_BIND_DONE SOCKET_CONNECT_DONE /**< Backward compatibility */
#define SOCKET_BIND_FAIL SOCKET_CONNECT_FAIL /**< Backward compatibility */
#define SOCKET_BIND_AUTH_FAIL SOCKET_CONNECT_AUTH_FAIL /**< Backward compatibility */
/* @} */
/** @} */

/** Network security levels. */
typedef enum net_security_t {
Expand Down Expand Up @@ -1228,3 +1228,4 @@ extern const cca_threshold_table_s *arm_nwk_get_cca_threshold_table(int8_t inter
}
#endif
#endif /* NET_INTERFACE_H_ */

2 changes: 1 addition & 1 deletion nanostack/net_nvm_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ typedef enum pana_client_nvm_update_process_t {
} pana_client_nvm_update_process_t;

/*!
* \struct wpan_nvm_params_t
* \struct wpan_nvm_params
* \brief Network nvm parameters.
*/
typedef struct wpan_nvm_params {
Expand Down
2 changes: 1 addition & 1 deletion nanostack/net_polling_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ extern "C" {
#endif

/*!
* \enum net_host_mode_t
* \enum net_host_mode
* \brief Sleepy host states.
*/
typedef enum net_host_mode {
Expand Down
2 changes: 1 addition & 1 deletion nanostack/ns_mdns_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ typedef struct ns_mdns *ns_mdns_t; /**< Instance */
typedef struct ns_mdns_service *ns_mdns_service_t; /**< Service instance */

/*!
* \struct ns_mdns_service_param_t
* \struct ns_mdns_service_param
* \brief Structure for mDNS service parameters
*/
typedef struct ns_mdns_service_param {
Expand Down
1 change: 1 addition & 0 deletions nanostack/nwk_stats_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ typedef struct nwk_stats_t {
/* MAC */
uint16_t adapt_layer_tx_queue_size; /**< Adaptation layer direct TX queue size. */
uint16_t adapt_layer_tx_queue_peak; /**< Adaptation layer direct TX queue size peak. */
uint32_t adapt_layer_tx_congestion_drop; /**< Adaptation layer direct TX randon early detection drop packet. */
} nwk_stats_t;

/**
Expand Down
1 change: 1 addition & 0 deletions nanostack/platform/arm_hal_aes.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ extern "C" {
#define ARM_AES_MBEDTLS_CONTEXT_MIN 1 /**</ event loop use only */
#endif

/** AES context */
typedef struct arm_aes_context arm_aes_context_t;

/**
Expand Down
22 changes: 22 additions & 0 deletions nanostack/platform/arm_hal_phy.h
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,25 @@ typedef enum {
MODULATION_INDEX_UNDEFINED ///< Modulation index undefined
} phy_modulation_index_e;

/** OFDM option */
typedef enum {
OFDM_OPTION_1 = 1, ///< OFDM option 1
OFDM_OPTION_2 = 2, ///< OFDM option 2
OFDM_OPTION_3 = 3, ///< OFDM option 3
OFDM_OPTION_4 = 4 ///< OFDM option 4
} phy_ofdm_option_e;

/** Modulation and coding scheme (OFDM) */
typedef enum {
OFDM_MCS_0 = 0, ///< OFDM MCS 0
OFDM_MCS_1 = 1, ///< OFDM MCS 1
OFDM_MCS_2 = 2, ///< OFDM MCS 2
OFDM_MCS_3 = 3, ///< OFDM MCS 3
OFDM_MCS_4 = 4, ///< OFDM MCS 4
OFDM_MCS_5 = 5, ///< OFDM MCS 5
OFDM_MCS_6 = 6 ///< OFDM MCS 6
} phy_ofdm_mcs_e;

/**
* @brief enum phy_802_15_4_mode_t IEEE 802.15.4 mode
*
Expand All @@ -192,6 +211,9 @@ typedef struct phy_rf_channel_configuration_s {
uint16_t number_of_channels; ///< Number of channels
phy_modulation_e modulation; ///< Modulation scheme
phy_modulation_index_e modulation_index; ///< Modulation index
bool fec; ///< Forward error correction, true - enabled, false - disabled
phy_ofdm_option_e ofdm_option; ///< OFDM option
phy_ofdm_mcs_e ofdm_mcs; ///< OFDM modulation and coding scheme
} phy_rf_channel_configuration_s;

/** Channel page configuration */
Expand Down
6 changes: 3 additions & 3 deletions nanostack/socket_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ typedef struct socket_callback_t {
} socket_callback_t;

/*!
* \struct ns_msghdr_t
* \struct ns_msghdr
* \brief Normal IP socket message structure for socket_recvmsg() and socket_sendmsg().
*/

Expand All @@ -211,7 +211,7 @@ typedef struct ns_msghdr {
} ns_msghdr_t;

/*!
* \struct ns_cmsghdr_t
* \struct ns_cmsghdr
* \brief Control messages.
*/
typedef struct ns_cmsghdr {
Expand Down Expand Up @@ -242,7 +242,7 @@ typedef struct ns_cmsghdr {
#define NS_MSG_LEGACY0 0x4000
///@}
/*!
* \struct ns_in6_pktinfo_t
* \struct ns_in6_pktinfo
* \brief IPv6 packet info which is used for socket_recvmsg() socket_sendmsg().
*/
typedef struct ns_in6_pktinfo {
Expand Down
16 changes: 15 additions & 1 deletion nanostack/ws_bbr_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ int ws_bbr_start(int8_t interface_id, int8_t backbone_interface_id);
#define BBR_GUA_ROUTE 0x0002 /**< More specific route is added for GUA prefix */
#define BBR_BB_WAIT 0x0004 /**< Wait backbone availability before starting Wi-SUN network */
#define BBR_DEFAULT_ROUTE 0x0008 /**< Add default route parameter to DIO */
#define BBR_REQUIRE_DAO_REFRESH 0x0010 /**< Do not increment PAN version number when active forces DAO update from nodes*/
#define BBR_REQUIRE_DAO_REFRESH 0x0000 /**< Deprecated DAO Refresh is now the default functionality*/
#define BBR_PERIODIC_VERSION_INC 0x0010 /**< Increment PAN version number Periodically*/
#define BBR_GUA_SLAAC 0x0020 /**< in Global prefix use SLAAC address generation to reduce traffic during bootstrap */

/**
Expand Down Expand Up @@ -334,6 +335,19 @@ int ws_bbr_pan_configuration_get(int8_t interface_id, uint16_t *pan_id);
*/
int ws_bbr_pan_configuration_validate(int8_t interface_id, uint16_t pan_id);

/**
* Sets Wi-SUN BSI
*
* Sets Wi-SUN PAN BSI.
*
* \param interface_id Network interface ID.
* \param new_bsi Identifier.
*
* \return 0, PAN BSI set.
* \return <0 PAN BSI set failed.
*/
int ws_bbr_bsi_set(int8_t interface_id, uint16_t new_bsi);

/**
* Sets memory used for key storages
*
Expand Down
Loading

0 comments on commit bb04880

Please sign in to comment.