Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-23 00:00:06 +01:00
Code Issues Releases Wiki Activity

Fixes the binding error when SMP in tandem with a Unix domain socket

Browse source
This commit is contained in:
張俊芝 2018-07-08 15:33:10 +08:00 • committed by Andy Green
parent 6517e01258
commit 8f5738299a
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/roles/http/server/server.c
View file

@ -131,6 +131,17 @@ done_list:
(void)n; (void)n;
#if defined(__linux__) #if defined(__linux__)
#ifdef LWS_WITH_UNIX_SOCK
/*
* A Unix domain sockets cannot be bound for several times, even if we set
* the SO_REUSE* options on.
* However, fortunately, each thread is able to independently listen when
* running on a reasonably new Linux kernel. So we can safely assume
* creating just one listening socket for a multi-threaded environment won't
* fail in most cases.
*/
if (!LWS_UNIX_SOCK_ENABLED(vhost))
#endif
limit = vhost->context->count_threads; limit = vhost->context->count_threads;
#endif #endif
@ -1128,7 +1139,7 @@ lws_http_action(struct lws *wsi)
} }
if (pcolon > pslash) if (pcolon > pslash)
pcolon = NULL; pcolon = NULL;
if (pcolon) if (pcolon)
n = pcolon - hit->origin; n = pcolon - hit->origin;
else else
@ -1142,13 +1153,13 @@ lws_http_action(struct lws *wsi)
i.address = ads; i.address = ads;
i.port = 80; i.port = 80;
if (hit->origin_protocol == LWSMPRO_HTTPS) { if (hit->origin_protocol == LWSMPRO_HTTPS) {
i.port = 443; i.port = 443;
i.ssl_connection = 1; i.ssl_connection = 1;
} }
if (pcolon) if (pcolon)
i.port = atoi(pcolon + 1); i.port = atoi(pcolon + 1);
lws_snprintf(rpath, sizeof(rpath) - 1, "/%s/%s", pslash + 1, lws_snprintf(rpath, sizeof(rpath) - 1, "/%s/%s", pslash + 1,
uri_ptr + hit->mountpoint_len); uri_ptr + hit->mountpoint_len);
lws_clean_url(rpath); lws_clean_url(rpath);
@ -1164,7 +1175,7 @@ lws_http_action(struct lws *wsi)
p++; p++;
} }
} }
i.path = rpath; i.path = rpath;
i.host = i.address; i.host = i.address;
@ -1178,7 +1189,7 @@ lws_http_action(struct lws *wsi)
"from %s, to %s\n", "from %s, to %s\n",
i.address, i.port, i.path, i.ssl_connection, i.address, i.port, i.path, i.ssl_connection,
i.uri_replace_from, i.uri_replace_to); i.uri_replace_from, i.uri_replace_to);
if (!lws_client_connect_via_info(&i)) { if (!lws_client_connect_via_info(&i)) {
lwsl_err("proxy connect fail\n"); lwsl_err("proxy connect fail\n");
return 1; return 1;