projects
/
project
/
uhttpd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix client state tracking and request complete handling
[project/uhttpd.git]
/
client.c
diff --git
a/client.c
b/client.c
index
0c978d7
..
a76d11e
100644
(file)
--- a/
client.c
+++ b/
client.c
@@
-27,12
+27,18
@@
static LIST_HEAD(clients);
int n_clients = 0;
struct config conf = {};
int n_clients = 0;
struct config conf = {};
-
static const char *
http_versions[] = {
+
const char * const
http_versions[] = {
[UH_HTTP_VER_0_9] = "HTTP/0.9",
[UH_HTTP_VER_1_0] = "HTTP/1.0",
[UH_HTTP_VER_1_1] = "HTTP/1.1",
};
[UH_HTTP_VER_0_9] = "HTTP/0.9",
[UH_HTTP_VER_1_0] = "HTTP/1.0",
[UH_HTTP_VER_1_1] = "HTTP/1.1",
};
+const char * const http_methods[] = {
+ [UH_HTTP_MSG_GET] = "GET",
+ [UH_HTTP_MSG_POST] = "POST",
+ [UH_HTTP_MSG_HEAD] = "HEAD",
+};
+
void uh_http_header(struct client *cl, int code, const char *summary)
{
const char *enc = "Transfer-Encoding: chunked\r\n";
void uh_http_header(struct client *cl, int code, const char *summary)
{
const char *enc = "Transfer-Encoding: chunked\r\n";
@@
-53,7
+59,7
@@
void uh_http_header(struct client *cl, int code, const char *summary)
static void uh_connection_close(struct client *cl)
{
static void uh_connection_close(struct client *cl)
{
- cl->state = CLIENT_STATE_
DON
E;
+ cl->state = CLIENT_STATE_
CLOS
E;
cl->us->eof = true;
ustream_state_change(cl->us);
}
cl->us->eof = true;
ustream_state_change(cl->us);
}
@@
-113,11
+119,21
@@
static void client_timeout(struct uloop_timeout *timeout)
uh_connection_close(cl);
}
uh_connection_close(cl);
}
+static int find_idx(const char * const *list, int max, const char *str)
+{
+ int i;
+
+ for (i = 0; i < max; i++)
+ if (!strcmp(list[i], str))
+ return i;
+
+ return -1;
+}
+
static int client_parse_request(struct client *cl, char *data)
{
struct http_request *req = &cl->request;
char *type, *path, *version;
static int client_parse_request(struct client *cl, char *data)
{
struct http_request *req = &cl->request;
char *type, *path, *version;
- int i;
type = strtok(data, " ");
path = strtok(NULL, " ");
type = strtok(data, " ");
path = strtok(NULL, " ");
@@
-126,23
+142,11
@@
static int client_parse_request(struct client *cl, char *data)
return CLIENT_STATE_DONE;
req->url = path;
return CLIENT_STATE_DONE;
req->url = path;
- if (!strcmp(type, "GET"))
- req->method = UH_HTTP_MSG_GET;
- else if (!strcmp(type, "POST"))
- req->method = UH_HTTP_MSG_POST;
- else if (!strcmp(type, "HEAD"))
- req->method = UH_HTTP_MSG_HEAD;
- else
+ req->method = find_idx(http_methods, ARRAY_SIZE(http_methods), type);
+ if (req->method < 0)
return CLIENT_STATE_DONE;
return CLIENT_STATE_DONE;
- cl->request.version = -1;
- i = array_size(http_versions);
- while (i--) {
- if (!strcmp(version, http_versions[i])) {
- cl->request.version = i;
- break;
- }
- }
+ req->version = find_idx(http_versions, ARRAY_SIZE(http_versions), version);
if (cl->request.version < 0)
return CLIENT_STATE_DONE;
if (cl->request.version < 0)
return CLIENT_STATE_DONE;
@@
-170,29
+174,26
@@
static bool client_init_cb(struct client *cl, char *buf, int len)
static void client_header_complete(struct client *cl)
{
static void client_header_complete(struct client *cl)
{
- uh_handle_
file_
request(cl);
+ uh_handle_request(cl);
}
}
-static
int
client_parse_header(struct client *cl, char *data)
+static
void
client_parse_header(struct client *cl, char *data)
{
char *name;
char *val;
if (!*data) {
uloop_timeout_cancel(&cl->timeout);
{
char *name;
char *val;
if (!*data) {
uloop_timeout_cancel(&cl->timeout);
+ cl->state = CLIENT_STATE_DATA;
client_header_complete(cl);
client_header_complete(cl);
- return
CLIENT_STATE_DATA
;
+ return;
}
}
- val = strchr(data, ':');
- if (!val)
- return CLIENT_STATE_DONE;
-
- *val = 0;
- val++;
-
- while (isspace(*val))
- val++;
+ val = uh_split_header(data);
+ if (!val) {
+ cl->state = CLIENT_STATE_DONE;
+ return;
+ }
for (name = data; *name; name++)
if (isupper(*name))
for (name = data; *name; name++)
if (isupper(*name))
@@
-200,7
+201,7
@@
static int client_parse_header(struct client *cl, char *data)
blobmsg_add_string(&cl->hdr, data, val);
blobmsg_add_string(&cl->hdr, data, val);
-
return
CLIENT_STATE_HEADER;
+
cl->state =
CLIENT_STATE_HEADER;
}
static bool client_data_cb(struct client *cl, char *buf, int len)
}
static bool client_data_cb(struct client *cl, char *buf, int len)
@@
-218,7
+219,7
@@
static bool client_header_cb(struct client *cl, char *buf, int len)
return false;
*newline = 0;
return false;
*newline = 0;
- cl
->state = cl
ient_parse_header(cl, buf);
+ client_parse_header(cl, buf);
line_len = newline + 2 - buf;
ustream_consume(cl->us, line_len);
if (cl->state == CLIENT_STATE_DATA)
line_len = newline + 2 - buf;
ustream_consume(cl->us, line_len);
if (cl->state == CLIENT_STATE_DATA)
@@
-288,9
+289,15
@@
static void client_notify_state(struct ustream *s)
{
struct client *cl = container_of(s, struct client, sfd);
{
struct client *cl = container_of(s, struct client, sfd);
- if (cl->state == CLIENT_STATE_CLOSE ||
- (s->eof && !s->w.data_bytes) || s->write_error)
- return client_close(cl);
+ if (!s->write_error) {
+ if (cl->state == CLIENT_STATE_DATA)
+ return;
+
+ if (!s->eof || s->w.data_bytes)
+ return;
+ }
+
+ return client_close(cl);
}
void uh_accept_client(int fd)
}
void uh_accept_client(int fd)