p
/
ponymap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

HTTP: initialize `http_settings' statically

This commit is contained in:
Přemysl Eric Janouch 2014-09-21 01:12:15 +02:00
parent 82a125a3c3
commit d453a1226c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/http.c
View File

@ -42,8 +42,6 @@ struct scan_data
struct unit *u; ///< Scan unit struct unit *u; ///< Scan unit
http_parser parser; ///< HTTP parser http_parser parser; ///< HTTP parser
http_parser_settings settings; ///< HTTP parser settings
enum header_state state; ///< What did we get last time? enum header_state state; ///< What did we get last time?
struct str field; ///< Field part buffer struct str field; ///< Field part buffer
struct str value; ///< Value part buffer struct str value; ///< Value part buffer
@ -109,11 +107,6 @@ scan_init (struct unit *u)
http_parser_init (&scan->parser, HTTP_RESPONSE); http_parser_init (&scan->parser, HTTP_RESPONSE);
scan->parser.data = scan; scan->parser.data = scan;
http_parser_settings *s = &scan->settings;
s->on_header_field = on_header_field;
s->on_header_value = on_header_value;
s->on_headers_complete = on_headers_complete;
scan->state = STATE_FIELD; scan->state = STATE_FIELD;
str_init (&scan->field); str_init (&scan->field);
str_init (&scan->value); str_init (&scan->value);
@ -134,12 +127,19 @@ scan_free (void *handle)
static void static void
on_data (void *handle, struct unit *u, struct str *data) on_data (void *handle, struct unit *u, struct str *data)
{ {
static const http_parser_settings http_settings =
{
.on_header_field = on_header_field,
.on_header_value = on_header_value,
.on_headers_complete = on_headers_complete,
};
struct scan_data *scan = handle; struct scan_data *scan = handle;
http_parser *parser = &scan->parser; http_parser *parser = &scan->parser;
size_t len = data ? data->len : 0; size_t len = data ? data->len : 0;
const char *str = data ? data->str : NULL; const char *str = data ? data->str : NULL;
size_t n_parsed = http_parser_execute (parser, &scan->settings, str, len); size_t n_parsed = http_parser_execute (parser, &http_settings, str, len);
if (parser->upgrade) if (parser->upgrade)
{ {