src/server/daemon/httplistener.c

Tue, 13 Aug 2024 20:08:13 +0200

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Tue, 13 Aug 2024 20:08:13 +0200
changeset 546
5494c28db896
parent 541
1e1fca11aaff
child 554
e0a6b761ddbc
permissions
-rw-r--r--

increase keep-alive timeout

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>
541
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
37 #include <netinet/tcp.h>
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
38 #include <stdio.h>
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
39 #include <stdlib.h>
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
40 #include <fcntl.h>
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
41 #include <unistd.h>
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
42 #include <strings.h>
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
43 #include <stdbool.h>
445
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
44 #include <signal.h>
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
45 #include <pthread.h>
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
46
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
47 #include <stdio.h>
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
48 #include <stdlib.h>
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
49
415
d938228c382e switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
50
d938228c382e switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
51 #include <cx/hash_map.h>
92
382bff43c6eb fixed some includes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 87
diff changeset
52
41
bb7a1f5a8b48 added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 38
diff changeset
53 #include "../util/atomic.h"
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
54 #include "httplistener.h"
171
af7e2d80dee6 adds wrapper for close syscall with error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 169
diff changeset
55 #include "netsite.h"
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
56
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
57 #include "session.h"
19
d680536f8c2f Added configuration manager
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
58 #include "configmanager.h"
29
e8619defde14 added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 25
diff changeset
59 #include "log.h"
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
60
415
d938228c382e switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
61 #define LISTENER_MAX_PROTOCOL_TOKENS 1024
d938228c382e switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
62
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
63
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
64 #define LISTENER_PROTO_IPV4 "ipv4"
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
65 #define LISTENER_PROTO_IPV6 "ipv6"
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 /*
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
69 * key: string format: <protocol>:<port>
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
70 * value: WSSocket*
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
71 *
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
72 * protocol: ipv4 | ipv6
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
73 * port: short
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
74 */
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
75 static CxMap *listener_socket_map;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
76
453
4586d534f9b5 fix build on macos
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 449
diff changeset
77 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
78
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
79
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
80 int http_listener_global_init(void) {
490
d218607f5a7e update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 454
diff changeset
81 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
82 if(!listener_socket_map) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
83 return 1;
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
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
86 return 0;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
87 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
88
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
89 int start_all_listener() {
19
d680536f8c2f Added configuration manager
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
90 ServerConfiguration *conf = cfgmgr_get_server_config();
415
d938228c382e switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
91 CxList *ls = conf->listeners;
490
d218607f5a7e update ucx
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 454
diff changeset
92 CxIterator iter = cxListIterator(ls);
415
d938228c382e switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
93 cx_foreach(HttpListener *, listener, iter) {
19
d680536f8c2f Added configuration manager
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
94 http_listener_start(listener);
d680536f8c2f Added configuration manager
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
95 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
96
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
97 return 0;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
98 }
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
99
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
100 static HttpSSL* create_http_ssl(ListenerConfig *conf) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
101 SSL_CTX *ctx = SSL_CTX_new(SSLv23_server_method());
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
102 if(!ctx) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
103 return NULL;
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
104 }
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
105 SSL_CTX_set_options(
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
106 ctx,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
107 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
108 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
109 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
110
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
111 int error = 0;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
112 if(conf->disable_proto.ptr) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
113 cxstring *plist = NULL;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
114 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
115 if(plist) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
116 for(int i=0;i<n;i++) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
117 cxstring proto = plist[i];
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
118 log_ereport(
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
119 LOG_VERBOSE,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
120 "Listener %s: Disable protocol %s",
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
121 conf->name.ptr,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
122 proto.ptr);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
123 if(!cx_strcasecmp(cx_strtrim(proto), cx_str("SSLv2"))) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
124 SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
125 } 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
126 SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv3);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
127 } 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
128 SSL_CTX_set_options(ctx, SSL_OP_NO_TLSv1);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
129 } 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
130 #ifdef SSL_OP_NO_TLSv1_1
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
131 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
132 #else
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
133 log_ereport(
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
134 LOG_WARN,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
135 "Listener: %s: TLSv1.1 not supported",
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
136 conf->name.ptr);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
137 #endif
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
138 } 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
139 #ifdef SSL_OP_NO_TLSv1_2
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
140 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
141 #else
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
142 log_ereport(
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
143 LOG_WARN,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
144 "Listener: %s: TLSv1.2 not supported",
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
145 conf->name.ptr);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
146 #endif
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
147 } 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
148 #ifdef SSL_OP_NO_TLSv1_3
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
149 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
150 #else
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
151 log_ereport(
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
152 LOG_WARN,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
153 "Listener: %s: TLSv1.3 not supported",
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
154 conf->name.ptr);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
155 #endif
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
156 } else {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
157 error = 1;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
158 log_ereport(
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
159 LOG_MISCONFIG,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
160 "Listener: %s: Unknown protocol %s",
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
161 conf->name.ptr,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
162 proto.ptr);
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 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
165 free(plist);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
166 }
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
167 }
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
168
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
169 if(error) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
170 SSL_CTX_free(ctx);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
171 return NULL;
37
360b9aabe17e added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
172 }
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
173
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
174 int ret;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
175 char errbuf[512];
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
176
441
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
177 // get TLS cert
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
178 error = 0;
441
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
179 if(conf->chainfile.ptr) {
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
180 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
181 if(!ret) {
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
182 ERR_error_string(ERR_get_error(), errbuf);
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
183 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
184 error = 1;
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
185 }
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
186 } else if(conf->certfile.ptr) {
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
187 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
188 if(!ret) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
189 ERR_error_string(ERR_get_error(), errbuf);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
190 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
191 error = 1;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
192 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
193 } else {
441
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
194 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
195 error = 1;
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
196 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
197
441
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
198 // get private key
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
199 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
200 if(!ret) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
201 ERR_error_string(ERR_get_error(), errbuf);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
202 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
203 error = 1;
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
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
206 if(error) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
207 SSL_CTX_free(ctx);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
208 return NULL;
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
209 }
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
210
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
211 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
212 if(!ssl) {
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
213 SSL_CTX_free(ctx);
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
214 return NULL;
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
215 }
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
216 ZERO(ssl, sizeof(HttpSSL));
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
217 ssl->sslctx = ctx;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
218
441
797aeb31a2c6 fix listener ssl initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 440
diff changeset
219 return ssl;
438
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
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
222 static WSSocket* create_socket(ListenerConfig *conf, const char *protocol) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
223 WSBool ipv4 = !strcmp(protocol, "ipv4") ? TRUE : FALSE;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
224
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
225 int s = -1;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
226 if(ipv4) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
227 // ipv4 socket
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
228 s = socket(AF_INET, SOCK_STREAM, 0);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
229 } else {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
230 // ipv6 socket
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
231 s = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
232 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
233 if(s < 0) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
234 log_ereport(
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
235 LOG_FAILURE,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
236 "cannot create socket: protocol: %s port: %d error: %s",
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
237 protocol,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
238 conf->port,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
239 strerror(errno));
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
240 return NULL;
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
241 }
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
242
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
243 // socket options
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
244 int o = 1;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
245 setsockopt(
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
246 s,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
247 SOL_SOCKET, SO_REUSEADDR,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
248 &o,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
249 sizeof(int));
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
250
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
251 #ifdef LINUX
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
252 if(!ipv4) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
253 o = 1;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
254 setsockopt(
454
e03d4a00427a fix build on linux
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 453
diff changeset
255 s,
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
256 IPPROTO_IPV6,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
257 IPV6_V6ONLY,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
258 &o,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
259 sizeof(int));
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
260 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
261 #endif
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
262
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
263 // bind server socket to address
446
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
264 union ws_socketaddr addr;
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
265 struct sockaddr *servaddr;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
266 size_t servaddr_size;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
267 if(ipv4) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
268 // ipv4
446
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
269 memset(&addr.addr4, 0, sizeof(addr.addr4));
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
270 addr.addr4.sin_family = AF_INET;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
271 addr.addr4.sin_addr.s_addr = htonl(INADDR_ANY);
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
272 addr.addr4.sin_port = htons(conf->port);
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
273 servaddr = (struct sockaddr *)&addr.addr4;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
274 servaddr_size = sizeof(addr.addr4);
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
275 } else {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
276 // ipv6
446
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
277 memset(&addr.addr6, 0, sizeof(addr.addr6));
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
278 addr.addr6.sin6_family = AF_INET6;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
279 addr.addr6.sin6_addr = in6addr_any;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
280 addr.addr6.sin6_port = htons(conf->port);
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
281 servaddr = (struct sockaddr *)&addr.addr6;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
282 servaddr_size = sizeof(addr.addr6);
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
283 }
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
284
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
285 if(bind(s, servaddr, servaddr_size)) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
286 log_ereport(
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
287 LOG_FAILURE,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
288 "cannot bind socket: protocol: %s port: %d error: %s",
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
289 protocol,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
290 conf->port,
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
291 strerror(errno));
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
292 close(s);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
293 return NULL;
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
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
296 // everything is ok, create WSSocket object
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
297 WSSocket *wssocket = malloc(sizeof(WSSocket));
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
298 if(!wssocket) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
299 close(s);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
300 return NULL;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
301 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
302 ZERO(wssocket, sizeof(WSSocket));
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
303 wssocket->socket = s;
446
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
304 wssocket->addr = addr;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
305 if(ipv4) {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
306 wssocket->sockaddr = (struct sockaddr *)&wssocket->addr.addr4;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
307 } else {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
308 wssocket->sockaddr = (struct sockaddr *)&wssocket->addr.addr6;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
309 }
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
310 wssocket->sockaddr_size = servaddr_size;
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
311
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
312 return wssocket;
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
313 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
314
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
315 static WSSocket* get_socket(ListenerConfig *conf, const char *protocol) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
316 char key_data[32];
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
317 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
318 CxHashKey key = cx_hash_key(key_data, key_len);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
319
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
320 WSSocket *sock = cxMapGet(listener_socket_map, key);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
321 if(!sock) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
322 sock = create_socket(conf, protocol);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
323 if(sock) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
324 cxMapPut(listener_socket_map, key, sock);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
325 }
23
a2c8fc23c90e Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
326 }
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
327 return sock;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
328 }
23
a2c8fc23c90e Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
329
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
330 /*
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
331 * 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
332 */
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
333 static HttpSSL* socket_get_ssl(WSSocket *socket1, WSSocket *socket2) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
334 if(socket1 && socket1->ssl) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
335 return socket1->ssl;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
336 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
337 if(socket2 && socket2->ssl) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
338 return socket2->ssl;
23
a2c8fc23c90e Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
339 }
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
340 return NULL;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
341 }
23
a2c8fc23c90e Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 21
diff changeset
342
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
343 static HttpListener* listener_create(ListenerConfig *conf) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
344 pool_handle_t *pool = conf->cfg->pool;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
345 HttpListener *listener = pool_malloc(pool, sizeof(HttpListener));
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
346 if(!listener) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
347 return NULL;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
348 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
349 ZERO(listener, sizeof(HttpListener));
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
350
74
5bc6d078fb2c listeners can be dynamically added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 69
diff changeset
351 listener->running = 0;
38
d07810b02147 added ldap authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 37
diff changeset
352 listener->cfg = conf->cfg;
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
353 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
354 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
355 listener->threadpool = NULL;
37
360b9aabe17e added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
356 if(conf->threadpool.ptr != NULL) {
415
d938228c382e switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 398
diff changeset
357 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
358 }
360b9aabe17e added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
359 if(listener->threadpool == NULL) {
360b9aabe17e added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
360 listener->threadpool = get_default_threadpool();
360b9aabe17e added support for asynchronous safs
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 36
diff changeset
361 }
134
44415e4399ce adds blockingio config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
362 if(conf->blockingio) {
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
363 listener->session_handler = create_basic_session_handler(pool);
134
44415e4399ce adds blockingio config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
364 } else {
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
365 listener->session_handler = create_event_session_handler(pool);
134
44415e4399ce adds blockingio config
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
366 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
367 listener->nacceptors = conf->nacceptors;
29
e8619defde14 added event handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 25
diff changeset
368 listener->port = conf->port;
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
369 listener->next = NULL;
492
07452a54a22b fix ssl settings not stored in the listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 490
diff changeset
370 //listener->ssl = NULL;
130
198ad9d8cec1 adds ssl protocol configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
371
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
372 // create sockets
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
373 listener->server_socket = get_socket(conf, LISTENER_PROTO_IPV4);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
374 listener->server_socket6 = get_socket(conf, LISTENER_PROTO_IPV6);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
375 if(!listener->server_socket && !listener->server_socket6) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
376 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
377 return NULL;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
378 }
130
198ad9d8cec1 adds ssl protocol configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
379
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
380 if(listener->server_socket) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
381 wssocket_ref(listener->server_socket);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
382 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
383 if(listener->server_socket6) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
384 wssocket_ref(listener->server_socket6);
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
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
387 // create SSL context
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
388 if(conf->ssl) {
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
389 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
390 if(!ssl) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
391 ssl = create_http_ssl(conf);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
392 if(!ssl) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
393 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
394 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
395 }
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
396 }
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
397 if(listener->server_socket) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
398 listener->server_socket->ssl = ssl;
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
399 }
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
400 if(listener->server_socket6) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
401 listener->server_socket6->ssl = ssl;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
402 }
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
403 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
404
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
405 // create acceptors
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
406 listener->acceptors = calloc(listener->nacceptors, sizeof(void*));
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
407 listener->acceptors6 = calloc(listener->nacceptors, sizeof(void*));
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
408 for (int i=0;i<listener->nacceptors;i++) {
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
409 listener->acceptors[i] = acceptor_new(listener);
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
410 listener->acceptors6[i] = acceptor_new(listener);
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
411 listener->acceptors6[i]->ipv6 = TRUE;
1
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
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
414 return listener;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
415 }
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
416
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
417 HttpListener* http_listener_create(ListenerConfig *conf) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
418 pthread_mutex_lock(&listener_mutex);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
419 HttpListener *listener = listener_create(conf);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
420 pthread_mutex_unlock(&listener_mutex);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
421 return listener;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
422 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
423
449
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
424 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
425 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
426
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
427 if(listener->shutdown) {
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
428 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
429 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
430 }
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
431 }
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
432
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
433 int http_listener_start(HttpListener *listener) {
74
5bc6d078fb2c listeners can be dynamically added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 69
diff changeset
434 if(listener->running) {
5bc6d078fb2c listeners can be dynamically added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 69
diff changeset
435 return 0;
5bc6d078fb2c listeners can be dynamically added
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 69
diff changeset
436 }
60
feb2f1e115c6 improved logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
437 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
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
439 WSBool ipv4 = listener->server_socket ? TRUE : FALSE;
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
440 WSBool ipv6 = listener->server_socket6 ? TRUE: FALSE;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
441
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
442 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
443 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
444 return -1;
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
445 } else {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
446 listener->server_socket->listening = TRUE;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
447 }
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
448 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
449 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
450 return -1;
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
451 } else {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
452 listener->server_socket6->listening = TRUE;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
453 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
454
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
455 // start acceptor threads
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
456 for (int i=0;i<listener->nacceptors;i++) {
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
457 if(ipv4) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
458 acceptor_start(listener->acceptors[i]);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
459 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
460 if(ipv6) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
461 acceptor_start(listener->acceptors6[i]);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
462 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
463 }
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
464 listener->running = TRUE;
19
d680536f8c2f Added configuration manager
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
465
d680536f8c2f Added configuration manager
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 15
diff changeset
466 return 0;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
467 }
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
468
440
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
469 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
470 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
471 return TRUE;
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
472 }
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
473 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
474 return TRUE;
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
475 }
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
476 return FALSE;
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
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
479 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
480 while(listener->next) {
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
481 listener = listener->next;
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
482 }
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
483 listener->next = next;
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
484 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
485
446
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
486 int http_listener_connect(HttpListener *listener, WSBool ipv6) {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
487 int domain = ipv6 ? AF_INET6 : AF_INET;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
488 int client = socket(domain, SOCK_STREAM, 0);
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
489 if(client < 0) {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
490 return -1;
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
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
493 struct sockaddr *sockaddr;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
494 size_t sockaddr_size;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
495 if(ipv6) {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
496 sockaddr = listener->server_socket6->sockaddr;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
497 sockaddr_size = listener->server_socket6->sockaddr_size;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
498 } else {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
499 sockaddr = listener->server_socket->sockaddr;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
500 sockaddr_size = listener->server_socket->sockaddr_size;
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
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
503 if(connect(client, sockaddr, sockaddr_size) < 0) {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
504 close(client);
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
505 return -1;
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
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
508 return client;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
509 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
510
445
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
511
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
512 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
513 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
514 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
515 return;
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
516 }
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
517 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
518 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
519 return;
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
520 }
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
521 listener->shutdown = TRUE;
446
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
522
449
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
523 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
524
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
525 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
526
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
527 // 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
528 // accept() returns
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
529 // 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
530 // not be a problem
446
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
531 for(int i=0;i<listener->nacceptors;i++) {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
532 listener->acceptors[i]->exit = TRUE;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
533 int client4 = http_listener_connect(listener, FALSE);
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
534 if(client4 < 0) {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
535 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
536 } else {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
537 close(client4);
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
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
540 listener->acceptors6[i]->exit = TRUE;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
541 int client6 = http_listener_connect(listener, TRUE);
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
542 if(client6 < 0) {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
543 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
544 } else {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
545 close(client6);
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
546 }
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
547 }
449
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
548
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
549 // 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
550 // 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
551 // 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
552 // 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
553 struct timespec ts;
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
554 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
555 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
556
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
557 pthread_mutex_unlock(&listener->shutdown_mutex);
445
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
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
560
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
561 Acceptor* acceptor_new(HttpListener *listener) {
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
562 Acceptor *acceptor = malloc(sizeof(Acceptor));
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
563 acceptor->listener = listener;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
564 acceptor->ipv6 = WS_FALSE;
445
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
565 acceptor->exit = WS_FALSE;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
566 return acceptor;
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
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
569 void acceptor_start(Acceptor *a) {
444
96d2ba2f28db fix configuration referencing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 441
diff changeset
570 cfg_ref(a->listener->cfg);
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
571 if(pthread_create(
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
572 &a->tid,
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
573 NULL,
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
574 (void*(*)(void*))acceptor_thread,
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
575 a) != 0)
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
576 {
445
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
577 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
578 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
579 } else {
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
580 (void)pthread_detach(a->tid);
1
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
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
584 void* acceptor_thread(Acceptor *acceptor) {
87
bdec069d2239 fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 81
diff changeset
585 WS_ASSERT(acceptor);
bdec069d2239 fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 81
diff changeset
586 WS_ASSERT(acceptor->listener);
444
96d2ba2f28db fix configuration referencing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 441
diff changeset
587 WS_ASSERT(acceptor->listener->cfg);
87
bdec069d2239 fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 81
diff changeset
588 WS_ASSERT(acceptor->listener->session_handler);
bdec069d2239 fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 81
diff changeset
589 WS_ASSERT(acceptor->listener->session_handler->enqueue_connection);
bdec069d2239 fixed pathcheck behavior
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 81
diff changeset
590
445
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
591 acceptor->running = TRUE;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
592 HttpListener *listener = acceptor->listener;
444
96d2ba2f28db fix configuration referencing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 441
diff changeset
593
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
594 int server_socket;
449
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
595 uint32_t *acceptors_running = &listener->nacceptors_running;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
596
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
597 ConnectionAddr ca;
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
598 struct sockaddr *ca_ptr;
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
599 socklen_t ca_length;
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
600 ConnectionAddrType addr_type;
492
07452a54a22b fix ssl settings not stored in the listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 490
diff changeset
601 HttpSSL *socket_ssl = NULL;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
602 if(acceptor->ipv6) {
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
603 server_socket = listener->server_socket6->socket;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
604 ca_ptr = (struct sockaddr*)&ca.address_v6;
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
605 ca_length = sizeof(ca.address_v6);
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
606 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
607 socket_ssl = listener->server_socket6->ssl;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
608 } else {
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
609 server_socket = listener->server_socket->socket;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
610 ca_ptr = (struct sockaddr*)&ca.address_v4;
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
611 ca_length = sizeof(ca.address_v4);
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
612 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
613 socket_ssl = listener->server_socket->ssl;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
614 }
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
615
445
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
616 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
617 ws_atomic_inc32(acceptors_running);
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
618
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
619 for (;;) {
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
620 // accept connections
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
621 int clientfd;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
622 socklen_t length = ca_length;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
623
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
624 // accept a connection
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
625 clientfd = accept(
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
626 server_socket,
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
627 ca_ptr,
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
628 &length);
440
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
629 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
630 if (clientfd == -1) {
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
631 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
632
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
633 if(acceptor->exit) {
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
634 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
635 break;
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
636 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
637 continue;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
638 }
541
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
639
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
640 //if(http_listener_apply_keep_alive_settings(listener, clientfd)) {
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
641 // close(clientfd);
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
642 // continue;
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
643 //}
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
644
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
645 // check listener
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
646 HttpListener *ls = listener;
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
647 int acceptor_exit = 0;
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
648 while(ls->next) {
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
649 ls = ls->next;
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
650 acceptor_exit = 1;
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
651 }
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
652
440
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
653 // create Connection object
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
654 Connection *conn = malloc(sizeof(Connection));
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
655 conn->address = ca;
396
77d81f2bb9f7 add initial ipv6 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 256
diff changeset
656 conn->addr_type = addr_type;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
657 conn->fd = clientfd;
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
658 conn->listener = ls;
194
6345f50208d5 fixes keep-alive with ssl
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 193
diff changeset
659 conn->ssl_accepted = 0;
494
f7f624cfe80a fix missing connection ssl_error initialization
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 492
diff changeset
660 conn->ssl_error = 0;
492
07452a54a22b fix ssl settings not stored in the listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 490
diff changeset
661 if(socket_ssl) {
191
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
662 // 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
663 // set socket non blocking
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
664 int flags;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
665 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
666 flags = 0;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
667 }
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
668 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
669 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
670 close(clientfd);
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
671 free(conn);
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
672 conn = NULL;
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
673 } else {
492
07452a54a22b fix ssl settings not stored in the listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 490
diff changeset
674 SSL *ssl = SSL_new(socket_ssl->sslctx);
445
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
675 if(ssl) {
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
676 SSL_set_fd(ssl, clientfd);
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
677
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
678 conn->ssl = ssl;
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
679 conn->read = connection_ssl_read;
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
680 conn->write = connection_ssl_write;
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
681 conn->close = connection_ssl_close;
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
682 } else {
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
683 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
684 free(conn);
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
685 close(clientfd);
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
686 conn = NULL;
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
687 }
188
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
688 }
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
689 } else {
111
c93be34fde76 fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
690 conn->ssl = NULL;
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
691 conn->read = connection_read;
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
692 conn->write = connection_write;
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
693 conn->close = connection_close;
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
694 }
61
c858850f3d3a improved configuration reloading
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 60
diff changeset
695
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
696 if(conn) {
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
697 cfg_ref(ls->cfg);
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 // enqueue the connection
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
700 ls->session_handler->enqueue_connection(
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
701 ls->session_handler,
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
702 conn);
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 101
diff changeset
703 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
704
440
d77b8f3e14e2 implement successor listener, fix webserver_reconfig
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
705 // ready for new connection
38
d07810b02147 added ldap authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 37
diff changeset
706
445
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
707 if(acceptor_exit || acceptor->exit) {
46
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
708 // this acceptor is outdated
446
240ed6f945ca implement acceptor thread shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 445
diff changeset
709 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
710 break;
5dee29c7c530 Fixed config parser bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 23
diff changeset
711 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
712 }
25
5dee29c7c530 Fixed config parser bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 23
diff changeset
713
449
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
714 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
715 // notify
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
716 if(listener->shutdown) {
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
717 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
718 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
719 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
720 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
721 }
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
722 }
a28a5ccc894b improve http listener migration / shutdown of old listener
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 446
diff changeset
723
445
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
724 acceptor->running = FALSE;
834351da593b improve acceptor error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 444
diff changeset
725
444
96d2ba2f28db fix configuration referencing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 441
diff changeset
726 cfg_unref(acceptor->listener->cfg);
36
450d2d5f4735 server can reload configuration
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 35
diff changeset
727
25
5dee29c7c530 Fixed config parser bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 23
diff changeset
728 return NULL;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
729 }
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
730
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
731 void wssocket_ref(WSSocket *ws) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
732 ws_atomic_inc32(&ws->ref);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
733 }
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
734
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
735 void wssocket_unref(WSSocket *ws) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
736 // 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
737 // a socket
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
738 ws_atomic_dec32(&ws->ref);
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
739 }
541
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
740
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
741
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
742 int http_listener_apply_keep_alive_settings(HttpListener *listener, int fd) {
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
743 // TODO: all these values should be configurable
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
744 int optval = 1;
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
745 if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &optval, sizeof(optval))) {
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
746 log_ereport(LOG_FAILURE, "listener: cannot set SO_KEEPALIVE: %s", strerror(errno));
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
747 return 1;
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
748 }
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
749
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
750 int keepidle = 60;
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
751 if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &keepidle, sizeof(keepidle))) {
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
752 log_ereport(LOG_FAILURE, "listener: cannot set TCP_KEEPIDLE to value %d: %s", keepidle, strerror(errno));
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
753 return 1;
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
754 }
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
755
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
756 int keepintvl = 10;
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
757 if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &keepintvl, sizeof(keepintvl))) {
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
758 log_ereport(LOG_FAILURE, "listener: cannot set TCP_KEEPINTVL to value %d: %s", keepintvl, strerror(errno));
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
759 return 1;
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
760 }
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
761
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
762 int keepcnt = 3;
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
763 if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &keepcnt, sizeof(keepcnt))) {
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
764 log_ereport(LOG_FAILURE, "listener: cannot set TCP_KEEPCNT to value %d: %s", keepcnt, strerror(errno));
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
765 return 1;
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
766 }
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
767
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
768 return 0;
1e1fca11aaff refactore EventHandler: add common fields to base struct
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 502
diff changeset
769 }

mercurial