/* darkstat 3
- * copyright (c) 2001-2011 Emil Mikulic.
+ * copyright (c) 2001-2014 Emil Mikulic.
*
* darkstat.c: signals, cmdline parsing, program body.
*
#include "db.h"
#include "dns.h"
#include "err.h"
-#include "http.h"
#include "hosts_db.h"
+#include "http.h"
#include "localip.h"
#include "ncache.h"
#include "now.h"
#include "pidfile.h"
+#include "str.h"
#include <assert.h>
#include <errno.h>
const char *opt_chroot_dir = NULL;
static void cb_chroot(const char *arg) { opt_chroot_dir = arg; }
+const char *opt_base = NULL;
+static void cb_base(const char *arg) { opt_base = arg; }
+
const char *opt_privdrop_user = NULL;
static void cb_user(const char *arg) { opt_privdrop_user = arg; }
-const char *daylog_fn = NULL;
-static void cb_daylog(const char *arg)
-{
- if (opt_chroot_dir == NULL)
- errx(1, "the daylog file is relative to the chroot.\n"
- "You must specify a --chroot dir before you can use --daylog.");
- else
- daylog_fn = arg;
-}
+const char *opt_daylog_fn = NULL;
+static void cb_daylog(const char *arg) { opt_daylog_fn = arg; }
const char *import_fn = NULL;
-static void cb_import(const char *arg)
-{
- if (opt_chroot_dir == NULL)
- errx(1, "the import file is relative to the chroot.\n"
- "You must specify a --chroot dir before you can use --import.");
- else
- import_fn = arg;
-}
+static void cb_import(const char *arg) { import_fn = arg; }
const char *export_fn = NULL;
-static void cb_export(const char *arg)
-{
- if ((opt_chroot_dir == NULL) && (opt_capfile == NULL))
- errx(1, "the export file is relative to the chroot.\n"
- "You must specify a --chroot dir before you can use --export.");
- else
- export_fn = arg;
-}
+static void cb_export(const char *arg) { export_fn = arg; }
static const char *pid_fn = NULL;
-static void cb_pidfile(const char *arg)
-{
- if (opt_chroot_dir == NULL)
- errx(1, "the pidfile is relative to the chroot.\n"
- "You must specify a --chroot dir before you can use --pidfile.");
- else
- pid_fn = arg;
-}
+static void cb_pidfile(const char *arg) { pid_fn = arg; }
unsigned int opt_hosts_max = 1000;
static void cb_hosts_max(const char *arg)
static void cb_hosts_keep(const char *arg)
{ opt_hosts_keep = parsenum(arg, 0); }
-unsigned int opt_ports_max = 200;
+unsigned int opt_ports_max = 60;
static void cb_ports_max(const char *arg)
{ opt_ports_max = parsenum(arg, 65536); }
{"-p", "port", cb_port, 0},
{"-b", "bindaddr", cb_bindaddr, -1},
{"-l", "network/netmask", cb_local, 0},
+ {"--base", "path", cb_base, 0},
{"--local-only", NULL, cb_local_only, 0},
{"--snaplen", "bytes", cb_snaplen, 0},
{"--pppoe", NULL, cb_pppoe, 0},
if (opt_want_syslog)
openlog("darkstat", LOG_NDELAY | LOG_PID, LOG_DAEMON);
- /* some default values */
- if (opt_chroot_dir == NULL)
- opt_chroot_dir = CHROOT_DIR;
+ /* default value */
if (opt_privdrop_user == NULL)
opt_privdrop_user = PRIVDROP_USER;
hosts_db_free();
graph_free();
verbosef("Total packets: %llu, bytes: %llu",
- (unsigned long long)acct_total_packets,
- (unsigned long long)acct_total_bytes);
+ (llu)acct_total_packets,
+ (llu)acct_total_bytes);
}
/* --- Program body --- */
/* do this first as it forks - minimize memory use */
if (opt_want_dns) dns_init(opt_privdrop_user);
cap_start(opt_want_promisc); /* needs root */
+ http_init_base(opt_base);
http_listen(opt_bindport);
ncache_init(); /* must do before chroot() */
/* Don't need root privs for these: */
now_init();
- if (daylog_fn != NULL) daylog_init(daylog_fn);
+ if (opt_daylog_fn != NULL) daylog_init(opt_daylog_fn);
graph_init();
hosts_db_init();
if (import_fn != NULL) db_import(import_fn);
daemonize_finish();
while (running) {
- int select_ret, max_fd = -1, use_timeout = 0;
+ int select_ret;
+ int max_fd = -1;
+ int use_timeout = 0;
+ int cap_ret;
struct timeval timeout;
struct timespec t;
fd_set rs, ws;
}
graph_rotate();
- cap_poll(&rs);
+ cap_ret = cap_poll(&rs);
dns_poll();
http_poll(&rs, &ws);
timer_stop(&t, 1000000000, "event processing took longer than a second");
+
+ if (!cap_ret) {
+ running = 0;
+ }
}
verbosef("shutting down");
if (export_fn != NULL) db_export(export_fn);
hosts_db_free();
graph_free();
- if (daylog_fn != NULL) daylog_free();
+ if (opt_daylog_fn != NULL) daylog_free();
ncache_free();
if (pid_fn) pidfile_unlink();
verbosef("shut down");