Update Nanostack binaries to 5.0.6

Author: Seppo Takalo

features/net/FEATURE_NANOSTACK/clone_nanostack.sh

@@ -0,0 +1,107 @@
+#!/bin/bash
+
+#
+# Export FEATURE_NANOSTACK libraries into mbed OS
+#
+# Usage:
+#
+# To remove all repositories call: ./clone_client.sh clean
+# To replace all with clone repositores: ./clone_client.sh clone
+# To export from cloned repositories: ./clone_client.sh export
+#
+# For developers:
+#    Use "clone" functionality to get master repositories to work with.
+#
+# For maintainers: Creating a release
+#    Use "clone" to get master repositories.
+#    For every directory checkout the release branch.
+#    Now use "export" function to flatten the git repositories into bare directories
+#    Now you can "git add" each directory and do "git commit"
+#
+# Note "clone" does implicit "clean" so you lose all changes done into directories.
+
+
+# REPOSITORIES and DIRECTORIES are array of repositories where to clone
+# and directories where to clone
+# these arrays MUST be in sync
+#  * Same number of elements
+#  * Same order. Each line should have maching pair in same index at other array
+REPOSITORIES=(
+    [email protected]:ARMmbed/sal-stack-nanostack.git
+    [email protected]:ARMmbed/coap-service.git
+    )
+
+DIRECTORIES=(
+    sal-stack-nanostack
+    coap-service
+    )
+
+# Exit immediately on fail, thread unset variables as error
+set -eu
+
+# Count number of repositories
+N=0
+for repo in ${REPOSITORIES[*]}; do
+    let N=N+1
+done
+let N=N-1 # Substract one, because indexes start from 0
+
+print_usage() {
+    echo -e "Usage: $0 [clean | clone | export ]"
+    echo -e "\tclean : Remove all repositories"
+    echo -e "\tclone : Replace repositories with Git cone"
+    echo -e "\texport : Export cloned Git repositories"
+}
+
+clean() {
+    for dir in ${DIRECTORIES[*]}; do
+        rm -rf $dir
+    done
+    clean_nanostack_binaries
+}
+
+clone() {
+    for i in $(seq 0 $N); do
+        git clone ${REPOSITORIES[$i]} ${DIRECTORIES[$i]}
+    done
+}
+
+export_repos() {
+    for i in $(seq 0 $N); do
+        echo "Exporting ${DIRECTORIES[$i]}"
+        cd ${DIRECTORIES[$i]}
+        git archive HEAD -o ../${DIRECTORIES[$i]}.tar.gz
+        cd ..
+        rm -rf ${DIRECTORIES[$i]}
+        mkdir ${DIRECTORIES[$i]}
+        tar xzf ${DIRECTORIES[$i]}.tar.gz -C ${DIRECTORIES[$i]}
+        rm ${DIRECTORIES[$i]}.tar.gz
+    done
+}
+
+copy_nanostack_binaries() {
+    mkdir -p ../nanostack-binaries
+    mv sal-stack-nanostack/FEATURE_* ../nanostack-binaries/
+}
+
+clean_nanostack_binaries() {
+    rm -rf ../nanostack-binaries
+}
+
+case "${1-}" in
+    clean)
+        clean
+        ;;
+    clone)
+        clean
+        clone
+        ;;
+    export)
+        export_repos
+        copy_nanostack_binaries
+        ;;
+    *)
+        print_usage
+        exit 1
+        ;;
+esac

features/net/FEATURE_NANOSTACK/coap-service/CHANGELOG.md

@@ -321,10 +321,11 @@ int coap_security_handler_connect(coap_security_t *sec, bool is_server, SecureSo
         return -1;
     }
 
-    //TODO: Only needed for server type?
+#ifdef MBEDTLS_SSL_SRV_C
     mbedtls_ssl_conf_dtls_cookies(&sec->_conf, simple_cookie_write,
                                   simple_cookie_check,
                                   &sec->_cookie);
+#endif
 
     sec->_is_started = true;
 
@@ -416,10 +417,11 @@ int coap_security_handler_connect_non_blocking(coap_security_t *sec, bool is_ser
         return -1;
     }
 
-    //Only needed for server type?
+#ifdef MBEDTLS_SSL_SRV_C
     mbedtls_ssl_conf_dtls_cookies(&sec->_conf, simple_cookie_write,
                                   simple_cookie_check,
                                   &sec->_cookie);
+#endif
 
     mbedtls_ssl_conf_min_version(&sec->_conf, MBEDTLS_SSL_MAJOR_VERSION_3, MBEDTLS_SSL_MAJOR_VERSION_3);
     mbedtls_ssl_conf_max_version(&sec->_conf, MBEDTLS_SSL_MAJOR_VERSION_3, MBEDTLS_SSL_MAJOR_VERSION_3);

features/net/FEATURE_NANOSTACK/coap-service/source/coap_security_handler.c

@@ -59,6 +59,12 @@
 #define TX_OPT_MULTICAST_HOP_LIMIT_64   0x02    /**< Use multicast hop limit of 64. */
 ///@}
 
