Merge branch 'master' into porting-guide-doc

Author: yogpan01

mbed-client/m2mbase.h

@@ -20,12 +20,15 @@
 #include <stdint.h>
 #include "mbed-client/m2mconfig.h"
 #include "mbed-client/m2mreportobserver.h"
+#include "mbed-client/functionpointer.h"
 
 //FORWARD DECLARATION
 struct sn_coap_hdr_;
 typedef sn_coap_hdr_ sn_coap_hdr_s;
 struct nsdl_s;
 
+typedef FP1<void, const char*> value_updated_callback;
+typedef void(*value_updated_callback2) (const char* object_name);
 class M2MObservationHandler;
 class M2MReportHandler;
 
@@ -369,6 +372,32 @@ class M2MBase : public M2MReportObserver {
      */
     virtual bool is_under_observation() const;
 
+    /**
+     * @brief Sets the function that is executed when this
+     * object receives a PUT or POST command.
+     * @param callback The function pointer that is called.
+     */
+    virtual void set_value_updated_function(value_updated_callback callback);
+
+    /**
+     * @brief Sets the function that is executed when this
+     * object receives a PUT or POST command.
+     * @param callback The function pointer that is called.
+     */
+    virtual void set_value_updated_function(value_updated_callback2 callback);
+
+    /**
+     * @brief Returns whether callback function is set or not.
+     * @return True if the callback function is set, else false.
+     */
+    virtual bool is_value_updated_function_set();
+
+    /**
+     * @brief Calls the function that is set in "set_value_updated_function".
+     * @param name Name of the object.
+     */
+    virtual void execute_value_updated(const String& name);
+
 protected : // from M2MReportObserver
 
     virtual void observation_to_be_sent(m2m::Vector<uint16_t> changed_instance_ids,
@@ -458,6 +487,8 @@ protected : // from M2MReportObserver
     bool                        _observable;
     bool                        _register_uri;
     bool                        _is_under_observation;
+    value_updated_callback      _value_updated_callback;
+    FP1<void, const char*>      *_function_pointer;
 
 friend class Test_M2MBase;
 

mbed-client/m2mconstants.h

@@ -36,6 +36,7 @@ const float REDUCTION_FACTOR = 0.75f;
 
 #define COAP "coap://"
 #define COAPS  "coaps://"
+#define BOOTSTRAP_URI "bs"
 // PUT attributes to be checked from server
 #define EQUAL  "="
 #define AMP  "&"

mbed-client/m2msecurity.h

@@ -211,6 +211,7 @@ friend class M2MNsdlInterface;
 private:
 
     M2MResource* get_resource(SecurityResource resource) const;
+    void clear_resources();
 
 private:
 
@@ -223,6 +224,7 @@ friend class M2MNsdlInterface;
     friend class Test_M2MConnectionHandlerPimpl_linux;
     friend class Test_M2MConnectionHandlerPimpl_mbed;
     friend class Test_M2MConnectionSecurityPimpl;
+    friend class Test_M2MNsdlInterface;
 };
 
 #endif // M2M_SECURITY_H

mbed-client/m2mtimerobserver.h

@@ -35,7 +35,8 @@ class M2MTimerObserver
         PMaxTimer,
         Dtls,
         QueueSleep,
-        RetryTimer
+        RetryTimer,
+        BootstrapTimer
     }Type;
 
     /**

mbed-client/m2mvector.h

@@ -138,8 +138,8 @@ class Vector
     void erase(int position) {
         if(position < _size) {
             _object_template[position] = 0;
-            for(int k = position; k < _size; k++) {
-                _object_template[k] = _object_template[k+1];
+            for(int k = position; k + 1 < _size; k++) {
+                _object_template[k] = _object_template[k + 1];
             }
             _size--;
         }

module.json

@@ -1,6 +1,6 @@
 {
   "name": "mbed-client",
-  "version": "1.12.5",
+  "version": "1.13.1",
   "description": "mbed Client C++ API",
   "keywords": [],
   "author": "Yogesh Pande <[email protected]>",

run_unit_tests.sh

@@ -29,8 +29,8 @@ mkdir results
 mkdir coverage
 
 find ./build -name '*.xml' | xargs cp -t ./results/
-find ./build -name '*.gcno' | xargs cp -t ./coverage/
-find ./build -name '*.gcda' | xargs cp -t ./coverage/
+find ./build/x86-linux-native-coverage/test -name '*.gcno' | xargs cp -t ./coverage/
+find ./build/x86-linux-native-coverage/test -name '*.gcda' | xargs cp -t ./coverage/
 touch coverage/*.gcda
 exclude_files="${PWD}/test/"
 gcovr -r ./ --gcov-filter='.*source*.' --exclude-unreachable-branches --exclude $exclude_files --object-directory ./coverage -x -o ./results/gcovr.xml

source/include/m2minterfaceimpl.h

@@ -382,8 +382,6 @@ friend class M2MInterfaceFactory;
     const int                   _max_states;
     bool                        _event_generated;
     EventData                   *_event_data;
-
-    String                      _endpoint_name;
     String                      _endpoint_type;
     String                      _domain;
     int32_t                     _life_time;
@@ -398,6 +396,7 @@ friend class M2MInterfaceFactory;
     bool                        _update_register_ongoing;
     M2MTimer                    *_queue_sleep_timer;
     M2MTimer                    *_retry_timer;
+    M2MTimer                    *_bootstrap_timer;
     callback_handler            _callback_handler;
     M2MSecurity                 *_security;
     uint8_t                     _retry_count;

source/include/m2mnsdlinterface.h

@@ -102,7 +102,7 @@ class M2MNsdlInterface : public M2MTimerObserver,
      * @param address Bootstrap address.
      * @return true if created and sent successfully else false.
     */
