get it working

This commit is contained in:
Olaf Rempel 2006-11-15 00:35:57 +01:00
parent 7b7b87db59
commit 2dc2394a2f
1 changed files with 10 additions and 8 deletions

View File

@ -59,23 +59,24 @@ static int daemon_loop(sqlite3 *db)
if (cp != NULL) if (cp != NULL)
*cp= '\0'; *cp= '\0';
char *ipstr = strtok(line, " \t"); char *tmp = strtok(line, " \t");
char *ipstr = strtok(NULL, " \t");
char *urlstr = strtok(NULL, " \t"); char *urlstr = strtok(NULL, " \t");
if (ipstr == NULL || urlstr == NULL) { if (tmp == NULL || ipstr == NULL || urlstr == NULL) {
puts("ERR\n"); puts("ERR");
continue; continue;
} }
struct in_addr addr; struct in_addr addr;
ret = inet_aton(ipstr, &addr); ret = inet_aton(ipstr, &addr);
if (ret == 0) { if (ret == 0) {
puts("ERR\n"); puts("ERR");
continue; continue;
} }
ret = snprintf(query, BUF_SIZE, "SELECT url FROM urlfilter WHERE (ip & mask) == (%u & mask);", addr.s_addr); ret = snprintf(query, BUF_SIZE, "SELECT url FROM urlfilter WHERE (ip & mask) == (%u & mask);", addr.s_addr);
if (ret < 0 || ret >= BUF_SIZE) { if (ret < 0 || ret >= BUF_SIZE) {
puts("ERR\n"); puts("ERR");
continue; continue;
} }
@ -86,15 +87,16 @@ static int daemon_loop(sqlite3 *db)
ret = sqlite3_exec(db, query, daemon_callback, &args, NULL); ret = sqlite3_exec(db, query, daemon_callback, &args, NULL);
if (ret != SQLITE_OK) { if (ret != SQLITE_OK) {
puts("ERR\n"); puts("ERR");
continue; continue;
} }
if (args.flags) if (args.flags)
puts("ERR\n"); puts("ERR");
else else
puts("OK\n"); puts("OK");
} }
return 0;
} }
static int show_callback(void *data, int cols, char **values, char **colnames) static int show_callback(void *data, int cols, char **values, char **colnames)