Merge branch 'release_internal' into release_external

* release_internal: (27 commits)
  Disabled BR IID verify from DODAG ID
  compile out trace when not available
  Add SPDX license identifier to Arm files
  fixed warnings: static method defined but not used
  Check if RX channel needs to be updated when RX slot detected (ARMmbed#2540)
  Fix doxygen 1.8.17 warnings (ARMmbed#2546)
  Update unit tests to support Ubuntu 2020_04 LTS (ARMmbed#2545)
  Fixed FHSS get retry period (ARMmbed#2543)
  Check if RX channel needs to be updated after broadcast received (ARMmbed#2539)
  Wi-SUN Neighbour ARO registration failure handling update:
  RPL dio Handler update:
  Asynch message advertiment enable added to DAO done when disabled.
  Corrected memory leak on key storage allocation on low memory situation
  Disable ASYNCH messages at enter Local repair state.
  Added Poison_count check for First DIO time blocker.
  Added channel mask size to FHSS configuration (ARMmbed#2536)
  RPL Local repair disable clear advertised_dodag_membership_since_last_repair state
  Fix doxygen comments (ARMmbed#2534)
  MAC ACK RX guarantee update
  MAC layer send ack allways when it requirement's
  ...

nanostack/fhss_config.h

@@ -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;
 

nanostack/mac_api.h

@@ -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 {
@@ -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 {

nanostack/net_interface.h

@@ -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 {
@@ -1228,3 +1228,4 @@ extern const cca_threshold_table_s *arm_nwk_get_cca_threshold_table(int8_t inter
 }
 #endif
 #endif /* NET_INTERFACE_H_ */
+

nanostack/net_nvm_api.h

@@ -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 {

nanostack/net_polling_api.h

@@ -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 {

nanostack/ns_mdns_api.h

@@ -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 {

nanostack/platform/arm_hal_aes.h

@@ -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;
 
 /**

nanostack/socket_api.h

@@ -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().
  */
 
@@ -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 {
@@ -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 {

nanostack/ws_management_api.h

@@ -16,7 +16,7 @@
  */
 
 /**
- * \file ws_management_if.h
+ * \file ws_management_api.h
  * \brief Wi-SUN management interface.
  *
  * This interface is used for configuring Wi-SUN devices.
@@ -37,61 +37,63 @@ extern "C" {
 #endif
 
 /* Regulatory domain values*/
-#define REG_DOMAIN_WW   0x00 // World wide
-#define REG_DOMAIN_NA   0x01 // North America
-#define REG_DOMAIN_JP   0x02 // Japan
-#define REG_DOMAIN_EU   0x03 // European Union
-#define REG_DOMAIN_CH   0x04 // China
-#define REG_DOMAIN_IN   0x05 // India
-#define REG_DOMAIN_MX   0x06 //
-#define REG_DOMAIN_BZ   0x07 // Brazil
-#define REG_DOMAIN_AZ   0x08 // Australia
-#define REG_DOMAIN_NZ   0x08 // New zealand
-#define REG_DOMAIN_KR   0x09 // Korea
-#define REG_DOMAIN_PH   0x0A //
-#define REG_DOMAIN_MY   0x0B //
-#define REG_DOMAIN_HK   0x0C //
-#define REG_DOMAIN_SG   0x0D // band 866-869
-#define REG_DOMAIN_TH   0x0E //
-#define REG_DOMAIN_VN   0x0F //
-#define REG_DOMAIN_SG_H 0x10 // band 920-925
-
-#define OPERATING_MODE_1a 0x1a
-#define OPERATING_MODE_1b 0x1b
-#define OPERATING_MODE_2a 0x2a
-#define OPERATING_MODE_2b 0x2b
-#define OPERATING_MODE_3  0x03
-#define OPERATING_MODE_4a 0x4a
-#define OPERATING_MODE_4b 0x4b
-#define OPERATING_MODE_5  0x05
-
-#define CHANNEL_FUNCTION_FIXED            0x00 // Fixed channel
-#define CHANNEL_FUNCTION_TR51CF           0x01 // TR51CF
-#define CHANNEL_FUNCTION_DH1CF            0x02 // Direct Hash
-#define CHANNEL_FUNCTION_VENDOR_DEFINED   0x03 // vendor given channel hop schedule
-
-#define CHANNEL_SPACING_200 0x00 // 200 khz
-#define CHANNEL_SPACING_400 0x01 // 400 khz
-#define CHANNEL_SPACING_600 0x02 // 600 khz
-#define CHANNEL_SPACING_100 0x03 // 100 khz
-#define CHANNEL_SPACING_250 0x04 // 250 khz
+#define REG_DOMAIN_WW   0x00 /**< World wide */
+#define REG_DOMAIN_NA   0x01 /**< North America */
+#define REG_DOMAIN_JP   0x02 /**< Japan */
+#define REG_DOMAIN_EU   0x03 /**< European Union */
+#define REG_DOMAIN_CH   0x04 /**< China */
+#define REG_DOMAIN_IN   0x05 /**< India */
+#define REG_DOMAIN_MX   0x06 /**< Mexico */
+#define REG_DOMAIN_BZ   0x07 /**< Brazil */
+#define REG_DOMAIN_AZ   0x08 /**< Australia */
+#define REG_DOMAIN_NZ   0x08 /**< New zealand */
+#define REG_DOMAIN_KR   0x09 /**< Korea */
+#define REG_DOMAIN_PH   0x0A /**< Philippines */
+#define REG_DOMAIN_MY   0x0B /**< Malaysia */
+#define REG_DOMAIN_HK   0x0C /**< Hong Kong */
+#define REG_DOMAIN_SG   0x0D /**< Singapore band 866-869 */
+#define REG_DOMAIN_TH   0x0E /**< Thailand */
+#define REG_DOMAIN_VN   0x0F /**< Vietnam */
+#define REG_DOMAIN_SG_H 0x10 /**< Singapore band 920-925 */
+
+#define OPERATING_MODE_1a 0x1a  /**< 50, 0,5 */
+#define OPERATING_MODE_1b 0x1b  /**< 50, 1.0 */
+#define OPERATING_MODE_2a 0x2a  /**< 100, 0,5 */
+#define OPERATING_MODE_2b 0x2b  /**< 100, 1.0 */
+#define OPERATING_MODE_3  0x03  /**< 150, 0.5 */
+#define OPERATING_MODE_4a 0x4a  /**< 200, 0.5 */
+#define OPERATING_MODE_4b 0x4b  /**< 200, 1.0 */
+#define OPERATING_MODE_5  0x05  /**< 300, 0.5 */
+
+#define CHANNEL_FUNCTION_FIXED            0x00  /**< Fixed channel */
+#define CHANNEL_FUNCTION_TR51CF           0x01  /**< TR51CF */
+#define CHANNEL_FUNCTION_DH1CF            0x02  /**< Direct Hash */
+#define CHANNEL_FUNCTION_VENDOR_DEFINED   0x03  /**< vendor given channel hop schedule */
+
+#define CHANNEL_SPACING_200     0x00    /**< 200 khz */
+#define CHANNEL_SPACING_400     0x01    /**< 400 khz */
+#define CHANNEL_SPACING_600     0x02    /**< 600 khz */
+#define CHANNEL_SPACING_100     0x03    /**< 100 khz */
+#define CHANNEL_SPACING_250     0x04    /**< 250 khz */
+#define CHANNEL_SPACING_800     0x05    /**< 800 khz */
+#define CHANNEL_SPACING_1200    0x06    /**< 1200 khz */
 
 /*
  *  Network Size definitions are device amount in hundreds of devices.
  *  These definitions are meant to give some estimates of sizes. Any value can be given as parameter
  */
 
-#define NETWORK_SIZE_CERTIFICATE    0x00  // Network configuration used in Wi-SUN certification
-#define NETWORK_SIZE_SMALL          0x01  // Small networks
-#define NETWORK_SIZE_MEDIUM         0x08  // 100 - 800 device networks are medium sized
-#define NETWORK_SIZE_LARGE          0x0F  // 800 - 1500 device networks are large
-#define NETWORK_SIZE_XLARGE         0x19  // 2500+ devices
-#define NETWORK_SIZE_AUTOMATIC      0xFF
+#define NETWORK_SIZE_CERTIFICATE    0x00    /**< Network configuration used in Wi-SUN certification */
+#define NETWORK_SIZE_SMALL          0x01    /**< Small networks */
+#define NETWORK_SIZE_MEDIUM         0x08    /**< 100 - 800 device networks are medium sized */
+#define NETWORK_SIZE_LARGE          0x0F    /**< 800 - 1500 device networks are large */
+#define NETWORK_SIZE_XLARGE         0x19    /**< 2500+ devices */
+#define NETWORK_SIZE_AUTOMATIC      0xFF    /**< Automatic network size */
 
 /** Temporary API change flag. this will be removed when new version of API is implemented on applications
  *
  */
-#define WS_MANAGEMENT_API_VER_2
+#define WS_MANAGEMENT_API_VER_2 /**< Management API version */
 
 /**
  * \brief Struct ws_statistics defines the Wi-SUN statistics storage structure.
@@ -184,6 +186,83 @@ int ws_management_network_name_validate(
     int8_t interface_id,
     char *network_name_ptr);
 
+/**
+ * Configure PHY mode ID of Wi-SUN stack as defined by Wi-SUN FAN 1.1.
+ *
+ * Change the default configuration for Wi-SUN PHY operation.
+ *
+ * Supported values:
+ * FSK without FEC:
+ * PHY mode ID | Symbol Rate (kbps) | Modulation Index
+ *           1                   50                0.5
+ *           2                   50                1.0
+ *           3                  100                0.5
+ *           4                  100                1.0
+ *           5                  150                0.5
+ *           6                  200                0.5
+ *           7                  200                1.0
+ *           8                  300                0.5
+ *
+ * FSK with FEC:
+ * PHY mode ID | Symbol Rate (kbps) | Modulation Index
+ *          17                   50                0.5
+ *          18                   50                1.0
+ *          19                  100                0.5
+ *          20                  100                1.0
+ *          21                  150                0.5
+ *          22                  200                0.5
+ *          23                  200                1.0
+ *          24                  300                0.5
+ *
+ * OFDM:
+ * PHY mode ID | Option | MCS | Data rate (kbps)
+ *          34        1     2                400
+ *          35        1     3                800
+ *          36        1     4               1200
+ *          37        1     5               1600
+ *          38        1     6               2400
+ *          51        2     3                400
+ *          52        2     4                600
+ *          53        2     5                800
+ *          54        2     6               1200
+ *          68        3     4                300
+ *          69        3     5                400
+ *          70        3     6                600
+ *          84        4     4                150
+ *          85        4     5                200
+ *          86        4     6                300
+ *
+ * if value of 255 is given then previous value is used.
+ *
+ * \param interface_id Network interface ID.
+ * \param phy_mode_id PHY mode ID. Default 255 (not used).
+ *
+ * \return 0, Init OK.
+ * \return <0 Init fail.
+ */
+int ws_management_phy_mode_id_set(
+    int8_t interface_id,
+    uint8_t phy_mode_id);
+
+/**
+ * Configure Channel plan ID of Wi-SUN stack as defined by Wi-SUN FAN 1.1.
+ *
+ * Change the default channel configuration for Wi-SUN.
+ *
+ * Supported values: TBD
+ *
+ * if value of 255 is given then previous value is used.
+ *
+ * \param interface_id Network interface ID.
+ * \param channel_plan_id Channel plan ID. Default 255 (not used).
+ *
+ * \return 0, Init OK.
+ * \return <0 Init fail.
+ */
+int ws_management_channel_plan_id_set(
+    int8_t interface_id,
+    uint8_t channel_plan_id);
+
 /**
  * Configure regulatory domain of Wi-SUN stack.
  *

source/6LoWPAN/adaptation_interface.c

@@ -110,6 +110,15 @@ typedef struct {
 
 #define LOWPAN_ACTIVE_UNICAST_ONGOING_MAX 10
 
+/* Minimum buffer amount and memory size to ensure operation even in out of memory situation
+ */
+#define LOWPAN_MEM_LIMIT_MIN_QUEUE 10
+#define LOWPAN_MEM_LIMIT_MIN_MEMORY 10000
+#define LOWPAN_MEM_LIMIT_REMOVE_NORMAL 3000 // Remove when approaching memory limit
+#define LOWPAN_MEM_LIMIT_REMOVE_MAX 10000 // Remove when at memory limit
+
+
+
 static NS_LIST_DEFINE(fragmenter_interface_list, fragmenter_interface_t, link);
 
 /* Adaptation interface local functions */
@@ -493,6 +502,63 @@ int8_t lowpan_adaptation_interface_mpx_register(int8_t interface_id, struct mpx_
     return 0;
 }
 
+void lowpan_adaptation_free_heap(bool full_gc)
+{
+    ns_list_foreach(fragmenter_interface_t, interface_ptr, &fragmenter_interface_list) {
+        // Go through all interfaces and free small amount of memory
+        // This is not very radical, but gives time to recover wthout causing too harsh changes
+        lowpan_adaptation_free_low_priority_packets(interface_ptr->interface_id, full_gc ? LOWPAN_MEM_LIMIT_REMOVE_MAX : LOWPAN_MEM_LIMIT_REMOVE_NORMAL);
+    }
+}
+
+int8_t lowpan_adaptation_free_low_priority_packets(int8_t interface_id, uint32_t requested_amount)
+{
+    fragmenter_interface_t *interface_ptr = lowpan_adaptation_interface_discover(interface_id);
+
+    if (!interface_ptr) {
+        return -1;
+    }
+    uint32_t adaptation_memory = 0;
+    uint16_t adaptation_packets = 0;
+    uint32_t memory_freed = 0;
+    uint16_t packets_freed = 0;
+
+    ns_list_foreach(buffer_t, entry, &interface_ptr->directTxQueue) {
+        adaptation_memory += sizeof(buffer_t) + entry->size;
+        adaptation_packets++;
+    }
+
+    if (interface_ptr->directTxQueue_size < LOWPAN_MEM_LIMIT_MIN_QUEUE) {
+        // Minimum reserved for operations
+        return 0;
+    }
+    if (adaptation_memory < LOWPAN_MEM_LIMIT_MIN_MEMORY) {
+        // Minimum reserved for operations
+        return 0;
+    }
+    if (adaptation_memory - requested_amount < LOWPAN_MEM_LIMIT_MIN_MEMORY) {
+        // only reduse to minimum
+        requested_amount = adaptation_memory - LOWPAN_MEM_LIMIT_MIN_MEMORY;
+    }
+
+    //Only remove last entries from TX queue with low priority
+    ns_list_foreach_reverse_safe(buffer_t, entry, &interface_ptr->directTxQueue) {
+        if (entry->priority == QOS_NORMAL) {
+            memory_freed += sizeof(buffer_t) + entry->size;
+            packets_freed++;
+            ns_list_remove(&interface_ptr->directTxQueue, entry);
+            interface_ptr->directTxQueue_size--;
+            lowpan_adaptation_tx_queue_level_update(interface_ptr);
+            socket_tx_buffer_event_and_free(entry, SOCKET_TX_FAIL);
+        }
+        if (memory_freed > requested_amount) {
+            // Enough memory freed
+            break;
+        }
+    }
+    tr_info("Adaptation Free low priority packets memory: %" PRIi32 " queue: %d deallocated %" PRIi32 " bytes, %d packets, %" PRIi32 " requested", adaptation_memory, adaptation_packets, memory_freed, packets_freed, requested_amount);
+    return 0;
+}
 
 static fragmenter_tx_entry_t *lowpan_indirect_entry_allocate(uint16_t fragment_buffer_size)
 {
@@ -1562,7 +1628,6 @@ int8_t lowpan_adaptation_free_messages_from_queues_by_address(struct protocol_in
     return 0;
 }
 
-
 int8_t lowpan_adaptation_indirect_queue_params_set(struct protocol_interface_info_entry *cur, uint16_t indirect_big_packet_threshold, uint16_t max_indirect_big_packets_total, uint16_t max_indirect_small_packets_per_child)
 {
     fragmenter_interface_t *interface_ptr = lowpan_adaptation_interface_discover(cur->id);