mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-08-06 13:37:34 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Handle errors better in listening code for CC3200

Browse Source 
PUBLISHED_FROM=9d4ab680fa672690735b827f56e135330f72beed
This commit is contained in:
rojer 2016-06-15 16:30:03 +03:00 committed by Sergey Lyubka
parent 632153a1b4
commit 441eaa7f6c
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mongoose.c
View File

@ -11208,9 +11208,7 @@ int mg_if_listen_tcp(struct mg_connection *nc, union socket_address *sa) {
int proto = 0;
if (nc->flags & MG_F_SSL) proto = SL_SEC_SOCKET;
sock_t sock = mg_open_listening_socket(sa, SOCK_STREAM, proto);
if (sock == INVALID_SOCKET) {
return (errno ? errno : 1);
}
if (sock < 0) return sock;
mg_sock_set(nc, sock);
#ifdef MG_ENABLE_SSL
return sl_set_ssl_opts(nc);
@ -11286,17 +11284,18 @@ static int mg_accept_conn(struct mg_connection *lc) {
/* 'sa' must be an initialized address to bind to */
static sock_t mg_open_listening_socket(union socket_address *sa, int type,
int proto) {
int r;
socklen_t sa_len =
(sa->sa.sa_family == AF_INET) ? sizeof(sa->sin) : sizeof(sa->sin6);
sock_t sock = sl_Socket(sa->sa.sa_family, type, proto);
if (sock < 0) return INVALID_SOCKET;
if (bind(sock, &sa->sa, sa_len) < 0) {
if (sock < 0) return sock;
if ((r = bind(sock, &sa->sa, sa_len)) < 0) {
sl_Close(sock);
return INVALID_SOCKET;
return r;
}
if (type != SOCK_DGRAM && sl_Listen(sock, SOMAXCONN) < 0) {
if (type != SOCK_DGRAM && (r = sl_Listen(sock, SOMAXCONN)) < 0) {
sl_Close(sock);
return INVALID_SOCKET;
return r;
}
mg_set_non_blocking_mode(sock);
return sock;