src/oping.c: Only treat "-" as STDIN, not all strings beginning with "-".

[liboping.git] / src / oping.c

diff --git a/src/oping.c b/src/oping.c
index bc33c27..4f75f22 100644 (file)
--- a/src/oping.c
+++ b/src/oping.c
@@ -63,7 +63,7 @@ typedef struct ping_context
 
        int req_sent;
        int req_rcvd;
-       
+
        double latency_min;
        double latency_max;
        double latency_total;
@@ -73,7 +73,9 @@ typedef struct ping_context
 static double  opt_interval   = 1.0;
 static int     opt_addrfamily = PING_DEF_AF;
 static char   *opt_srcaddr    = NULL;
+static char   *opt_filename   = NULL;
 static int     opt_count      = -1;
+static int     opt_send_ttl   = 64;
 
 static void sigint_handler (int signal)
 {
@@ -107,8 +109,16 @@ static void context_destroy (ping_context_t *context)
 
 static void usage_exit (const char *name)
 {
-       fprintf (stderr, "Usage: %s [-46] [-c count] [-i interval] host [host [host ...]]\n",
-                       name);
+       int name_length;
+
+       name_length = (int) strlen (name);
+
+       fprintf (stderr, "Usage: %s [-46] [-c count] [-i interval]\n"
+                       "%*s[-t ttl] [-I srcaddr]\n"
+                       "%*s-f filename | host [host [host ...]]\n",
+                       name,
+                       8 + name_length, "",
+                       8 + name_length, "");
        exit (1);
 }
 
@@ -118,7 +128,7 @@ static int read_options (int argc, char **argv)
 
        while (1)
        {
-               optchar = getopt (argc, argv, "46c:hi:I:");
+               optchar = getopt (argc, argv, "46c:hi:I:t:f:");
 
                if (optchar == -1)
                        break;
@@ -139,6 +149,14 @@ static int read_options (int argc, char **argv)
                                }
                                break;
 
+                       case 'f':
+                               {
+                                       if (opt_filename != NULL)
+                                               free (opt_filename);
+                                       opt_filename = strdup (optarg);
+                               }
+                               break;
+
                        case 'i':
                                {
                                        double new_interval;
@@ -158,6 +176,18 @@ static int read_options (int argc, char **argv)
                                }
                                break;
 
+                       case 't':
+                       {
+                               int new_send_ttl;
+                               new_send_ttl = atoi (optarg);
+                               if ((new_send_ttl > 0) && (new_send_ttl < 256))
+                                       opt_send_ttl = new_send_ttl;
+                               else
+                                       fprintf (stderr, "Invalid TTL argument: %s\n",
+                                                       optarg);
+                               break;
+                       }
+
                        case 'h':
                        default:
                                usage_exit (argv[0]);
@@ -175,7 +205,7 @@ static void print_host (pingobj_iter_t *iter)
        size_t          buffer_len;
        size_t          data_len;
        ping_context_t *context;
-       
+
        latency = -1.0;
        buffer_len = sizeof (latency);
        ping_iterator_get_info (iter, PING_INFO_LATENCY,
@@ -286,8 +316,9 @@ int main (int argc, char **argv)
 
        optind = read_options (argc, argv);
 
-       if (optind >= argc)
+       if (optind >= argc && !opt_filename) {
                usage_exit (argv[0]);
+       }
 
        if (geteuid () != 0)
        {
@@ -301,6 +332,12 @@ int main (int argc, char **argv)
                return (1);
        }
 
+       if (ping_setopt (ping, PING_OPT_TTL, &opt_send_ttl) != 0)
+       {
+               fprintf (stderr, "Setting TTL to %i failed: %s\n",
+                               opt_send_ttl, ping_get_error (ping));
+       }
+
        {
                double temp_sec;
                double temp_nsec;
@@ -324,6 +361,44 @@ int main (int argc, char **argv)
                }
        }
 
+       if (opt_filename != NULL)
+       {
+               FILE *infile;
+               char line[256];
+               char host[256];
+
+               if (strcmp (opt_filename, "-") == 0)
+                       /* Open STDIN */
+                       infile = fdopen(0, "r");
+               else
+                       infile = fopen(opt_filename, "r");
+
+               if (!infile)
+               {
+                       fprintf (stderr, "Couldn't open file for hostnames: %s\n", strerror(errno));
+                       return (1);
+               }
+
+               while (fgets(line, sizeof(line), infile))
+               {
+                       if (sscanf(line, "%s", host) != 1)
+                               continue;
+
+                       if ((!*host) || (host[0] == '#'))
+                               continue;
+
+                       if (ping_host_add(ping, host) < 0)
+                       {
+                               const char *errmsg = ping_get_error (ping);
+
+                               fprintf (stderr, "Adding host `%s' failed: %s\n", host, errmsg);
+                               continue;
+                       }
+               }
+
+               fclose(infile);
+       }
+
        for (i = optind; i < argc; i++)
        {
                if (ping_host_add (ping, argv[i]) < 0)