ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #49 from ARMmbed/socket_mesh_patch2 

Using socket_close() instead of socket_free()
pull/3240/head
Hasnain Virk 2016-11-01 17:34:51 +02:00 committed by GitHub
parent 7f5370e0bf ff5bc03fd7
commit 0480a02a3b
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/coap_connection_handler.c
View File

@ -259,7 +259,7 @@ static void int_socket_delete(internal_socket_t *this)
this->usage_counter--; this->usage_counter--;
if(this->usage_counter == 0){ if(this->usage_counter == 0){
clear_secure_sessions(this); clear_secure_sessions(this);
socket_free(this->socket); socket_close(this->socket);
ns_list_remove(&socket_list, this); ns_list_remove(&socket_list, this);
if( this->data ){ if( this->data ){
ns_dyn_mem_free(this->data); ns_dyn_mem_free(this->data);

11
test/coap-service/unittest/stub/socket_api_stub.c
View File

@ -25,7 +25,7 @@ int8_t socket_open(uint8_t protocol, uint16_t identifier, void (*passed_fptr)(vo
return socket_api_stub.int8_value; 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){ if( socket_api_stub.counter >= 0){
return socket_api_stub.values[socket_api_stub.counter--]; 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; 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){ if( socket_api_stub.counter >= 0){
return socket_api_stub.values[socket_api_stub.counter--]; 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; 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) int8_t socket_send(int8_t socket, uint8_t *buffer, uint16_t length)
{ {
if( socket_api_stub.counter >= 0){ if( socket_api_stub.counter >= 0){