-    bool create_bootstrap_resource(sn_nsdl_addr_s *address);
+    bool create_bootstrap_resource(sn_nsdl_addr_s *address, const String &bootstrap_endpoint_name);
 
     /**
      * @brief Sends the register message to the server.
@@ -182,12 +182,6 @@ class M2MNsdlInterface : public M2MTimerObserver,
                                sn_nsdl_addr_s *address,
                                sn_nsdl_capab_e nsdl_capab);
 
-    /**
-     * @brief Callback when the bootstrap information is received from bootstrap server.
-     * @param server_info, Server information received from bootstrap server.
-     */
-    void bootstrap_done_callback(sn_nsdl_oma_server_info_t *server_info);
-
     /**
      * @brief Callback when there is data received from server and needs to be processed.
      * @param data, data received from server.
@@ -210,6 +204,12 @@ class M2MNsdlInterface : public M2MTimerObserver,
      */
     nsdl_s* get_nsdl_handle();
 
+    /**
+     * @brief Get endpoint name
+     * @return endpoint name
+     */
+    const String& endpoint_name() const;
+
 protected: // from M2MTimerObserver
 
     virtual void timer_expired(M2MTimerObserver::Type type);
@@ -298,41 +298,82 @@ class M2MNsdlInterface : public M2MTimerObserver,
                            const String  &uri_path);
 
     /**
-     * \brief Allocate (size + 1) amount of memory, copy size bytes into
+     * @brief Allocate (size + 1) amount of memory, copy size bytes into
      * it and add zero termination.
-     * \param source Source string to copy, may not be NULL.
-     * \param size The size of memory to be reserved.
+     * @param source Source string to copy, may not be NULL.
+     * @param size The size of memory to be reserved.
     */
     uint8_t* alloc_string_copy(const uint8_t* source, uint16_t size);
 
     /**
-     * \brief Utility method to convert given lifetime int to ascii 
+     * @brief Utility method to convert given lifetime int to ascii
      * and allocate a buffer for it and set it to _endpoint->lifetime_ptr.
-     * \param lifetime A new value for lifetime.
+     * @param lifetime A new value for lifetime.
     */
     void set_endpoint_lifetime_buffer(int lifetime);
 
+    /**
+     * @brief Handle incoming bootstrap PUT message.
+     * @param coap_header, Received CoAP message
+     * @param address, Server address
+    */
+    void handle_bootstrap_put_message(sn_coap_hdr_s *coap_header, sn_nsdl_addr_s *address);
+
+    /**
+     * @brief Handle bootstrap finished message.
+     * @param coap_header, Received CoAP message
+     * @param address, Server address
+    */
+    void handle_bootstrap_finished(sn_coap_hdr_s *coap_header,sn_nsdl_addr_s *address);
+
+    /**
+     * @brief Handle bootstrap delete message.
+     * @param coap_header, Received CoAP message
+     * @param address, Server address
+    */
+    void handle_bootstrap_delete(sn_coap_hdr_s *coap_header,sn_nsdl_addr_s *address);
+
+    /**
+     * @brief Parse bootstrap TLV message.
+     * @param coap_header, Received CoAP message
+     * @return True if parsing was succesful else false
+    */
+    bool parse_bootstrap_message(sn_coap_hdr_s *coap_header, bool is_security_object);
+
+    /**
+     * @brief Parse bootstrap TLV message.
+     * @param coap_header, Received CoAP message
+     * @return True if parsing was succesful else false
+    */
+    bool validate_security_object();
+
+    /**
+     * @brief Handle bootstrap errors.
+    */
+    void handle_bootstrap_error();
+
 private:
 
     M2MNsdlObserver                   &_observer;
     M2MObjectList                      _object_list;
