src/oping.c: Allow setting of the TTL using `-t'.

[liboping.git] / src / oping.c

diff --git a/src/oping.c b/src/oping.c
index 23d9986..0f39dc5 100644 (file)
--- a/src/oping.c
+++ b/src/oping.c
@@ -74,14 +74,17 @@ static double  opt_interval   = 1.0;
 static int     opt_addrfamily = PING_DEF_AF;
 static char   *opt_srcaddr    = NULL;
 static int     opt_count      = -1;
+static int     opt_send_ttl   = 64;
 
-void sigint_handler (int signal)
+static void sigint_handler (int signal)
 {
+       /* Make compiler happy */
+       signal = 0;
        /* Exit the loop */
        opt_count = 0;
 }
 
-ping_context_t *context_create (void)
+static ping_context_t *context_create (void)
 {
        ping_context_t *ret;
 
@@ -98,25 +101,33 @@ ping_context_t *context_create (void)
        return (ret);
 }
 
-void context_destroy (ping_context_t *context)
+static void context_destroy (ping_context_t *context)
 {
        free (context);
 }
 
-void usage_exit (const char *name)
+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"
+                       "%*shost [host [host ...]]\n",
+                       name,
+                       8 + name_length, "",
+                       8 + name_length, "");
        exit (1);
 }
 
-int read_options (int argc, char **argv)
+static int read_options (int argc, char **argv)
 {
        int optchar;
 
        while (1)
        {
-               optchar = getopt (argc, argv, "46c:hi:I:");
+               optchar = getopt (argc, argv, "46c:hi:I:t:");
 
                if (optchar == -1)
                        break;
@@ -141,7 +152,10 @@ int read_options (int argc, char **argv)
                                {
                                        double new_interval;
                                        new_interval = atof (optarg);
-                                       if (new_interval >= 0.2)
+                                       if (new_interval < 0.001)
+                                               fprintf (stderr, "Ignoring invalid interval %g.\n",
+                                                               new_interval);
+                                       else
                                                opt_interval = new_interval;
                                }
                                break;
@@ -153,6 +167,18 @@ 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]);
@@ -162,22 +188,30 @@ int read_options (int argc, char **argv)
        return (optind);
 }
 
-void print_host (pingobj_iter_t *iter)
+static void print_host (pingobj_iter_t *iter)
 {
        double          latency;
        unsigned int    sequence;
+       int             recv_ttl;
        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,
                        &latency, &buffer_len);
 
+       sequence = 0;
        buffer_len = sizeof (sequence);
        ping_iterator_get_info (iter, PING_INFO_SEQUENCE,
                        &sequence, &buffer_len);
 
+       recv_ttl = -1;
+       buffer_len = sizeof (recv_ttl);
+       ping_iterator_get_info (iter, PING_INFO_RECV_TTL,
+                       &recv_ttl, &buffer_len);
+
        data_len = 0;
        ping_iterator_get_info (iter, PING_INFO_DATA,
                        NULL, &data_len);
@@ -196,20 +230,20 @@ void print_host (pingobj_iter_t *iter)
                if ((context->latency_min < 0.0) || (context->latency_min > latency))
                        context->latency_min = latency;
 
-               printf ("%u bytes from %s (%s): icmp_seq=%u time=%.2f ms\n",
-                               (unsigned int) data_len,
+               printf ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i time=%.2f ms\n",
+                               data_len,
                                context->host, context->addr,
-                               (unsigned int) sequence, latency);
+                               sequence, recv_ttl, latency);
        }
        else
        {
                printf ("echo reply from %s (%s): icmp_seq=%u timeout\n",
                                context->host, context->addr,
-                               (unsigned int) sequence);
+                               sequence);
        }
 }
 
-void time_normalize (struct timespec *ts)
+static void time_normalize (struct timespec *ts)
 {
        while (ts->tv_nsec < 0)
        {
@@ -230,7 +264,7 @@ void time_normalize (struct timespec *ts)
        }
 }
 
-void time_calc (struct timespec *ts_dest,
+static void time_calc (struct timespec *ts_dest,
                const struct timespec *ts_int,
                const struct timeval  *tv_begin,
                const struct timeval  *tv_end)
@@ -288,6 +322,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;
@@ -322,6 +362,9 @@ int main (int argc, char **argv)
                }
        }
 
+       /* Drop root privileges if we're setuid-root. */
+       setuid (getuid ());
+
        i = 0;
        for (iter = ping_iterator_get (ping);
                        iter != NULL;
@@ -341,8 +384,8 @@ int main (int argc, char **argv)
                buffer_size = 0;
                ping_iterator_get_info (iter, PING_INFO_DATA, NULL, &buffer_size);
 
-               printf ("PING %s (%s) %u bytes of data.\n",
-                               context->host, context->addr, (unsigned int) buffer_size);
+               printf ("PING %s (%s) %zu bytes of data.\n",
+                               context->host, context->addr, buffer_size);
 
                ping_iterator_set_context (iter, (void *) context);
 
@@ -372,7 +415,8 @@ int main (int argc, char **argv)
 
                if (ping_send (ping) < 0)
                {
-                       fprintf (stderr, "ping_send failed\n");
+                       fprintf (stderr, "ping_send failed: %s\n",
+                                       ping_get_error (ping));
                        return (1);
                }
 
@@ -449,7 +493,7 @@ int main (int argc, char **argv)
                }
 
                ping_iterator_set_context (iter, NULL);
-               free (context);
+               context_destroy (context);
        }
 
        ping_destroy (ping);