Diff: simple-mbed-cloud-client/mbed-cloud-client/mbed-client/source/m2mbase.cpp

Revision:

0:119624335925

diff -r 000000000000 -r 119624335925 simple-mbed-cloud-client/mbed-cloud-client/mbed-client/source/m2mbase.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/simple-mbed-cloud-client/mbed-cloud-client/mbed-client/source/m2mbase.cpp	Sat Jun 30 01:40:30 2018 +0000
@@ -0,0 +1,882 @@
+/*
+ * Copyright (c) 2015 ARM Limited. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ * Licensed under the Apache License, Version 2.0 (the License); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mbed-client/m2mbase.h"
+#include "mbed-client/m2mobservationhandler.h"
+#include "mbed-client/m2mconstants.h"
+#include "mbed-client/m2mtimer.h"
+
+#include "mbed-client/m2mobject.h"
+#include "mbed-client/m2mobjectinstance.h"
+#include "mbed-client/m2mresource.h"
+
+#include "include/m2mreporthandler.h"
+#include "include/nsdlaccesshelper.h"
+#include "include/m2mcallbackstorage.h"
+#include "mbed-trace/mbed_trace.h"
+
+#include "sn_nsdl_lib.h"
+#include <assert.h>
+#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
+#include "common_functions.h"
+
+#define TRACE_GROUP "mClt"
+
+M2MBase::M2MBase(const String& resource_name,
+                 M2MBase::Mode mode,
+#ifndef DISABLE_RESOURCE_TYPE
+                 const String &resource_type,
+#endif
+                 char *path,
+                 bool external_blockwise_store,
+                 bool multiple_instance,
+                 M2MBase::DataType type)
+:
+  _sn_resource(NULL),
+  _report_handler(NULL)
+{
+    // Checking the name length properly, i.e returning error is impossible from constructor without exceptions
+    assert(resource_name.length() <= MAX_ALLOWED_STRING_LENGTH);
+
+    _sn_resource = (lwm2m_parameters_s*)memory_alloc(sizeof(lwm2m_parameters_s));
+    if(_sn_resource) {
+        memset(_sn_resource, 0, sizeof(lwm2m_parameters_s));
+        _sn_resource->free_on_delete = true;
+        _sn_resource->multiple_instance = multiple_instance;
+        _sn_resource->data_type = type;
+        _sn_resource->dynamic_resource_params =
+                (sn_nsdl_dynamic_resource_parameters_s*)memory_alloc(sizeof(sn_nsdl_dynamic_resource_parameters_s));
+        if(_sn_resource->dynamic_resource_params) {
+            memset(_sn_resource->dynamic_resource_params,
+                   0, sizeof(sn_nsdl_dynamic_resource_parameters_s));
+            _sn_resource->dynamic_resource_params->static_resource_parameters =
+                    (sn_nsdl_static_resource_parameters_s*)memory_alloc(sizeof(sn_nsdl_static_resource_parameters_s));
+
+            // Set callback function in case of both dynamic and static resource
+            _sn_resource->dynamic_resource_params->sn_grs_dyn_res_callback = __nsdl_c_callback;
+
+            if(_sn_resource->dynamic_resource_params->static_resource_parameters) {
+                // Cast const away to able to compile using MEMORY_OPTIMIZED_API flag
+                sn_nsdl_static_resource_parameters_s *params =
+                        const_cast<sn_nsdl_static_resource_parameters_s *>(_sn_resource->dynamic_resource_params->static_resource_parameters);
+                memset(params, 0, sizeof(sn_nsdl_static_resource_parameters_s));
+                const size_t len = strlen(resource_type.c_str());
+                if (len > 0) {
+#ifndef RESOURCE_ATTRIBUTES_LIST
+#ifndef DISABLE_RESOURCE_TYPE
+                    params->resource_type_ptr = (char*)alloc_string_copy((uint8_t*) resource_type.c_str(), len);
+#endif
+#else
+                    sn_nsdl_attribute_item_s item;
+                    item.attribute_name = ATTR_RESOURCE_TYPE;
+                    item.value = (char*)alloc_string_copy((uint8_t*) resource_type.c_str(), len);
+                    sn_nsdl_set_resource_attribute(_sn_resource->dynamic_resource_params->static_resource_parameters, &item);
+#endif
+                }
+                params->path = path;
+                params->mode = (unsigned)mode;
+                params->free_on_delete = true;
+                params->external_memory_block = external_blockwise_store;
+                _sn_resource->dynamic_resource_params->static_resource_parameters = params;
+            }
+        }
+
+        if((!resource_name.empty())) {
+            _sn_resource->identifier_int_type = false;
+            _sn_resource->identifier.name = stringdup((char*)resource_name.c_str());
+        } else {
+            tr_debug("M2MBase::M2Mbase resource name is EMPTY ===========");
+            _sn_resource->identifier_int_type = true;
+            _sn_resource->identifier.instance_id = 0;
+        }
+        _sn_resource->dynamic_resource_params->publish_uri = true;
+        _sn_resource->dynamic_resource_params->free_on_delete = true;
+        _sn_resource->dynamic_resource_params->notification_status = NOTIFICATION_STATUS_INIT;
+        _sn_resource->dynamic_resource_params->auto_observable = false;
+    }
+}
+
+M2MBase::M2MBase(const lwm2m_parameters_s *s):
+    _sn_resource((lwm2m_parameters_s*) s),
+    _report_handler(NULL)
+{
+    tr_debug("M2MBase::M2MBase(const lwm2m_parameters_s *s)");
+    // Set callback function in case of both dynamic and static resource
+    _sn_resource->dynamic_resource_params->sn_grs_dyn_res_callback = __nsdl_c_callback;
+}
+
+M2MBase::~M2MBase()
+{
+    tr_debug("M2MBase::~M2MBase()");
+    delete _report_handler;
+
+    value_updated_callback* callback = (value_updated_callback*)M2MCallbackStorage::remove_callback(*this, M2MCallbackAssociation::M2MBaseValueUpdatedCallback);
+    delete callback;
+
+    M2MCallbackStorage::remove_callback(*this, M2MCallbackAssociation::M2MBaseValueUpdatedCallback2);
+    M2MCallbackStorage::remove_callback(*this, M2MCallbackAssociation::M2MBaseNotificationDeliveryStatusCallback);
+}
+
+char* M2MBase::create_path_base(const M2MBase &parent, const char *name)
+{
+    char * result = NULL;
+    // Expectation is that every element can be MAX_NAME_SZE, + 4 /'s + \0
+    StringBuffer<(MAX_NAME_SIZE * 4 + (4 + 1))> path;
+    path.append(parent.uri_path());
+    path.append('/');
+    path.append(name);
+    result = stringdup(path.c_str());
+
+    return result;
+}
+
+char* M2MBase::create_path(const M2MObject &parent, uint16_t object_instance)
+{
+    StringBuffer<6> obj_inst_id;
+    obj_inst_id.append_int(object_instance);
+
+    return create_path_base(parent, obj_inst_id.c_str());
+}
+
+char* M2MBase::create_path(const M2MObject &parent, const char *name)
+{
+    return create_path_base(parent, name);
+}
+
+char* M2MBase::create_path(const M2MResource &parent, uint16_t resource_instance)
+{
+    StringBuffer<6> res_inst;
+    res_inst.append_int(resource_instance);
+
+    return create_path_base(parent, res_inst.c_str());
+}
+
+char* M2MBase::create_path(const M2MResource &parent, const char *name)
+{
+    return create_path_base(parent, name);
+}
+
+char* M2MBase::create_path(const M2MObjectInstance &parent, const char *name)
+{
+    return create_path_base(parent, name);
+}
+
+void M2MBase::set_operation(M2MBase::Operation opr)
+{
+    // If the mode is Static, there is only GET_ALLOWED supported.
+    if(M2MBase::Static == mode()) {
+        _sn_resource->dynamic_resource_params->access = M2MBase::GET_ALLOWED;
+    } else {
+        _sn_resource->dynamic_resource_params->access = opr;
+    }
+}
+
+#ifndef RESOURCE_ATTRIBUTES_LIST
+#ifndef MEMORY_OPTIMIZED_API
+#ifndef DISABLE_INTERFACE_DESCRIPTION
+void M2MBase::set_interface_description(const char *desc)
+{
+    assert(_sn_resource->dynamic_resource_params->static_resource_parameters->free_on_delete);
+    free(_sn_resource->dynamic_resource_params->static_resource_parameters->interface_description_ptr);
+    _sn_resource->dynamic_resource_params->static_resource_parameters->interface_description_ptr = NULL;
+    const size_t len = strlen(desc);
+    if (len > 0 ) {
+        _sn_resource->dynamic_resource_params->static_resource_parameters->interface_description_ptr =
+                (char*)alloc_string_copy((uint8_t*) desc, len);
+    }
+}
+
+void M2MBase::set_interface_description(const String &desc)
+{
+    assert(_sn_resource->dynamic_resource_params->static_resource_parameters->free_on_delete);
+    set_interface_description(desc.c_str());
+}
+#endif // DISABLE_INTERFACE_DESCRIPTION
+
+#ifndef DISABLE_RESOURCE_TYPE
+void M2MBase::set_resource_type(const String &res_type)
+{
+    assert(_sn_resource->dynamic_resource_params->static_resource_parameters->free_on_delete);
+    set_resource_type(res_type.c_str());
+}
+
+void M2MBase::set_resource_type(const char *res_type)
+{
+    assert(_sn_resource->dynamic_resource_params->static_resource_parameters->free_on_delete);
+    free(_sn_resource->dynamic_resource_params->static_resource_parameters->resource_type_ptr);
+    _sn_resource->dynamic_resource_params->static_resource_parameters->resource_type_ptr = NULL;
+    const size_t len = strlen(res_type);
+    if (len > 0) {
+        _sn_resource->dynamic_resource_params->static_resource_parameters->resource_type_ptr = (char*)
+                alloc_string_copy((uint8_t*) res_type, len);
+    }
+}
+#endif // DISABLE_RESOURCE_TYPE
+#endif //MEMORY_OPTIMIZED_API
+#else // RESOURCE_ATTRIBUTES_LIST
+void M2MBase::set_interface_description(const char *desc)
+{
+    assert(_sn_resource->dynamic_resource_params->static_resource_parameters->free_on_delete);
+    const size_t len = strlen(desc);
+    if (len > 0 ) {
+        sn_nsdl_attribute_item_s item;
+        item.attribute_name = ATTR_INTERFACE_DESCRIPTION;
+        item.value = (char*)alloc_string_copy((uint8_t*) desc, len);
+        sn_nsdl_set_resource_attribute(_sn_resource->dynamic_resource_params->static_resource_parameters, &item);
+    }
+}
+
+void M2MBase::set_interface_description(const String &desc)
+{
+    assert(_sn_resource->dynamic_resource_params->static_resource_parameters->free_on_delete);
+    set_interface_description(desc.c_str());
+}
+
+void M2MBase::set_resource_type(const String &res_type)
+{
+    assert(_sn_resource->dynamic_resource_params->static_resource_parameters->free_on_delete);
+    set_resource_type(res_type.c_str());
+}
+
+void M2MBase::set_resource_type(const char *res_type)
+{
+    assert(_sn_resource->dynamic_resource_params->static_resource_parameters->free_on_delete);
+    const size_t len = strlen(res_type);
+    if (len > 0) {
+        sn_nsdl_attribute_item_s item;
+        item.attribute_name = ATTR_RESOURCE_TYPE;
+        item.value = (char*)alloc_string_copy((uint8_t*) res_type, len);
+        sn_nsdl_set_resource_attribute(_sn_resource->dynamic_resource_params->static_resource_parameters, &item);
+    }
+}
+#endif // RESOURCE_ATTRIBUTES_LIST
+
+void M2MBase::set_coap_content_type(const uint16_t con_type)
+{
+    _sn_resource->dynamic_resource_params->coap_content_type = con_type;
+}
+
+void M2MBase::set_observable(bool observable)
+{
+    _sn_resource->dynamic_resource_params->observable = observable;
+}
+
+void M2MBase::set_auto_observable(bool auto_observable)
+{
+    _sn_resource->dynamic_resource_params->auto_observable = auto_observable;
+}
+
+void M2MBase::add_observation_level(M2MBase::Observation obs_level)
+{
+    if(_report_handler) {
+        _report_handler->add_observation_level(obs_level);
+    }
+}
+
+void M2MBase::remove_observation_level(M2MBase::Observation obs_level)
+{
+    if(_report_handler) {
+        _report_handler->remove_observation_level(obs_level);
+    }
+}
+
+
+void M2MBase::set_under_observation(bool observed,
+                                    M2MObservationHandler *handler)
+{
+    tr_debug("M2MBase::set_under_observation - observed: %d", observed);
+    tr_debug("M2MBase::set_under_observation - base_type: %d", base_type());
+    if(_report_handler) {
+        _report_handler->set_under_observation(observed);
+    }
+
+    set_observation_handler(handler);
+
+    if (handler) {
+        if (base_type() != M2MBase::ResourceInstance) {
+            // Create report handler only if it does not exist and one wants observation
+            // This saves 76 bytes of memory on most usual case.
+            if (observed) {
+                if(!_report_handler) {
+                    _report_handler = new M2MReportHandler(*this);
+                }
+            }
+            if (_report_handler) {
+                _report_handler->set_under_observation(observed);
+            }
+        }
+    } else {
+        delete _report_handler;
+        _report_handler = NULL;
+    }
+}
+
+void M2MBase::set_observation_token(const uint8_t *token, const uint8_t length)
+{
+    if (_report_handler) {
+        _report_handler->set_observation_token(token, length);
+    }
+}
+
+void M2MBase::set_instance_id(const uint16_t inst_id)
+{
+    _sn_resource->identifier_int_type = true;
+    _sn_resource->identifier.instance_id = inst_id;
+}
+
+void M2MBase::set_max_age(const uint32_t max_age)
+{
+    _sn_resource->max_age = max_age;
+}
+
+M2MBase::BaseType M2MBase::base_type() const
+{
+    return (M2MBase::BaseType)_sn_resource->base_type;
+}
+
+M2MBase::Operation M2MBase::operation() const
+{
+    return (M2MBase::Operation)_sn_resource->dynamic_resource_params->access;
+}
+
+const char* M2MBase::name() const
+{
+    assert(_sn_resource->identifier_int_type == false);
+    return _sn_resource->identifier.name;
+}
+
+int32_t M2MBase::name_id() const
+{
+    int32_t name_id = -1;
+    assert(_sn_resource->identifier_int_type == false);
+    if(is_integer(_sn_resource->identifier.name) && strlen(_sn_resource->identifier.name) <= MAX_ALLOWED_STRING_LENGTH) {
+        name_id = strtoul(_sn_resource->identifier.name, NULL, 10);
+        if(name_id > 65535){
+            name_id = -1;
+        }
+    }
+    return name_id;
+}
+
+uint16_t M2MBase::instance_id() const
+{
+    assert(_sn_resource->identifier_int_type == true);
+    return _sn_resource->identifier.instance_id;
+}
+
+#ifndef RESOURCE_ATTRIBUTES_LIST
+#ifndef DISABLE_INTERFACE_DESCRIPTION
+const char* M2MBase::interface_description() const
+{
+    return (reinterpret_cast<char*>(
+        _sn_resource->dynamic_resource_params->static_resource_parameters->interface_description_ptr));
+}
+#endif
+
+#ifndef DISABLE_RESOURCE_TYPE
+const char* M2MBase::resource_type() const
+{
+    return (reinterpret_cast<char*>(
+        _sn_resource->dynamic_resource_params->static_resource_parameters->resource_type_ptr));
+}
+#endif
+#else // RESOURCE_ATTRIBUTES_LIST
+#ifndef DISABLE_INTERFACE_DESCRIPTION
+const char* M2MBase::interface_description() const
+{
+    return sn_nsdl_get_resource_attribute(_sn_resource->dynamic_resource_params->static_resource_parameters, ATTR_INTERFACE_DESCRIPTION);
+}
+#endif
+
+#ifndef DISABLE_RESOURCE_TYPE
+const char* M2MBase::resource_type() const
+{
+    return sn_nsdl_get_resource_attribute(_sn_resource->dynamic_resource_params->static_resource_parameters, ATTR_RESOURCE_TYPE);
+}
+#endif
+#endif // RESOURCE_ATTRIBUTES_LIST
+const char* M2MBase::uri_path() const
+{
+    return (reinterpret_cast<char*>(
+        _sn_resource->dynamic_resource_params->static_resource_parameters->path));
+}
+
+uint16_t M2MBase::coap_content_type() const
+{
+    return _sn_resource->dynamic_resource_params->coap_content_type;
+}
+
+bool M2MBase::is_observable() const
+{
+    if (_sn_resource->dynamic_resource_params->auto_observable) {
+        return true;
+    } else {
+        return _sn_resource->dynamic_resource_params->observable;
+    }
+}
+
+M2MBase::Observation M2MBase::observation_level() const
+{
+    M2MBase::Observation obs_level = M2MBase::None;
+    if(_report_handler) {
+        obs_level = _report_handler->observation_level();
+    }
+    return obs_level;
+}
+
+void M2MBase::get_observation_token(uint8_t *token, uint8_t &token_length) const
+{
+    if(_report_handler) {
+        _report_handler->get_observation_token(token, token_length);
+    }
+}
+
+M2MBase::Mode M2MBase::mode() const
+{
+    return (M2MBase::Mode)_sn_resource->dynamic_resource_params->static_resource_parameters->mode;
+}
+
+uint16_t M2MBase::observation_number() const
+{
+    uint16_t obs_number = 0;
+    if(_report_handler) {
+        obs_number = _report_handler->observation_number();
+    }
+    return obs_number;
+}
+
+uint32_t M2MBase::max_age() const
+{
+    return _sn_resource->max_age;
+}
+
+bool M2MBase::handle_observation_attribute(const char *query)
+{
+    tr_debug("M2MBase::handle_observation_attribute - under observation(%d)", is_under_observation());
+    bool success = false;
+    // Create handler if not already exists. Client must able to parse write attributes even when
+    // observation is not yet set
+    if (!_report_handler) {
+        _report_handler = new M2MReportHandler(*this);
+    }
+
+    success = _report_handler->parse_notification_attribute(query,base_type());
+    if (success) {
+        if (is_under_observation()) {
+            _report_handler->set_under_observation(true);
+        }
+     } else {
+        _report_handler->set_default_values();
+    }
+    return success;
+}
+
+void M2MBase::observation_to_be_sent(const m2m::Vector<uint16_t> &changed_instance_ids,
+                                     uint16_t obs_number,
+                                     bool send_object)
+{
+    //TODO: Move this to M2MResourceInstance
+    M2MObservationHandler *obs_handler = observation_handler();
+    if (obs_handler) {
+        obs_handler->observation_to_be_sent(this,
+                                            obs_number,
+                                            changed_instance_ids,
+                                            send_object);
+    }
+}
+
+void M2MBase::set_base_type(M2MBase::BaseType type)
+{
+    assert(_sn_resource->free_on_delete);
+    _sn_resource->base_type = type;
+}
+
+sn_coap_hdr_s* M2MBase::handle_get_request(nsdl_s */*nsdl*/,
+                                           sn_coap_hdr_s */*received_coap_header*/,
+                                           M2MObservationHandler */*observation_handler*/)
+{
+    //Handled in M2MResource, M2MObjectInstance and M2MObject classes
+    return NULL;
+}
+
+sn_coap_hdr_s* M2MBase::handle_put_request(nsdl_s */*nsdl*/,
+                                           sn_coap_hdr_s */*received_coap_header*/,
+                                           M2MObservationHandler */*observation_handler*/,
+                                           bool &)
+{
+    //Handled in M2MResource, M2MObjectInstance and M2MObject classes
+    return NULL;
+}
+
+sn_coap_hdr_s* M2MBase::handle_post_request(nsdl_s */*nsdl*/,
+                                            sn_coap_hdr_s */*received_coap_header*/,
+                                            M2MObservationHandler */*observation_handler*/,
+                                            bool &,
+                                            sn_nsdl_addr_s *)
+{
+    //Handled in M2MResource, M2MObjectInstance and M2MObject classes
+    return NULL;
+}
+
+void *M2MBase::memory_alloc(uint32_t size)
+{
+    if(size)
+        return malloc(size);
+    else
+        return 0;
+}
+
+void M2MBase::memory_free(void *ptr)
+{
+    free(ptr);
+}
+
+char* M2MBase::alloc_string_copy(const char* source)
+{
+    assert(source != NULL);
+
+    // Note: the armcc's libc does not have strdup, so we need to implement it here
+    const size_t len = strlen(source);
+
+    return (char*)alloc_string_copy((uint8_t*)source, len);
+}
+
+uint8_t* M2MBase::alloc_string_copy(const uint8_t* source, uint32_t size)
+{
+    assert(source != NULL);
+
+    uint8_t* result = (uint8_t*)memory_alloc(size + 1);
+    if (result) {
+        memcpy(result, source, size);
+        result[size] = '\0';
+    }
+    return result;
+}
+
+uint8_t* M2MBase::alloc_copy(const uint8_t* source, uint32_t size)
+{
+    assert(source != NULL);
+
+    uint8_t* result = (uint8_t*)memory_alloc(size);
+    if (result) {
+        memcpy(result, source, size);
+    }
+    return result;
+}
+
+bool M2MBase::validate_string_length(const String &string, size_t min_length, size_t max_length)
+{
+    bool valid = false;
+
+    const size_t len = string.length();
+    if ((len >= min_length) && (len <= max_length)) {
+        valid = true;
+    }
+
+    return valid;
+}
+
+bool M2MBase::validate_string_length(const char* string, size_t min_length, size_t max_length)
+{
+    bool valid = false;
+
+    if (string != NULL) {
+        const size_t len = strlen(string);
+        if ((len >= min_length) && (len <= max_length)) {
+            valid = true;
+        }
+    }
+    return valid;
+}
+
+M2MReportHandler* M2MBase::create_report_handler()
+{
+    if (!_report_handler) {
+        _report_handler = new M2MReportHandler(*this);
+    }
+    return _report_handler;
+}
+
+M2MReportHandler* M2MBase::report_handler() const
+{
+    return _report_handler;
+}
+
+void M2MBase::set_register_uri(bool register_uri)
+{
+    _sn_resource->dynamic_resource_params->publish_uri = register_uri;
+}
+
+bool M2MBase::register_uri()
+{
+    return _sn_resource->dynamic_resource_params->publish_uri;
+}
+
+bool M2MBase::is_integer(const String &value)
+{
+    const char *s = value.c_str();
+    if(value.empty() || ((!isdigit(s[0])) && (s[0] != '-') && (s[0] != '+'))) {
+        return false;
+    }
+    char * p;
+    strtol(value.c_str(), &p, 10);
+    return (*p == 0);
+}
+
+bool M2MBase::is_integer(const char *value)
+{
+    assert(value != NULL);
+
+    if((strlen(value) < 1) || ((!isdigit(value[0])) && (value[0] != '-') && (value[0] != '+'))) {
+        return false;
+    }
+    char * p;
+    strtol(value, &p, 10);
+    return (*p == 0);
+}
+
+bool M2MBase::is_under_observation() const
+{
+   bool under_observation = false;
+    if(_report_handler) {
+        under_observation = _report_handler->is_under_observation();
+    }
+    return under_observation;
+}
+
+bool M2MBase::set_value_updated_function(value_updated_callback callback)
+{
+    value_updated_callback* old_callback = (value_updated_callback*)M2MCallbackStorage::remove_callback(*this, M2MCallbackAssociation::M2MBaseValueUpdatedCallback);
+    delete old_callback;
+    // XXX: create a copy of the copy of callback object. Perhaps it would better to
+    // give a reference as parameter and just store that, as it would save some memory.
+    value_updated_callback* new_callback = new value_updated_callback(callback);
+
+    return M2MCallbackStorage::add_callback(*this, new_callback, M2MCallbackAssociation::M2MBaseValueUpdatedCallback);
+}
+
+bool M2MBase::set_value_updated_function(value_updated_callback2 callback)
+{
+    M2MCallbackStorage::remove_callback(*this, M2MCallbackAssociation::M2MBaseValueUpdatedCallback2);
+
+    return M2MCallbackStorage::add_callback(*this, (void*)callback, M2MCallbackAssociation::M2MBaseValueUpdatedCallback2);
+}
+
+bool M2MBase::is_value_updated_function_set() const
+{
+    bool func_set = false;
+    if ((M2MCallbackStorage::does_callback_exist(*this, M2MCallbackAssociation::M2MBaseValueUpdatedCallback) == true) ||
+        (M2MCallbackStorage::does_callback_exist(*this, M2MCallbackAssociation::M2MBaseValueUpdatedCallback2) == true)) {
+
+        func_set = true;
+    }
+    return func_set;
+}
+
+void M2MBase::execute_value_updated(const String& name)
+{
+    // Q: is there a point to call both callback types? Or should we call just one of them?
+
+    value_updated_callback* callback = (value_updated_callback*)M2MCallbackStorage::get_callback(*this,
+                                                                                                 M2MCallbackAssociation::M2MBaseValueUpdatedCallback);
+    if (callback) {
+        (*callback)(name.c_str());
+    }
+
+    value_updated_callback2 callback2 = (value_updated_callback2)M2MCallbackStorage::get_callback(*this, M2MCallbackAssociation::M2MBaseValueUpdatedCallback2);
+    if (callback2) {
+        (*callback2)(name.c_str());
+    }
+}
+
+bool M2MBase::build_path(StringBuffer<MAX_PATH_SIZE> &buffer, const char *s1, uint16_t i1, const char *s2, uint16_t i2)
+{
+
+    if(!buffer.ensure_space(strlen(s1) + strlen(s2) + (MAX_INSTANCE_SIZE * 2) + 3 + 1)){
+        return false;
+    }
+
+    buffer.append(s1);
+    buffer.append('/');
+    buffer.append_int(i1);
+    buffer.append('/');
+    buffer.append(s2);
+    buffer.append('/');
+    buffer.append_int(i2);
+
+    return true;
+
+}
+
+bool M2MBase::build_path(StringBuffer<MAX_PATH_SIZE_2> &buffer, const char *s1, uint16_t i1, const char *s2)
+{
+    if(!buffer.ensure_space(strlen(s1) + strlen(s2) + MAX_INSTANCE_SIZE + 2 + 1)){
+        return false;
+    }
+
+    buffer.append(s1);
+    buffer.append('/');
+    buffer.append_int(i1);
+    buffer.append('/');
+    buffer.append(s2);
+
+    return true;
+}
+
+bool M2MBase::build_path(StringBuffer<MAX_PATH_SIZE_3> &buffer, const char *s1, uint16_t i1, uint16_t i2)
+{
+    if(!buffer.ensure_space(strlen(s1) + (MAX_INSTANCE_SIZE * 2) + 2 + 1)){
+        return false;
+    }
+
+    buffer.append(s1);
+    buffer.append('/');
+    buffer.append_int(i1);
+    buffer.append('/');
+    buffer.append_int(i2);
+
+    return true;
+}
+
+bool M2MBase::build_path(StringBuffer<MAX_PATH_SIZE_4> &buffer, const char *s1, uint16_t i1)
+{
+    if(!buffer.ensure_space(strlen(s1) + MAX_INSTANCE_SIZE + 1 + 1)){
+        return false;
+    }
+
+    buffer.append(s1);
+    buffer.append('/');
+    buffer.append_int(i1);
+
+    return true;
+}
+
+char* M2MBase::stringdup(const char* src)
+{
+    assert(src != NULL);
+
+    const size_t len = strlen(src) + 1;
+
+    char *dest = (char*)malloc(len);
+
+    if (dest) {
+        memcpy(dest, src, len);
+    }
+    return dest;
+}
+
+void M2MBase::free_resources()
+{
+    // remove the nsdl structures from the nsdlinterface's lists.
+    M2MObservationHandler *obs_handler = observation_handler();
+    if (obs_handler) {
+        tr_debug("M2MBase::free_resources()");
+        obs_handler->resource_to_be_deleted(this);
+    }
+
+    if (_sn_resource->dynamic_resource_params->static_resource_parameters->free_on_delete) {
+        sn_nsdl_static_resource_parameters_s *params =
+                const_cast<sn_nsdl_static_resource_parameters_s *>(_sn_resource->dynamic_resource_params->static_resource_parameters);
+
+        free(params->path);
+        //free(params->resource);
+#ifndef RESOURCE_ATTRIBUTES_LIST
+#ifndef DISABLE_RESOURCE_TYPE
+        free(params->resource_type_ptr);
+#endif
+#ifndef DISABLE_INTERFACE_DESCRIPTION
+        free(params->interface_description_ptr);
+#endif
+#else
+        sn_nsdl_free_resource_attributes_list(_sn_resource->dynamic_resource_params->static_resource_parameters);
+#endif
+        free(params);
+    }
+    if (_sn_resource->dynamic_resource_params->free_on_delete) {
+        free(_sn_resource->dynamic_resource_params->resource);
+        free(_sn_resource->dynamic_resource_params);
+    }
+
+    if(_sn_resource->free_on_delete && _sn_resource->identifier_int_type == false) {
+        tr_debug("M2MBase::free_resources()");
+        free(_sn_resource->identifier.name);
+    }
+    if(_sn_resource->free_on_delete) {
+        free(_sn_resource);
+    }
+}
+
+size_t M2MBase::resource_name_length() const
+{
+    assert(_sn_resource->identifier_int_type == false);
+    return strlen(_sn_resource->identifier.name);
+}
+
+sn_nsdl_dynamic_resource_parameters_s* M2MBase::get_nsdl_resource() const
+{
+    return _sn_resource->dynamic_resource_params;
+}
+
+M2MBase::lwm2m_parameters_s* M2MBase::get_lwm2m_parameters() const
+{
+    return _sn_resource;
+}
+
+uint16_t M2MBase::get_notification_msgid() const
+{
+    return _sn_resource->dynamic_resource_params->msg_id;
+}
+
+void M2MBase::set_notification_msgid(uint16_t msgid)
+{
+    _sn_resource->dynamic_resource_params->msg_id = msgid;
+}
+
+bool M2MBase::set_notification_delivery_status_cb(notification_delivery_status_cb callback, void *client_args)
+{
+    M2MCallbackStorage::remove_callback(*this,
+                                        M2MCallbackAssociation::M2MBaseNotificationDeliveryStatusCallback);
+
+    return M2MCallbackStorage::add_callback(*this,
+                                            (void*)callback,
+                                            M2MCallbackAssociation::M2MBaseNotificationDeliveryStatusCallback,
+                                            client_args);
+}
+
+void M2MBase::send_notification_delivery_status(const M2MBase& object, const NoticationDeliveryStatus status)
+{
+    _sn_resource->dynamic_resource_params->notification_status = status;
+    M2MCallbackAssociation* item = M2MCallbackStorage::get_association_item(object,
+                                                                            M2MCallbackAssociation::M2MBaseNotificationDeliveryStatusCallback);
+    if (item) {
+        notification_delivery_status_cb callback = (notification_delivery_status_cb)item->_callback;
+        if (callback) {
+            (*callback)(object, status, item->_client_args);
+        }
+    }
+}
+
+NoticationDeliveryStatus M2MBase::get_notification_delivery_status() const
+{
+    return _sn_resource->dynamic_resource_params->notification_status;
+}
+
+void M2MBase::clear_notification_delivery_status()
+{
+    _sn_resource->dynamic_resource_params->notification_status = NOTIFICATION_STATUS_INIT;
+}