abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-03 21:14:40 +08: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; 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. /* Below this, the well-known socket functions are implemented.
* Use google.com or opengroup.org to get a good description :-) * Use google.com or opengroup.org to get a good description :-)
* *
@ -381,15 +404,7 @@ lwip_close(int s)
netconn_delete(sock->conn); netconn_delete(sock->conn);
sys_sem_wait(socksem); free_socket(sock);
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);
return 0; 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. * The socket may not have been used for another connection previously.
* *
* @param s the socket to set to listening mode * @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 * @return 0 on success, non-zero on failure
*/ */
int 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 */ /* Now decide if anyone is waiting for this socket */
/* NOTE: This code is written this way to protect the select link list /* 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 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 multiple times ONLY IF a select was actually waiting. We go through
the list the number of waiting select calls + 1. This list is the list the number of waiting select calls + 1. This list is