From ff5bc03fd7674d28b71be05cffe84c03124d590d Mon Sep 17 00:00:00 2001
From: Hasnain Virk <hasnain.virk@arm.com>
Date: Tue, 1 Nov 2016 16:49:39 +0200
Subject: [PATCH] Using socket_close() instead of socket_free()

* Pertaining to new socket API changes, socket_free is deprecated.
* socket_close() is used from now on.
* Fixing stubs too.
---
 source/coap_connection_handler.c                  |  2 +-
 test/coap-service/unittest/stub/socket_api_stub.c | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/source/coap_connection_handler.c b/source/coap_connection_handler.c
index 6b3babc615..d7a63f3925 100644
--- a/source/coap_connection_handler.c
+++ b/source/coap_connection_handler.c
@@ -259,7 +259,7 @@ static void int_socket_delete(internal_socket_t *this)
         this->usage_counter--;
         if(this->usage_counter == 0){
             clear_secure_sessions(this);
-            socket_free(this->socket);
+            socket_close(this->socket);
             ns_list_remove(&socket_list, this);
             if( this->data ){
                 ns_dyn_mem_free(this->data);
diff --git a/test/coap-service/unittest/stub/socket_api_stub.c b/test/coap-service/unittest/stub/socket_api_stub.c
index 18bc9ba437..521a9c204d 100644
--- a/test/coap-service/unittest/stub/socket_api_stub.c
+++ b/test/coap-service/unittest/stub/socket_api_stub.c
@@ -25,7 +25,7 @@ int8_t socket_open(uint8_t protocol, uint16_t identifier, void (*passed_fptr)(vo
     return socket_api_stub.int8_value;
 }
 
-int8_t socket_free(int8_t socket)
+int8_t socket_close(int8_t socket)
 {
     if( socket_api_stub.counter >= 0){
         return socket_api_stub.values[socket_api_stub.counter--];
@@ -33,7 +33,7 @@ int8_t socket_free(int8_t socket)
 
     return socket_api_stub.int8_value;
 }
-int8_t socket_listen(int8_t socket, ...)
+int8_t socket_listen(int8_t socket, uint8_t backlog)
 {
     if( socket_api_stub.counter >= 0){
         return socket_api_stub.values[socket_api_stub.counter--];
@@ -57,14 +57,7 @@ int8_t socket_bind(int8_t socket, const ns_address_t *address)
 
     return socket_api_stub.int8_value;
 }
-int8_t socket_close(int8_t socket, ns_address_t *address)
-{
-    if( socket_api_stub.counter >= 0){
-        return socket_api_stub.values[socket_api_stub.counter--];
-    }
 
-    return socket_api_stub.int8_value;
-}
 int8_t socket_send(int8_t socket, uint8_t *buffer, uint16_t length)
 {
     if( socket_api_stub.counter >= 0){