Merge pull request #2527 from yogpan01/IOTCLT-961

Fix for IOTCLT-961 for next mbed-os release candidate

features/FEATURE_CLIENT/mbed-client-classic/source/m2mconnectionhandlerpimpl.cpp

@@ -27,7 +27,6 @@
 #include "eventOS_scheduler.h"
 
 #include "mbed-trace/mbed_trace.h"
-#include "mbed.h"
 
 #define TRACE_GROUP "mClt"
 
@@ -111,7 +110,7 @@ M2MConnectionHandlerPimpl::M2MConnectionHandlerPimpl(M2MConnectionHandler* base,
     _address._address = _address_buffer;
 
     if (_network_stack != M2MInterface::LwIP_IPv4) {
-        error("ConnectionHandler: Unsupported network stack, only IPv4 is currently supported");
+        tr_error("ConnectionHandler: Unsupported network stack, only IPv4 is currently supported");
     }
     _running = true;
     tr_debug("M2MConnectionHandlerPimpl::M2MConnectionHandlerPimpl() - Initializing thread");
@@ -125,6 +124,10 @@ M2MConnectionHandlerPimpl::M2MConnectionHandlerPimpl(M2MConnectionHandler* base,
 M2MConnectionHandlerPimpl::~M2MConnectionHandlerPimpl()
 {
     tr_debug("M2MConnectionHandlerPimpl::~M2MConnectionHandlerPimpl()");
+    if(_socket_address) {
+        delete _socket_address;
+        _socket_address = NULL;
+    }
     if (_socket) {
         delete _socket;
         _socket = 0;
@@ -171,6 +174,10 @@ bool M2MConnectionHandlerPimpl::resolve_server_address(const String& server_addr
 void M2MConnectionHandlerPimpl::dns_handler()
 {
     tr_debug("M2MConnectionHandlerPimpl::dns_handler()");
+    if(_socket_address) {
+        delete _socket_address;
+       _socket_address = NULL;
+    }
     _socket_address = new SocketAddress(_net_iface,_server_address.c_str(), _server_port);
     if(*_socket_address) {
         _address._address = (void*)_socket_address->get_ip_address();

features/FEATURE_CLIENT/mbed-client/docs/Introduction.md

@@ -64,7 +64,7 @@ _interface->set_random_number_callback(&get_random_number);
 
 mbed Client provides an API to add your own entropy source into the underlying SSL library. There is a default entropy source provided by mbed Client. It uses PRNG seeded with RTC for the security but some platforms do not have RTC, and for some, this level of security may not be strong enough. 
 
-Now, an application can pass its own entropy source to mbed Client as function pointer callback through an API, `set_entropy_callback(entropy_cb callback)`.
+Now, an application can pass its own entropy source to mbed Client as function pointer callback through an API  `set_entropy_callback(entropy_cb callback)`.
 
 Here is an example on how you can use it from an application:
 
@@ -101,7 +101,18 @@ The maximum single UDP message size that mbed Client can receive is 1152 bytes.
 
 For transferring larger amounts of data, the Blockwise feature must be deployed. When using this feature, mbed Client can handle messages up to 64KB. This feature is disabled by default.
 
-To enable the Blockwise feature, you need to create a `config.json` file in the application level. 
+For mbed OS, to enable Blockwise feature , create a `mbed_app.json` file in the application level and overwrite Blockwise value as described below:
+
+*Example:*
+```
+"target_overrides": {
+        "*": {
+            "mbed-client.sn-coap-max-blockwise-payload-size": 1024
+        }
+
+```
+
+For yotta based builds, to enable the Blockwise feature, you need to create a `config.json` file in the application level. 
 
 *Example:*
 ```
@@ -115,9 +126,19 @@ Acceptable values for the `coap_max_blockwise_payload_size` flag are:
 
 ### CoAP message deduplication
 
-Message duplication is disabled by default. More information about deduplication in the [CoAP specification](https://tools.ietf.org/html/rfc7252#page-24).
+By default, message deduplication is disabled. More information about deduplication in the [CoAP specification](https://tools.ietf.org/html/rfc7252#page-24).
+
+For mbed OS, to enable message deduplication, create a `mbed_app.json` file in the application level and overwrite the deduplication value as described below:
+
+*Example:*
+```
+"target_overrides": {
+        "*": {
+            "mbed-client.sn-coap-duplication-max-msgs-count": 1
+        }
 
-To enable message deduplication, you need to create a `config.json` file in the application level.
+```
+For yotta based builds, to enable message deduplication, you need to create a `config.json` file in the application level.
 
 *Example:*
 ```
@@ -127,6 +148,53 @@ To enable message deduplication, you need to create a `config.json` file in the
 ```
 Recommended values for the `coap_duplication_max_msgs_count` flag are 0 to 6. Value 0 means that the feature is not used. It is not recommended to use higher value than 6, because it increases the memory consumption.
 
+### Reconnectivity
+
+Apart from standard CoAP features, mbed Client also handles reconnectivity logic on behalf of applications, thereby aiming to provide seamless connectivity experience and recovery from temporary network hiccups or service side disruptions.
+
+The reconnection logic handles the following:
+
+ - Reconnection towards mDS; establishing the network connection and re-registration to mDS.
+ - CoAP message resending logic. More information about resending in [CoAP specification](https://tools.ietf.org/html/rfc7252#section-4.8).
+
+There are two parameters in the reconnection logic, both configurable by the application:
+
+ - Reconnection Retry
+ - Reconnection Time Interval (in seconds)
+
+mbed Client tries to establish a successful connection to the server by incrementing the reconnection trials every time there is a failed connection attempt. 
+
+The logic of the `Reconnection Timeout` is `Reconnection Retry count * Reconnection Time Interval` , where `Reconnection Retry count` is incremented by 1 with every failed reconnection attempt.
+
+mbed Client continues to attempt a reconnection until `Reconnection Retry count` reaches the defined value (either by the application or the default value set in Client).
+
+If mbed Client still cannot establish a connection and the set `Reconnection Retry count` is reached, it returns an error through a callback with an appropriate error code defining the reason for failed connection.
+
+There are a few exceptions to the reconnection logic though. If mbed Client sends registration data that is rejected by the server, the client returns an error and does not attempt a reconnection as the server has rejected the data from the client. A typical example of such case would be passing a non-matching endpoint name or domain name against the client certificates.
+
+Applications can define their own parameters for the reconnection logic.
+
+For mbed OS, to overwrite the reconnection retry count and reconnection time interval, create a `mbed_app.json` file in the application level and overwrite the values as described below:
+
+*Example:*
+```
+"target_overrides": {
+        "*": {
+            "mbed-client.reconnection-count": 3,
+            "mbed-client.reconnection-interval": 5,
+        }
+
+```
+For yotta  based builds, to overwrite the reconnection retry count and reconnection time interval, you need to create a `config.json` file in the application level.
+
+*Example:*
+```
+{
+"reconnection_count": 3,
+"reconnection_interval": 5
+}
+```
+
 ## How to use the API
 More information on how to use the API effectively to create and configure Objects, Object Instances and Resources, can be found [here](Howto.md).
 

features/FEATURE_CLIENT/mbed-client/docs/dev_man_serv_enable.md

@@ -67,7 +67,7 @@ The Client API allows setting values to Resources, an array of Resource Instance
 
 The **Write** operation is used to overwrite the value of a Resource, an array of Resource Instances or multiple Resources from an Object Instance. 
 
-Whenever there is a valid `PUT` operation for any of the resources, the application will receive a callback:
+Whenever there is a valid `PUT` operation for any of the resources, the application will receive a callback: 
 
 ```
 void value_updated(M2MBase *base, M2MBase::BaseType type) 
@@ -119,6 +119,34 @@ void value_updated(M2MBase *base, M2MBase::BaseType type) {
         }
     }
 ```
+By default, callbacks are handled in the `value_updated()` function but the application can also define a callback function for an individual resource.
+
+Check the code snippet below for usage.
+
+```
+static void value_updated_global(const char *name) {
+    if(name) {
+        ...
+    }
+}
+
+void M2MLWClient::value_updated_function(const char* name) {
+    if (name) {
+        ...
+    }
+}
+
+M2MResource* res = inst->create_dynamic_resource("D", "ResourceTest", true);
+char buffer[20];
+int size = sprintf(buffer,"%d",_value);
+res->set_operation(M2MBase::GET_PUT_POST_DELETE_ALLOWED);
+res->set_value((const uint8_t*)buffer, (const uint32_t)size);
+res->set_value_updated_function(value_updated_callback(this,&MbedClient::value_updated_function));
+/* Overloaded function can be used If callback function is not in class scope. 
+res2->set_value_updated_function(value_updated_callback2(&value_updated_global));
+*/
+
+```
 
 ## The Write Attributes operation
 
@@ -182,7 +210,7 @@ if(_object) {
                        (const uint32_t)size);
         res->set_execute_function(execute_callback(this,&M2MLWClient::execute_function));
         /* Overloaded function can be used If callback function is not in class scope. 
-        res->set_execute_function(&execute_function_2);
+        res->set_execute_function(execute_callback_2(&execute_function_2));
         */
 ```
 

features/FEATURE_CLIENT/mbed-client/module.json

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

features/FEATURE_CLIENT/mbed-client/source/m2minterfaceimpl.cpp

@@ -603,6 +603,7 @@ void M2MInterfaceImpl::state_bootstrap_address_resolved( EventData *data)
     }
     address.port = event->_port;
     address.addr_ptr = (uint8_t*)event->_address->_address;
+    address.addr_len = event->_address->_length;
     _connection_handler->start_listening_for_data();
 
     // Include domain id to be part of endpoint name
@@ -816,6 +817,7 @@ void M2MInterfaceImpl::state_coap_data_received( EventData *data)
         }
         address.port = event->_address->_port;
         address.addr_ptr = (uint8_t*)event->_address->_address;
+        address.addr_len = event->_address->_length;
 
         // Process received data
         internal_event(STATE_PROCESSING_COAP_DATA);