mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-01 04:12:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved freeing a socket to its own function (free_socket, like alloc_socket

Browse Source
This commit is contained in:
goldsimon 2010-01-30 14:19:18 +00:00
parent 855dcadf7a
commit f8c22c7428
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/api/sockets.c
View File

@ -239,6 +239,29 @@ alloc_socket(struct netconn *newconn)
return -1;
}
/** Free a socket. The socket's netbuf must have been
* delete before!
*
* @param sock the socket to free
*/
static void
free_socket(struct lwip_socket *sock)
{
struct netbuf *lastdata;
sys_sem_wait(socksem);
lastdata = sock->lastdata;
sock->lastdata = NULL;
sock->lastoffset = 0;
sock->conn = NULL;
sock_set_errno(sock, 0);
sys_sem_signal(socksem);
if (lastdata != NULL) {
netbuf_delete(lastdata);
}
}
/* Below this, the well-known socket functions are implemented.
* Use google.com or opengroup.org to get a good description :-)
*
@ -381,15 +404,7 @@ lwip_close(int s)
netconn_delete(sock->conn);
sys_sem_wait(socksem);
if (sock->lastdata) {
netbuf_delete(sock->lastdata);
}
sock->lastdata = NULL;
sock->lastoffset = 0;
sock->conn = NULL;
sock_set_errno(sock, 0);
sys_sem_signal(socksem);
free_socket(sock);
return 0;
}
@ -440,7 +455,7 @@ lwip_connect(int s, const struct sockaddr *name, socklen_t namelen)
* The socket may not have been used for another connection previously.
*
* @param s the socket to set to listening mode
* @param backlog (ATTENTION: need TCP_LISTEN_BACKLOG=1)
* @param backlog (ATTENTION: needs TCP_LISTEN_BACKLOG=1)
* @return 0 on success, non-zero on failure
*/
int
@ -1110,7 +1125,7 @@ event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len)
/* Now decide if anyone is waiting for this socket */
/* NOTE: This code is written this way to protect the select link list
but to avoid a deadlock situation by releasing socksem before
but to avoid a deadlock situation by releasing selectsem before
signalling for the select. This means we need to go through the list
multiple times ONLY IF a select was actually waiting. We go through
the list the number of waiting select calls + 1. This list is