Fix locking issues. Improve stream interface.

* gnulib.modules: Add c-type, c-strcase, crypto/md5,
xgetdomainname, xgethostname.
* src/Makefile.am (tagr_SOURCES): Add apop.c, udb.c, xhostname.c
* src/graph.c (draw_graph): Rename `now' to `start'.
* src/main.c (hostname, rebuild_last_option): New globals.
(main): Init hostname.
* src/output.c (update_output): Change semantics of the last
parameter.
* src/readconfig.c (cb_facility): Use c_strcasecmp.
(tagr_kw): New keywords: hostname, udb-file, lock-count,
lock-timeout, idle-timeout.
* src/report.c: Fix locking issues.
(update_monitor): Change semantics of the last parameter.
(rebuild): Likewise.
* src/server.c: Rewrite stream interface.
* src/tagr.h (TAGR_ARG_UNUSED, TAGR_PRINTFLIKE): New macros.
(lock_retry_count_option, lock_retry_timeout_option)
(stream_idle_timeout, hostname): New declarations.
(TAGR_UPD_FORCE, TAGR_UPD_LASTTIME): New defines.
(trim_crlf, tagr_local_hostnamem tagr_auth_init, tagr_auth)
(tagr_udb_name)
(udb_get_passwordudb_free_password): New declarations.

* TODO: Update

1 files changed, 23 insertions, 14 deletions

diff --git a/src/report.c b/src/report.c
index 71a735f..ab4cada 100644
--- a/src/report.c
+++ b/src/report.c
@@ -33,6 +33,9 @@
 #include <fprintftime.h>
 #include <gdbm.h>
 
+unsigned lock_retry_count_option = 5;
+unsigned lock_retry_timeout_option = 1;
+
 static char *dbname;
 static GDBM_FILE dbf;
 
@@ -45,13 +48,20 @@ tagr_db_report (char *str)
 int
 open_db (int flag)
 {
-  dbname = xmalloc (strlen (basedir) + 1 + sizeof (TAGR_DBNAME));
-  strcpy (dbname, basedir);
-  strcat (dbname, "/");
-  strcat (dbname, TAGR_DBNAME);
-  dbf = gdbm_open (dbname, 0, 
-                   flag == TAGR_DB_WR ? GDBM_WRCREAT : GDBM_READER, 
-                   TAGR_DBMODE, tagr_db_report);
+  unsigned i;
+  
+  dbname = mkfilename (basedir, TAGR_DBNAME, NULL);
+
+  for (i = 0; i < lock_retry_count_option; i++)
+    {
+      dbf = gdbm_open (dbname, 0, 
+                       flag == TAGR_DB_WR ? GDBM_WRCREAT : GDBM_READER, 
+                       TAGR_DBMODE, tagr_db_report);
+      if (dbf || errno != EAGAIN)
+        break;
+      sleep (lock_retry_timeout_option);
+    }
+  
   if (dbf == NULL)
     {
       logmsg (L_ERR, _("cannot open database %s: %s"),
@@ -251,7 +261,7 @@ report (Stat *stat, time_t timestamp)
 }
 
 int
-update_monitor (datum key, time_t timestamp, int force)
+update_monitor (datum key, time_t timestamp, int flags)
 {
   char id[MAX_NAME_LENGTH+1];
   struct traffic_record *tr = NULL;
@@ -273,8 +283,7 @@ update_monitor (datum key, time_t timestamp, int force)
   _read_db (key, &tr);
   if (tr)
     {
-      update_output (mon, tr, tr->last.time /*FIXME: must be now? */,
-                     force);
+      update_output (mon, tr, timestamp, flags);
       free (tr);
     }
 
@@ -282,20 +291,20 @@ update_monitor (datum key, time_t timestamp, int force)
 }
   
 void
-rebuild (int force)
+rebuild (int flags)
 {
   datum key;
   datum content;
   time_t now = time (NULL);
-
+  
   verbose (1, _("rebuild initiated"));
   if (open_db (TAGR_DB_RD) == 0)
     {
       key = gdbm_firstkey (dbf);
       while (key.dptr)
         {
-          datum nextkey = gdbm_nextkey ( dbf, key );
-          update_monitor (key, now, force);
+          datum nextkey = gdbm_nextkey (dbf, key);
+          update_monitor (key, now, flags);
           free (key.dptr);
           key = nextkey;
         }