Merge pull request #9 from ARMmbed/secure-close

Remove Nanostack dependency from service api

Author: Mika Tervonen

coap-service/coap_service_api.h

@@ -139,7 +139,7 @@ extern void coap_service_delete( int8_t service_id );
  *
  * \param service_id         Id number of the current service.
  */
-extern void coap_service_close_secure_connection(int8_t service_id, ns_address_t *dest_addr);
+extern void coap_service_close_secure_connection(int8_t service_id, uint8_t destination_addr_ptr[static 16], uint16_t port);
 
 /**
  * \brief Sets password for device

source/coap_connection_handler.c

@@ -112,6 +112,7 @@ static void clear_secure_sessions(internal_socket_t *this){
     if( this ){
         ns_list_foreach_safe(secure_session_t, cur_ptr, &secure_session_list) {
             if( cur_ptr->parent == this ){
+                coap_security_send_close_alert( cur_ptr->sec_handler );
                 secure_session_delete(cur_ptr);
             }
         }
@@ -579,34 +580,17 @@ coap_conn_handler_t *connection_handler_create(receive_from_socket_cb *recv_from
 void connection_handler_destroy(coap_conn_handler_t *handler)
 {
     if(handler){
-        if( handler->socket && handler->socket->is_secure){
-            //If nothing is sent, there is no address to find.
-            //This case is handled in int_socket_delete.
-            secure_session_t *session = secure_session_find_by_parent( handler->socket);
-
-            while(session != NULL ){
-                if( session && handler->socket->usage_counter == 1){ //Last connection
-                    coap_security_send_close_alert( session->sec_handler );
-                }
-
-                if( session){
-                    secure_session_delete(session);
-                }
-                session = secure_session_find_by_parent( handler->socket);
-            }
-        }
         int_socket_delete(handler->socket);
         handler->socket = NULL;
         ns_dyn_mem_free(handler);
     }
 }
 
-void connection_handler_close_secure_connection( coap_conn_handler_t *handler, ns_address_t *dest_addr )
+void connection_handler_close_secure_connection( coap_conn_handler_t *handler, uint8_t destination_addr_ptr[static 16], uint16_t port )
 {
     if(handler){
         if( handler->socket && handler->socket->is_secure){
-            secure_session_t *session = secure_session_find( handler->socket, dest_addr->address,
-                                                             dest_addr->identifier);
+            secure_session_t *session = secure_session_find( handler->socket, destination_addr_ptr, port);
             if( session ){
                 coap_security_send_close_alert( session->sec_handler );
             }

source/coap_message_handler.c

@@ -82,6 +82,9 @@ static void transaction_delete(coap_transaction_t *this)
 {
     if (this) {
         ns_list_remove(&request_list, this);
+        if(this->data_ptr){
+            ns_dyn_mem_free(this->data_ptr);
+        }
         ns_dyn_mem_free(this);
     }
 

source/coap_service_api.c

@@ -344,14 +344,14 @@ void coap_service_delete(int8_t service_id)
     return;
 }
 
-void coap_service_close_secure_connection(int8_t service_id, ns_address_t *dest_addr)
+extern void coap_service_close_secure_connection(int8_t service_id, uint8_t destination_addr_ptr[static 16], uint16_t port)
 {
     coap_service_t *this = service_find(service_id);
-    if (!this || !dest_addr) {
+    if (!this || !destination_addr_ptr) {
         return;
     }
     if (this->conn_handler){
-        connection_handler_close_secure_connection(this->conn_handler, dest_addr);
+        connection_handler_close_secure_connection(this->conn_handler, destination_addr_ptr, port);
     }
 }
 

source/include/coap_connection_handler.h

@@ -47,7 +47,7 @@ coap_conn_handler_t *connection_handler_create(receive_from_socket_cb *recv_from
 
 void connection_handler_destroy( coap_conn_handler_t *handler );
 
-void connection_handler_close_secure_connection(coap_conn_handler_t *handler, ns_address_t *dest_addr);
+void connection_handler_close_secure_connection( coap_conn_handler_t *handler, uint8_t destination_addr_ptr[static 16], uint16_t port );
 
 int coap_connection_handler_open_connection(coap_conn_handler_t *handler, uint16_t listen_port, bool use_ephemeral_port, bool is_secure, bool real_socket, bool bypassSec);
 

test/coap-service/unittest/stub/coap_connection_handler_stub.c

@@ -36,8 +36,7 @@ void connection_handler_destroy(coap_conn_handler_t *handler)
 {
 
 }
-
-void connection_handler_close_secure_connection( coap_conn_handler_t *handler, ns_address_t *dest_addr )
+void connection_handler_close_secure_connection( coap_conn_handler_t *handler, uint8_t destination_addr_ptr[static 16], uint16_t port )
 {
 
 }