14 files changed, 253 insertions, 96 deletions
diff --git a/NEWS b/NEWS
index 2f75f6b..07ed6b8 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@ See the end for copying conditions.
 Please send tagr bug reports to <gray@gnu.org.ua>
-Version 1.0.95 (Git)
+Version 1.9.90 (Git)
 ^L
 Version 1.0
diff --git a/configure.ac b/configure.ac
index 1d4673b..a622998 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>. 
 AC_PREREQ(2.59)
-AC_INIT([tagr], 1.0.95, [gray@gnu.org.ua])
+AC_INIT([tagr], 1.9.90, [gray@gnu.org.ua])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADER([config.h])
diff --git a/etc/Makefile.am b/etc/Makefile.am
index e9e5fcc..ccd72c9 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST = tagr.css tagr.tmpl upgrade.awk
+EXTRA_DIST = tagr.css tagr.tmpl upgrade.awk logfilter.awk uptmpl.sed
diff --git a/etc/logfilter.awk b/etc/logfilter.awk
new file mode 100644
index 0000000..88e1d98
--- /dev/null
+++ b/etc/logfilter.awk
@@ -0,0 +1,40 @@
+# Format ipacct log file for input to tagr --read
+# Copyright (C) 2009 Sergey Poznyakoff
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+BEGIN {
+    month["Jan"] = 1
+    month["Feb"] = 2
+    month["Mar"] = 3
+    month["Apr"] = 4
+    month["May"] = 5
+    month["Jun"] = 6
+    month["Jul"] = 7
+    month["Aug"] = 8
+    month["Sep"] = 9
+    month["Oct"] = 10
+    month["Nov"] = 11
+    month["Dec"] = 12
+}
+# mktime input format is:
+# YYYY MM DD HH MM SS
+# Log entry format is:
+# Sat Apr 25 00:25:00 2009   pirx    199004      4238901
+#  $1  $2  $3    $4     $5    $6       $7          $8 
+NF == 8 {
+  gsub(/:/, " ", $4)
+  print $6, mktime($5 " " month[$2] " " $3 " " $4), $8, $7
+}
diff --git a/etc/tagr.tmpl b/etc/tagr.tmpl
index 0663f57..e5a198e 100644
--- a/etc/tagr.tmpl
+++ b/etc/tagr.tmpl
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
- <title>Traffic Analysis for $ROUTERNAME</title>
+ <title>Traffic Analysis for $(MONITOR)</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rev="made" href="mailto:gray@gnu.org.ua" />
 <link rel="stylesheet" type="text/css" href="/~ipacct/ipacct.css" />
@@ -13,7 +13,7 @@
 </head>
 <body>
-<h1>Stats for $ROUTERNAME ($ROUTERIP)</h1>
+<h1>Stats for $MONITOR ($ID)</h1>
 <p>
 <span class="emph">Speed on port is $(SPEED:0)</span>
 </p>
@@ -23,7 +23,7 @@ The statistics were last updated <b>$NOW</b>
 <div class="graph">
 <h3>`Daily' Graph (5 Minute Average)</h3>
-<img src="$(ROUTERNAME)-day.png" alt="[ daily graph ]" />
+<img src="$(MONITOR)-day.png" alt="[ daily graph ]" />
 <table class="graph">
 <tr>
  <td>Max <span class="input">&nbsp;In:</span></td>
@@ -50,7 +50,7 @@ The statistics were last updated <b>$NOW</b>
 <div class="graph">
 <h3>`Weekly' Graph (30 Minute Average)</h3>
-<img src="$(ROUTERNAME)-week.png" alt="[ weekly graph ]" />
+<img src="$(MONITOR)-week.png" alt="[ weekly graph ]" />
 <table class="graph">
 <tr>
  <td>Max <span class="input">&nbsp;In:</span></td>
