src/server/daemon/httplistener.c

Wed, 06 Sep 2023 22:25:34 +0200

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Wed, 06 Sep 2023 22:25:34 +0200
changeset 507
4b3ac9249394
parent 502
11ac3761c0e3
child 541
1e1fca11aaff
permissions
-rw-r--r--

send_string_escaped should escape for urls, not html

1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
1 /*
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
3 *
44
3da1f7b6847f added some error messages
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 41
diff changeset
4 * Copyright 2013 Olaf Wintermann. All rights reserved.
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
5 *
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
6 * Redistribution and use in source and binary forms, with or without
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
7 * modification, are permitted provided that the following conditions are met:
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
8 *
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
10 * notice, this list of conditions and the following disclaimer.
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
11 *
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
14 * documentation and/or other materials provided with the distribution.
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
15 *
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
27 */
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
28
14
b8bf95b39952 New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 9
diff changeset
29 #include "../public/nsapi.h"
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
30
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
31 #include <stdio.h>
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
32 #include <stdlib.h>
446
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
33
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
34 #include <sys/shm.h>
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
35 #include <sys/ipc.h>
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
36 #include <sys/file.h>
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
37 #include <stdio.h>
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
38 #include <stdlib.h>
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
39 #include <fcntl.h>
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
40 #include <unistd.h>
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
41 #include <strings.h>
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
42 #include <stdbool.h>
445
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
43 #include <signal.h>
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
44 #include <pthread.h>
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
45
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
46 #include <stdio.h>
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
47 #include <stdlib.h>
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
48
415
d938228c382e switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
49
d938228c382e switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
50 #include <cx/hash_map.h>
92
382bff43c6eb fixed some includes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 87
diff changeset
51
41
bb7a1f5a8b48 added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 38
diff changeset
52 #include "../util/atomic.h"
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
53 #include "httplistener.h"
171
af7e2d80dee6 adds wrapper for close syscall with error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 169
diff changeset
54 #include "netsite.h"
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
55
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
56 #include "session.h"
19
d680536f8c2f Added configuration manager
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
57 #include "configmanager.h"
29
e8619defde14 added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 25
diff changeset
58 #include "log.h"
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
59
415
d938228c382e switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
60 #define LISTENER_MAX_PROTOCOL_TOKENS 1024
d938228c382e switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
61
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
62
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
63 #define LISTENER_PROTO_IPV4 "ipv4"
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
64 #define LISTENER_PROTO_IPV6 "ipv6"
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
65
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
66
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
67 /*
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
68 * key: string format: <protocol>:<port>
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
69 * value: WSSocket*
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
70 *
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
71 * protocol: ipv4 | ipv6
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
72 * port: short
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
73 */
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
74 static CxMap *listener_socket_map;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
75
453
4586d534f9b5 fix build on macos
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
76 static pthread_mutex_t listener_mutex = PTHREAD_MUTEX_INITIALIZER;
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
77
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
78
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
79 int http_listener_global_init(void) {
490
d218607f5a7e update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 454
diff changeset
80 listener_socket_map = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, 4);
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
81 if(!listener_socket_map) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
82 return 1;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
83 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
84
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
85 return 0;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
86 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
87
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
88 int start_all_listener() {
19
d680536f8c2f Added configuration manager
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
89 ServerConfiguration *conf = cfgmgr_get_server_config();
415
d938228c382e switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
90 CxList *ls = conf->listeners;
490
d218607f5a7e update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 454
diff changeset
91 CxIterator iter = cxListIterator(ls);
415
d938228c382e switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
92 cx_foreach(HttpListener *, listener, iter) {
19
d680536f8c2f Added configuration manager
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
93 http_listener_start(listener);
d680536f8c2f Added configuration manager
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
94 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
95
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
96 return 0;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
97 }
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
98
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
99 static HttpSSL* create_http_ssl(ListenerConfig *conf) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
100 SSL_CTX *ctx = SSL_CTX_new(SSLv23_server_method());
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
101 if(!ctx) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
102 return NULL;
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
103 }
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
104 SSL_CTX_set_options(
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
105 ctx,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
106 SSL_OP_SINGLE_DH_USE | SSL_OP_NO_SSLv3);
502
11ac3761c0e3 fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
107 SSL_CTX_set_mode(ctx, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
11ac3761c0e3 fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 494
diff changeset
108 SSL_CTX_set_mode(ctx, SSL_MODE_ENABLE_PARTIAL_WRITE);
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
109
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
110 int error = 0;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
111 if(conf->disable_proto.ptr) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
112 cxstring *plist = NULL;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
113 ssize_t n = cx_strsplit_a(cxDefaultAllocator, conf->disable_proto, cx_str(","), LISTENER_MAX_PROTOCOL_TOKENS, &plist);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
114 if(plist) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
115 for(int i=0;i<n;i++) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
116 cxstring proto = plist[i];
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
117 log_ereport(
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
118 LOG_VERBOSE,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
119 "Listener %s: Disable protocol %s",
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
120 conf->name.ptr,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
121 proto.ptr);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
122 if(!cx_strcasecmp(cx_strtrim(proto), cx_str("SSLv2"))) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
123 SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
124 } else if(!cx_strcasecmp(cx_strtrim(proto), cx_str("SSLv3"))) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
125 SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv3);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
126 } else if(!cx_strcasecmp(cx_strtrim(proto), cx_str("TLSv1"))) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
127 SSL_CTX_set_options(ctx, SSL_OP_NO_TLSv1);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
128 } else if(!cx_strcasecmp(cx_strtrim(proto), cx_str("TLSv1.1"))) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
129 #ifdef SSL_OP_NO_TLSv1_1
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
130 SSL_CTX_set_options(ctx, SSL_OP_NO_TLSv1_1);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
131 #else
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
132 log_ereport(
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
133 LOG_WARN,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
134 "Listener: %s: TLSv1.1 not supported",
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
135 conf->name.ptr);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
136 #endif
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
137 } else if(cx_strcasecmp(cx_strtrim(proto), cx_str("TLSv1.2"))) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
138 #ifdef SSL_OP_NO_TLSv1_2
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
139 SSL_CTX_set_options(ctx, SSL_OP_NO_TLSv1_2);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
140 #else
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
141 log_ereport(
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
142 LOG_WARN,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
143 "Listener: %s: TLSv1.2 not supported",
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
144 conf->name.ptr);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
145 #endif
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
146 } else if(cx_strcasecmp(cx_strtrim(proto), cx_str("TLSv1.3"))) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
147 #ifdef SSL_OP_NO_TLSv1_3
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
148 SSL_CTX_set_options(ctx, SSL_OP_NO_TLSv1_3);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
149 #else
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
150 log_ereport(
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
151 LOG_WARN,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
152 "Listener: %s: TLSv1.3 not supported",
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
153 conf->name.ptr);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
154 #endif
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
155 } else {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
156 error = 1;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
157 log_ereport(
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
158 LOG_MISCONFIG,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
159 "Listener: %s: Unknown protocol %s",
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
160 conf->name.ptr,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
161 proto.ptr);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
162 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
163 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
164 free(plist);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
165 }
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
166 }
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
167
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
168 if(error) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
169 SSL_CTX_free(ctx);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
170 return NULL;
37
360b9aabe17e added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
171 }
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
172
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
173 int ret;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
174 char errbuf[512];
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
175
441
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
176 // get TLS cert
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
177 error = 0;
441
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
178 if(conf->chainfile.ptr) {
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
179 ret = SSL_CTX_use_certificate_chain_file(ctx, conf->chainfile.ptr);
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
180 if(!ret) {
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
181 ERR_error_string(ERR_get_error(), errbuf);
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
182 log_ereport(LOG_MISCONFIG, "Cannot load ssl cert file: %s", errbuf);
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
183 error = 1;
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
184 }
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
185 } else if(conf->certfile.ptr) {
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
186 ret = SSL_CTX_use_certificate_file(ctx, conf->certfile.ptr, SSL_FILETYPE_PEM);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
187 if(!ret) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
188 ERR_error_string(ERR_get_error(), errbuf);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
189 log_ereport(LOG_MISCONFIG, "Cannot load ssl chain file: %s", errbuf);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
190 error = 1;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
191 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
192 } else {
441
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
193 log_ereport(LOG_MISCONFIG, "Listener %s: no CertChain/Cert specified", conf->name.ptr);
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
194 error = 1;
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
195 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
196
441
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
197 // get private key
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
198 ret = SSL_CTX_use_PrivateKey_file(ctx, conf->privkeyfile.ptr, SSL_FILETYPE_PEM);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
199 if(!ret) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
200 ERR_error_string(ERR_get_error(), errbuf);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
201 log_ereport(LOG_MISCONFIG, "Cannot load ssl key file: %s", errbuf);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
202 error = 1;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
203 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
204
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
205 if(error) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
206 SSL_CTX_free(ctx);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
207 return NULL;
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
208 }
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
209
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
210 HttpSSL *ssl = pool_malloc(conf->cfg->pool, sizeof(HttpSSL));
441
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
211 if(!ssl) {
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
212 SSL_CTX_free(ctx);
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
213 return NULL;
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
214 }
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
215 ZERO(ssl, sizeof(HttpSSL));
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
216 ssl->sslctx = ctx;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
217
441
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
218 return ssl;
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
219 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
220
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
221 static WSSocket* create_socket(ListenerConfig *conf, const char *protocol) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
222 WSBool ipv4 = !strcmp(protocol, "ipv4") ? TRUE : FALSE;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
223
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
224 int s = -1;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
225 if(ipv4) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
226 // ipv4 socket
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
227 s = socket(AF_INET, SOCK_STREAM, 0);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
228 } else {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
229 // ipv6 socket
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
230 s = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
231 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
232 if(s < 0) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
233 log_ereport(
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
234 LOG_FAILURE,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
235 "cannot create socket: protocol: %s port: %d error: %s",
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
236 protocol,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
237 conf->port,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
238 strerror(errno));
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
239 return NULL;
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
240 }
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
241
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
242 // socket options
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
243 int o = 1;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
244 setsockopt(
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
245 s,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
246 SOL_SOCKET, SO_REUSEADDR,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
247 &o,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
248 sizeof(int));
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
249
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
250 #ifdef LINUX
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
251 if(!ipv4) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
252 o = 1;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
253 setsockopt(
454
e03d4a00427a fix build on linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 453
diff changeset
254 s,
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
255 IPPROTO_IPV6,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
256 IPV6_V6ONLY,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
257 &o,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
258 sizeof(int));
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
259 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
260 #endif
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
261
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
262 // bind server socket to address
446
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
263 union ws_socketaddr addr;
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
264 struct sockaddr *servaddr;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
265 size_t servaddr_size;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
266 if(ipv4) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
267 // ipv4
446
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
268 memset(&addr.addr4, 0, sizeof(addr.addr4));
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
269 addr.addr4.sin_family = AF_INET;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
270 addr.addr4.sin_addr.s_addr = htonl(INADDR_ANY);
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
271 addr.addr4.sin_port = htons(conf->port);
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
272 servaddr = (struct sockaddr *)&addr.addr4;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
273 servaddr_size = sizeof(addr.addr4);
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
274 } else {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
275 // ipv6
446
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
276 memset(&addr.addr6, 0, sizeof(addr.addr6));
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
277 addr.addr6.sin6_family = AF_INET6;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
278 addr.addr6.sin6_addr = in6addr_any;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
279 addr.addr6.sin6_port = htons(conf->port);
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
280 servaddr = (struct sockaddr *)&addr.addr6;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
281 servaddr_size = sizeof(addr.addr6);
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
282 }
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
283
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
284 if(bind(s, servaddr, servaddr_size)) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
285 log_ereport(
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
286 LOG_FAILURE,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
287 "cannot bind socket: protocol: %s port: %d error: %s",
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
288 protocol,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
289 conf->port,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
290 strerror(errno));
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
291 close(s);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
292 return NULL;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
293 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
294
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
295 // everything is ok, create WSSocket object
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
296 WSSocket *wssocket = malloc(sizeof(WSSocket));
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
297 if(!wssocket) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
298 close(s);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
299 return NULL;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
300 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
301 ZERO(wssocket, sizeof(WSSocket));
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
302 wssocket->socket = s;
446
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
303 wssocket->addr = addr;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
304 if(ipv4) {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
305 wssocket->sockaddr = (struct sockaddr *)&wssocket->addr.addr4;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
306 } else {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
307 wssocket->sockaddr = (struct sockaddr *)&wssocket->addr.addr6;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
308 }
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
309 wssocket->sockaddr_size = servaddr_size;
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
310
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
311 return wssocket;
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
312 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
313
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
314 static WSSocket* get_socket(ListenerConfig *conf, const char *protocol) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
315 char key_data[32];
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
316 size_t key_len = snprintf(key_data, 32, "%s:%d", protocol, conf->port);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
317 CxHashKey key = cx_hash_key(key_data, key_len);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
318
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
319 WSSocket *sock = cxMapGet(listener_socket_map, key);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
320 if(!sock) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
321 sock = create_socket(conf, protocol);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
322 if(sock) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
323 cxMapPut(listener_socket_map, key, sock);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
324 }
23
a2c8fc23c90e Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
325 }
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
326 return sock;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
327 }
23
a2c8fc23c90e Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
328
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
329 /*
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
330 * returns HttpSSL of socket1 or socket2 if ssl is available
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
331 */
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
332 static HttpSSL* socket_get_ssl(WSSocket *socket1, WSSocket *socket2) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
333 if(socket1 && socket1->ssl) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
334 return socket1->ssl;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
335 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
336 if(socket2 && socket2->ssl) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
337 return socket2->ssl;
23
a2c8fc23c90e Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
338 }
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
339 return NULL;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
340 }
23
a2c8fc23c90e Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
341
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
342 static HttpListener* listener_create(ListenerConfig *conf) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
343 pool_handle_t *pool = conf->cfg->pool;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
344 HttpListener *listener = pool_malloc(pool, sizeof(HttpListener));
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
345 if(!listener) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
346 return NULL;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
347 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
348 ZERO(listener, sizeof(HttpListener));
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
349
74
5bc6d078fb2c listeners can be dynamically added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 69
diff changeset
350 listener->running = 0;
38
d07810b02147 added ldap authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 37
diff changeset
351 listener->cfg = conf->cfg;
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
352 listener->name = cx_strdup_a(pool_allocator(pool), cx_strcast(conf->name));
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
353 listener->default_vs.vs_name = pool_strdup(pool, conf->vs.ptr);
81
d25825f37967 preparation for admin interface
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 78
diff changeset
354 listener->threadpool = NULL;
37
360b9aabe17e added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
355 if(conf->threadpool.ptr != NULL) {
415
d938228c382e switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
356 listener->threadpool = get_threadpool(cx_strcast(conf->threadpool));
37
360b9aabe17e added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
357 }
360b9aabe17e added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
358 if(listener->threadpool == NULL) {
360b9aabe17e added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
359 listener->threadpool = get_default_threadpool();
360b9aabe17e added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
360 }
134
44415e4399ce adds blockingio config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
361 if(conf->blockingio) {
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
362 listener->session_handler = create_basic_session_handler(pool);
134
44415e4399ce adds blockingio config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
363 } else {
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
364 listener->session_handler = create_event_session_handler(pool);
134
44415e4399ce adds blockingio config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
365 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
366 listener->nacceptors = conf->nacceptors;
29
e8619defde14 added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 25
diff changeset
367 listener->port = conf->port;
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
368 listener->next = NULL;
492
07452a54a22b fix ssl settings not stored in the listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 490
diff changeset
369 //listener->ssl = NULL;
130
198ad9d8cec1 adds ssl protocol configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
370
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
371 // create sockets
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
372 listener->server_socket = get_socket(conf, LISTENER_PROTO_IPV4);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
373 listener->server_socket6 = get_socket(conf, LISTENER_PROTO_IPV6);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
374 if(!listener->server_socket && !listener->server_socket6) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
375 log_ereport(LOG_FAILURE, "Listener %s: no server socket", conf->name.ptr);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
376 return NULL;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
377 }
130
198ad9d8cec1 adds ssl protocol configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
378
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
379 if(listener->server_socket) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
380 wssocket_ref(listener->server_socket);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
381 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
382 if(listener->server_socket6) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
383 wssocket_ref(listener->server_socket6);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
384 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
385
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
386 // create SSL context
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
387 if(conf->ssl) {
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
388 HttpSSL *ssl = socket_get_ssl(listener->server_socket, listener->server_socket6);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
389 if(!ssl) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
390 ssl = create_http_ssl(conf);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
391 if(!ssl) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
392 log_ereport(LOG_FAILURE, "Listener %s: cannot create SSL context", conf->name.ptr);
129
fd324464f56f adds support for ssl cert chain files and improves ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 115
diff changeset
393 return NULL;
fd324464f56f adds support for ssl cert chain files and improves ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 115
diff changeset
394 }
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
395 }
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
396 if(listener->server_socket) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
397 listener->server_socket->ssl = ssl;
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
398 }
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
399 if(listener->server_socket6) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
400 listener->server_socket6->ssl = ssl;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
401 }
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
402 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
403
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
404 // create acceptors
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
405 listener->acceptors = calloc(listener->nacceptors, sizeof(void*));
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
406 listener->acceptors6 = calloc(listener->nacceptors, sizeof(void*));
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
407 for (int i=0;i<listener->nacceptors;i++) {
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
408 listener->acceptors[i] = acceptor_new(listener);
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
409 listener->acceptors6[i] = acceptor_new(listener);
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
410 listener->acceptors6[i]->ipv6 = TRUE;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
411 }
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
412
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
413 return listener;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
414 }
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
415
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
416 HttpListener* http_listener_create(ListenerConfig *conf) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
417 pthread_mutex_lock(&listener_mutex);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
418 HttpListener *listener = listener_create(conf);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
419 pthread_mutex_unlock(&listener_mutex);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
420 return listener;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
421 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
422
449
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
423 void http_listener_destroy(HttpListener *listener) {
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
424 log_ereport(LOG_DEBUG, "destroy http listener: %s config: %p", listener->name.ptr, listener->cfg);
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
425
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
426 if(listener->shutdown) {
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
427 pthread_mutex_destroy(&listener->shutdown_mutex);
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
428 pthread_cond_destroy(&listener->shutdown_cond);
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
429 }
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
430 }
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
431
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
432 int http_listener_start(HttpListener *listener) {
74
5bc6d078fb2c listeners can be dynamically added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 69
diff changeset
433 if(listener->running) {
5bc6d078fb2c listeners can be dynamically added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 69
diff changeset
434 return 0;
5bc6d078fb2c listeners can be dynamically added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 69
diff changeset
435 }
60
feb2f1e115c6 improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
436 log_ereport(LOG_INFORM, "start listener on port %d", listener->port);
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
437
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
438 WSBool ipv4 = listener->server_socket ? TRUE : FALSE;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
439 WSBool ipv6 = listener->server_socket6 ? TRUE: FALSE;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
440
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
441 if (ipv4 && !listener->server_socket->listening && listen(listener->server_socket->socket, 256) == -1) {
398
83234bc3bee9 use IPV6_V6ONLY socket option on linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 396
diff changeset
442 log_ereport(LOG_FAILURE, "http_listener_start: listen failed: %s", strerror(errno));
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
443 return -1;
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
444 } else {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
445 listener->server_socket->listening = TRUE;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
446 }
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
447 if (ipv6 && !listener->server_socket6->listening && listen(listener->server_socket6->socket, 256) == -1) {
398
83234bc3bee9 use IPV6_V6ONLY socket option on linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 396
diff changeset
448 log_ereport(LOG_FAILURE, "http_listener_start: listen v6 failed: %s", strerror(errno));
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
449 return -1;
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
450 } else {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
451 listener->server_socket6->listening = TRUE;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
452 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
453
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
454 // start acceptor threads
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
455 for (int i=0;i<listener->nacceptors;i++) {
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
456 if(ipv4) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
457 acceptor_start(listener->acceptors[i]);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
458 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
459 if(ipv6) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
460 acceptor_start(listener->acceptors6[i]);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
461 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
462 }
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
463 listener->running = TRUE;
19
d680536f8c2f Added configuration manager
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
464
d680536f8c2f Added configuration manager
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
465 return 0;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
466 }
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
467
440
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
468 int http_listener_socket_eq(HttpListener *l1, HttpListener *l2) {
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
469 if(l1->server_socket && l2->server_socket && l1->server_socket == l2->server_socket) {
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
470 return TRUE;
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
471 }
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
472 if(l1->server_socket6 && l2->server_socket6 && l1->server_socket6 == l2->server_socket6) {
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
473 return TRUE;
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
474 }
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
475 return FALSE;
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
476 }
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
477
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
478 void http_listener_set_next(HttpListener *listener, HttpListener *next) {
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
479 while(listener->next) {
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
480 listener = listener->next;
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
481 }
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
482 listener->next = next;
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
483 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
484
446
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
485 int http_listener_connect(HttpListener *listener, WSBool ipv6) {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
486 int domain = ipv6 ? AF_INET6 : AF_INET;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
487 int client = socket(domain, SOCK_STREAM, 0);
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
488 if(client < 0) {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
489 return -1;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
490 }
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
491
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
492 struct sockaddr *sockaddr;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
493 size_t sockaddr_size;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
494 if(ipv6) {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
495 sockaddr = listener->server_socket6->sockaddr;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
496 sockaddr_size = listener->server_socket6->sockaddr_size;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
497 } else {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
498 sockaddr = listener->server_socket->sockaddr;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
499 sockaddr_size = listener->server_socket->sockaddr_size;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
500 }
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
501
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
502 if(connect(client, sockaddr, sockaddr_size) < 0) {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
503 close(client);
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
504 return -1;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
505 }
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
506
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
507 return client;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
508 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
509
445
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
510
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
511 void http_listener_shutdown_acceptors(HttpListener *listener) {
449
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
512 if(pthread_mutex_init(&listener->shutdown_mutex, NULL)) {
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
513 log_ereport(LOG_FAILURE, "http_listener_shutdown_acceptors: pthread_mutex_init failed: %s", strerror(errno));
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
514 return;
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
515 }
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
516 if(pthread_cond_init(&listener->shutdown_cond, NULL)) {
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
517 log_ereport(LOG_FAILURE, "http_listener_shutdown_acceptors: pthread_cond_init failed: %s", strerror(errno));
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
518 return;
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
519 }
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
520 listener->shutdown = TRUE;
446
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
521
449
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
522 log_ereport(LOG_INFORM, "shutdown http listener %s", listener->name.ptr);
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
523
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
524 pthread_mutex_lock(&listener->shutdown_mutex);
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
525
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
526 // shut down acceptors by connecting to the server socket, to make sure
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
527 // accept() returns
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
528 // the acceptor will handle this as a normal connection, but this should
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
529 // not be a problem
446
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
530 for(int i=0;i<listener->nacceptors;i++) {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
531 listener->acceptors[i]->exit = TRUE;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
532 int client4 = http_listener_connect(listener, FALSE);
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
533 if(client4 < 0) {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
534 log_ereport(LOG_FAILURE, "http_listener_shutdown_acceptors: cannot connect to ipv4 server socket: %s", strerror(errno));
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
535 } else {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
536 close(client4);
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
537 }
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
538
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
539 listener->acceptors6[i]->exit = TRUE;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
540 int client6 = http_listener_connect(listener, TRUE);
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
541 if(client6 < 0) {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
542 log_ereport(LOG_FAILURE, "http_listener_shutdown_acceptors: cannot connect to ipv6 server socket: %s", strerror(errno));
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
543 } else {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
544 close(client6);
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
545 }
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
546 }
449
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
547
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
548 // The last acceptor will notify listener_shutdown.cond
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
549 // It is not really necessary to wait for acceptors to shut down,
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
550 // we do it mostly for nicer log messages. The timeout is there
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
551 // for making sure, this function never blocks forever.
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
552 struct timespec ts;
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
553 ts.tv_sec = time(NULL) + 60;
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
554 pthread_cond_timedwait(&listener->shutdown_cond, &listener->shutdown_mutex, &ts);
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
555
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
556 pthread_mutex_unlock(&listener->shutdown_mutex);
445
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
557 }
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
558
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
559
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
560 Acceptor* acceptor_new(HttpListener *listener) {
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
561 Acceptor *acceptor = malloc(sizeof(Acceptor));
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
562 acceptor->listener = listener;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
563 acceptor->ipv6 = WS_FALSE;
445
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
564 acceptor->exit = WS_FALSE;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
565 return acceptor;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
566 }
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
567
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
568 void acceptor_start(Acceptor *a) {
444
96d2ba2f28db fix configuration referencing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 441
diff changeset
569 cfg_ref(a->listener->cfg);
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
570 if(pthread_create(
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
571 &a->tid,
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
572 NULL,
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
573 (void*(*)(void*))acceptor_thread,
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
574 a) != 0)
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
575 {
445
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
576 log_ereport(LOG_FAILURE, "Listener %s: acceptor_start: %s acceptor", a->listener->name.ptr, strerror(errno));
444
96d2ba2f28db fix configuration referencing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 441
diff changeset
577 cfg_unref(a->listener->cfg);
449
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
578 } else {
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
579 (void)pthread_detach(a->tid);
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
580 }
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
581 }
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
582
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
583 void* acceptor_thread(Acceptor *acceptor) {
87
bdec069d2239 fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 81
diff changeset
584 WS_ASSERT(acceptor);
bdec069d2239 fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 81
diff changeset
585 WS_ASSERT(acceptor->listener);
444
96d2ba2f28db fix configuration referencing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 441
diff changeset
586 WS_ASSERT(acceptor->listener->cfg);
87
bdec069d2239 fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 81
diff changeset
587 WS_ASSERT(acceptor->listener->session_handler);
bdec069d2239 fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 81
diff changeset
588 WS_ASSERT(acceptor->listener->session_handler->enqueue_connection);
bdec069d2239 fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 81
diff changeset
589
445
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
590 acceptor->running = TRUE;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
591 HttpListener *listener = acceptor->listener;
444
96d2ba2f28db fix configuration referencing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 441
diff changeset
592
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
593 int server_socket;
449
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
594 uint32_t *acceptors_running = &listener->nacceptors_running;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
595
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
596 ConnectionAddr ca;
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
597 struct sockaddr *ca_ptr;
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
598 socklen_t ca_length;
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
599 ConnectionAddrType addr_type;
492
07452a54a22b fix ssl settings not stored in the listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 490
diff changeset
600 HttpSSL *socket_ssl = NULL;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
601 if(acceptor->ipv6) {
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
602 server_socket = listener->server_socket6->socket;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
603 ca_ptr = (struct sockaddr*)&ca.address_v6;
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
604 ca_length = sizeof(ca.address_v6);
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
605 addr_type = CONN_ADDR_IPV6;
492
07452a54a22b fix ssl settings not stored in the listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 490
diff changeset
606 socket_ssl = listener->server_socket6->ssl;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
607 } else {
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
608 server_socket = listener->server_socket->socket;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
609 ca_ptr = (struct sockaddr*)&ca.address_v4;
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
610 ca_length = sizeof(ca.address_v4);
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
611 addr_type = CONN_ADDR_IPV4;
492
07452a54a22b fix ssl settings not stored in the listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 490
diff changeset
612 socket_ssl = listener->server_socket->ssl;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
613 }
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
614
445
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
615 log_ereport(LOG_DEBUG, "acceptor: %p listener: %p start", acceptor, acceptor->listener);
449
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
616 ws_atomic_inc32(acceptors_running);
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
617
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
618 for (;;) {
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
619 // accept connections
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
620 int clientfd;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
621 socklen_t length = ca_length;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
622
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
623 // accept a connection
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
624 clientfd = accept(
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
625 server_socket,
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
626 ca_ptr,
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
627 &length);
440
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
628 log_ereport(LOG_DEBUG, "acceptor: %p listener: %p: accept(): %d", acceptor, acceptor->listener, clientfd);
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
629 if (clientfd == -1) {
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
630 log_ereport(LOG_FAILURE, "accept %s failed: %s", acceptor->ipv6 ? "ipv6" : "ipv4", strerror(errno));
446
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
631
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
632 if(acceptor->exit) {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
633 log_ereport(LOG_VERBOSE, "acceptor thread %p: listener: %p exit", acceptor, acceptor->listener);
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
634 break;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
635 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
636 continue;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
637 }
145
1c93281ca4bf fixes memory leaks in request_stat_path and send_cgi
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 134
diff changeset
638
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
639 // check listener
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
640 HttpListener *ls = listener;
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
641 int acceptor_exit = 0;
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
642 while(ls->next) {
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
643 ls = ls->next;
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
644 acceptor_exit = 1;
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
645 }
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
646
440
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
647 // create Connection object
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
648 Connection *conn = malloc(sizeof(Connection));
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
649 conn->address = ca;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
650 conn->addr_type = addr_type;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
651 conn->fd = clientfd;
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
652 conn->listener = ls;
194
6345f50208d5 fixes keep-alive with ssl
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 193
diff changeset
653 conn->ssl_accepted = 0;
494
f7f624cfe80a fix missing connection ssl_error initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 492
diff changeset
654 conn->ssl_error = 0;
492
07452a54a22b fix ssl settings not stored in the listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 490
diff changeset
655 if(socket_ssl) {
191
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
656 // SSL connections are always non-blocking
188
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
657 // set socket non blocking
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
658 int flags;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
659 if((flags = fcntl(conn->fd, F_GETFL, 0)) == -1) {
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
660 flags = 0;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
661 }
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
662 if(fcntl(conn->fd, F_SETFL, flags | O_NONBLOCK)) {
445
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
663 log_ereport(LOG_FAILURE, "acceptor: fcntl failed: %s", strerror(errno));
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
664 close(clientfd);
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
665 free(conn);
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
666 conn = NULL;
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
667 } else {
492
07452a54a22b fix ssl settings not stored in the listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 490
diff changeset
668 SSL *ssl = SSL_new(socket_ssl->sslctx);
445
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
669 if(ssl) {
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
670 SSL_set_fd(ssl, clientfd);
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
671
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
672 conn->ssl = ssl;
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
673 conn->read = connection_ssl_read;
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
674 conn->write = connection_ssl_write;
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
675 conn->close = connection_ssl_close;
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
676 } else {
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
677 log_ereport(LOG_FAILURE, "acceptor: %p listener: %p SSL_new() failed", acceptor, acceptor->listener);
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
678 free(conn);
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
679 close(clientfd);
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
680 conn = NULL;
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
681 }
188
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
682 }
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
683 } else {
111
c93be34fde76 fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
684 conn->ssl = NULL;
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
685 conn->read = connection_read;
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
686 conn->write = connection_write;
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
687 conn->close = connection_close;
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
688 }
61
c858850f3d3a improved configuration reloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 60
diff changeset
689
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
690 if(conn) {
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
691 cfg_ref(ls->cfg);
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
692
440
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
693 // enqueue the connection
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
694 ls->session_handler->enqueue_connection(
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
695 ls->session_handler,
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
696 conn);
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
697 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
698
440
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
699 // ready for new connection
38
d07810b02147 added ldap authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 37
diff changeset
700
445
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
701 if(acceptor_exit || acceptor->exit) {
46
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
702 // this acceptor is outdated
446
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
703 log_ereport(LOG_VERBOSE, "acceptor thread %p: listener: %p exit", acceptor, acceptor->listener);
25
5dee29c7c530 Fixed config parser bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 23
diff changeset
704 break;
5dee29c7c530 Fixed config parser bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 23
diff changeset
705 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
706 }
25
5dee29c7c530 Fixed config parser bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 23
diff changeset
707
449
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
708 if(ws_atomic_dec32(acceptors_running) == 0) {
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
709 // notify
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
710 if(listener->shutdown) {
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
711 log_ereport(LOG_DEBUG, "last acceptor shutdown: notify cfgmgr");
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
712 pthread_mutex_lock(&listener->shutdown_mutex);
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
713 pthread_cond_signal(&listener->shutdown_cond);
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
714 pthread_mutex_unlock(&listener->shutdown_mutex);
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
715 }
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
716 }
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
717
445
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
718 acceptor->running = FALSE;
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
719
444
96d2ba2f28db fix configuration referencing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 441
diff changeset
720 cfg_unref(acceptor->listener->cfg);
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
721
25
5dee29c7c530 Fixed config parser bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 23
diff changeset
722 return NULL;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
723 }
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
724
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
725 void wssocket_ref(WSSocket *ws) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
726 ws_atomic_inc32(&ws->ref);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
727 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
728
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
729 void wssocket_unref(WSSocket *ws) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
730 // does nothing yet, because maybe it is not a good idea to destroy
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
731 // a socket
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
732 ws_atomic_dec32(&ws->ref);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
733 }

mercurial