src/server/daemon/sessionhandler.c

Mon, 12 Aug 2024 00:22:37 +0200

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Mon, 12 Aug 2024 00:22:37 +0200
changeset 543
3335f431a91b
parent 542
1327febf99c4
child 544
27684460629f
permissions
-rw-r--r--

implement 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
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
29 #include <stdio.h>
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
30 #include <stdlib.h>
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
31 #include <errno.h>
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
32
14
b8bf95b39952 New source folder layout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 1
diff changeset
33 #include "../public/nsapi.h"
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
34
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
35 #include "sessionhandler.h"
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
36 #include "httprequest.h"
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
37 #include "httpparser.h"
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
38 #include "log.h"
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
39 #include "error.h"
79
f48cea237ec3 fixed some memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 78
diff changeset
40 #include "httplistener.h"
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
41
542
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
42 struct EventHttpIO {
159
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
43 HTTPRequest *request;
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
44 HttpParser *parser;
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
45 int error;
542
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
46 };
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
47
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
48
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
49 int connection_read(Connection *conn, void *buf, int len) {
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
50 return (int)read(conn->fd, buf, len);
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
51 }
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
52
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
53 int connection_write(Connection *conn, const void *buf, int len) {
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
54 return (int)write(conn->fd, buf, len);
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
55 }
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
56
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
57 void connection_close(Connection *conn) {
169
76c96ee18221 check close return value
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 162
diff changeset
58 while(close(conn->fd)) {
76c96ee18221 check close return value
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 162
diff changeset
59 if(errno != EINTR) {
76c96ee18221 check close return value
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 162
diff changeset
60 log_ereport(LOG_VERBOSE, "connection close failed: %s", strerror(errno));
76c96ee18221 check close return value
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 162
diff changeset
61 break;
76c96ee18221 check close return value
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 162
diff changeset
62 }
171
af7e2d80dee6 adds wrapper for close syscall with error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 169
diff changeset
63 log_ereport(LOG_VERBOSE, "connection close: EINTR");
169
76c96ee18221 check close return value
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 162
diff changeset
64 }
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
65 }
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
66
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
67 int connection_ssl_read(Connection *conn, void *buf, int len) {
128
288fd9b9a739 fixes ssl shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 114
diff changeset
68 int ret = SSL_read(conn->ssl, buf, len);
288fd9b9a739 fixes ssl shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 114
diff changeset
69 if(ret <= 0) {
133
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
70 conn->ssl_error = SSL_get_error(conn->ssl, ret);
128
288fd9b9a739 fixes ssl shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 114
diff changeset
71 }
288fd9b9a739 fixes ssl shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 114
diff changeset
72 return ret;
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
73 }
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
74
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
75 int connection_ssl_write(Connection *conn, const void *buf, int len) {
128
288fd9b9a739 fixes ssl shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 114
diff changeset
76 int ret = SSL_write(conn->ssl, buf, len);
288fd9b9a739 fixes ssl shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 114
diff changeset
77 if(ret <= 0) {
133
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
78 conn->ssl_error = SSL_get_error(conn->ssl, ret);
128
288fd9b9a739 fixes ssl shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 114
diff changeset
79 }
288fd9b9a739 fixes ssl shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 114
diff changeset
80 return ret;
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
81 }
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
82
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
83 void connection_ssl_close(Connection *conn) {
142
55298bc9ed28 adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 141
diff changeset
84 if(!conn->ssl_error) {
55298bc9ed28 adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 141
diff changeset
85 int ret = SSL_shutdown(conn->ssl);
55298bc9ed28 adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 141
diff changeset
86 if(ret != 1) {
55298bc9ed28 adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 141
diff changeset
87 conn->ssl_error = SSL_get_error(conn->ssl, ret);
55298bc9ed28 adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 141
diff changeset
88 log_ereport(LOG_VERBOSE, "SSL_shutdown failed: %d", conn->ssl_error);
55298bc9ed28 adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 141
diff changeset
89 }
133
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
90 }
169
76c96ee18221 check close return value
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 162
diff changeset
91 while(close(conn->fd)) {
76c96ee18221 check close return value
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 162
diff changeset
92 if(errno != EINTR) {
76c96ee18221 check close return value
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 162
diff changeset
93 log_ereport(LOG_VERBOSE, "connection close failed: %s", strerror(errno));
76c96ee18221 check close return value
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 162
diff changeset
94 break;
76c96ee18221 check close return value
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 162
diff changeset
95 }
171
af7e2d80dee6 adds wrapper for close syscall with error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 169
diff changeset
96 log_ereport(LOG_VERBOSE, "connection close: EINTR");
169
76c96ee18221 check close return value
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 162
diff changeset
97 }
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
98 }
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
99
114
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
100 void connection_destroy(Connection *conn) {
411
bbd82eee568e improve sessionhandler error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
101 cfg_unref(conn->listener->cfg);
128
288fd9b9a739 fixes ssl shutdown
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 114
diff changeset
102 conn->close(conn);
114
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
103 if(conn->ssl) {
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
104 SSL_free(conn->ssl);
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
105 }
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
106 free(conn);
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
107 }
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
108
192
6a145e13d933 replaces eventfd with pipe and closes aio branch
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
109 IOStream* create_connection_iostream(
6a145e13d933 replaces eventfd with pipe and closes aio branch
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
110 SessionHandler *sh,
6a145e13d933 replaces eventfd with pipe and closes aio branch
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
111 Connection *conn,
6a145e13d933 replaces eventfd with pipe and closes aio branch
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
112 pool_handle_t *pool,
6a145e13d933 replaces eventfd with pipe and closes aio branch
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
113 WSBool *ssl)
6a145e13d933 replaces eventfd with pipe and closes aio branch
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 191
diff changeset
114 {
191
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
115 IOStream *io = NULL;
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
116 if(conn->ssl) {
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
117 io = sslstream_new(pool, conn->ssl);
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
118 *ssl = 1;
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
119 } else {
430
83560f32e7d5 refactor send_cgi into non-blocking SAF (wip)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 415
diff changeset
120 io = Sysstream_new(pool, conn->fd);
191
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
121 *ssl = 0;
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
122 }
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
123 return io;
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
124 }
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
125
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
126
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 430
diff changeset
127 SessionHandler* create_basic_session_handler(pool_handle_t *pool) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 430
diff changeset
128 BasicSessionHandler *handler = pool_malloc(pool, sizeof(BasicSessionHandler));
67
50505dc3f8a6 dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 60
diff changeset
129 handler->threadpool = threadpool_new(4, 8);
357
f45e962edf45 add separate threadpool_start function for creating initial threadpool threads
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 354
diff changeset
130 threadpool_start(handler->threadpool); // TODO: handle error
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
131 handler->sh.enqueue_connection = basic_enq_conn;
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
132 handler->sh.keep_alive = basic_keep_alive;
191
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
133 handler->sh.create_iostream = create_connection_iostream;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
134
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
135 return (SessionHandler*)handler;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
136 }
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
137
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
138 void basic_enq_conn(SessionHandler *handler, Connection *conn) {
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
139 BasicSessionHandler *sh = (BasicSessionHandler*)handler;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
140 conn->session_handler = handler;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
141 threadpool_run(sh->threadpool, basic_run_session, conn);
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
142 }
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
143
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
144 void* basic_run_session(void *data) {
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
145 Connection *conn = (Connection*)data;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
146
410
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
147 HTTPRequest *request = malloc(sizeof(HTTPRequest));
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
148 http_request_init(request);
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
149 request->connection = conn;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
150
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
151 // read request
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
152 netbuf *buf = malloc(sizeof(netbuf));
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
153 buf->rdtimeout = 120;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
154 buf->pos = 0;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
155 buf->cursize = 0;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
156 buf->maxsize = 2048;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
157 buf->sd = &conn->fd;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
158 buf->inbuf = malloc(2048);
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
159 buf->errmsg = NULL;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
160
410
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
161 request->netbuf = buf;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
162
410
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
163 HttpParser *parser = http_parser_new(request);
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
164 int state;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
165 int r;
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
166 r = conn->read(conn, buf->inbuf + buf->pos, buf->maxsize - buf->pos);
410
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
167
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
168 if(r > 0) {
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
169 int err = 0;
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
170 buf->cursize += r;
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
171 while((state = http_parser_process(parser)) != 0) {
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
172 if(state == 2) {
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
173 log_ereport(LOG_FAILURE, "basic_run_session: invalid http request");
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
174 err = 1;
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
175 break;
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
176 }
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
177 r = conn->read(conn, buf->inbuf + buf->pos, buf->maxsize - buf->pos);
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
178 if(r == -1) {
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
179 log_ereport(LOG_FAILURE, "basic_run_session: IO error: %s", strerror(errno));
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
180 err = 1;
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
181 break;
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
182 }
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
183 buf->cursize += r;
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
184 }
410
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
185
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
186 if(!err) {
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
187 if(http_parser_validate(parser)) {
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
188 // process request
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
189 r = handle_request(request, NULL, NULL); // TODO: use correct thread pool
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
190 } else {
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
191 log_ereport(LOG_FAILURE, "basic_run_session: http parser validation failed");
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
192 fatal_error(request, 400);
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
193 }
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
194 }
410
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
195 } else {
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
196 log_ereport(LOG_FAILURE, "basic_run_session: IO error: %s", strerror(errno));
180
98462e878ca7 fixes crash with broken http requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 171
diff changeset
197 }
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
198
410
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
199 free(buf->inbuf);
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
200 free(buf);
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
201 connection_destroy(conn);
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
202 http_parser_free(parser);
8f4d28ac6ae2 improve error handling in basic_run_session
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 357
diff changeset
203 http_request_cleanup(request);
46
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
204
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
205 return NULL;
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
206 }
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
207
78
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
208 void basic_keep_alive(SessionHandler *handler, Connection *conn) {
135
471e28cca288 ucx update
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 133
diff changeset
209 connection_destroy(conn);
78
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
210 }
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
211
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
212
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
213 /* ----- event session handler ----- */
1
3c066d52342d added source
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff changeset
214
438
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 430
diff changeset
215 SessionHandler* create_event_session_handler(pool_handle_t *pool) {
22eca559aded refactore http listener creation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 430
diff changeset
216 EventSessionHandler *handler = pool_malloc(pool, sizeof(EventSessionHandler));
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
217 handler->eventhandler = get_default_event_handler();
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
218 handler->sh.enqueue_connection = evt_enq_conn;
78
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
219 handler->sh.keep_alive = evt_keep_alive;
191
391ccd490d97 moves IOStream creation to the sessionhandler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 188
diff changeset
220 handler->sh.create_iostream = create_connection_iostream;
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
221 return (SessionHandler*)handler;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
222 }
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
223
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
224 void evt_enq_conn(SessionHandler *handler, Connection *conn) {
542
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
225 Event *event = malloc(sizeof(Event));
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
226 if(!event) {
411
bbd82eee568e improve sessionhandler error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
227 connection_destroy(conn);
bbd82eee568e improve sessionhandler error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
228 return;
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
229 }
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
230
542
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
231 EventHttpIO *io = evt_req_init(handler, conn);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
232 if(!io) {
411
bbd82eee568e improve sessionhandler error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
233 connection_destroy(conn);
542
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
234 free(event);
411
bbd82eee568e improve sessionhandler error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
235 return;
bbd82eee568e improve sessionhandler error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
236 }
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
237
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
238 /*
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
239 * to start the request handling, we begin with a poll on the socket,
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
240 *
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
241 * evt_enq_conn() --> event handler --> handle_request()
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
242 */
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
243
159
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
244 ZERO(event, sizeof(Event));
194
6345f50208d5 fixes keep-alive with ssl
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 193
diff changeset
245 event->fn = conn->ssl && !conn->ssl_accepted ? evt_request_ssl_accept : evt_request_input;
46
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
246 event->finish = evt_request_finish;
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
247 event->cookie = io;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
248
159
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
249 EventHandler *ev = ev_instance(((EventSessionHandler*)handler)->eventhandler);
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
250
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
251 if(ev_pollin(ev, conn->fd, event) != 0) {
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
252 // TODO: ev_pollin should log, intercept some errors here
133
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
253 log_ereport(LOG_FAILURE, "Cannot enqueue connection");
411
bbd82eee568e improve sessionhandler error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
254 evt_request_error(ev, event);
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
255 }
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
256 }
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
257
542
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
258 EventHttpIO* evt_req_init(SessionHandler *handler, Connection *conn) {
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
259 // set socket non blocking
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
260 int flags;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
261 if ((flags = fcntl(conn->fd, F_GETFL, 0)) == -1) {
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
262 flags = 0;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
263 }
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
264 if (fcntl(conn->fd, F_SETFL, flags | O_NONBLOCK) != 0) {
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
265 log_ereport(LOG_FAILURE, "sessionhandler: fcntl failed: %s", strerror(errno));
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
266 return NULL;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
267 }
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
268
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
269 HTTPRequest *request = malloc(sizeof(HTTPRequest));
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
270 if(!request) {
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
271 return NULL;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
272 }
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
273 http_request_init(request);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
274 request->connection = conn;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
275 conn->session_handler = handler;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
276
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
277 // TODO: remove code redundancy (basic_run_session)
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
278
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
279 // read request
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
280 netbuf *buf = malloc(sizeof(netbuf));
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
281 if(!buf) {
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
282 http_request_cleanup(request);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
283 return NULL;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
284 }
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
285 buf->rdtimeout = 120;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
286 buf->pos = 0;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
287 buf->cursize = 0;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
288 buf->maxsize = 2048;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
289 buf->sd = &conn->fd;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
290 buf->errmsg = NULL;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
291 buf->inbuf = malloc(2048);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
292 if(!buf->inbuf) {
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
293 http_request_cleanup(request);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
294 free(buf);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
295 return NULL;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
296 }
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
297
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
298 request->netbuf = buf;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
299
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
300 HttpParser *parser = http_parser_new(request);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
301 if(!parser) {
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
302 http_request_cleanup(request);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
303 free(buf->inbuf);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
304 free(buf);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
305 return NULL;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
306 }
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
307
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
308 EventHttpIO *io = malloc(sizeof(EventHttpIO));
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
309 if(io == NULL) {
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
310 http_request_cleanup(request);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
311 free(buf->inbuf);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
312 free(buf);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
313 http_parser_free(parser);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
314 return NULL;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
315 }
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
316 io->request = request;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
317 io->parser = parser;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
318 io->error = 0;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
319
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
320 return io;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
321 }
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
322
188
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
323 int evt_request_ssl_accept(EventHandler *handler, Event *event) {
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
324 EventHttpIO *io = event->cookie;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
325 Connection *conn = io->request->connection;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
326
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
327 int ret = SSL_accept(conn->ssl);
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
328 if(ret <= 0) {
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
329 int error = SSL_get_error(conn->ssl, ret);
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
330 char *errstr;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
331 switch(error) {
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
332 default: errstr = "unknown"; break;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
333 case SSL_ERROR_WANT_READ: {
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
334 event->events = EVENT_POLLIN;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
335 return 1;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
336 }
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
337 case SSL_ERROR_WANT_WRITE: {
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
338 event->events = EVENT_POLLOUT;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
339 return 1;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
340 }
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
341 case SSL_ERROR_ZERO_RETURN: errstr = "SSL_ERROR_ZERO_RETURN"; break;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
342 case SSL_ERROR_WANT_CONNECT: errstr = "SSL_ERROR_WANT_CONNECT"; break;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
343 case SSL_ERROR_WANT_ACCEPT: errstr = "SSL_ERROR_WANT_ACCEPT"; break;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
344 case SSL_ERROR_WANT_X509_LOOKUP: errstr = "SSL_ERROR_WANT_X509_LOOKUP"; break;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
345 case SSL_ERROR_SYSCALL: errstr = "SSL_ERROR_SYSCALL"; break;
197
23fa058ae54b fixes ssl accept error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 195
diff changeset
346 case SSL_ERROR_SSL: errstr = "SSL_ERROR_SSL"; break;
188
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
347 }
197
23fa058ae54b fixes ssl accept error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 195
diff changeset
348 log_ereport(LOG_VERBOSE, "SSL accept error[%d]: %s", error, errstr);
23fa058ae54b fixes ssl accept error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 195
diff changeset
349 event->finish = evt_request_error;
23fa058ae54b fixes ssl accept error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 195
diff changeset
350 io->error = 1;
23fa058ae54b fixes ssl accept error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 195
diff changeset
351 return 0;
188
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
352 }
194
6345f50208d5 fixes keep-alive with ssl
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 193
diff changeset
353 conn->ssl_accepted = WS_TRUE;
188
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
354
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
355 // SSL_accept successful, start request input now
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
356 event->fn = evt_request_input;
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
357 return evt_request_input(handler, event);
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
358 }
0e6a05c779e0 using non-blocking IO for SSL_accept
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 159
diff changeset
359
159
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
360 int evt_request_input(EventHandler *handler, Event *event) {
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
361 EventHttpIO *io = event->cookie;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
362 HttpParser *parser = io->parser;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
363 HTTPRequest *request = io->request;
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
364 Connection *conn = io->request->connection;
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
365 netbuf *buf = request->netbuf;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
366
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
367 int state;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
368 int r;
106
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
369 r = conn->read(
b122f34ddc80 added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 79
diff changeset
370 conn,
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
371 buf->inbuf + buf->pos,
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
372 buf->maxsize - buf->pos);
114
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
373 if(r <= 0) {
133
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
374 if(conn->ssl) {
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
375 // SSL specific error handling
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
376 switch(conn->ssl_error) {
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
377 case SSL_ERROR_WANT_READ: {
159
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
378 event->events = EVENT_POLLIN;
133
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
379 return 1;
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
380 }
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
381 case SSL_ERROR_WANT_WRITE: {
159
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
382 event->events = EVENT_POLLOUT;
133
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
383 return 1;
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
384 }
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
385 }
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
386 }
87b405d61f64 improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 129
diff changeset
387
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
388 event->finish = evt_request_error;
152
8b85c5face66 improves sessionhandler logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 142
diff changeset
389 io->error = 1;
41
bb7a1f5a8b48 added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 37
diff changeset
390 return 0;
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
391 }
48
37a512d7b8f6 fixed some memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 47
diff changeset
392 //fwrite(buf->inbuf + buf->pos, 1, r, stdout);
37a512d7b8f6 fixed some memory leaks
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 47
diff changeset
393 //printf("\n");
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
394
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
395 buf->cursize += r;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
396 state = http_parser_process(parser);
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
397 if(state == 2) {
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
398 // parse error
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
399 fatal_error(request, 400);
354
017eda1be105 add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 197
diff changeset
400 log_ereport(LOG_VERBOSE, "http parser: bad request");
017eda1be105 add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 197
diff changeset
401 //printf("\n\n%.*s\n\n", parser->request->netbuf->cursize, parser->request->netbuf->inbuf);
017eda1be105 add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 197
diff changeset
402 //fflush(stdout);
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
403 event->finish = evt_request_error;
152
8b85c5face66 improves sessionhandler logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 142
diff changeset
404 io->error = 2;
41
bb7a1f5a8b48 added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 37
diff changeset
405 return 0;
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
406 } else if(state == 1) {
41
bb7a1f5a8b48 added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 37
diff changeset
407 /*
bb7a1f5a8b48 added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 37
diff changeset
408 * we need more data -> return 1 to tell the event handler to
bb7a1f5a8b48 added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 37
diff changeset
409 * continue polling
bb7a1f5a8b48 added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 37
diff changeset
410 */
159
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
411 event->events = EVENT_POLLIN;
41
bb7a1f5a8b48 added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 37
diff changeset
412 return 1;
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
413 }
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
414
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
415 // we are done with reading
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
416
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
417 // set socket blocking
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
418 int flags;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
419 if (-1 == (flags = fcntl(request->connection->fd, F_GETFL, 0))) {
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
420 flags = 0;
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
421 }
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
422 if (fcntl(request->connection->fd, F_SETFL, flags & ~O_NONBLOCK) != 0) {
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
423 // just close the connection if fcntl fails
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
424 event->finish = evt_request_error;
152
8b85c5face66 improves sessionhandler logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 142
diff changeset
425 io->error = 3;
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
426 return 0;
180
98462e878ca7 fixes crash with broken http requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 171
diff changeset
427 }
98462e878ca7 fixes crash with broken http requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 171
diff changeset
428
98462e878ca7 fixes crash with broken http requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 171
diff changeset
429 if(!http_parser_validate(parser)) {
98462e878ca7 fixes crash with broken http requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 171
diff changeset
430 log_ereport(LOG_FAILURE, "http_parser_validate failed");
411
bbd82eee568e improve sessionhandler error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 410
diff changeset
431 fatal_error(request, 400);
181
12828065f120 abort on http_parser_validate error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
432 event->finish = evt_request_error;
12828065f120 abort on http_parser_validate error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 180
diff changeset
433 return 0;
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
434 }
180
98462e878ca7 fixes crash with broken http requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 171
diff changeset
435
46
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
436 /*
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
437 * process request
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
438 *
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
439 * We return 0 to finish request input. The event handler than stops
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
440 * polling and executes event->finish (evt_request_input_finish)
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
441 */
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
442 return 0;
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
443 }
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
444
159
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
445 int evt_request_finish(EventHandler *h, Event *event) {
46
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
446 EventHttpIO *io = event->cookie;
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
447 HttpParser *parser = io->parser;
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
448 HTTPRequest *request = io->request;
67
50505dc3f8a6 dynamic thread pool
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 60
diff changeset
449
159
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
450 int r = handle_request(request, NULL, h);
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
451 if(r != 0) {
169
76c96ee18221 check close return value
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 162
diff changeset
452 connection_destroy(request->connection);
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
453 }
41
bb7a1f5a8b48 added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 37
diff changeset
454
46
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
455 /*
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
456 * handle_request can return before the request is finished, but it copies
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
457 * all important data. We can free request, parser and event
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
458 *
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
459 * don't free request->netbuf and request->connection
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
460 */
114
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
461 http_request_cleanup(request);
46
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
462 http_parser_free(parser);
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
463
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
464 free(io);
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
465 free(event);
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
466
636e05eb48f6 cleaning up resources after requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 44
diff changeset
467 return 0;
35
4417619a9bbd using non blocking IO for request input
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 14
diff changeset
468 }
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
469
159
9ba9f8befa80 makes EventHandler public
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 152
diff changeset
470 int evt_request_error(EventHandler *h, Event *event) {
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
471 EventHttpIO *io = event->cookie;
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
472 HttpParser *parser = io->parser;
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
473 HTTPRequest *request = io->request;
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
474
152
8b85c5face66 improves sessionhandler logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 142
diff changeset
475 if(event->error) {
195
d367b687bc74 fixes double close
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 194
diff changeset
476 log_ereport(LOG_VERBOSE, "sessionhandler http io error: %d fd: %d", io->error, request->connection->fd);
152
8b85c5face66 improves sessionhandler logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 142
diff changeset
477 }
8b85c5face66 improves sessionhandler logging
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 142
diff changeset
478
114
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
479 free(request->netbuf->inbuf);
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
480 free(request->netbuf);
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
481
114
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
482 connection_destroy(request->connection);
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
483
114
c3a0f1275d71 fixed keep alive bug
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 106
diff changeset
484 http_request_cleanup(request);
47
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
485 http_parser_free(parser);
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
486
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
487 free(io);
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
488 free(event);
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
489
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
490 return 0;
ce9790523346 server can change uid
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 46
diff changeset
491 }
78
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
492
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
493 void evt_keep_alive(SessionHandler *handler, Connection *conn) {
542
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
494 Event *event = malloc(sizeof(Event));
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
495 if(!event) {
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
496 connection_destroy(conn);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
497 return;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
498 }
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
499
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
500 ZERO(event, sizeof(Event));
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
501 event->fn = evt_keep_alive_enqueue;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
502 event->finish = ev_free_event; // this will free the event obj at the end
543
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
503 event->cookie = conn;
542
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
504
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
505 EventHandler *ev = ev_instance(((EventSessionHandler*)handler)->eventhandler);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
506 if(event_send(ev, event)) {
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
507 log_ereport(LOG_FAILURE, "Keep-Alive: ev_send failed");
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
508 connection_destroy(conn);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
509 free(event);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
510 }
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
511 }
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
512
543
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
513 int evt_keep_alive_enqueue(EventHandler *h, Event *event) {
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
514 Connection *conn = event->cookie;
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
515
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
516 EVWatchList *keepalive = malloc(sizeof(EVWatchList));
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
517 if(!keepalive) {
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
518 connection_destroy(conn);
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
519 return 0;
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
520 }
542
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
521
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
522 Event *ioevent = malloc(sizeof(Event));
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
523 if(!ioevent) {
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
524 connection_destroy(conn);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
525 free(keepalive);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
526 return 0;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
527 }
78
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
528
542
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
529 // add keepalive object to the eventhandler watchlist
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
530 // the watchlist will check the timeout
543
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
531 ZERO(keepalive, sizeof(EVWatchList));
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
532 keepalive->data1 = conn;
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
533 keepalive->data2 = ioevent;
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
534 keepalive->destroy = evt_keep_alive_destroy;
542
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
535 keepalive->created = time(NULL);
543
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
536 keepalive->expire = keepalive->created + 10; // TODO: config
542
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
537 ev_watchlist_add(h, keepalive);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
538
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
539 // wait for input
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
540 ZERO(ioevent, sizeof(Event));
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
541 ioevent->fn = evt_keep_alive_input_event;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
542 ioevent->finish = ev_free_event;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
543 ioevent->cookie = keepalive;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
544 if(ev_pollin(h, conn->fd, ioevent) != 0) {
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
545 log_ereport(LOG_FAILURE, "Cannot enqueue connection");
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
546 ev_watchlist_remove(h, keepalive);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
547 connection_destroy(conn);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
548 free(keepalive);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
549 free(ioevent);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
550 }
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
551
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
552 return 0;
78
3578977d29a3 added keep-alive support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 67
diff changeset
553 }
542
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
554
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
555 int evt_keep_alive_input_event(EventHandler *h, Event *event) {
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
556 EVWatchList *keepalive = event->cookie;
543
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
557 Connection *conn = keepalive->data1;
542
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
558
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
559 // remove connection from the keep-alive list
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
560 ev_watchlist_remove(h, keepalive);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
561 free(keepalive);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
562
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
563 // prepare http io
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
564 EventHttpIO *io = evt_req_init(conn->session_handler, conn);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
565 if(!io) {
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
566 connection_destroy(conn);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
567 return 0;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
568 }
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
569
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
570 // pass this event to the request input function
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
571 // the event object needs some adjustments for this (see evt_enq_conn)
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
572 event->cookie = io;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
573 event->fn = conn->ssl && !conn->ssl_accepted ? evt_request_ssl_accept : evt_request_input;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
574 event->finish = evt_request_finish;
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
575 return event->fn(h, event);
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
576 }
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
577
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
578 void evt_keep_alive_destroy(EventHandler *h, EVWatchList *item) {
543
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
579 Connection *conn = item->data1;
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
580 Event *ioevent = item->data2;
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
581 log_ereport(LOG_DEBUG, "sessionhandler: keep-alive timeout: close connection");
542
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
582
543
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
583 if(ev_remove_poll(h, conn->fd)) {
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
584 log_ereport(LOG_FAILURE, "sessionhandler: keep-alive timeout: cannot remove poll");
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
585 }
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
586
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
587 connection_destroy(conn);
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
588 free(ioevent);
3335f431a91b implement keep-alive timeout
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 542
diff changeset
589 free(item);
542
1327febf99c4 refactore keep alive handler
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 438
diff changeset
590 }

mercurial