Sun, 15 Feb 2026 13:30:29 +0100
add http_client_send_request test
|
662
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
3 | * |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
4 | * Copyright 2026 Olaf Wintermann. All rights reserved. |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
5 | * |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
8 | * |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
11 | * |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
15 | * |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
|
662
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
|
70fdf948b642
refactor HttpParser to support parsing of Http responses
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
29 | #include "httpclient.h" |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
30 | |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
31 | #include "../util/socket.h" |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
32 | |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
33 | #include <cx/buffer.h> |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
34 | #include <cx/string.h> |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
35 | #include <stdlib.h> |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
36 | #include <string.h> |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
37 | #include <errno.h> |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
38 | |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
39 | static int client_connected(EventHandler *ev, Event *event); |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
40 | static int client_io(EventHandler *ev, Event *event); |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
41 | static int client_finished(EventHandler *ev, Event *event); |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
42 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
43 | static int client_send_request(HttpClient *client); |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
44 | |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
45 | HttpClient* http_client_new(EventHandler *ev) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
46 | CxMempool *mp = cxMempoolCreate(32, CX_MEMPOOL_TYPE_PURE); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
47 | if(!mp) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
48 | return NULL; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
49 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
50 | |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
51 | HttpClient *client = malloc(sizeof(HttpClient)); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
52 | HeaderArray *req_headers = header_array_create(); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
53 | HeaderArray *resp_headers = header_array_create(); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
54 | if(!client || !req_headers || !resp_headers) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
55 | free(client); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
56 | header_array_free(req_headers); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
57 | header_array_free(resp_headers); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
58 | cxMempoolFree(mp); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
59 | return NULL; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
60 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
61 | |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
62 | memset(client, 0, sizeof(HttpClient)); |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
63 | client->ev = ev; |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
64 | client->socketfd = -1; |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
65 | client->request_headers = req_headers; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
66 | client->response_headers = resp_headers; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
67 | |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
68 | client->buffer.maxsize = HTTP_CLIENT_BUFFER_SIZE; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
69 | client->buffer.inbuf = malloc(HTTP_CLIENT_BUFFER_SIZE); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
70 | HttpParser *parser = http_parser_new2(1, &client->buffer, resp_headers); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
71 | if(!parser || !client->buffer.inbuf) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
72 | http_client_free(client); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
73 | return NULL; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
74 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
75 | client->parser = parser; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
76 | |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
77 | return client; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
78 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
79 | |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
80 | void http_client_free(HttpClient *client) { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
81 | cxMempoolFree(client->mp); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
82 | header_array_free(client->request_headers); |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
83 | http_parser_free(client->parser); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
84 | free(client->buffer.inbuf); |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
85 | free(client->addr); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
86 | free(client->method); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
87 | free(client->uri); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
88 | free(client); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
89 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
90 | |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
91 | int http_client_set_addr(HttpClient *client, const struct sockaddr *addr, socklen_t addrlen) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
92 | free(client->addr); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
93 | client->addr = NULL; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
94 | client->addrlen = 0; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
95 | |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
96 | void *newaddr = malloc(addrlen); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
97 | if(!newaddr) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
98 | return 1; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
99 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
100 | memcpy(newaddr, addr, addrlen); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
101 | client->addr = newaddr; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
102 | client->addrlen = addrlen; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
103 | |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
104 | return 0; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
105 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
106 | |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
107 | int http_client_set_method(HttpClient *client, const char *method) { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
108 | return http_client_set_method_len(client, method, method ? strlen(method) : 0); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
109 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
110 | |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
111 | int http_client_set_uri(HttpClient *client, const char *uri) { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
112 | return http_client_set_uri_len(client, uri, uri ? strlen(uri) : 0); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
113 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
114 | |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
115 | static int client_set_str(char **ptr, const char *str, size_t len) { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
116 | free(*ptr); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
117 | if(str) { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
118 | char *newvalue = malloc(len+1); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
119 | if(!newvalue) { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
120 | *ptr = NULL; |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
121 | return 1; |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
122 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
123 | memcpy(newvalue, str, len); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
124 | newvalue[len] = 0; |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
125 | *ptr = newvalue; |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
126 | } else { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
127 | *ptr = NULL; |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
128 | } |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
129 | return 0; |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
130 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
131 | |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
132 | int http_client_set_method_len(HttpClient *client, const char *method, size_t len) { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
133 | return client_set_str(&client->method, method, len); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
134 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
135 | |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
136 | int http_client_set_uri_len(HttpClient *client, const char *uri, size_t len) { |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
137 | return client_set_str(&client->uri, uri, len); |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
138 | } |
|
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
139 | |
|
665
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
140 | int http_client_add_request_header(HttpClient *client, cxmutstr name, cxmutstr value) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
141 | return header_array_add(client->request_headers, name, value); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
142 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
143 | |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
144 | int http_client_add_request_header_copy(HttpClient *client, cxstring name, cxstring value) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
145 | cxmutstr n = cx_strdup_a(client->mp->allocator, name); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
146 | cxmutstr v = cx_strdup_a(client->mp->allocator, value); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
147 | |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
148 | int err = 1; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
149 | if(n.ptr && v.ptr) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
150 | err = http_client_add_request_header(client, n, v); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
151 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
152 | if(err) { |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
153 | cxFree(client->mp->allocator, n.ptr); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
154 | cxFree(client->mp->allocator, v.ptr); |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
155 | } |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
156 | return err; |
|
b8d5b797d090
add first http client code
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
662
diff
changeset
|
157 | } |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
158 | |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
159 | int http_client_start(HttpClient *client) { |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
160 | int socketfd = socket(AF_INET, SOCK_STREAM, 0); |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
161 | if(socketfd < 0) { |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
162 | return 1; |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
163 | } |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
164 | |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
165 | if(util_socket_setnonblock(socketfd, 1)) { |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
166 | close(socketfd); |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
167 | return 1; |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
168 | } |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
169 | |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
170 | client->socketfd = socketfd; |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
171 | |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
172 | client->writeev.cookie = client; |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
173 | client->writeev.fn = client_connected; |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
174 | |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
175 | int ret = 1; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
176 | if(connect(socketfd, client->addr, client->addrlen)) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
177 | int err = errno; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
178 | if(err == EINPROGRESS) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
179 | ret = ev_pollout(client->ev, socketfd, &client->writeev); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
180 | } else { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
181 | log_ereport(LOG_FAILURE, "http-client-start: connect failed: %s", strerror(err)); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
182 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
183 | } else { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
184 | // TODO: call client_connected directly |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
185 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
186 | |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
187 | if(ret) { |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
188 | close(socketfd); |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
189 | } |
|
669
ccdc97fd8204
setup HttpClient in proxy SAF
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
668
diff
changeset
|
190 | return ret; |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
191 | } |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
192 | |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
193 | static int create_req_buffer(HttpClient *client) { |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
194 | CxBuffer buf; |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
195 | if(cxBufferInit(&buf, cxDefaultAllocator, NULL, 1024, CX_BUFFER_AUTO_EXTEND)) { |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
196 | return 1; |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
197 | } |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
198 | |
|
668
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
199 | if(client->method) { |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
200 | cxBufferPutString(&buf, "GET "); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
201 | } else { |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
202 | cxBufferPutString(&buf, client->method); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
203 | } |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
204 | cxBufferPutString(&buf, client->uri ? client->uri : "/"); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
205 | cxBufferPutString(&buf, " HTTP/1.1\r\n"); |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
206 | |
|
668
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
207 | HeaderArray *hdr = client->request_headers; |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
208 | while(hdr) { |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
209 | for(int i=0;i<hdr->len;i++) { |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
210 | cxBufferPutString(&buf, hdr->headers[i].name); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
211 | cxBufferPutString(&buf, ": "); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
212 | cxBufferPutString(&buf, hdr->headers[i].value); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
213 | cxBufferPutString(&buf, "\r\n"); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
214 | } |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
215 | hdr = hdr->next; |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
216 | } |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
217 | cxBufferPutString(&buf, "\r\n"); |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
218 | client->req_buffer = buf.space; |
|
0a7d1e9ca6b8
implement HttpClient function create_req_buffer
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
666
diff
changeset
|
219 | client->req_buffer_len = buf.size; |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
220 | |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
221 | return 0; |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
222 | } |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
223 | |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
224 | static int client_connected(EventHandler *ev, Event *event) { |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
225 | HttpClient *client = event->cookie; |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
226 | if(create_req_buffer(client)) { |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
227 | // TODO: set error |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
228 | return 0; // end |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
229 | } |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
230 | event->fn = client_io; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
231 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
232 | return client_io(ev, event); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
233 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
234 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
235 | static int client_io(EventHandler *ev, Event *event) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
236 | HttpClient *client = event->cookie; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
237 | if(client->req_buffer_pos < client->req_buffer_len) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
238 | if(client_send_request(client)) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
239 | if(client->error) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
240 | return 0; // TODO: set error |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
241 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
242 | return 1; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
243 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
244 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
245 | |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
246 | // writing complete, switch to read events |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
247 | event->events = EVENT_POLLIN; |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
248 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
249 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
250 | char *buffer; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
251 | size_t nbytes; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
252 | if(client->header_complete) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
253 | buffer = client->buffer.inbuf; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
254 | nbytes = client->buffer.maxsize; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
255 | } else { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
256 | buffer = client->buffer.inbuf + client->buffer.pos; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
257 | nbytes = client->buffer.maxsize - client->buffer.cursize; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
258 | } |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
259 | |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
260 | |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
261 | ssize_t r; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
262 | while((r = read(client->socketfd, buffer, nbytes)) > 0) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
263 | client->buffer.cursize += r; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
264 | if(!client->header_complete) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
265 | switch(http_parser_process(client->parser)) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
266 | case 0: { // finish |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
267 | if(!http_parser_validate(client->parser)) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
268 | client->error = 1; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
269 | return 0; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
270 | } |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
271 | client->statuscode = client->parser->status; |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
272 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
273 | client->header_complete = 1; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
274 | if(client->response_start) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
275 | cxmutstr msg = client->parser->msg; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
276 | char t = msg.ptr[msg.length]; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
277 | msg.ptr[msg.length] = 0; |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
278 | int ret = client->response_start(client, client->statuscode, msg.ptr, client->response_start_userdata); |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
279 | msg.ptr[msg.length] = t; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
280 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
281 | // TODO: check ret |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
282 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
283 | break; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
284 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
285 | case 1: { // need more data |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
286 | continue; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
287 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
288 | case 2: { // error |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
289 | client->error = 1; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
290 | return 0; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
291 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
292 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
293 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
294 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
295 | // header complete |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
296 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
297 | char *out = client->buffer.inbuf + client->buffer.pos; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
298 | size_t len = client->buffer.cursize - client->buffer.pos; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
299 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
300 | if(client->response_body_write) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
301 | int ret = client->response_body_write(client, out, len, client->response_body_write_userdata); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
302 | // TODO: check ret |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
303 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
304 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
305 | client->buffer.pos = 0; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
306 | client->buffer.cursize = 0; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
307 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
308 | |
|
672
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
309 | if(r < 0) { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
310 | if(errno == EAGAIN) { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
311 | return 1; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
312 | } else { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
313 | log_ereport(LOG_FAILURE, "http-client: IO error: %s", strerror(errno)); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
314 | } |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
315 | } |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
316 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
317 | // request finished |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
318 | if(client->response_finished) { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
319 | client->response_finished(client, client->response_finished_userdata); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
320 | } |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
321 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
322 | return 0; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
323 | } |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
324 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
325 | static int client_finished(EventHandler *ev, Event *event) { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
326 | HttpClient *client = event->cookie; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
327 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
328 | close(client->socketfd); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
329 | client->socketfd = -1; |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
330 | |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
331 | // request finished |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
332 | if(client->response_finished) { |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
333 | client->response_finished(client, client->response_finished_userdata); |
|
226bfd584075
minimally working httpclient
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
671
diff
changeset
|
334 | } |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
335 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
336 | return 0; |
|
666
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
337 | } |
|
c99e0b352e36
add non-blocking http client connect
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
665
diff
changeset
|
338 | |
|
671
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
339 | static int client_send_request(HttpClient *client) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
340 | size_t nbytes = client->req_buffer_len - client->req_buffer_pos; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
341 | ssize_t w = write(client->socketfd, client->req_buffer + client->req_buffer_pos, nbytes); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
342 | if(w <= 0) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
343 | if(errno != EAGAIN) { |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
344 | // TODO: log correct host |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
345 | log_ereport(LOG_VERBOSE, "http-client %s - %s: write failed: %s", "localhost", client->uri, strerror(errno)); |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
346 | client->error = 1; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
347 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
348 | return 1; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
349 | } |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
350 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
351 | client->req_buffer_pos += w; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
352 | |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
353 | return client->req_buffer_pos < client->req_buffer_len; |
|
879005903b2b
implement basic http client IO
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
669
diff
changeset
|
354 | } |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
355 | |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
356 | |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
357 | |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
358 | /* --------------------------------- Tests --------------------------------- */ |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
359 | |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
360 | static CX_TEST(test_http_client_send_request) { |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
361 | CX_TEST_DO { |
|
674
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
362 | EventHandler dummy; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
363 | HttpClient *client = http_client_new(&dummy); |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
364 | |
|
674
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
365 | int fds[2]; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
366 | util_socketpair(fds); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
367 | util_socket_setnonblock(fds[0], 1); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
368 | util_socket_setnonblock(fds[1], 1); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
369 | client->socketfd = fds[0]; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
370 | int sock = fds[1]; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
371 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
372 | // create a large test buffer, that is bigger than the socket buffer |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
373 | // 32mb should be enough |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
374 | size_t len = 32*1024*1024; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
375 | char *str = malloc(len); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
376 | // init the buffer with random data |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
377 | for(size_t i=0;i<len;i+=sizeof(int)) { |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
378 | int *p = (int*)(str+i); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
379 | *p = rand();; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
380 | } |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
381 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
382 | client->req_buffer = str; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
383 | client->req_buffer_len = len; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
384 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
385 | // test client_send_request |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
386 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
387 | int ret = client_send_request(client); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
388 | // It is very likely that the first client_send_request call doesn't |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
389 | // fully write the request buffer to the socket |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
390 | // In that case it returns 1 but without the error flag |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
391 | CX_TEST_ASSERT(ret == 1 && !client->error); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
392 | CX_TEST_ASSERT(client->req_buffer_pos > 0); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
393 | CX_TEST_ASSERT(client->req_buffer_pos < len); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
394 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
395 | // read the request buffer from sock and continue with client_send_request |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
396 | CxBuffer buf; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
397 | cxBufferInit(&buf, cxDefaultAllocator, NULL, len, CX_BUFFER_AUTO_EXTEND); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
398 | char tmpbuf[1024]; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
399 | int writes = 1; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
400 | while(client->req_buffer_pos < client->req_buffer_len && writes < 2000000) { |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
401 | ssize_t r = read(sock, tmpbuf, 1024); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
402 | CX_TEST_ASSERT(r >= 0); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
403 | cxBufferWrite(tmpbuf, 1, r, &buf); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
404 | ret = client_send_request(client); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
405 | CX_TEST_ASSERT(ret == 0 || (ret == 1 && !client->error)); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
406 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
407 | writes++; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
408 | } |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
409 | CX_TEST_ASSERT(client->req_buffer_pos == client->req_buffer_len); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
410 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
411 | // finish reading the request buffer from sock |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
412 | ssize_t r; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
413 | while((r = read(sock, tmpbuf, 1024)) > 0 && writes < 2000000) { |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
414 | cxBufferWrite(tmpbuf, 1, r, &buf); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
415 | writes++; |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
416 | } |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
417 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
418 | CX_TEST_ASSERT(buf.size == len); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
419 | CX_TEST_ASSERT(!memcmp(str, buf.space, len)); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
420 | |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
421 | // cleanup |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
422 | close(fds[0]); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
423 | close(fds[1]); |
|
6a031133a498
add http_client_send_request test
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
673
diff
changeset
|
424 | http_client_free(client); |
|
673
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
425 | } |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
426 | } |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
427 | |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
428 | void http_client_add_tests(CxTestSuite *suite) { |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
429 | cx_test_register(suite, test_http_client_send_request); |
|
144bdc33fdb6
add socket utils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
672
diff
changeset
|
430 | } |