author | Tero Marttila <terom@fixme.fi> |
Tue, 17 Jun 2008 19:08:05 +0300 | |
changeset 22 | 4627760fc0d1 |
parent 18 | 86f2e5b7191b |
child 27 | 1e79b4cc8f1b |
permissions | -rw-r--r-- |
10
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
1 |
#include <sys/queue.h> |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
2 |
#include <string.h> |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
3 |
#include <stdlib.h> |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
4 |
|
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
5 |
#include <event2/event_struct.h> |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
6 |
|
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
7 |
#include "http.h" |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
8 |
#include "common.h" |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
9 |
|
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
10 |
int http_qarg_parse (struct evhttp_request *request, struct http_qarg *qarg_spec) { |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
11 |
// our return code |
12
43297144f196
* rename files, render_file -> file_main, render_node -> node_main, mandelbrot -> render_mandelbrot
Tero Marttila <terom@fixme.fi>
parents:
10
diff
changeset
|
12 |
int error = -1; |
10
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
13 |
|
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
14 |
// get the uri from the request |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
15 |
const char *uri = evhttp_request_get_uri(request); |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
16 |
|
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
17 |
// the keyval list that we get from evhttp_parse_query |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
18 |
struct evkeyval *qarg; |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
19 |
struct evkeyvalq qargs; |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
20 |
|
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
21 |
// parse the uri into a list |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
22 |
evhttp_parse_query(uri, &qargs); |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
23 |
|
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
24 |
// iterate over the list of given query arugments |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
25 |
TAILQ_FOREACH(qarg, &qargs, next) { |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
26 |
struct http_qarg *qarg_info; |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
27 |
|
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
28 |
// match them against our http_qarg structs |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
29 |
for (qarg_info = qarg_spec; qarg_info->hqa_type != QARG_END; qarg_info++) { |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
30 |
if (strcmp(qarg->key, qarg_info->hqa_key) == 0) { |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
31 |
// found a match |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
32 |
|
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
33 |
// extract a value from the qarg |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
34 |
char *cptr = NULL; |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
35 |
signed long int int_val; |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
36 |
|
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
37 |
switch (qarg_info->hqa_type) { |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
38 |
case QARG_UINT : |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
39 |
int_val = strtol(qarg->value, &cptr, 10); |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
40 |
|
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
41 |
if (*qarg->value == '\0' || *cptr != '\0' || int_val < 0) |
18
86f2e5b7191b
render_multi uses render_slices now, and seems to work
Tero Marttila <terom@fixme.fi>
parents:
12
diff
changeset
|
42 |
ERROR("invalid QARG_UINT: %s: %s -> %ld", qarg->key, qarg->value, int_val); |
10
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
43 |
|
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
44 |
*((unsigned long int *) qarg_info->hqa_addr) = (unsigned long int) int_val; |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
45 |
|
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
46 |
break; |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
47 |
|
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
48 |
case QARG_INVALID : |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
49 |
ERROR("QARG_INVALID: %s: %s", qarg->key, qarg->value); |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
50 |
|
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
51 |
default : |
12
43297144f196
* rename files, render_file -> file_main, render_node -> node_main, mandelbrot -> render_mandelbrot
Tero Marttila <terom@fixme.fi>
parents:
10
diff
changeset
|
52 |
FATAL("invalid qarg_info->hqa_type: %d", qarg_info->hqa_type); |
10
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
53 |
} |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
54 |
} |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
55 |
} |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
56 |
} |
12
43297144f196
* rename files, render_file -> file_main, render_node -> node_main, mandelbrot -> render_mandelbrot
Tero Marttila <terom@fixme.fi>
parents:
10
diff
changeset
|
57 |
|
43297144f196
* rename files, render_file -> file_main, render_node -> node_main, mandelbrot -> render_mandelbrot
Tero Marttila <terom@fixme.fi>
parents:
10
diff
changeset
|
58 |
// success |
43297144f196
* rename files, render_file -> file_main, render_node -> node_main, mandelbrot -> render_mandelbrot
Tero Marttila <terom@fixme.fi>
parents:
10
diff
changeset
|
59 |
error = 0; |
10
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
60 |
error: |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
61 |
|
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
62 |
// clean up the qargs (badly named functions :< ) |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
63 |
evhttp_clear_headers(&qargs); |
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
64 |
|
12
43297144f196
* rename files, render_file -> file_main, render_node -> node_main, mandelbrot -> render_mandelbrot
Tero Marttila <terom@fixme.fi>
parents:
10
diff
changeset
|
65 |
return error; |
10
9daa832ab9c4
separate http query argument parsing into a new http module, and clean up unused headers from web_main.c
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
66 |
} |