@@ -77,7 +77,7 @@ The statistics were last updated <b>$NOW</b>
 <div class="graph">
 <h3>`Monthly' Graph (2 Hour Average)</h3>
-<img src="$(ROUTERNAME)-month.png" alt="[ monthly graph ]" />
+<img src="$(MONITOR)-month.png" alt="[ monthly graph ]" />
 <table class="graph">
 <tr>
  <td>Max <span class="input">&nbsp;In:</span></td>
@@ -104,7 +104,7 @@ The statistics were last updated <b>$NOW</b>
 <div class="graph">
 <h3>`Yearly' Graph (1 Day Average)</h3>
-<img src="$(ROUTERNAME)-year.png" alt="[ yearly graph ]" />
+<img src="$(MONITOR)-year.png" alt="[ yearly graph ]" />
 <table class="graph">
 <tr>
  <td>Max <span class="input">&nbsp;In:</span></td>
diff --git a/etc/upgrade.awk b/etc/upgrade.awk
index 0479609..2278758 100644
--- a/etc/upgrade.awk
+++ b/etc/upgrade.awk
@@ -1,3 +1,19 @@
+# Upgrade 1.0-style Tagr configuration file.
+# Copyright (C) 2009 Sergey Poznyakoff
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>. 
 NF == 0 || /[ \t]*#/ { print; next }
 $1 == "user" || $1 == "template" || $1 == "basedir" {
   printf("%s;\n", $0)
diff --git a/etc/uptmpl.sed b/etc/uptmpl.sed
new file mode 100644
index 0000000..1229984
--- /dev/null
+++ b/etc/uptmpl.sed
@@ -0,0 +1,2 @@
+s/\$ROUTERNAME/$MONITOR/g
+s/\$ROUTERIP/$ID/g
+\ No newline at end of file
diff --git a/gnulib.modules b/gnulib.modules
index f7631e3..7eecc00 100644
--- a/gnulib.modules
+++ b/gnulib.modules
@@ -2,6 +2,7 @@
 # A module name per line. Empty lines and comments are ignored.
 argp
+fprintftime
 getline
 gitlog-to-changelog
 glob
diff --git a/src/graph.c b/src/graph.c
index 16483bb..bfd00cb 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -54,11 +54,7 @@ int graph_ysize = 100;
 int graph_h_margin[2] = { 100, 14 };
 int graph_v_margin[2] = { 14, 35 };
-char *rate_unit = "Bits per Second";
+char *rate_unit = "Bytes per Second";
-static char *short_suffix[] = {"", "k", "M", "G", "T"};
-char **number_suffix = short_suffix;
-size_t number_suffix_count = sizeof (short_suffix) / sizeof (short_suffix[0]);
 #define make_color_index(g, ar) \
  gdImageColorAllocate (g, (ar)[0], (ar)[1], (ar)[2])
@@ -98,7 +94,8 @@ draw_graph (FILE *fp,
  xscale = (double) graph_xsize / xmax;
  
 #define ytr(y)                      \
-  (unsigned long) ((ymax >= (y) ? (ymax - (y)) : ymax) * yscale + graph_h_margin[1])
+  (unsigned long) ((ymax >= (y) ? (ymax - (y)) : ymax) * \
+                    yscale + graph_h_margin[1])
 #define xtr(x)                      \
  (unsigned long) (growright ?      \
                   ((full_xsize - (x)*xscale)) : \
diff --git a/src/grid.c b/src/grid.c
index f4a75e1..1671753 100644
--- a/src/grid.c
+++ b/src/grid.c
@@ -80,6 +80,11 @@ grid_free_data (void *ptr)
 }
+/* FIXME: Suffixes not yet used. */
+static char *short_suffix[] = {"", "k", "M", "G", "T"};
+char **number_suffix = short_suffix;
+size_t number_suffix_count = sizeof (short_suffix) / sizeof (short_suffix[0]);
 struct ygrid_data
 {
  unsigned long step;
diff --git a/src/html.gram.y b/src/html.gram.y
index bce5e93..fae64ff 100644
--- a/src/html.gram.y
+++ b/src/html.gram.y
@@ -36,6 +36,8 @@ static FILE *tmp_file;