From 2dc2394a2f430098f9b33cd18bc059a12587b9ba Mon Sep 17 00:00:00 2001 From: Olaf Rempel Date: Wed, 15 Nov 2006 00:35:57 +0100 Subject: [PATCH] get it working --- urlfilter.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/urlfilter.c b/urlfilter.c index 7e37d10..b3bc6c2 100644 --- a/urlfilter.c +++ b/urlfilter.c @@ -59,23 +59,24 @@ static int daemon_loop(sqlite3 *db) if (cp != NULL) *cp= '\0'; - char *ipstr = strtok(line, " \t"); + char *tmp = strtok(line, " \t"); + char *ipstr = strtok(NULL, " \t"); char *urlstr = strtok(NULL, " \t"); - if (ipstr == NULL || urlstr == NULL) { - puts("ERR\n"); + if (tmp == NULL || ipstr == NULL || urlstr == NULL) { + puts("ERR"); continue; } struct in_addr addr; ret = inet_aton(ipstr, &addr); if (ret == 0) { - puts("ERR\n"); + puts("ERR"); continue; } ret = snprintf(query, BUF_SIZE, "SELECT url FROM urlfilter WHERE (ip & mask) == (%u & mask);", addr.s_addr); if (ret < 0 || ret >= BUF_SIZE) { - puts("ERR\n"); + puts("ERR"); continue; } @@ -86,15 +87,16 @@ static int daemon_loop(sqlite3 *db) ret = sqlite3_exec(db, query, daemon_callback, &args, NULL); if (ret != SQLITE_OK) { - puts("ERR\n"); + puts("ERR"); continue; } if (args.flags) - puts("ERR\n"); + puts("ERR"); else - puts("OK\n"); + puts("OK"); } + return 0; } static int show_callback(void *data, int cols, char **values, char **colnames)