Merge branch 'install-config'

diff --git a/src/network.c b/src/network.c
index 54f9bfa..22e911a 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -215,7 +215,11 @@ int network_create_socket (const char *node, const char *service)
        DBG ("node = %s, service = %s", node, service);
 
        if (operating_mode == MODE_LOCAL || operating_mode == MODE_LOG)
+       {
+               syslog (LOG_WARNING, "network_create_socket: There is no point opening a socket when you are in mode `%s'.",
+                               operating_mode == MODE_LOCAL ? "Local" : "Log");
                return (-1);
+       }
 
        socklist_tail = socklist_head;
        while ((socklist_tail != NULL) && (socklist_tail->next != NULL))

diff --git a/src/traffic.c b/src/traffic.c
index 18a2063..14b7dc3 100644 (file)
--- a/src/traffic.c
+++ b/src/traffic.c
@@ -74,8 +74,8 @@
  */
 /* TODO: Move this to `interface-%s/<blah>.rrd' in version 4. */
 static char *bytes_file   = "traffic-%s.rrd";
-static char *packets_file = "if_packets-%s.rrd";
-static char *errors_file  = "if_errors-%s.rrd";
+static char *packets_file = "interface-%s/if_packets.rrd";
+static char *errors_file  = "interface-%s/if_errors.rrd";
 /* TODO: Maybe implement multicast and broadcast counters */
 
 static char *config_keys[] =