+typedef enum dhcp_instance_type
+{
+    DHCP_INSTANCE_CLIENT,
+    DHCP_INSTANCE_SERVER
+} dhcp_instance_type_e;
+
 /**
  * \brief DHCP Service receive callback.
  *
@@ -96,14 +102,18 @@ typedef int (dhcp_service_receive_resp_cb)(uint16_t instance_id, void *ptr, uint
 
 
 /**
- * \brief Initialize the server instance.
+ * \brief Initialize a new DHCP service instance.
  *
  * Creates and shares the socket for other DHCP services.
  *
+ * \param interface_id Interface for the new DHCP instance.
+ * \param instance_type The type of the new DHCP instance.
+ * \param A callback function to receive DHCP messages.
+ *
  * \return Instance ID that is used to identify the service.
  */
 
-uint16_t dhcp_service_init(int8_t interface_id, dhcp_service_receive_req_cb *receive_req_cb);
+uint16_t dhcp_service_init(int8_t interface_id, dhcp_instance_type_e instance_type, dhcp_service_receive_req_cb *receive_req_cb);
 
 /**
 * \brief Deletes a server instance.

features/net/FEATURE_NANOSTACK/coap-service/test/coap-service/unittest/run_tests

@@ -30,7 +30,7 @@ extern "C" {
 
 #include "ns_types.h"
 
-
+#define thread_test_router_upgrade(iface) thread_test_router_id_request_send(iface, 2) // THREAD_COAP_STATUS_TLV_TOO_FEW_ROUTERS
 /**
   * \brief Add a static neighbour
   *
@@ -174,15 +174,7 @@ int thread_test_set_context_id_reuse_timeout(
  * \return <0 Remove fail
  */
 int thread_test_remove_router_by_id(int8_t interface_id, uint8_t routerId);
-/**
- * \brief Start router upgrade process.
- *
- * \param interface_id Network Interface
- *
- * \return 0, upgrade started
- * \return <0 fail
- */
-int thread_test_router_upgrade(int8_t interface_id);
+
 /**
  * \brief Start router downgrade process.
  *
@@ -367,7 +359,7 @@ int8_t thread_test_neighbour_info_get(int8_t interface_id, uint8_t index, uint16
 typedef int (response_cb)(int8_t interface_id, uint8_t *response_ptr, uint16_t response_len);
 
 /**
- * \brief Send diagnostic command
+ * \brief Send diagnostic command DEPRECATED
  *
  * \param interface_id      Network Interface
  * \param address_ptr       Address to which the command is sent
@@ -380,6 +372,24 @@ typedef int (response_cb)(int8_t interface_id, uint8_t *response_ptr, uint16_t r
  */
 int thread_test_diagnostic_command_send(int8_t interface_id, uint8_t *address_ptr,const char *uri_ptr, uint8_t request_length, uint8_t *request_ptr, response_cb *resp_cb);
 
+typedef int (coap_response_cb)(int8_t interface_id, uint8_t message_code, uint8_t message_type, uint8_t *response_ptr, uint16_t response_len);
+
+/**
+ * \brief Send diagnostic request
+ *
+ * \param interface_id      Network Interface
+ * \param address_ptr       Address to which the command is sent
+ * \param msg_type           Uri for the command
+ * \param msg_code           Uri for the command
+ * \param uri_ptr           Uri for the command
+ * \param request_length    The length of the request
+ * \param request_ptr       Pointer to the beginning of the request contents
+ * \param resp_cb           Pointer to callback function that is called after the reply for the command is obtained
+ *
+ * \return 0,               Command send OK
+ * \return <0               Command send Fail
+ */
+int thread_test_coap_request_send(int8_t interface_id, uint8_t *address_ptr, uint16_t port, uint8_t msg_type, uint8_t msg_code, uint16_t content_format, const char *uri_ptr, uint8_t *request_ptr, uint8_t request_length, coap_response_cb *resp_cb);
 
 /**
  * \brief Set initial SLAAC iid.
@@ -391,6 +401,26 @@ int thread_test_diagnostic_command_send(int8_t interface_id, uint8_t *address_pt
  */
 int8_t thread_test_initial_slaac_iid_set(int8_t interface_id, uint8_t *iid);
 
+/**
+ * \brief Send router ID request.
+ *
+ * \param interface_id      Network Interface
+ * \param status            Value of router ID request status TLV
+ * \return 0,               Command OK
+ * \return <0               Command Fail
+ */
+int8_t thread_test_router_id_request_send(int8_t interface_id, uint8_t status);
+
+/**
+ * \brief Set joiner port to joiner router device.
+ * If port == 0, then default port is used.
+ *
+ * \param iid               Joiner port.
+ * \return 0,               Command OK
+ * \return <0               Command Fail
+ */
+int8_t thread_test_joiner_router_joiner_port_set(uint16_t port);
+
 #ifdef __cplusplus
 }
 #endif