Merge branch 'collectd-4.2'

[collectd.git] / src / collectd.c

diff --git a/src/collectd.c b/src/collectd.c
index 9f3c62b..c9ae66d 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -23,7 +23,10 @@
 #include "collectd.h"
 #include "common.h"
 
-#include "network.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+
 #include "plugin.h"
 #include "configfile.h"
 
@@ -48,29 +51,67 @@ static void sigTermHandler (int signal)
        loop++;
 }
 
-static int init_global_variables (void)
+static int init_hostname (void)
 {
        const char *str;
 
+       struct addrinfo  ai_hints;
+       struct addrinfo *ai_list;
+       struct addrinfo *ai_ptr;
+       int status;
+
        str = global_option_get ("Hostname");
        if (str != NULL)
        {
                strncpy (hostname_g, str, sizeof (hostname_g));
+               hostname_g[sizeof (hostname_g) - 1] = '\0';
+               return (0);
        }
-       else
+
+       if (gethostname (hostname_g, sizeof (hostname_g)) != 0)
        {
-               if (gethostname (hostname_g, sizeof (hostname_g)) != 0)
-               {
-                       fprintf (stderr, "`gethostname' failed and no "
-                                       "hostname was configured.\n");
-                       return (-1);
-               }
+               fprintf (stderr, "`gethostname' failed and no "
+                               "hostname was configured.\n");
+               return (-1);
+       }
+
+       str = global_option_get ("FQDNLookup");
+       if ((strcasecmp ("false", str) == 0)
+                       || (strcasecmp ("no", str) == 0)
+                       || (strcasecmp ("off", str) == 0))
+               return (0);
+
+       memset (&ai_hints, '\0', sizeof (ai_hints));
+       ai_hints.ai_flags = AI_CANONNAME;
+
+       status = getaddrinfo (hostname_g, NULL, &ai_hints, &ai_list);
+       if (status != 0)
+       {
+               ERROR ("getaddrinfo failed.");
+               return (-1);
        }
-       DEBUG ("hostname_g = %s;", hostname_g);
+
+       for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next)
+       {
+               if (ai_ptr->ai_canonname == NULL)
+                       continue;
+
+               strncpy (hostname_g, ai_ptr->ai_canonname, sizeof (hostname_g));
+               hostname_g[sizeof (hostname_g) - 1] = '\0';
+               break;
+       }
+
+       freeaddrinfo (ai_list);
+       return (0);
+} /* int init_hostname */
+
+static int init_global_variables (void)
+{
+       const char *str;
 
        str = global_option_get ("Interval");
        if (str == NULL)
-               str = COLLECTD_STEP;
+               str = "10";
        interval_g = atoi (str);
        if (interval_g <= 0)
        {
@@ -80,6 +121,10 @@ static int init_global_variables (void)
        }
        DEBUG ("interval_g = %i;", interval_g);
 
+       if (init_hostname () != 0)
+               return (-1);
+       DEBUG ("hostname_g = %s;", hostname_g);
+
        return (0);
 } /* int init_global_variables */
 
@@ -114,7 +159,7 @@ static int change_basedir (const char *orig_dir)
                        if (mkdir (orig_dir, 0755) == -1)
                        {
                                char errbuf[1024];
-                               ERROR ("mkdir (%s): %s", orig_dir,
+                               ERROR ("change_basedir: mkdir (%s): %s", orig_dir,
                                                sstrerror (errno, errbuf,
                                                        sizeof (errbuf)));
                                return (-1);
@@ -187,11 +232,6 @@ static void exit_usage (char *name)
                        "  Config-File       "CONFIGFILE"\n"
                        "  PID-File          "PIDFILE"\n"
                        "  Data-Directory    "PKGLOCALSTATEDIR"\n"
-#if COLLECT_DEBUG
-                       "  Log-File          "LOGFILE"\n"
-#endif
-                       "  Step              "COLLECTD_STEP" seconds\n"
-                       "  Heartbeat         "COLLECTD_HEARTBEAT" seconds\n"
                        "\n"PACKAGE" "VERSION", http://collectd.org/\n"
                        "by Florian octo Forster <octo@verplant.org>\n"
                        "for contributions see `AUTHORS'\n");
@@ -324,6 +364,7 @@ int main (int argc, char **argv)
        struct sigaction sigIntAction;
        struct sigaction sigTermAction;
        char *configfile = CONFIGFILE;
+       int test_config  = 0;
        const char *basedir;
 #if COLLECT_DAEMON
        struct sigaction sigChldAction;
@@ -336,7 +377,7 @@ int main (int argc, char **argv)
        {
                int c;
 
-               c = getopt (argc, argv, "hC:"
+               c = getopt (argc, argv, "htC:"
 #if COLLECT_DAEMON
                                "fP:"
 #endif
@@ -350,6 +391,9 @@ int main (int argc, char **argv)
                        case 'C':
                                configfile = optarg;
                                break;
+                       case 't':
+                               test_config = 1;
+                               break;
 #if COLLECT_DAEMON
                        case 'P':
                                global_option_set ("PIDFile", optarg);
@@ -401,6 +445,9 @@ int main (int argc, char **argv)
        if (init_global_variables () != 0)
                return (1);
 
+       if (test_config)
+               return (0);
+
 #if COLLECT_DAEMON
        /*
         * fork off child