Merge commit '8696907765975bba8cb098c2772c89198c71a783' into feature-wisun

* commit '8696907765975bba8cb098c2772c89198c71a783':
  Squashed 'features/nanostack/sal-stack-nanostack/' changes from fb7413b..cc03296

Author: Arto Kinnunen

features/nanostack/sal-stack-nanostack/nanostack/fhss_config.h

@@ -116,9 +116,12 @@ typedef struct fhss_ws_configuration {
     /** Broadcast fixed channel */
     uint8_t broadcast_fixed_channel;
 
-    /** Channel mask. */
+    /** Channel mask. Wi-SUN will use this for broadcast */
     uint32_t channel_mask[8];
 
+    /** Wi-SUN specific unicast channel mask */
+    uint32_t unicast_channel_mask[8];
+
     /** Vendor defined channel function. */
     fhss_vendor_defined_cf *vendor_defined_cf;
 

features/nanostack/sal-stack-nanostack/nanostack/fhss_ws_extension.h

@@ -30,6 +30,14 @@
 extern "C" {
 #endif
 
+/**
+ * @brief ws_channel_mask_t WS neighbour supported channel mask
+ */
+typedef struct ws_channel_mask {
+    uint16_t channel_count;                     /**<active channels at mask */
+    uint32_t channel_mask[8];                   /**< Supported channels */
+} ws_channel_mask_t;
+
 /**
  * @brief unicast_timing_info Unicast timing/hopping schedule information structure.
  */
@@ -64,6 +72,7 @@ typedef struct fhss_ws_neighbor_timing_info {
     uint8_t timing_accuracy;                    /**< Neighbor timing accuracy */
     unicast_timing_info_t uc_timing_info;       /**< Neighbor unicast timing info */
     broadcast_timing_info_t bc_timing_info;     /**< Neighbor broadcast timing info */
+    ws_channel_mask_t uc_channel_list;          /**< Neighbor Unicast channel list */
     uint32_t *excluded_channels;                /**< Neighbor excluded channels (bit mask) */
 } fhss_ws_neighbor_timing_info_t;
 

features/nanostack/sal-stack-nanostack/nanostack/mac_common_defines.h

@@ -43,6 +43,7 @@
 #define MAC_IEEE_802_15_4_MIN_MPDU_OVERHEAD             9       /**< Minimum overhead added by MAC to MPDU */
 #define MAC_IEEE_802_15_4_MAX_BEACON_OVERHEAD           75      /**< Maximum overhead which is added by the MAC for beacon */
 #define MAC_IEEE_802_15_4_MAX_PHY_PACKET_SIZE           127     /**< Maximum number of octets PHY layer is able to receive */
+#define MAC_IEEE_802_15_4G_MAX_PHY_PACKET_SIZE          2047    /**< Maximum number of octets PHY layer is able to receive */
 
 #define MAC_IEEE_802_15_4_MAX_BEACON_PAYLOAD_LENGTH \
     (MAC_IEEE_802_15_4_MAX_PHY_PACKET_SIZE - MAC_IEEE_802_15_4_MAX_BEACON_OVERHEAD) /**< Maximum size of beacon payload */

features/nanostack/sal-stack-nanostack/nanostack/mlme.h

@@ -264,6 +264,7 @@ typedef enum {
     macAutoRequestKeyIndex = 0x7b,  /*<The index of the key used for automatic data*/
     macDefaultKeySource = 0x7c,      /*<Default key source*/
     //NON standard extension
+    mac802_15_4Mode = 0xf6,         /*<IEEE 802.15.4 mode*/
     macDeviceDescriptionPanIDUpdate = 0xf7, /*<Thread pending link update case this will update device descrioton list pan-id to new one*/
     macTXPower = 0xf8,              /*<TX output power*/
     macCCAThreshold = 0xf9,         /*<CCA threshold*/

features/nanostack/sal-stack-nanostack/nanostack/platform/arm_hal_phy.h

@@ -79,7 +79,8 @@ typedef enum {
     PHY_EXTENSION_SET_RF_CONFIGURATION,  /**<  Set RF configuration using phy_rf_channel_configuration_s structure */
     PHY_EXTENSION_FILTERING_SUPPORT, /**<  Return filtering modes that can be supported by the PHY driver. See phy_link_filters_e */
     PHY_EXTENSION_SET_TX_POWER, /**<  Set TX output power which is given as percentage of maximum. 0 is the lowest possible TX power and 100 is the highest possible TX power */
-    PHY_EXTENSION_SET_CCA_THRESHOLD /**<  Set CCA threshold which is given as percentage of maximum threshold. 0 is the lowest(strictest) possible threshold and 100 is the highest possible threshold */
+    PHY_EXTENSION_SET_CCA_THRESHOLD, /**<  Set CCA threshold which is given as percentage of maximum threshold. 0 is the lowest(strictest) possible threshold and 100 is the highest possible threshold */
+    PHY_EXTENSION_SET_802_15_4_MODE /**<  Set IEEE 802.15.4 mode as defined by phy_802_15_4_mode_t*/
 } phy_extension_type_e;
 
 /** Address types */
@@ -172,6 +173,15 @@ typedef enum {
     MODULATION_INDEX_UNDEFINED  ///< Modulation index undefined
 } phy_modulation_index_e;
 
+/**
+ * @brief enum phy_802_15_4_mode_t IEEE 802.15.4 mode
+ *
+ */
+typedef enum {
+    IEEE_802_15_4_2011,    /**<IEEE 802.15.4-2011*/
+    IEEE_802_15_4G_2012    /**<IEEE 802.15.4g-2012*/
+} phy_802_15_4_mode_t;
+
 /** Channel configuration */
 typedef struct phy_rf_channel_configuration_s {
     uint32_t channel_0_center_frequency;        ///< Center frequency

features/nanostack/sal-stack-nanostack/nanostack/socket_api.h

@@ -694,27 +694,29 @@ static inline int8_t socket_read_session_address(int8_t socket, ns_address_t *ad
  *
  * IPv6 socket options summary
  *
- * | opt_name / cmsg_type         | Data type        | set/getsockopt  | sendmsg | recvmsg                           |
- * | :--------------------------: | :--------------: | :-------------: | :-----: | :-------------------------------: |
- * | SOCKET_IPV6_TCLASS           | int16_t          |     Yes         |   Yes   | If enabled with RECVTCLASS        |
- * | SOCKET_IPV6_UNICAST_HOPS     | int16_t          |     Yes         |   No    | No                                |
- * | SOCKET_IPV6_MULTICAST_HOPS   | int16_t          |     Yes         |   No    | No                                |
- * | SOCKET_IPV6_ADDR_PREFERENCES | int              |     Yes         |   No    | No                                |
- * | SOCKET_IPV6_USE_MIN_MTU      | int8_t           |     Yes         |   Yes   | No                                |
- * | SOCKET_IPV6_DONTFRAG         | int8_t           |     Yes         |   Yes   | No                                |
- * | SOCKET_IPV6_FLOW_LABEL       | int32_t          |     Yes         |   No    | No                                |
- * | SOCKET_IPV6_HOPLIMIT         | int16_t          |     No          |   Yes   | If enabled with RECVHOPLIMIT      |
- * | SOCKET_IPV6_PKTINFO          | ns_in6_pktinfo_t |     No          |   Yes   | If enabled with RECVPKTINFO       |
- * | SOCKET_IPV6_RECVPKTINFO      | bool             |     Yes         |   No    | No                                |
- * | SOCKET_IPV6_RECVHOPLIMIT     | bool             |     Yes         |   No    | No                                |
- * | SOCKET_IPV6_RECVTCLASS       | bool             |     Yes         |   No    | No                                |
- * | SOCKET_IPV6_MULTICAST_IF     | int8_t           |     Yes         |   No    | No                                |
- * | SOCKET_IPV6_MULTICAST_LOOP   | bool             |     Yes         |   Yes   | No                                |
- * | SOCKET_IPV6_JOIN_GROUP       | ns_ipv6_mreq_t   |     Set only    |   No    | No                                |
- * | SOCKET_IPV6_LEAVE_GROUP      | ns_ipv6_mreq_t   |     Set only    |   No    | No                                |
- * | SOCKET_BROADCAST_PAN         | int8_t           |     Yes         |   No    | No                                |
- * | SOCKET_LINK_LAYER_SECURITY   | int8_t           |     Yes         |   No    | No                                |
- * | SOCKET_INTERFACE_SELECT      | int8_t           |     Yes         |   No    | No                                |
+ * | opt_name / cmsg_type         | Data type         | set/getsockopt  | sendmsg | recvmsg                           |
+ * | :--------------------------: | :---------- ----: | :-------------: | :-----: | :-------------------------------: |
+ * | SOCKET_IPV6_TCLASS           | int16_t           |     Yes         |   Yes   | If enabled with RECVTCLASS        |
+ * | SOCKET_IPV6_UNICAST_HOPS     | int16_t           |     Yes         |   No    | No                                |
+ * | SOCKET_IPV6_MULTICAST_HOPS   | int16_t           |     Yes         |   No    | No                                |
+ * | SOCKET_IPV6_ADDR_PREFERENCES | int               |     Yes         |   No    | No                                |
+ * | SOCKET_IPV6_USE_MIN_MTU      | int8_t            |     Yes         |   Yes   | No                                |
+ * | SOCKET_IPV6_DONTFRAG         | int8_t            |     Yes         |   Yes   | No                                |
+ * | SOCKET_IPV6_FLOW_LABEL       | int32_t           |     Yes         |   No    | No                                |
+ * | SOCKET_IPV6_HOPLIMIT         | int16_t           |     No          |   Yes   | If enabled with RECVHOPLIMIT      |
+ * | SOCKET_IPV6_PKTINFO          | ns_in6_pktinfo_t  |     No          |   Yes   | If enabled with RECVPKTINFO       |
+ * | SOCKET_IPV6_RECVPKTINFO      | bool              |     Yes         |   No    | No                                |
+ * | SOCKET_IPV6_RECVHOPLIMIT     | bool              |     Yes         |   No    | No                                |
+ * | SOCKET_IPV6_RECVTCLASS       | bool              |     Yes         |   No    | No                                |
+ * | SOCKET_IPV6_MULTICAST_IF     | int8_t            |     Yes         |   No    | No                                |
+ * | SOCKET_IPV6_MULTICAST_LOOP   | bool              |     Yes         |   Yes   | No                                |
+ * | SOCKET_IPV6_JOIN_GROUP       | ns_ipv6_mreq_t    |     Set only    |   No    | No                                |
+ * | SOCKET_IPV6_LEAVE_GROUP      | ns_ipv6_mreq_t    |     Set only    |   No    | No                                |
+ * | SOCKET_BROADCAST_PAN         | int8_t            |     Yes         |   No    | No                                |
+ * | SOCKET_LINK_LAYER_SECURITY   | int8_t            |     Yes         |   No    | No                                |
+ * | SOCKET_INTERFACE_SELECT      | int8_t            |     Yes         |   No    | No                                |
+ * | SOCKET_LATENCY               | ns_ipv6_latency_t |     Get only    |   No    | No                                |
+ * | SOCKET_STAGGER               | ns_ipv6_stagger_t |     Get only    |   No    | No                                |
  *
  */
 
@@ -753,6 +755,10 @@ static inline int8_t socket_read_session_address(int8_t socket, ns_address_t *ad
 #define SOCKET_IPV6_JOIN_GROUP              15
 /** Leave a multicast group, using ns_ipv6_mreq_t */
 #define SOCKET_IPV6_LEAVE_GROUP             16
+/** Read estimated latency to reach destination */
+#define SOCKET_LATENCY                      17
+/** Read estimated stagger value that can be used as initial delay after bootstrap or firmware update. */
+#define SOCKET_STAGGER                      18
 
 #define SOCKET_BROADCAST_PAN                0xfc /**< Internal use - transmit with IEEE 802.15.4 broadcast PAN ID */
 #define SOCKET_LINK_LAYER_SECURITY          0xfd /**< Not standard enable or disable socket security at link layer (For 802.15.4). */
@@ -765,6 +771,20 @@ typedef struct ns_ipv6_mreq {
     int8_t ipv6mr_interface;            /**< interface id */
 } ns_ipv6_mreq_t;
 
+/** Latency request used for getsockopt() */
+typedef struct {
+    uint8_t dest_addr[16];      /**< [IN] IPv6 destination address */
+    uint32_t latency;           /**< [OUT] estimated latency value in milliseconds */
+} ns_ipv6_latency_t;
+
+/** Stagger request used for getsockopt() */
+typedef struct {
+    uint8_t dest_addr[16];      /**< [IN] IPv6 destination address */
+    uint16_t data_amount;       /**< [IN] Amount of data in kilobytes */
+    uint16_t stagger_min;       /**< [OUT] Minimum stagger value in seconds */
+    uint16_t stagger_max;       /**< [OUT] Maximum stagger value in seconds */
+    uint16_t stagger_rand;      /**< [OUT] Randomized stagger value in seconds */
+} ns_ipv6_stagger_t;
 /**
  * \brief Set an option for a socket
  *
@@ -804,6 +824,7 @@ int8_t socket_setsockopt(int8_t socket, uint8_t level, uint8_t opt_name, const v
  * \return 0 on success.
  * \return -1 invalid socket ID.
  * \return -2 invalid/unsupported option.
+ * \return -3 data can't be retrieved.
  */
 int8_t socket_getsockopt(int8_t socket, uint8_t level, uint8_t opt_name, void *opt_value, uint16_t *opt_len);
 

features/nanostack/sal-stack-nanostack/nanostack/ws_bbr_api.h

@@ -52,6 +52,7 @@ 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*/
 
 /**
  * Configure border router features.
@@ -158,4 +159,88 @@ int ws_bbr_eapol_node_limit_set(int8_t interface_id, uint16_t limit);
  */
 int ws_bbr_ext_certificate_validation_set(int8_t interface_id, uint8_t validation);
 
+/**
+ * Sets RPL parameters
+ *
+ * Sets RPL DIO trickle parameters.
+ *
+ * \param interface_id Network interface ID.
+ * \param dio_interval_min DIO trickle timer Imin parameter.
+ * \param dio_interval_doublings DIO trickle timer Imax parameter as doublings of Imin
+ * \param dio_redundancy_constant DIO trickle timer redundancy constant.
+ *
+ * \return 0, RPL parameters set.
+ * \return <0 Node RPL parameters set failed.
+ */
+int ws_bbr_rpl_parameters_set(int8_t interface_id, uint8_t dio_interval_min, uint8_t dio_interval_doublings, uint8_t dio_redundancy_constant);
+
+/**
+ * Gets RPL parameters
+ *
+ * Gets RPL DIO trickle parameters.
+ *
+ * \param interface_id Network interface ID.
+ * \param dio_interval_min DIO trickle timer Imin parameter.
+ * \param dio_interval_doublings DIO trickle timer Imax parameter as doublings of Imin
+ * \param dio_redundancy_constant DIO trickle timer redundancy constant.
+ *
+ * \return 0, RPL parameters get.
+ * \return <0 Node RPL parameters get failed.
+ */
+int ws_bbr_rpl_parameters_get(int8_t interface_id, uint8_t *dio_interval_min, uint8_t *dio_interval_doublings, uint8_t *dio_redundancy_constant);
+
+/**
+ * Validate RPL parameters
+ *
+ * Validates RPL DIO trickle parameters.
+ *
+ * \param interface_id Network interface ID.
+ * \param dio_interval_min DIO trickle timer Imin parameter.
+ * \param dio_interval_doublings DIO trickle timer Imax parameter as doublings of Imin
+ * \param dio_redundancy_constant DIO trickle timer redundancy constant.
+ *
+ * \return 0, RPL parameters validated.
+ * \return <0 Node RPL parameters validation failed.
+ */
+int ws_bbr_rpl_parameters_validate(int8_t interface_id, uint8_t dio_interval_min, uint8_t dio_interval_doublings, uint8_t dio_redundancy_constant);
+
+/**
+ * Sets PAN configuration
+ *
+ * Sets PAN configuration parameters.
+ *
+ * \param interface_id Network interface ID.
+ * \param pan_id PAN ID; 0xffff default, generate the PAN ID.
+ *
+ * \return 0, PAN configuration set.
+ * \return <0 PAN configuration set failed.
+ */
+int ws_bbr_pan_configuration_set(int8_t interface_id, uint16_t pan_id);
+
+/**
+ * Gets PAN configuration
+ *
+ * Gets PAN configuration parameters.
+ *
+ * \param interface_id Network interface ID.
+ * \param pan_id PAN ID; 0xffff default
+ *
+ * \return 0, PAN configuration get.
+ * \return <0 PAN configuration get failed.
+ */
+int ws_bbr_pan_configuration_get(int8_t interface_id, uint16_t *pan_id);
+
+/**
+ * Validates PAN configuration
+ *
+ * Validates PAN configuration parameters.
+ *
+ * \param interface_id Network interface ID.
+ * \param pan_id PAN ID.
+ *
+ * \return 0, PAN configuration validated.
+ * \return <0 PAN configuration validation failed.
+ */
+int ws_bbr_pan_configuration_validate(int8_t interface_id, uint16_t pan_id);
+
 #endif /* WS_BBR_API_H_ */