RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #2025 from OlegHahm/socket_init_fix_fix

Browse Source 
net: socket: fix for e93d030058
This commit is contained in:
Oleg Hahm 2014-12-03 20:18:33 +01:00
commit 13fe311b10
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/net/transport_layer/socket_base/socket.c
View File

@ -179,12 +179,12 @@ void socket_base_print_internal_socket(socket_internal_t *current_socket_interna
printf("\n--------------------------\n");
}
int socket_base_exists_socket(int socket)
bool socket_base_exists_socket(int socket)
{
if (socket<1) {
if (socket < 1) {
return false;
}
if (socket_base_sockets[socket - 1].socket_id == 0) {
if ((socket > MAX_SOCKETS) || (socket_base_sockets[socket - 1].socket_id == 0)) {
return false;
}
else {
@ -248,7 +248,7 @@ uint16_t socket_base_get_free_source_port(uint8_t protocol)
int socket_base_socket(int domain, int type, int protocol)
{
int i = 0;
int i = 1;
while (socket_base_get_socket(i) != NULL) {
i++;
@ -257,17 +257,16 @@ int socket_base_socket(int domain, int type, int protocol)
if (i > MAX_SOCKETS) {
return -1;
}
else {
socket_t *current_socket = &socket_base_sockets[i].socket_values;
socket_base_sockets[i].socket_id = i + 1;
current_socket->domain = domain;
current_socket->type = type;
current_socket->protocol = protocol;
socket_t *current_socket = &socket_base_sockets[i - 1].socket_values;
socket_base_sockets[i - 1].socket_id = i;
current_socket->domain = domain;
current_socket->type = type;
current_socket->protocol = protocol;
#ifdef MODULE_TCP
current_socket->tcp_control.state = 0;
current_socket->tcp_control.state = 0;
#endif
return socket_base_sockets[i].socket_id;
}
return socket_base_sockets[i - 1].socket_id;
}
int socket_base_connect(int socket, sockaddr6_t *addr, uint32_t addrlen)

2
sys/net/transport_layer/socket_base/socket.h
View File

@ -96,7 +96,7 @@ extern "C" {
socket_internal_t *socket_base_get_socket(int s);
uint16_t socket_base_get_free_source_port(uint8_t protocol);
int socket_base_exists_socket(int socket);
bool socket_base_exists_socket(int socket);
int socket_base_socket(int domain, int type, int protocol);
void socket_base_print_sockets(void);