-    M2MServer                         *_server;
+    M2MServer                         *_server; // Not owned
+    M2MSecurity                       *_security; // Not owned
     M2MTimer                          *_nsdl_exceution_timer;
     M2MTimer                          *_registration_timer;
     sn_nsdl_ep_parameters_s           *_endpoint;
     sn_nsdl_resource_info_s           *_resource;
-    sn_nsdl_bs_ep_info_t               _bootstrap_endpoint;
-    sn_nsdl_oma_device_t               _bootstrap_device_setup;
     sn_nsdl_addr_s                     _sn_nsdl_address;
     nsdl_s                            *_nsdl_handle;
     uint32_t                           _counter_for_nsdl;
     uint16_t                           _bootstrap_id;
     bool                               _register_ongoing;
     bool                               _unregister_ongoing;
     bool                               _update_register_ongoing;
+    String                             _endpoint_name;
 
 friend class Test_M2MNsdlInterface;
 
 };
 
 #endif // M2MNSDLINTERFACE_H
+

source/include/nsdlaccesshelper.h

@@ -40,7 +40,7 @@ uint8_t __nsdl_c_send_to_server(struct nsdl_s * nsdl_handle,
 uint8_t __nsdl_c_received_from_server(struct nsdl_s * nsdl_handle,
                                       sn_coap_hdr_s *coap_header,
                                       sn_nsdl_addr_s *address_ptr);
-void __nsdl_c_bootstrap_done(sn_nsdl_oma_server_info_t *server_info_ptr, struct nsdl_s * nsdl_handle);
+
 void *__socket_malloc( void * context, size_t size);
 void __socket_free(void * context, void * ptr);
 

source/m2mbase.cpp

@@ -81,7 +81,8 @@ M2MBase::M2MBase(const M2MBase& other) :
     _observation_level(other._observation_level),
     _observable(other._observable),
     _register_uri(other._register_uri),
-    _is_under_observation(other._is_under_observation)
+    _is_under_observation(other._is_under_observation),
+    _function_pointer(NULL)
 {
 
     if(other._token) {
@@ -105,12 +106,13 @@ M2MBase::M2MBase(const String & resource_name,
   _token(NULL),
   _token_length(0),
   _coap_content_type(0),
-  _operation(M2MBase::NOT_ALLOWED),  
+  _operation(M2MBase::NOT_ALLOWED),
   _mode(mde),
   _observation_level(M2MBase::None),
   _observable(false),
   _register_uri(true),
-  _is_under_observation(false)
+  _is_under_observation(false),
+  _function_pointer(NULL)
 {
     if(is_integer(_name) && _name.size() <= MAX_ALLOWED_STRING_LENGTH) {
         _name_id = strtoul(_name.c_str(), NULL, 10);
@@ -126,6 +128,7 @@ M2MBase::~M2MBase()
 {
     delete _report_handler;
     free(_token);
+    delete _function_pointer;
 }
 
 void M2MBase::set_operation(M2MBase::Operation opr)
@@ -450,3 +453,27 @@ bool M2MBase::is_under_observation() const
 {
     return _is_under_observation;
 }
+
+void M2MBase::set_value_updated_function(value_updated_callback callback)
+{
+    _value_updated_callback = callback;
+}
+
+void M2MBase::set_value_updated_function(value_updated_callback2 callback)
+{
+    delete _function_pointer;
+    _function_pointer = new FP1<void, const char*>(callback);
+    set_value_updated_function(value_updated_callback(_function_pointer,
+                                                      &FP1<void, const char*>::call));
+}
+bool M2MBase::is_value_updated_function_set()
+{
+    return (_value_updated_callback) ? true : false;
+}
+
+void M2MBase::execute_value_updated(const String& name)
+{
+    if(_value_updated_callback) {
+        _value_updated_callback(name.c_str());
+    }
+}