Sat, 18 Jul 2026 20:50:04 +0200
fix missing error propagation in net_http_write when using chunked transfer encoding
| 1 | 1 | /* |
| 2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. | |
| 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 | 5 | * |
| 6 | * Redistribution and use in source and binary forms, with or without | |
| 7 | * modification, are permitted provided that the following conditions are met: | |
| 8 | * | |
| 9 | * 1. Redistributions of source code must retain the above copyright | |
| 10 | * notice, this list of conditions and the following disclaimer. | |
| 11 | * | |
| 12 | * 2. Redistributions in binary form must reproduce the above copyright | |
| 13 | * notice, this list of conditions and the following disclaimer in the | |
| 14 | * documentation and/or other materials provided with the distribution. | |
| 15 | * | |
| 16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | |
| 17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | |
| 18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |
| 19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | |
| 20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | |
| 21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | |
| 22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | |
| 23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | |
| 24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |
| 25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |
| 26 | * POSSIBILITY OF SUCH DAMAGE. | |
| 27 | */ | |
| 28 | ||
|
41
bb7a1f5a8b48
added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
29 | #ifdef __gnu_linux__ |
|
bb7a1f5a8b48
added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
30 | #define _GNU_SOURCE |
|
bb7a1f5a8b48
added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
31 | #endif |
|
bb7a1f5a8b48
added Linux support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
32
diff
changeset
|
32 | |
| 1 | 33 | #include <unistd.h> |
| 34 | #include <stdlib.h> | |
|
147
d050449c3b9e
ported io.c and some headers to windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
35 | |
|
d050449c3b9e
ported io.c and some headers to windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
36 | #ifdef XP_UNIX |
|
4
998844b5ed25
Added some protocol functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
37 | #include <sys/uio.h> |
|
69
4a10bc0ee80d
compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
38 | #include <sys/uio.h> |
|
147
d050449c3b9e
ported io.c and some headers to windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
39 | #endif |
|
d050449c3b9e
ported io.c and some headers to windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
40 | |
|
d050449c3b9e
ported io.c and some headers to windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
41 | #ifdef XP_WIN32 |
|
d050449c3b9e
ported io.c and some headers to windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
42 | |
|
d050449c3b9e
ported io.c and some headers to windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
43 | #endif |
|
111
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
44 | |
|
126
631aaa01b2b5
fixes chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
45 | #if defined(LINUX) || defined(SOLARIS) |
| 54 | 46 | #include <sys/sendfile.h> |
|
126
631aaa01b2b5
fixes chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
47 | #define WS_SENDFILE |
|
631aaa01b2b5
fixes chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
48 | #elif defined(BSD) |
|
111
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
49 | #if defined(__NetBSD__) || defined(__OpenBSD__) |
| 112 | 50 | #define net_sys_sendfile net_fallback_sendfile |
|
126
631aaa01b2b5
fixes chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
51 | #else |
|
631aaa01b2b5
fixes chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
52 | #define WS_SENDFILE |
|
69
4a10bc0ee80d
compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
53 | #endif |
|
147
d050449c3b9e
ported io.c and some headers to windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
54 | #endif |
|
d050449c3b9e
ported io.c and some headers to windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
55 | |
|
d050449c3b9e
ported io.c and some headers to windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
56 | #ifdef WS_SENDFILE |
|
d050449c3b9e
ported io.c and some headers to windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
57 | #define NET_SYS_SENDFILE net_sys_sendfile |
|
126
631aaa01b2b5
fixes chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
58 | #else |
|
147
d050449c3b9e
ported io.c and some headers to windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
59 | #define NET_SYS_SENDFILE net_fallback_sendfile |
|
111
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
60 | #endif |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
61 | |
|
147
d050449c3b9e
ported io.c and some headers to windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
62 | |
|
d050449c3b9e
ported io.c and some headers to windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
63 | |
| 54 | 64 | #include "../daemon/vfs.h" |
| 1 | 65 | #include "io.h" |
|
4
998844b5ed25
Added some protocol functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
66 | #include "pool.h" |
|
171
af7e2d80dee6
adds wrapper for close syscall with error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
67 | #include "../daemon/netsite.h" |
|
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
68 | #include "../daemon/event.h" |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
407
diff
changeset
|
69 | #include <cx/printf.h> |
| 1 | 70 | |
|
734
a5f3e1e5e744
add test_io_httpstream_chunked_write_partial_writev
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
719
diff
changeset
|
71 | #include <openssl/err.h> |
|
a5f3e1e5e744
add test_io_httpstream_chunked_write_partial_writev
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
719
diff
changeset
|
72 | |
| 1 | 73 | IOStream native_io_funcs = { |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
74 | (io_write_f)net_sys_write, |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
75 | (io_writev_f)net_sys_writev, |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
76 | (io_read_f)net_sys_read, |
|
147
d050449c3b9e
ported io.c and some headers to windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
77 | (io_sendfile_f)NET_SYS_SENDFILE, |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
78 | (io_close_f)net_sys_close, |
|
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
79 | NULL, |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
80 | (io_setmode_f)net_sys_setmode, |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
81 | (io_poll_f)net_sys_poll, |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
82 | (io_free_f)sysstream_free, |
|
513
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
83 | 0, |
|
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
84 | 0 |
| 1 | 85 | }; |
| 86 | ||
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
87 | IOStream http_io_funcs = { |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
88 | (io_write_f)net_http_write, |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
89 | (io_writev_f)net_http_writev, |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
90 | (io_read_f)net_http_read, |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
91 | (io_sendfile_f)net_http_sendfile, |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
92 | (io_close_f)net_http_close, |
|
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
93 | (io_finish_f)net_http_finish, |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
94 | (io_setmode_f)net_http_setmode, |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
95 | (io_poll_f)net_http_poll, |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
96 | (io_free_f)httpstream_free, |
|
513
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
97 | 0, |
|
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
98 | IO_STREAM_TYPE_HTTP |
|
8
f4d56bf9de40
Added request body reader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
99 | }; |
|
f4d56bf9de40
Added request body reader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
100 | |
|
106
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
101 | IOStream ssl_io_funcs = { |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
102 | (io_write_f)net_ssl_write, |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
103 | (io_writev_f)net_ssl_writev, |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
104 | (io_read_f)net_ssl_read, |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
105 | NULL, |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
106 | (io_close_f)net_ssl_close, |
|
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
107 | (io_finish_f)net_ssl_finish, |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
108 | (io_setmode_f)net_ssl_setmode, |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
109 | (io_poll_f)net_ssl_poll, |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
110 | (io_free_f)sslstream_free, |
|
513
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
111 | 0, |
|
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
112 | IO_STREAM_TYPE_SSL |
|
106
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
113 | }; |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
114 | |
|
513
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
115 | static int net_write_max_attempts = 16384; |
|
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
116 | |
|
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
117 | void io_set_max_writes(int n) { |
|
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
118 | net_write_max_attempts = 1; |
|
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
119 | } |
| 1 | 120 | |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
121 | /* |
|
430
83560f32e7d5
refactor send_cgi into non-blocking SAF (wip)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
122 | * Sysstream implementation |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
123 | */ |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
124 | |
|
430
83560f32e7d5
refactor send_cgi into non-blocking SAF (wip)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
125 | IOStream* Sysstream_new(pool_handle_t *pool, SYS_SOCKET fd) { |
|
83560f32e7d5
refactor send_cgi into non-blocking SAF (wip)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
126 | Sysstream *st = pool_malloc(pool, sizeof(Sysstream)); |
| 1 | 127 | st->st = native_io_funcs; |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
128 | st->pool = pool; |
| 1 | 129 | st->fd = fd; |
| 130 | return (IOStream*)st; | |
| 131 | } | |
| 132 | ||
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
133 | void sysstream_free(IOStream *st) { |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
134 | Sysstream *sys = (Sysstream*)st; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
135 | pool_free(sys->pool, st); |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
136 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
137 | |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
138 | #ifdef XP_UNIX |
|
498
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
139 | ssize_t net_sys_write(Sysstream *st, const void *buf, size_t nbytes) { |
|
739
f5ccacc7bab8
fix missing error propagation in net_http_write when using chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
140 | st->st.io_errno = 0; |
|
502
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
141 | ssize_t r = write(st->fd, buf, nbytes); |
|
739
f5ccacc7bab8
fix missing error propagation in net_http_write when using chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
142 | if(r <= 0) { |
|
f5ccacc7bab8
fix missing error propagation in net_http_write when using chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
143 | st->st.io_errno = errno; |
|
f5ccacc7bab8
fix missing error propagation in net_http_write when using chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
144 | } |
|
502
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
145 | return r; |
|
8
f4d56bf9de40
Added request body reader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
146 | } |
|
f4d56bf9de40
Added request body reader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
147 | |
|
430
83560f32e7d5
refactor send_cgi into non-blocking SAF (wip)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
148 | ssize_t net_sys_writev(Sysstream *st, struct iovec *iovec, int iovcnt) { |
|
502
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
149 | ssize_t r = writev(st->fd, iovec, iovcnt); |
|
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
150 | st->st.io_errno = errno; |
|
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
151 | return r; |
|
64
c7f5b062e622
added net_writev
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
152 | } |
|
c7f5b062e622
added net_writev
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
153 | |
|
430
83560f32e7d5
refactor send_cgi into non-blocking SAF (wip)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
154 | ssize_t net_sys_read(Sysstream *st, void *buf, size_t nbytes) { |
|
502
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
155 | ssize_t r = read(st->fd, buf, nbytes); |
|
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
156 | st->st.io_errno = errno; |
|
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
157 | return r; |
|
8
f4d56bf9de40
Added request body reader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
158 | } |
|
f4d56bf9de40
Added request body reader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
159 | |
|
126
631aaa01b2b5
fixes chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
160 | #ifdef WS_SENDFILE |
|
430
83560f32e7d5
refactor send_cgi into non-blocking SAF (wip)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
161 | ssize_t net_sys_sendfile(Sysstream *st, sendfiledata *sfd) { |
| 54 | 162 | ssize_t ret = 0; |
| 163 | off_t fileoffset = sfd->offset; | |
| 164 | if(sfd->fd->fd != -1) { | |
| 71 | 165 | #ifdef BSD |
|
69
4a10bc0ee80d
compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
166 | struct iovec hdvec; |
|
4a10bc0ee80d
compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
167 | hdvec.iov_base = (void*)sfd->header; |
|
4a10bc0ee80d
compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
168 | hdvec.iov_len = sfd->hlen; |
|
4a10bc0ee80d
compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
169 | struct iovec trvec; |
|
4a10bc0ee80d
compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
170 | trvec.iov_base = (void*)sfd->trailer; |
|
4a10bc0ee80d
compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
171 | trvec.iov_len = sfd->tlen; |
|
4a10bc0ee80d
compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
172 | struct sf_hdtr hdtr; |
|
4a10bc0ee80d
compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
173 | hdtr.headers = &hdvec; |
|
493
56cf890dd9ed
fix net_sendfile not counting number of written bytes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
430
diff
changeset
|
174 | hdtr.hdr_cnt = sfd->hlen > 0 ? 1 : 0; |
|
69
4a10bc0ee80d
compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
175 | hdtr.trailers = &trvec; |
|
493
56cf890dd9ed
fix net_sendfile not counting number of written bytes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
430
diff
changeset
|
176 | hdtr.trl_cnt = sfd->tlen > 0 ? 1 : 0; |
|
69
4a10bc0ee80d
compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
177 | |
|
70
4e6e812c1d97
fixed some warnings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
69
diff
changeset
|
178 | off_t len = sfd->len; |
| 71 | 179 | #ifdef OSX |
| 180 | ret = sendfile(sfd->fd->fd, st->fd, fileoffset, &len, &hdtr, 0); | |
| 181 | #else // BSD | |
| 182 | ret = sendfile( | |
| 183 | sfd->fd->fd, | |
| 184 | st->fd, | |
| 185 | fileoffset, | |
| 186 | sfd->len, | |
| 187 | &hdtr, | |
| 188 | NULL, | |
| 189 | 0); | |
| 190 | #endif | |
|
493
56cf890dd9ed
fix net_sendfile not counting number of written bytes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
430
diff
changeset
|
191 | if(ret == 0) { |
|
56cf890dd9ed
fix net_sendfile not counting number of written bytes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
430
diff
changeset
|
192 | ret = sfd->hlen + sfd->tlen + sfd->len; |
|
56cf890dd9ed
fix net_sendfile not counting number of written bytes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
430
diff
changeset
|
193 | } |
|
56cf890dd9ed
fix net_sendfile not counting number of written bytes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
430
diff
changeset
|
194 | |
| 71 | 195 | #else // Solaris/Linux |
|
104
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
82
diff
changeset
|
196 | if(sfd->header) { |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
82
diff
changeset
|
197 | ret += write(st->fd, sfd->header, sfd->hlen); |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
82
diff
changeset
|
198 | } |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
82
diff
changeset
|
199 | ret += sendfile(st->fd, sfd->fd->fd, &fileoffset, sfd->len); |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
82
diff
changeset
|
200 | if(sfd->trailer) { |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
82
diff
changeset
|
201 | ret += write(st->fd, sfd->trailer, sfd->tlen); |
|
a8acbb12f27c
implemented range requests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
82
diff
changeset
|
202 | } |
|
69
4a10bc0ee80d
compiles on os x
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
66
diff
changeset
|
203 | #endif |
| 54 | 204 | } else { |
|
126
631aaa01b2b5
fixes chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
112
diff
changeset
|
205 | return net_fallback_sendfile((IOStream*)st, sfd); |
| 54 | 206 | } |
|
502
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
207 | st->st.io_errno = errno; |
| 54 | 208 | return ret; |
| 209 | } | |
|
111
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
210 | #endif |
| 54 | 211 | |
|
430
83560f32e7d5
refactor send_cgi into non-blocking SAF (wip)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
212 | void net_sys_close(Sysstream *st) { |
|
171
af7e2d80dee6
adds wrapper for close syscall with error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
213 | system_close(st->fd); |
|
80
0de4a90979e1
fixed chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
214 | } |
|
0de4a90979e1
fixed chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
215 | |
|
430
83560f32e7d5
refactor send_cgi into non-blocking SAF (wip)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
216 | void net_sys_setmode(Sysstream *st, int mode) { |
|
697
3ddfd45d4e47
add raw mode for http streams
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
217 | if(mode > IO_MODE_NONBLOCKING) { |
|
3ddfd45d4e47
add raw mode for http streams
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
218 | return; |
|
3ddfd45d4e47
add raw mode for http streams
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
219 | } |
|
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
220 | int flags; |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
221 | if (-1 == (flags = fcntl(st->fd, F_GETFL, 0))) { |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
222 | flags = 0; |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
223 | } |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
224 | if(mode == IO_MODE_BLOCKING) { |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
225 | if (fcntl(st->fd, F_SETFL, flags & ~O_NONBLOCK) != 0) { |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
226 | perror("fcntl"); |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
227 | // TODO: error |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
228 | } |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
229 | } else if(mode == IO_MODE_NONBLOCKING) { |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
230 | if (fcntl(st->fd, F_SETFL, flags | O_NONBLOCK) != 0) { |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
231 | perror("fcntl"); |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
232 | // TODO: error |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
233 | } |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
234 | } |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
235 | } |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
236 | |
|
430
83560f32e7d5
refactor send_cgi into non-blocking SAF (wip)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
237 | int net_sys_poll(Sysstream *st, EventHandler *ev, int events, Event *cb) { |
|
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
238 | switch(events) { |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
239 | default: return -1; |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
240 | case IO_POLL_NONE: return ev_remove_poll(ev, st->fd); |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
241 | case IO_POLL_IN: return ev_pollin(ev, st->fd, cb); |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
242 | case IO_POLL_OUT: return ev_pollout(ev, st->fd, cb); |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
243 | case IO_POLL_IN | IO_POLL_OUT: return -1; // TODO: implement |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
244 | } |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
245 | } |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
246 | |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
247 | #elif defined(XP_WIN32) |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
248 | |
|
430
83560f32e7d5
refactor send_cgi into non-blocking SAF (wip)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
249 | ssize_t net_sys_write(Sysstream *st, void *buf, size_t nbytes) { |
|
147
d050449c3b9e
ported io.c and some headers to windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
250 | int ret = send(st->fd, buf, nbytes, 0); |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
251 | if(ret == SOCKET_ERROR) { |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
252 | return IO_ERROR; |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
253 | } |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
254 | return ret; |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
255 | } |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
256 | |
|
430
83560f32e7d5
refactor send_cgi into non-blocking SAF (wip)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
257 | ssize_t net_sys_writev(Sysstream *st, struct iovec *iovec, int iovcnt) { |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
258 | // TODO |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
259 | } |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
260 | |
|
430
83560f32e7d5
refactor send_cgi into non-blocking SAF (wip)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
261 | ssize_t net_sys_read(Sysstream *st, void *buf, size_t nbytes) { |
|
147
d050449c3b9e
ported io.c and some headers to windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
262 | int ret = recv(st->fd, buf, nbytes, 0); |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
263 | if(ret == SOCKET_ERROR) { |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
264 | return IO_ERROR; |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
265 | } |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
266 | return ret; |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
267 | } |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
268 | |
|
430
83560f32e7d5
refactor send_cgi into non-blocking SAF (wip)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
269 | ssize_t net_sys_sendfile(Sysstream *st, sendfiledata *sfd) { |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
270 | // TODO |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
271 | } |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
272 | |
|
430
83560f32e7d5
refactor send_cgi into non-blocking SAF (wip)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
415
diff
changeset
|
273 | void net_sys_close(Sysstream *st) { |
|
147
d050449c3b9e
ported io.c and some headers to windows
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
142
diff
changeset
|
274 | closesocket(st->fd); |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
275 | } |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
276 | |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
277 | #endif |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
278 | |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
279 | |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
280 | /* |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
281 | * HttpStream implementation |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
282 | */ |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
283 | |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
284 | IOStream* httpstream_new(pool_handle_t *pool, IOStream *fd) { |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
285 | HttpStream *st = pool_malloc(pool, sizeof(HttpStream)); |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
286 | st->st = http_io_funcs; |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
287 | st->fd = fd; |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
407
diff
changeset
|
288 | st->written = 0; |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
289 | st->max_read = 0; |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
290 | st->read = 0; |
|
354
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
336
diff
changeset
|
291 | st->read_total = 0; |
|
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
336
diff
changeset
|
292 | st->readbuf = NULL; |
|
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
336
diff
changeset
|
293 | st->bufsize = 0; |
|
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
336
diff
changeset
|
294 | st->buflen = NULL; |
|
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
336
diff
changeset
|
295 | st->bufpos = NULL; |
|
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
336
diff
changeset
|
296 | st->chunk_buf_pos = 0; |
|
498
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
297 | st->current_chunk_length = 0; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
298 | st->current_chunk_pos = 0; |
|
500
077aa138e8fb
fix uninitialized memory in http stream, when chunked transfer encoding is used
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
498
diff
changeset
|
299 | st->current_trailer = 0; |
|
498
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
300 | st->write_chunk_buf_len = 0; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
301 | st->write_chunk_buf_pos = 0; |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
302 | st->chunked_enc = WS_FALSE; |
|
354
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
336
diff
changeset
|
303 | st->read_eof = WS_TRUE; |
|
361
570026d3a685
make sure the http stream is finished if headers are sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
304 | st->write_eof = WS_FALSE; |
|
714
fe4d14625245
implement HttpStream raw mode: raw mode disables read counter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
707
diff
changeset
|
305 | st->raw = WS_FALSE; |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
306 | return (IOStream*)st; |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
307 | } |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
308 | |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
309 | void httpstream_free(IOStream *st) { |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
310 | HttpStream *http = (HttpStream*)st; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
311 | http->fd->free(http->fd); |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
312 | pool_free(http->pool, st); |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
313 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
314 | |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
315 | int httpstream_enable_chunked_read(IOStream *st, char *buffer, size_t bufsize, int *cursize, int *pos) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
316 | if(st->read != (io_read_f)net_http_read) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
317 | log_ereport(LOG_FAILURE, "%s", "httpstream_enable_chunked_read: IOStream is not an HttpStream"); |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
318 | return 1; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
319 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
320 | st->read = (io_read_f)net_http_read_chunked; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
321 | HttpStream *http = (HttpStream*)st; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
322 | http->max_read = 0; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
323 | http->read = 0; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
324 | http->readbuf = buffer; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
325 | http->bufsize = bufsize; |
|
336
fb75473fecca
store HttpStream buflen as pointer (referencing NSAPISession cursize)
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
335
diff
changeset
|
326 | http->buflen = cursize; |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
327 | http->bufpos = pos; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
328 | http->chunk_buf_pos = 0; |
|
354
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
336
diff
changeset
|
329 | http->read_eof = WS_FALSE; |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
330 | return 0; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
331 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
332 | |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
333 | int httpstream_enable_buffered_read(IOStream *st, char *buffer, size_t bufsize, int *cursize, int *pos) { |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
334 | if(st->read != (io_read_f)net_http_read) { |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
335 | log_ereport(LOG_FAILURE, "%s", "httpstream_enable_chunked_read: IOStream is not an HttpStream"); |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
336 | return 1; |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
337 | } |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
338 | st->read = (io_read_f)net_http_read_buffered; |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
339 | HttpStream *http = (HttpStream*)st; |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
340 | http->readbuf = buffer; |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
341 | http->bufsize = bufsize; |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
342 | http->buflen = cursize; |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
343 | http->bufpos = pos; |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
344 | return 0; |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
345 | } |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
346 | |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
347 | int httpstream_enable_chunked_write(IOStream *st) { |
|
513
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
348 | if(st->type != IO_STREAM_TYPE_HTTP) { |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
349 | log_ereport(LOG_FAILURE, "%s", "httpstream_enable_chunked_write: IOStream is not an HttpStream"); |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
350 | return 1; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
351 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
352 | HttpStream *http = (HttpStream*)st; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
353 | http->chunked_enc = WS_TRUE; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
354 | return 0; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
355 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
356 | |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
357 | int httpstream_set_max_read(IOStream *st, int64_t maxread) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
358 | if(st->write != (io_write_f)net_http_write) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
359 | log_ereport(LOG_FAILURE, "%s", "httpstream_set_max_read: IOStream is not an HttpStream"); |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
360 | return 1; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
361 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
362 | HttpStream *http = (HttpStream*)st; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
363 | http->max_read = maxread; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
364 | return 0; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
365 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
366 | |
|
354
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
336
diff
changeset
|
367 | WSBool httpstream_eof(IOStream *st) { |
|
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
336
diff
changeset
|
368 | HttpStream *http = (HttpStream*)st; |
|
707
5fb102d2c745
fix proxy event handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
697
diff
changeset
|
369 | return http->read_eof || http->read == http->max_read; |
|
354
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
336
diff
changeset
|
370 | } |
|
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
336
diff
changeset
|
371 | |
|
407
78af44222463
close connection if content-length != number of bytes written
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
406
diff
changeset
|
372 | int64_t httpstream_written(IOStream *st) { |
|
78af44222463
close connection if content-length != number of bytes written
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
406
diff
changeset
|
373 | HttpStream *http = (HttpStream*)st; |
|
78af44222463
close connection if content-length != number of bytes written
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
406
diff
changeset
|
374 | return http->written; |
|
78af44222463
close connection if content-length != number of bytes written
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
406
diff
changeset
|
375 | } |
|
78af44222463
close connection if content-length != number of bytes written
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
406
diff
changeset
|
376 | |
|
498
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
377 | /* |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
378 | * iovec callback func |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
379 | * returns number of payload bytes written (number of bytes returned back to the net_write caller) |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
380 | */ |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
381 | typedef ssize_t(*writeop_finish_func)(HttpStream *st, char *base, size_t len, size_t written, void *udata); |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
382 | |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
383 | static ssize_t httpstream_finish_prev_header(HttpStream *st, char *base, size_t len, size_t written, void *udata) { |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
384 | st->write_chunk_buf_pos += written; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
385 | if(st->write_chunk_buf_pos == st->write_chunk_buf_len) { |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
386 | st->write_chunk_buf_len = 0; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
387 | st->write_chunk_buf_pos = 0; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
388 | } |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
389 | return 0; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
390 | } |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
391 | |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
392 | static ssize_t httpstream_finish_data(HttpStream *st, char *base, size_t len, size_t written, void *udata) { |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
393 | st->current_chunk_pos += written; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
394 | if(st->current_chunk_pos == st->current_chunk_length) { |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
395 | st->current_chunk_length = 0; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
396 | st->current_chunk_pos = 0; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
397 | st->current_trailer = 2; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
398 | } |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
399 | return written; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
400 | } |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
401 | |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
402 | static ssize_t httpstream_finish_new_header(HttpStream *st, char *base, size_t len, size_t written, void *udata) { |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
403 | size_t *chunk_len = udata; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
404 | st->current_chunk_length = *chunk_len; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
405 | st->current_chunk_pos = 0; // new chunk started |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
406 | if(written < len) { |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
407 | st->write_chunk_buf_len = len-written; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
408 | st->write_chunk_buf_pos = 0; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
409 | memcpy(st->write_chunk_buf + st->write_chunk_buf_pos, base+written, st->write_chunk_buf_len); |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
410 | } else { |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
411 | st->write_chunk_buf_len = 0; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
412 | st->write_chunk_buf_pos = 0; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
413 | } |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
414 | return 0; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
415 | } |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
416 | |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
417 | static ssize_t httpstream_finish_trailer(HttpStream *st, char *base, size_t len, size_t written, void *udata) { |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
418 | st->current_trailer -= written; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
419 | return 0; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
420 | } |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
421 | |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
422 | ssize_t net_http_write(HttpStream *st, const void *buf, size_t nbytes) { |
|
502
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
423 | st->st.io_errno = 0; |
|
361
570026d3a685
make sure the http stream is finished if headers are sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
424 | if(st->write_eof) return 0; |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
425 | IOStream *fd = st->fd; |
|
498
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
426 | if(!st->chunked_enc) { |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
427 | ssize_t w = fd->write(fd, buf, nbytes); |
|
739
f5ccacc7bab8
fix missing error propagation in net_http_write when using chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
428 | if(w <= 0) { |
|
f5ccacc7bab8
fix missing error propagation in net_http_write when using chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
429 | st->st.io_errno = fd->io_errno; |
|
f5ccacc7bab8
fix missing error propagation in net_http_write when using chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
735
diff
changeset
|
430 | } |
|
657
f1469e3144a7
fix wrong content-length in the access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
583
diff
changeset
|
431 | //st->written += w > 0 ? w : 0; |
|
f1469e3144a7
fix wrong content-length in the access log
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
583
diff
changeset
|
432 | st->written += w; |
|
406
e5d96f6b9306
store number of written bytes in the HttpStream
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
383
diff
changeset
|
433 | return w; |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
434 | } else { |
|
498
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
435 | struct iovec io[8]; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
436 | writeop_finish_func io_finished[8]; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
437 | void *io_finished_udata[8]; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
438 | int iovec_len = 0; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
439 | |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
440 | char *str_crlf = "\r\n"; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
441 | |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
442 | size_t prev_chunk_len = st->current_chunk_length; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
443 | size_t new_chunk_len = 0; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
444 | |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
445 | // was the previous chunk header completely sent? |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
446 | if(st->write_chunk_buf_len > 0) { |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
447 | io[0].iov_base = &st->write_chunk_buf[st->write_chunk_buf_pos]; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
448 | io[0].iov_len = st->write_chunk_buf_len - st->write_chunk_buf_pos; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
449 | io_finished[0] = httpstream_finish_prev_header; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
450 | io_finished_udata[0] = &prev_chunk_len; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
451 | iovec_len++; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
452 | } |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
453 | |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
454 | // was the previous chunk payload completely sent? |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
455 | if(st->current_chunk_length != 0) { |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
456 | size_t chunk_remaining = st->current_chunk_length - st->current_chunk_pos; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
457 | size_t prev_nbytes = chunk_remaining > nbytes ? nbytes : chunk_remaining; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
458 | io[iovec_len].iov_base = (char*)buf; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
459 | io[iovec_len].iov_len = prev_nbytes; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
460 | io_finished[iovec_len] = httpstream_finish_data; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
461 | buf = ((char*)buf) + prev_nbytes; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
462 | nbytes -= prev_nbytes; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
463 | iovec_len++; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
464 | |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
465 | io[iovec_len].iov_base = str_crlf; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
466 | io[iovec_len].iov_len = 2; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
467 | io_finished[iovec_len] = httpstream_finish_trailer; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
468 | iovec_len++; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
469 | } else if(st->current_trailer > 0) { |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
470 | io[iovec_len].iov_base = str_crlf + 2 - st->current_trailer; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
471 | io[iovec_len].iov_len = st->current_trailer; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
472 | io_finished[iovec_len] = httpstream_finish_trailer; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
473 | iovec_len++; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
474 | } |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
475 | |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
476 | // TODO: on some plattforms iov_len is smaller than size_t |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
477 | // if nbytes > INT_MAX, it should be devided into multiple |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
478 | // iovec entries |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
479 | char chunk_len[16]; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
480 | if(nbytes > 0) { |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
481 | new_chunk_len = nbytes; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
482 | io[iovec_len].iov_base = chunk_len; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
483 | io[iovec_len].iov_len = snprintf(chunk_len, 16, "%zx\r\n", nbytes); |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
484 | io_finished[iovec_len] = httpstream_finish_new_header; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
485 | io_finished_udata[iovec_len] = &new_chunk_len; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
486 | iovec_len++; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
487 | |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
488 | io[iovec_len].iov_base = (char*)buf; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
489 | io[iovec_len].iov_len = nbytes; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
490 | io_finished[iovec_len] = httpstream_finish_data; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
491 | iovec_len++; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
492 | |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
493 | io[iovec_len].iov_base = str_crlf; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
494 | io[iovec_len].iov_len = 2; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
495 | io_finished[iovec_len] = httpstream_finish_trailer; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
496 | iovec_len++; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
497 | } |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
498 | |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
499 | ssize_t wv = fd->writev(fd, io, iovec_len); |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
500 | if(wv <= 0) { |
|
502
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
501 | st->st.io_errno = net_errno(st->fd); |
|
498
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
502 | return wv; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
503 | } |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
504 | |
|
502
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
505 | ssize_t ret_w = 0; |
|
498
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
506 | int i = 0; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
507 | while(wv > 0) { |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
508 | char *base = io[i].iov_base; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
509 | size_t len = io[i].iov_len; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
510 | size_t wlen = wv > len ? len : wv; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
511 | ret_w += io_finished[i](st, base, len, wlen, io_finished_udata[i]); |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
512 | wv -= wlen; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
513 | i++; |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
514 | } |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
515 | |
|
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
516 | st->written += ret_w; |
|
502
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
517 | if(ret_w == 0) { |
|
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
518 | st->st.io_errno = EWOULDBLOCK; // not sure if this is really correct |
|
513
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
519 | //ret_w = -1; |
|
502
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
520 | } |
|
498
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
521 | return ret_w; |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
522 | } |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
523 | } |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
524 | |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
525 | ssize_t net_http_writev(HttpStream *st, struct iovec *iovec, int iovcnt) { |
|
361
570026d3a685
make sure the http stream is finished if headers are sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
526 | if(st->write_eof) return 0; |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
527 | IOStream *fd = st->fd; |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
528 | if(st->chunked_enc) { |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
529 | struct iovec *io = calloc(iovcnt + 1, sizeof(struct iovec)); |
|
251
f727a21497bb
add basic PUT implementation and tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
235
diff
changeset
|
530 | if(!io) { |
|
f727a21497bb
add basic PUT implementation and tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
235
diff
changeset
|
531 | return 0; |
|
f727a21497bb
add basic PUT implementation and tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
235
diff
changeset
|
532 | } |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
533 | char chunk_len[16]; |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
534 | io[0].iov_base = chunk_len; |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
535 | size_t len = 0; |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
536 | for(int i=0;i<iovcnt;i++) { |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
537 | len += iovec[i].iov_len; |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
538 | } |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
539 | io[0].iov_len = snprintf(chunk_len, 16, "\r\n%zx\r\n", len); |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
540 | memcpy(io + 1, iovec, iovcnt * sizeof(struct iovec)); |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
541 | ssize_t r = fd->writev(fd, io, iovcnt + 1); |
|
251
f727a21497bb
add basic PUT implementation and tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
235
diff
changeset
|
542 | |
|
f727a21497bb
add basic PUT implementation and tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
235
diff
changeset
|
543 | ssize_t ret = r - io[0].iov_len; |
|
f727a21497bb
add basic PUT implementation and tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
235
diff
changeset
|
544 | free(io); |
|
406
e5d96f6b9306
store number of written bytes in the HttpStream
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
383
diff
changeset
|
545 | st->written += ret; |
|
251
f727a21497bb
add basic PUT implementation and tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
235
diff
changeset
|
546 | return ret; |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
547 | } else { |
|
406
e5d96f6b9306
store number of written bytes in the HttpStream
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
383
diff
changeset
|
548 | ssize_t w = fd->writev(fd, iovec, iovcnt); |
|
e5d96f6b9306
store number of written bytes in the HttpStream
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
383
diff
changeset
|
549 | st->written += w; |
|
e5d96f6b9306
store number of written bytes in the HttpStream
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
383
diff
changeset
|
550 | return w; |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
551 | } |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
552 | } |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
553 | |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
554 | ssize_t net_http_read(HttpStream *st, void *buf, size_t nbytes) { |
|
719
c4c2b8e8ddc5
add test_http_client_ws_msg_in
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
714
diff
changeset
|
555 | if(st->read >= st->max_read && !st->raw) { |
|
354
017eda1be105
add missing HttpStream initializations
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
336
diff
changeset
|
556 | st->read_eof = WS_TRUE; |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
557 | return 0; |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
558 | } |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
559 | ssize_t r = st->fd->read(st->fd, buf, nbytes); |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
560 | if(r < 0) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
561 | st->st.io_errno = st->fd->io_errno; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
562 | } |
|
714
fe4d14625245
implement HttpStream raw mode: raw mode disables read counter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
707
diff
changeset
|
563 | if(!st->raw) { |
|
fe4d14625245
implement HttpStream raw mode: raw mode disables read counter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
707
diff
changeset
|
564 | st->read += r; |
|
fe4d14625245
implement HttpStream raw mode: raw mode disables read counter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
707
diff
changeset
|
565 | } |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
566 | return r; |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
567 | } |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
568 | |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
569 | #define BUF_UNNEEDED_DIFF 64 |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
570 | /* |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
571 | * read from st->readbuf first, read from st->fd if perform_io is true |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
572 | */ |
|
685
349d62bfae29
fix error forwarding in http_read_buffered when IO is performed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
573 | static ssize_t http_read_buffered(HttpStream *httpstr, char *buf, size_t nbytes, WSBool read_data, WSBool *perform_io) { |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
574 | ssize_t r = 0; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
575 | |
|
334
a55491f66003
fix and simplify chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
576 | //memset(buf, 'x', nbytes); |
|
a55491f66003
fix and simplify chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
577 | //char *orig_buf = buf; |
|
a55491f66003
fix and simplify chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
578 | |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
579 | // copy available data from st->readbuf to buf |
|
685
349d62bfae29
fix error forwarding in http_read_buffered when IO is performed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
580 | int pos = *httpstr->bufpos; |
|
349d62bfae29
fix error forwarding in http_read_buffered when IO is performed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
581 | int buflen = *httpstr->buflen; |
|
349d62bfae29
fix error forwarding in http_read_buffered when IO is performed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
582 | int buf_available = buflen > 0 ? buflen - pos : 0; |
|
349d62bfae29
fix error forwarding in http_read_buffered when IO is performed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
583 | if(buf_available > 0) { |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
584 | size_t cplen = buf_available > nbytes ? nbytes : buf_available; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
585 | if(read_data) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
586 | // if we read data (and not a chunk header), we limit the |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
587 | // amount of bytes we copy |
|
685
349d62bfae29
fix error forwarding in http_read_buffered when IO is performed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
588 | size_t chunk_available = httpstr->max_read - httpstr->read; |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
589 | cplen = cplen > chunk_available ? chunk_available : cplen; |
|
714
fe4d14625245
implement HttpStream raw mode: raw mode disables read counter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
707
diff
changeset
|
590 | if(!httpstr->raw) { |
|
fe4d14625245
implement HttpStream raw mode: raw mode disables read counter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
707
diff
changeset
|
591 | httpstr->read += cplen; |
|
fe4d14625245
implement HttpStream raw mode: raw mode disables read counter
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
707
diff
changeset
|
592 | } |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
593 | } |
|
685
349d62bfae29
fix error forwarding in http_read_buffered when IO is performed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
594 | memcpy(buf, httpstr->readbuf + pos, cplen); |
|
349d62bfae29
fix error forwarding in http_read_buffered when IO is performed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
595 | *httpstr->bufpos += cplen; |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
596 | r += cplen; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
597 | buf += cplen; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
598 | nbytes -= cplen; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
599 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
600 | |
| 335 | 601 | // maybe perform IO and refill the read buffer |
| 602 | // if we read data (read_data == true), make sure not to perform IO, | |
| 603 | // when a chunk is completed | |
| 604 | // | |
| 605 | // if we read a chunk header (read_data == false) it is very important | |
| 606 | // to not perform IO, if we have previously copied data from readbuf | |
| 607 | // this ensures we never override non-chunk-header data | |
|
685
349d62bfae29
fix error forwarding in http_read_buffered when IO is performed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
608 | if(*perform_io && ((read_data && nbytes > 0 && httpstr->max_read - httpstr->read) || (!read_data && r == 0))) { |
|
349d62bfae29
fix error forwarding in http_read_buffered when IO is performed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
609 | if(*httpstr->buflen - *httpstr->bufpos > 0) { |
|
334
a55491f66003
fix and simplify chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
610 | printf("todo: fix, should not happen, remove later\n"); |
|
a55491f66003
fix and simplify chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
611 | } |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
612 | // fill buffer again |
|
685
349d62bfae29
fix error forwarding in http_read_buffered when IO is performed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
613 | ssize_t rlen = httpstr->fd->read(httpstr->fd, httpstr->readbuf, httpstr->bufsize); |
|
349d62bfae29
fix error forwarding in http_read_buffered when IO is performed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
614 | *httpstr->buflen = rlen; |
|
349d62bfae29
fix error forwarding in http_read_buffered when IO is performed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
615 | *httpstr->bufpos = 0; |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
616 | *perform_io = WS_FALSE; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
617 | if(rlen < 0) { |
|
685
349d62bfae29
fix error forwarding in http_read_buffered when IO is performed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
618 | httpstr->st.io_errno = httpstr->fd->io_errno; |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
619 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
620 | |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
621 | if(rlen > 0) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
622 | // call func again to get data from buffer (no IO will be performed) |
|
685
349d62bfae29
fix error forwarding in http_read_buffered when IO is performed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
623 | r += http_read_buffered(httpstr, buf, nbytes, read_data, perform_io); |
|
349d62bfae29
fix error forwarding in http_read_buffered when IO is performed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
624 | } else if(r == 0) { |
|
349d62bfae29
fix error forwarding in http_read_buffered when IO is performed
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
684
diff
changeset
|
625 | r = rlen; |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
626 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
627 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
628 | |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
629 | return r; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
630 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
631 | |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
632 | ssize_t net_http_read_buffered(HttpStream *st, void *buf, size_t nbytes) { |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
633 | WSBool perform_io = TRUE; |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
634 | return http_read_buffered(st, buf, nbytes, TRUE, &perform_io); |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
635 | } |
|
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
636 | |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
637 | |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
638 | /* |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
639 | * parses a chunk header |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
640 | * the chunk length is stored in chunklen |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
641 | * return: 0 if the data is incomplete |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
642 | * -1 if an error occured |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
643 | * >0 chunk header length |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
644 | */ |
|
498
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
645 | int http_stream_parse_chunk_header(char *str, int len, WSBool first, int64_t *chunklen) { |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
646 | char *hdr_start = NULL; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
647 | char *hdr_end = NULL; |
|
688
02360295ec58
fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
648 | char *chk_end = str + len; |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
649 | int i = 0; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
650 | if(first) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
651 | hdr_start = str; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
652 | } else { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
653 | if(len < 3) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
654 | return 0; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
655 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
656 | if(str[0] == '\r' && str[1] == '\n') { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
657 | hdr_start = str+2; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
658 | i = 2; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
659 | } else if(str[0] == '\n') { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
660 | hdr_start = str+1; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
661 | i = 1; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
662 | } else { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
663 | return -1; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
664 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
665 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
666 | |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
667 | for(;i<len;i++) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
668 | char c = str[i]; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
669 | if(c == '\r' || c == '\n') { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
670 | hdr_end = str+i; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
671 | break; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
672 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
673 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
674 | if(!hdr_end || i == len) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
675 | return 0; // incomplete |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
676 | } |
|
549
b26bec196a2e
fix http_stream_parse_chunk_header: check if the chunk starts with a digit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
677 | |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
678 | if(*hdr_end == '\r') { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
679 | // we also need '\n' |
|
688
02360295ec58
fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
680 | if(hdr_end + 1 >= chk_end) { |
|
02360295ec58
fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
681 | return 0; // incomplete |
|
02360295ec58
fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
682 | } |
|
02360295ec58
fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
683 | |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
684 | if(hdr_end[1] != '\n') { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
685 | return -1; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
686 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
687 | i++; // '\n' found |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
688 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
689 | |
|
549
b26bec196a2e
fix http_stream_parse_chunk_header: check if the chunk starts with a digit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
690 | // check if the first character is a number |
|
b26bec196a2e
fix http_stream_parse_chunk_header: check if the chunk starts with a digit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
691 | char f = hdr_start[0]; |
|
b26bec196a2e
fix http_stream_parse_chunk_header: check if the chunk starts with a digit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
692 | if(!(isdigit(f) || (f >= 'A' && f <= 'F') || (f >= 'a' && f <= 'f'))) { |
|
b26bec196a2e
fix http_stream_parse_chunk_header: check if the chunk starts with a digit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
693 | return -1; |
|
b26bec196a2e
fix http_stream_parse_chunk_header: check if the chunk starts with a digit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
694 | } |
|
b26bec196a2e
fix http_stream_parse_chunk_header: check if the chunk starts with a digit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
695 | |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
696 | // parse |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
697 | char save_c = *hdr_end; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
698 | *hdr_end = '\0'; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
699 | char *end; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
700 | int64_t clen; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
701 | errno = 0; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
702 | clen = strtoll(hdr_start, &end, 16); |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
703 | *hdr_end = save_c; |
|
549
b26bec196a2e
fix http_stream_parse_chunk_header: check if the chunk starts with a digit
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
548
diff
changeset
|
704 | if(errno == 0 && end != hdr_end) { |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
705 | return -1; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
706 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
707 | i++; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
708 | |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
709 | if(clen == 0) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
710 | // chunk length of 0 indicates the end |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
711 | // an additional \r\n is required (we also accept \n) |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
712 | if(i >= len) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
713 | return 0; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
714 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
715 | if(str[i] == '\n') { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
716 | i++; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
717 | } else if(str[i] == '\r') { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
718 | if(++i >= len) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
719 | return 0; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
720 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
721 | if(str[i] == '\n') { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
722 | i++; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
723 | } else { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
724 | return -1; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
725 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
726 | } else { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
727 | return -1; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
728 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
729 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
730 | |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
731 | *chunklen = clen; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
732 | return i; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
733 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
734 | |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
735 | ssize_t net_http_read_chunked(HttpStream *st, void *buf, size_t nbytes) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
736 | if(st->read_eof) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
737 | return 0; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
738 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
739 | |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
740 | char *rbuf = buf; // buffer pos |
|
688
02360295ec58
fix chunkheader parser not detecting EOF correctly in some cases
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
687
diff
changeset
|
741 | ssize_t rd = 0; // number of bytes read |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
742 | size_t rbuflen = nbytes; // number of bytes until end of buf |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
743 | WSBool perform_io = WS_TRUE; // we do only 1 read before we abort |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
744 | while(rd < nbytes && (perform_io || (st->max_read - st->read) > 0)) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
745 | // how many bytes are available in the current chunk |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
746 | size_t chunk_available = st->max_read - st->read; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
747 | if(chunk_available > 0) { |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
748 | ssize_t r = http_read_buffered(st, rbuf, rbuflen, TRUE, &perform_io); |
|
692
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
749 | if(r <= 0) { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
750 | if(rd == 0) { |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
751 | rd = r; |
|
32faa1d6a744
add httpclient response write error tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
688
diff
changeset
|
752 | } |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
753 | break; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
754 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
755 | rd += r; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
756 | st->read_total += r; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
757 | rbuf += r; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
758 | rbuflen -= r; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
759 | } else { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
760 | int chunkbuf_avail = HTTP_STREAM_CBUF_SIZE - st->chunk_buf_pos; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
761 | if(chunkbuf_avail == 0) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
762 | // for some reason HTTP_STREAM_CBUF_SIZE is not enough |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
763 | // to store the chunk header |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
764 | // this indicates that something has gone wrong (or this is an attack) |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
765 | st->read_eof = WS_TRUE; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
766 | return -1; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
767 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
768 | // fill st->chunk_buf |
|
683
db37761a8494
enable buffered reader for request bodies with fixed content-length
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
657
diff
changeset
|
769 | ssize_t r = http_read_buffered(st, &st->chunk_buf[st->chunk_buf_pos], chunkbuf_avail, FALSE, &perform_io); |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
770 | if(r == 0) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
771 | break; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
772 | } |
|
687
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
773 | if(r < 0) { |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
774 | if(rd == 0) { |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
775 | rd = r; |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
776 | } |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
777 | break; |
|
4bded456b4a7
add test for http client responses with chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
685
diff
changeset
|
778 | } |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
779 | int chunkbuf_len = st->chunk_buf_pos + r; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
780 | int64_t chunklen; |
|
498
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
781 | int ret = http_stream_parse_chunk_header(st->chunk_buf, chunkbuf_len, st->read_total > 0 ? FALSE : TRUE, &chunklen); |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
782 | if(ret == 0) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
783 | // incomplete chunk header |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
784 | st->chunk_buf_pos = chunkbuf_len; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
785 | } else if(ret < 0) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
786 | // error |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
787 | st->read_eof = WS_TRUE; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
788 | return -1; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
789 | } else if(ret > 0) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
790 | st->max_read = chunklen; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
791 | st->read = 0; |
| 335 | 792 | int remaining_len = chunkbuf_len - ret; |
| 793 | if(remaining_len > 0) { | |
| 794 | // we have read more into chunk_buf than the chunk_header | |
| 795 | // it is save to just move bufpos back | |
| 796 | *st->bufpos -= remaining_len; | |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
797 | } |
|
334
a55491f66003
fix and simplify chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
333
diff
changeset
|
798 | //st->remaining_len = chunkbuf_len - ret; |
|
333
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
799 | st->chunk_buf_pos = 0; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
800 | |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
801 | if(chunklen == 0) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
802 | st->read_eof = WS_TRUE; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
803 | break; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
804 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
805 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
806 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
807 | |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
808 | if(!perform_io && rd == 0) { |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
809 | perform_io = WS_TRUE; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
810 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
811 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
812 | |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
813 | return rd; |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
814 | } |
|
bb536d4bc174
first semi-functional implementation of chunked transfer encoding for request bodies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
332
diff
changeset
|
815 | |
|
361
570026d3a685
make sure the http stream is finished if headers are sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
816 | ssize_t net_http_sendfile(HttpStream *st, sendfiledata *sfd) { |
|
570026d3a685
make sure the http stream is finished if headers are sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
817 | if(st->write_eof) return 0; |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
818 | ssize_t ret = 0; |
| 112 | 819 | // TODO: support chunked transfer encoding |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
820 | if(st->fd->sendfile) { |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
821 | ret = st->fd->sendfile(st->fd, sfd); |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
822 | } else { |
| 112 | 823 | ret = net_fallback_sendfile((IOStream*)st, sfd); |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
824 | } |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
825 | |
|
493
56cf890dd9ed
fix net_sendfile not counting number of written bytes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
430
diff
changeset
|
826 | st->written += ret > 0 ? ret : 0; |
|
56cf890dd9ed
fix net_sendfile not counting number of written bytes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
430
diff
changeset
|
827 | |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
828 | return ret; |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
829 | } |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
830 | |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
831 | void net_http_close(HttpStream *st) { |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
832 | st->fd->close(st->fd); |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
833 | } |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
834 | |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
835 | void net_http_finish(HttpStream *st) { |
|
361
570026d3a685
make sure the http stream is finished if headers are sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
836 | if(st->chunked_enc && !st->write_eof) { |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
837 | st->fd->write(st->fd, "0\r\n\r\n", 5); |
|
80
0de4a90979e1
fixed chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
838 | } |
|
361
570026d3a685
make sure the http stream is finished if headers are sent
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
354
diff
changeset
|
839 | st->write_eof = WS_TRUE; |
|
80
0de4a90979e1
fixed chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
840 | } |
|
0de4a90979e1
fixed chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
841 | |
|
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
842 | void net_http_setmode(HttpStream *st, int mode) { |
|
697
3ddfd45d4e47
add raw mode for http streams
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
843 | if(mode == IO_MODE_RAW) { |
|
3ddfd45d4e47
add raw mode for http streams
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
844 | st->raw = TRUE; |
|
3ddfd45d4e47
add raw mode for http streams
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
845 | } else { |
|
3ddfd45d4e47
add raw mode for http streams
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
846 | st->fd->setmode(st->fd, mode); |
|
3ddfd45d4e47
add raw mode for http streams
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
692
diff
changeset
|
847 | } |
|
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
848 | } |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
849 | |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
850 | int net_http_poll(HttpStream *st, EventHandler *ev, int events, Event *cb) { |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
851 | return st->fd->poll(st->fd, ev, events, cb); |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
852 | } |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
853 | |
|
8
f4d56bf9de40
Added request body reader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
854 | |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
855 | /* |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
856 | * SSLStream implementation |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
857 | */ |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
858 | |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
859 | IOStream* sslstream_new(pool_handle_t *pool, SSL *ssl) { |
|
106
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
860 | SSLStream *st = pool_malloc(pool, sizeof(SSLStream)); |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
861 | st->st = ssl_io_funcs; |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
862 | st->ssl = ssl; |
|
133
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
126
diff
changeset
|
863 | st->error = 0; |
|
106
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
864 | return (IOStream*)st; |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
865 | } |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
866 | |
|
684
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
867 | void sslstream_free(IOStream *st) { |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
868 | SSLStream *ssl = (SSLStream*)st; |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
869 | SSL_free(ssl->ssl); |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
870 | pool_free(ssl->pool, st); |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
871 | } |
|
48da20bde908
refactor http client io to use an HttpStream for reading the response
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
683
diff
changeset
|
872 | |
|
498
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
873 | ssize_t net_ssl_write(SSLStream *st, const void *buf, size_t nbytes) { |
|
133
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
126
diff
changeset
|
874 | int ret = SSL_write(st->ssl, buf, nbytes); |
|
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
126
diff
changeset
|
875 | if(ret <= 0) { |
|
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
126
diff
changeset
|
876 | st->error = SSL_get_error(st->ssl, ret); |
|
502
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
877 | if(st->error == SSL_ERROR_WANT_WRITE || st->error == SSL_ERROR_WANT_READ) { |
|
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
878 | st->st.io_errno = EWOULDBLOCK; |
|
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
879 | } else { |
|
734
a5f3e1e5e744
add test_io_httpstream_chunked_write_partial_writev
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
719
diff
changeset
|
880 | log_ereport(LOG_FAILURE, "net_ssl_write SSL error: %d , nbytes: %d, ret: %d", st->error, (int)nbytes, ret); |
|
a5f3e1e5e744
add test_io_httpstream_chunked_write_partial_writev
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
719
diff
changeset
|
881 | unsigned long e; |
|
a5f3e1e5e744
add test_io_httpstream_chunked_write_partial_writev
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
719
diff
changeset
|
882 | while ((e = ERR_get_error())) { |
|
a5f3e1e5e744
add test_io_httpstream_chunked_write_partial_writev
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
719
diff
changeset
|
883 | fprintf(stderr, "%s\n", ERR_error_string(e, NULL)); |
|
a5f3e1e5e744
add test_io_httpstream_chunked_write_partial_writev
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
719
diff
changeset
|
884 | } |
|
502
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
885 | st->st.io_errno = -1; |
|
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
886 | } |
|
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
887 | ret = -1; |
|
133
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
126
diff
changeset
|
888 | } |
|
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
126
diff
changeset
|
889 | return ret; |
|
106
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
890 | } |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
891 | |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
892 | ssize_t net_ssl_writev(SSLStream *st, struct iovec *iovec, int iovcnt) { |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
893 | ssize_t r = 0; |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
894 | for(int i=0;i<iovcnt;i++) { |
|
734
a5f3e1e5e744
add test_io_httpstream_chunked_write_partial_writev
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
719
diff
changeset
|
895 | int ml = iovec[i].iov_len > 10 ? 10 : iovec[i].iov_len; |
|
106
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
896 | int ret = SSL_write(st->ssl, iovec[i].iov_base, iovec[i].iov_len); |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
897 | if(ret <= 0) { |
|
502
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
898 | if(r == 0) { |
|
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
899 | st->error = SSL_get_error(st->ssl, ret); |
|
734
a5f3e1e5e744
add test_io_httpstream_chunked_write_partial_writev
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
719
diff
changeset
|
900 | log_ereport(LOG_FAILURE, "net_ssl_write SSL error: %d , iov_len: %d, ret: %d", st->error, (int)iovec[i].iov_len, ret); |
|
502
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
901 | if(st->error == SSL_ERROR_WANT_WRITE || st->error == SSL_ERROR_WANT_READ) { |
|
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
902 | st->st.io_errno = EWOULDBLOCK; |
|
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
903 | } else { |
|
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
904 | st->st.io_errno = -1; |
|
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
905 | } |
|
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
906 | } |
|
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
907 | break; |
|
106
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
908 | } |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
909 | r += ret; |
|
539
d556b45b0d24
fix net_ssl_writev skipping bytes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
513
diff
changeset
|
910 | if(ret < iovec[i].iov_len) { |
|
d556b45b0d24
fix net_ssl_writev skipping bytes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
513
diff
changeset
|
911 | break; |
|
d556b45b0d24
fix net_ssl_writev skipping bytes
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
513
diff
changeset
|
912 | } |
|
106
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
913 | } |
|
502
11ac3761c0e3
fix non-blocking CGI handler and non-blocking SSL-IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
500
diff
changeset
|
914 | return r == 0 ? -1 : r; |
|
106
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
915 | } |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
916 | |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
917 | ssize_t net_ssl_read(SSLStream *st, void *buf, size_t nbytes) { |
|
133
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
126
diff
changeset
|
918 | int ret = SSL_read(st->ssl, buf, nbytes); |
|
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
126
diff
changeset
|
919 | if(ret <= 0) { |
|
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
126
diff
changeset
|
920 | st->error = SSL_get_error(st->ssl, ret); |
|
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
126
diff
changeset
|
921 | } |
|
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
126
diff
changeset
|
922 | return ret; |
|
106
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
923 | } |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
924 | |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
925 | void net_ssl_close(SSLStream *st) { |
|
133
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
126
diff
changeset
|
926 | int ret = SSL_shutdown(st->ssl); |
|
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
126
diff
changeset
|
927 | if(ret != 1) { |
|
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
126
diff
changeset
|
928 | st->error = SSL_get_error(st->ssl, ret); |
|
87b405d61f64
improves event handler and ssl error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
126
diff
changeset
|
929 | } |
|
171
af7e2d80dee6
adds wrapper for close syscall with error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
930 | system_close(SSL_get_fd(st->ssl)); |
|
106
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
931 | } |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
932 | |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
933 | void net_ssl_finish(SSLStream *st) { |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
934 | |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
935 | } |
|
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
936 | |
|
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
937 | void net_ssl_setmode(SSLStream *st, int mode) { |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
938 | int flags; |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
939 | if (-1 == (flags = fcntl(SSL_get_fd(st->ssl), F_GETFL, 0))) { |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
940 | flags = 0; |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
941 | } |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
942 | if(mode == IO_MODE_BLOCKING) { |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
943 | if (fcntl(SSL_get_fd(st->ssl), F_SETFL, flags & ~O_NONBLOCK) != 0) { |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
944 | perror("fcntl"); |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
945 | // TODO: error |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
946 | } |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
947 | } else if(mode == IO_MODE_NONBLOCKING) { |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
948 | if (fcntl(SSL_get_fd(st->ssl), F_SETFL, flags | O_NONBLOCK) != 0) { |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
949 | perror("fcntl"); |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
950 | // TODO: error |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
951 | } |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
952 | } |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
953 | } |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
954 | |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
955 | int net_ssl_poll(SSLStream *st, EventHandler *ev, int events, Event *cb) { |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
956 | int fd = SSL_get_fd(st->ssl); |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
957 | switch(events) { |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
958 | default: return -1; |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
959 | case IO_POLL_NONE: return ev_remove_poll(ev, fd); |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
960 | case IO_POLL_IN: return ev_pollin(ev, fd, cb); |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
961 | case IO_POLL_OUT: return ev_pollout(ev, fd, cb); |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
962 | case IO_POLL_IN | IO_POLL_OUT: return -1; // TODO: implement |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
963 | } |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
964 | } |
|
106
b122f34ddc80
added minimal ssl support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
104
diff
changeset
|
965 | |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
966 | /* -------------------- public nsapi network functions -------------------- */ |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
967 | |
|
8
f4d56bf9de40
Added request body reader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
968 | ssize_t net_read(SYS_NETFD fd, void *buf, size_t nbytes) { |
|
f4d56bf9de40
Added request body reader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
969 | ssize_t r = ((IOStream*)fd)->read(fd, buf, nbytes); |
|
f4d56bf9de40
Added request body reader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
970 | if(r == 0) { |
|
f4d56bf9de40
Added request body reader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
971 | return IO_EOF; |
|
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
972 | } else if(r < 0) { |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
973 | ((IOStream*)fd)->io_errno = errno; |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
974 | return IO_ERROR; |
|
8
f4d56bf9de40
Added request body reader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
975 | } |
|
f4d56bf9de40
Added request body reader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
976 | return r; |
|
f4d56bf9de40
Added request body reader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
977 | } |
|
f4d56bf9de40
Added request body reader
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
4
diff
changeset
|
978 | |
|
498
0d80f8a2b29f
fix net_http_write when used with chunked transfer encoding and non-blocking IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
493
diff
changeset
|
979 | ssize_t net_write(SYS_NETFD fd, const void *buf, size_t nbytes) { |
|
513
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
980 | size_t w = 0; |
|
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
981 | size_t remaining = nbytes; |
|
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
982 | const char *cbuf = buf; |
|
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
983 | ssize_t r = 0; |
|
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
984 | int attempts = 0; |
|
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
985 | while(w < nbytes && attempts < net_write_max_attempts) { |
|
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
986 | r = ((IOStream*)fd)->write(fd, cbuf, remaining); |
|
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
987 | if(r <= 0) { |
|
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
988 | break; |
|
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
989 | } |
|
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
990 | w += r; |
|
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
991 | cbuf += r; |
|
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
992 | remaining -= r; |
|
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
993 | attempts++; |
|
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
994 | } |
|
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
995 | if(r < 0 && w == 0) { |
|
9
30e51941a673
Added mod_jk dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
8
diff
changeset
|
996 | return IO_ERROR; |
|
20
7b235fa88008
Some fixes for mod_jk
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
14
diff
changeset
|
997 | } |
|
513
9a49c245a49c
change net_write to attempt to write all bytes, improve error handling
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
502
diff
changeset
|
998 | return w; |
|
9
30e51941a673
Added mod_jk dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
8
diff
changeset
|
999 | } |
|
30e51941a673
Added mod_jk dependencies
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
8
diff
changeset
|
1000 | |
|
64
c7f5b062e622
added net_writev
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
1001 | ssize_t net_writev(SYS_NETFD fd, struct iovec *iovec, int iovcnt) { |
|
c7f5b062e622
added net_writev
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
1002 | ssize_t r = ((IOStream*)fd)->writev(fd, iovec, iovcnt); |
|
c7f5b062e622
added net_writev
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
1003 | if(r < 0) { |
|
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
1004 | ((IOStream*)fd)->io_errno = errno; |
|
64
c7f5b062e622
added net_writev
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
1005 | return IO_ERROR; |
|
c7f5b062e622
added net_writev
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
1006 | } |
|
c7f5b062e622
added net_writev
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
1007 | return r; |
|
c7f5b062e622
added net_writev
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
1008 | } |
|
c7f5b062e622
added net_writev
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
1009 | |
|
23
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
1010 | ssize_t net_printf(SYS_NETFD fd, char *format, ...) { |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
1011 | va_list arg; |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
1012 | va_start(arg, format); |
|
415
d938228c382e
switch from ucx 2 to 3
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
407
diff
changeset
|
1013 | cxmutstr buf = cx_vasprintf_a(cxDefaultAllocator, format, arg); |
|
383
a5698877d14a
fix net_printf not working with empty strings
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
361
diff
changeset
|
1014 | ssize_t r = buf.length > 0 ? net_write(fd, buf.ptr, buf.length) : 0; |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1015 | free(buf.ptr); |
|
142
55298bc9ed28
adds new a pathcheck saf and improves content type matchin and improves content type matching
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
133
diff
changeset
|
1016 | va_end(arg); |
|
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
1017 | if(r < 0) { |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
1018 | ((IOStream*)fd)->io_errno = errno; |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
1019 | } |
|
64
c7f5b062e622
added net_writev
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
54
diff
changeset
|
1020 | return r; |
|
23
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
1021 | } |
|
a2c8fc23c90e
Added basic authentication
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
20
diff
changeset
|
1022 | |
| 54 | 1023 | ssize_t net_sendfile(SYS_NETFD fd, sendfiledata *sfd) { |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1024 | IOStream *out = fd; |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1025 | if(out->sendfile && sfd->fd && sfd->fd->fd != -1) { |
|
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1026 | ssize_t r = out->sendfile(fd, sfd); |
| 54 | 1027 | if(r < 0) { |
|
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
1028 | out->io_errno = errno; |
| 54 | 1029 | return IO_ERROR; |
| 1030 | } | |
|
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
1031 | return r; |
| 54 | 1032 | } else { |
|
66
74babc0082b7
added authentication cache
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
1033 | // stream/file does not support sendfile |
|
74babc0082b7
added authentication cache
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
65
diff
changeset
|
1034 | // do regular copy |
| 112 | 1035 | return net_fallback_sendfile(out, sfd); |
| 54 | 1036 | } |
| 1037 | } | |
| 1038 | ||
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1039 | // private |
| 112 | 1040 | ssize_t net_fallback_sendfile(IOStream *fd, sendfiledata *sfd) { |
|
111
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1041 | char *buf = malloc(4096); |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1042 | if(!buf) { |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1043 | // TODO: out of memory error |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1044 | return IO_ERROR; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1045 | } |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1046 | char *header = (char*)sfd->header; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1047 | int hlen = sfd->hlen; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1048 | char *trailer = (char*)sfd->trailer; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1049 | int tlen = sfd->tlen; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1050 | if(header == NULL) { |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1051 | hlen = 0; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1052 | } |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1053 | if(trailer == NULL) { |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1054 | tlen = 0; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1055 | } |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1056 | |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1057 | ssize_t r; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1058 | while(hlen > 0) { |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1059 | r = fd->write(fd, header, hlen); |
|
111
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1060 | header += r; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1061 | hlen -= r; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1062 | if(r <= 0) { |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1063 | free(buf); |
|
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
1064 | fd->io_errno = errno; |
|
111
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1065 | return IO_ERROR; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1066 | } |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1067 | } |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1068 | |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1069 | if(system_lseek(sfd->fd, sfd->offset, SEEK_SET) == -1) { |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1070 | free(buf); |
|
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
1071 | fd->io_errno = errno; |
|
111
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1072 | return IO_ERROR; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1073 | } |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1074 | |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1075 | size_t length = sfd->len; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1076 | while(length > 0) { |
|
205
b8515afa450a
improve error handling and add some debug code in net_fallback_sendfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
203
diff
changeset
|
1077 | // TODO: remove |
|
b8515afa450a
improve error handling and add some debug code in net_fallback_sendfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
203
diff
changeset
|
1078 | if(length > sfd->len) { |
|
b8515afa450a
improve error handling and add some debug code in net_fallback_sendfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
203
diff
changeset
|
1079 | log_ereport(LOG_WARN, "net_fallback_sendfile: length > sfd->len: %zu > %zu", length, sfd->len); |
|
b8515afa450a
improve error handling and add some debug code in net_fallback_sendfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
203
diff
changeset
|
1080 | free(buf); |
|
b8515afa450a
improve error handling and add some debug code in net_fallback_sendfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
203
diff
changeset
|
1081 | return IO_ERROR; |
|
b8515afa450a
improve error handling and add some debug code in net_fallback_sendfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
203
diff
changeset
|
1082 | } |
|
b8515afa450a
improve error handling and add some debug code in net_fallback_sendfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
203
diff
changeset
|
1083 | |
|
111
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1084 | if((r = system_fread(sfd->fd, buf, 4096)) <= 0) { |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1085 | break; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1086 | } |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1087 | char *write_buf = buf; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1088 | while(r > 0) { |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1089 | ssize_t w = fd->write(fd, write_buf, r); |
|
205
b8515afa450a
improve error handling and add some debug code in net_fallback_sendfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
203
diff
changeset
|
1090 | // TODO: remove |
|
b8515afa450a
improve error handling and add some debug code in net_fallback_sendfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
203
diff
changeset
|
1091 | if(w > r) { |
|
b8515afa450a
improve error handling and add some debug code in net_fallback_sendfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
203
diff
changeset
|
1092 | log_ereport(LOG_WARN, "net_fallback_sendfile: w > r, %zd > %zd", w, r); |
|
b8515afa450a
improve error handling and add some debug code in net_fallback_sendfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
203
diff
changeset
|
1093 | w = 0; |
|
b8515afa450a
improve error handling and add some debug code in net_fallback_sendfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
203
diff
changeset
|
1094 | } |
|
b8515afa450a
improve error handling and add some debug code in net_fallback_sendfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
203
diff
changeset
|
1095 | |
|
203
7fe53d5d587c
fix error handling in net_fallback_sendfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
193
diff
changeset
|
1096 | if(w <= 0) { |
|
205
b8515afa450a
improve error handling and add some debug code in net_fallback_sendfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
203
diff
changeset
|
1097 | free(buf); |
|
b8515afa450a
improve error handling and add some debug code in net_fallback_sendfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
203
diff
changeset
|
1098 | fd->io_errno = errno; |
|
b8515afa450a
improve error handling and add some debug code in net_fallback_sendfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
203
diff
changeset
|
1099 | return IO_ERROR; |
|
203
7fe53d5d587c
fix error handling in net_fallback_sendfile
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
193
diff
changeset
|
1100 | } |
|
111
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1101 | r -= w; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1102 | length -= w; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1103 | write_buf += w; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1104 | } |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1105 | } |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1106 | free(buf); |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1107 | if(length > 0) { |
|
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
1108 | fd->io_errno = errno; |
|
111
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1109 | return IO_ERROR; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1110 | } |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1111 | |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1112 | while(tlen > 0) { |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1113 | r = fd->write(fd, trailer, tlen); |
|
111
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1114 | trailer += r; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1115 | tlen -= r; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1116 | if(r <= 0) { |
|
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
1117 | fd->io_errno = errno; |
|
111
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1118 | return IO_ERROR; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1119 | } |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1120 | } |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1121 | |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1122 | return sfd->hlen + sfd->len + sfd->tlen; |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1123 | } |
|
c93be34fde76
fixed NetBSD build and an uninitialized struct member
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1124 | |
|
82
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
80
diff
changeset
|
1125 | int net_flush(SYS_NETFD sd) { |
|
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
80
diff
changeset
|
1126 | // TODO: implement |
|
740cfd9dd443
added some nsapi stuff
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
80
diff
changeset
|
1127 | return 0; |
|
4
998844b5ed25
Added some protocol functions
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1
diff
changeset
|
1128 | } |
|
32
ebba53de8b18
added solaris 10 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1129 | |
|
80
0de4a90979e1
fixed chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
1130 | void net_close(SYS_NETFD fd) { |
|
0de4a90979e1
fixed chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
1131 | ((IOStream*)fd)->close(fd); |
|
32
ebba53de8b18
added solaris 10 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1132 | } |
|
ebba53de8b18
added solaris 10 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1133 | |
|
172
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
1134 | int net_setnonblock(SYS_NETFD fd, int nonblock) { |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
1135 | ((IOStream*)fd)->setmode( |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
1136 | fd, |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
1137 | nonblock ? IO_MODE_NONBLOCKING : IO_MODE_BLOCKING); |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
1138 | return 0; |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
1139 | } |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
1140 | |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
1141 | int net_errno(SYS_NETFD fd) { |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
1142 | return ((IOStream*)fd)->io_errno; |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
1143 | } |
|
5580517faafc
adds public aio and poll api and asynchronous send_range function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
147
diff
changeset
|
1144 | |
|
110
43a746e905f6
refactored IO system
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
106
diff
changeset
|
1145 | // private |
|
80
0de4a90979e1
fixed chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
1146 | void net_finish(SYS_NETFD fd) { |
|
0de4a90979e1
fixed chunked transfer encoding
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
71
diff
changeset
|
1147 | ((IOStream*)fd)->finish(fd); |
|
32
ebba53de8b18
added solaris 10 support
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
25
diff
changeset
|
1148 | } |