Implement --no-lastseen

diff --git a/darkstat.8 b/darkstat.8
index 65071c2..2a7c4b4 100644 (file)
--- a/darkstat.8
+++ b/darkstat.8
@@ -28,6 +28,8 @@ darkstat \- network statistics gatherer
 ] [
 .BI \-\-no\-macs
 ] [
 ] [
 .BI \-\-no\-macs
 ] [

+.BI \-\-no\-lastseen
+] [

 .BI \-p " port"
 ] [
 .BI \-b " bindaddr"
 .BI \-p " port"
 ] [
 .BI \-b " bindaddr"


@@ -129,7 +131,11 @@ as an extra process is created for DNS resolving.
 .\"
 .TP
 .BI \-\-no\-macs
 .\"
 .TP
 .BI \-\-no\-macs

-Do not display MAC addresses in hosts table.
+Do not display MAC addresses in the hosts table.
+.\"
+.TP
+.BI \-\-no\-lastseen
+Do not display the last seen time in the hosts table.

 .\"
 .TP
 .BI \-p " port"
 .\"
 .TP
 .BI \-p " port"

diff --git a/darkstat.c b/darkstat.c
index e974d52..14f4568 100644 (file)
--- a/darkstat.c
+++ b/darkstat.c
@@ -86,6 +86,9 @@ static void cb_no_dns(const char *arg _unused_) { want_dns = 0; }
 int want_macs = 1;
 static void cb_no_macs(const char *arg _unused_) { want_macs = 0; }
 
 int want_macs = 1;
 static void cb_no_macs(const char *arg _unused_) { want_macs = 0; }
 

+int want_lastseen = 1;
+static void cb_no_lastseen(const char *arg _unused_) { want_lastseen = 0; }
+

 unsigned short bindport = 667;
 static void cb_port(const char *arg) { bindport = parsenum(arg, 65536); }
 
 unsigned short bindport = 667;
 static void cb_port(const char *arg) { bindport = parsenum(arg, 65536); }
 


@@ -188,6 +191,7 @@ static struct cmdline_arg cmdline_args[] = {
    {"--no-promisc",   NULL,              cb_no_promisc,   0},
    {"--no-dns",       NULL,              cb_no_dns,       0},
    {"--no-macs",      NULL,              cb_no_macs,      0},
    {"--no-promisc",   NULL,              cb_no_promisc,   0},
    {"--no-dns",       NULL,              cb_no_dns,       0},
    {"--no-macs",      NULL,              cb_no_macs,      0},

+   {"--no-lastseen",  NULL,              cb_no_lastseen,  0},

    {"-p",             "port",            cb_port,         0},
    {"-b",             "bindaddr",        cb_bindaddr,     0},
    {"-f",             "filter",          cb_filter,       0},
    {"-p",             "port",            cb_port,         0},
    {"-b",             "bindaddr",        cb_bindaddr,     0},
    {"-f",             "filter",          cb_filter,       0},

diff --git a/hosts_db.c b/hosts_db.c
index 9b8e15c..afa85ea 100644 (file)
--- a/hosts_db.c
+++ b/hosts_db.c
@@ -1,5 +1,5 @@
 /* darkstat 3
 /* darkstat 3

- * copyright (c) 2001-2008 Emil Mikulic.
+ * copyright (c) 2001-2009 Emil Mikulic.

  *
  * hosts_db.c: database of hosts, ports, protocols.
  *
  *
  * hosts_db.c: database of hosts, ports, protocols.
  *


@@ -26,6 +26,7 @@
 #include <string.h> /* memset(), strcmp() */
 #include <unistd.h>
 
 #include <string.h> /* memset(), strcmp() */
 #include <unistd.h>
 

+extern int want_lastseen;

 int show_mac_addrs = 0;
 extern const char *interface;
 
 int show_mac_addrs = 0;
 extern const char *interface;
 


@@ -273,8 +274,10 @@ format_cols_host(struct str *buf)
    str_append(buf,
       " <th><a href=\"?sort=in\">In</a></th>\n"
       " <th><a href=\"?sort=out\">Out</a></th>\n"
    str_append(buf,
       " <th><a href=\"?sort=in\">In</a></th>\n"
       " <th><a href=\"?sort=out\">Out</a></th>\n"

-      " <th><a href=\"?sort=total\">Total</a></th>\n"
-      " <th>Last seen</th>\n"
+      " <th><a href=\"?sort=total\">Total</a></th>\n");
+   if (want_lastseen) str_append(buf,
+      " <th>Last seen</th>\n");
+   str_append(buf,

       "</tr>\n");
 }
 
       "</tr>\n");
 }
 


@@ -283,8 +286,6 @@ format_row_host(struct str *buf, const struct bucket *b,
    const char *css_class)
 {
    const char *ip = ip_to_str( b->u.host.ip );
    const char *css_class)
 {
    const char *ip = ip_to_str( b->u.host.ip );

-   struct str *lastseen = NULL;
-   time_t last_t;

 
    str_appendf(buf,
       "<tr class=\"%s\">\n"
 
    str_appendf(buf,
       "<tr class=\"%s\">\n"


@@ -304,26 +305,33 @@ format_row_host(struct str *buf, const struct bucket *b,
          b->u.host.mac_addr[4],
          b->u.host.mac_addr[5]);
 
          b->u.host.mac_addr[4],
          b->u.host.mac_addr[5]);
 

-   last_t = b->u.host.last_seen;
-   if (now >= last_t)
-      lastseen = length_of_time(now - last_t);
-

    str_appendf(buf,
       " <td class=\"num\">%'qu</td>\n"
       " <td class=\"num\">%'qu</td>\n"
    str_appendf(buf,
       " <td class=\"num\">%'qu</td>\n"
       " <td class=\"num\">%'qu</td>\n"

-      " <td class=\"num\">%'qu</td>\n"
-      " <td class=\"num\">",
+      " <td class=\"num\">%'qu</td>\n",

       b->in, b->out, b->total);
 
       b->in, b->out, b->total);
 

-   if (lastseen == NULL)
-      str_append(buf, "(clock error)");
-   else {
-      str_appendstr(buf, lastseen);
-      str_free(lastseen);
+   if (want_lastseen) {
+      time_t last_t = b->u.host.last_seen;
+      struct str *lastseen = NULL;
+
+      last_t = b->u.host.last_seen;
+      if (now >= last_t)
+         lastseen = length_of_time(now - last_t);
+
+      str_append(buf,
+         " <td class=\"num\">");
+      if (lastseen == NULL)
+         str_append(buf, "(clock error)");
+      else {
+         str_appendstr(buf, lastseen);
+         str_free(lastseen);
+      }
+      str_append(buf,
+         "</td>");

    }
 
    str_appendf(buf,
    }
 
    str_appendf(buf,

-       "</td>\n"

       "</tr>\n");
 
    /* Only resolve hosts "on demand" */
       "</tr>\n");
 
    /* Only resolve hosts "on demand" */