aboutsummaryrefslogtreecommitdiff
path: root/src/supplemental
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2020-08-08 14:02:52 -0700
committerGarrett D'Amore <garrett@damore.org>2020-08-08 14:51:44 -0700
commit79afcea91aa6882eede47b5cddc4f097454b6027 (patch)
treed4b06132b193f56fb347bf88765293ccffe05641 /src/supplemental
parent0299f164c4a1f41e169c159e6cd1b382d3690ab0 (diff)
downloadnng-79afcea91aa6882eede47b5cddc4f097454b6027.tar.gz
nng-79afcea91aa6882eede47b5cddc4f097454b6027.tar.bz2
nng-79afcea91aa6882eede47b5cddc4f097454b6027.zip
fixes #1279 Add support for ws4:// and ws6:// style websocket urls
fixes #1277 FreeBSD errors due to bad v4 vs. v6 assumptions
Diffstat (limited to 'src/supplemental')
-rw-r--r--src/supplemental/http/http_server.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/supplemental/http/http_server.c b/src/supplemental/http/http_server.c
index e711c2a2..caa06b3d 100644
--- a/src/supplemental/http/http_server.c
+++ b/src/supplemental/http/http_server.c
@@ -937,6 +937,14 @@ http_server_init(nni_http_server **serverp, const nni_url *url)
} else if ((strcmp(url->u_scheme, "https") == 0) ||
(strcmp(url->u_scheme, "wss") == 0)) {
myurl.u_scheme = "tls+tcp";
+ } else if (strcmp(url->u_scheme, "ws4") == 0) {
+ myurl.u_scheme = "tcp4";
+ } else if (strcmp(url->u_scheme, "ws6") == 0) {
+ myurl.u_scheme = "tcp6";
+ } else if (strcmp(url->u_scheme, "wss4") == 0) {
+ myurl.u_scheme = "tls+tcp4";
+ } else if (strcmp(url->u_scheme, "wss6") == 0) {
+ myurl.u_scheme = "tls+tcp6";
} else {
return (NNG_EADDRINVAL);
}