From 97ca851780e814ad19931f9b1f67bbda2454e33a Mon Sep 17 00:00:00 2001 From: SJ Date: Mon, 23 Jul 2012 16:51:36 +0200 Subject: [PATCH] added a debug option to the parse_line function --- src/cfg.c | 1 + src/cfg.h | 2 ++ src/parser.c | 2 ++ test/Makefile.in | 6 +++--- test/{view.c => debug.c} | 2 ++ 5 files changed, 10 insertions(+), 3 deletions(-) rename test/{view.c => debug.c} (98%) diff --git a/src/cfg.c b/src/cfg.c index 92ca197e..4502b554 100644 --- a/src/cfg.c +++ b/src/cfg.c @@ -64,6 +64,7 @@ struct _parse_rule config_parse_rules[] = { "clamd_addr", "string", (void*) string_parser, offsetof(struct __config, clamd_addr), "", MAXVAL-1}, { "clamd_port", "integer", (void*) int_parser, offsetof(struct __config, clamd_port), "0", sizeof(int)}, { "clamd_socket", "string", (void*) string_parser, offsetof(struct __config, clamd_socket), CLAMD_SOCKET, MAXVAL-1}, + { "debug", "integer", (void*) int_parser, offsetof(struct __config, debug), "0", sizeof(int)}, { "default_retention_days", "integer", (void*) int_parser, offsetof(struct __config, default_retention_days), "2557", sizeof(int)}, { "hostid", "string", (void*) string_parser, offsetof(struct __config, hostid), HOSTID, MAXVAL-1}, { "iv", "string", (void*) string_parser, offsetof(struct __config, iv), "", MAXVAL-1}, diff --git a/src/cfg.h b/src/cfg.h index 93fc5013..24940e65 100644 --- a/src/cfg.h +++ b/src/cfg.h @@ -63,6 +63,8 @@ struct __config { int memcached_to_db_interval; int archive_emails_not_having_message_id; + + int debug; }; diff --git a/src/parser.c b/src/parser.c index 0f56e3c2..a01dd212 100644 --- a/src/parser.c +++ b/src/parser.c @@ -142,6 +142,8 @@ int parse_line(char *buf, struct _state *state, struct session_data *sdata, int char *p, *q, puf[SMALLBUFSIZE]; int x, n, len, b64_len, boundary_line=0; + if(cfg->debug == 1) printf("line: %s", buf); + state->line_num++; len = strlen(buf); diff --git a/test/Makefile.in b/test/Makefile.in index ba09faf8..d0f7f0f1 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -24,12 +24,12 @@ RUNNING_GROUP = `@id_bin@ -gn $(RUNNING_USER)` INSTALL = @INSTALL@ -all: parser view +all: parser debug parser: parser.c ../src/libpiler.a $(CC) $(CFLAGS) $(INCDIR) $(DEFS) -o $@ $^ -lpiler $(LIBS) $(LIBDIR) -view: view.c ../src/libpiler.a +debug: debug.c ../src/libpiler.a $(CC) $(CFLAGS) $(INCDIR) $(DEFS) -o $@ $^ -lpiler $(LIBS) $(LIBDIR) install: @@ -38,7 +38,7 @@ test: ./parser clean: - rm -f parser view + rm -f parser debug distclean: clean rm -f Makefile diff --git a/test/view.c b/test/debug.c similarity index 98% rename from test/view.c rename to test/debug.c index e40c0119..df4e624a 100644 --- a/test/view.c +++ b/test/debug.c @@ -42,6 +42,8 @@ int main(int argc, char **argv){ snprintf(sdata.filename, SMALLBUFSIZE-1, "%s", argv[1]); snprintf(sdata.tmpframe, SMALLBUFSIZE-1, "%s.m", argv[1]); + cfg.debug = 1; + state = parse_message(&sdata, 0, &cfg); post_parse(&sdata, &state, &cfg);