src/liboping.c: Check if pointer is NULL before dereferencing it in `ping_receive_ipv4'.

[liboping.git] / src / oping.c

diff --git a/src/oping.c b/src/oping.c
index cfbe18ac59e9d4076cf79318eee5a3fdb3dd968f..0f39dc5b4d884005dd12bb4658f2bbc0d9ef2c81 100644 (file)
--- a/src/oping.c
+++ b/src/oping.c
@@ -74,6 +74,7 @@ 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;
 
 static void sigint_handler (int signal)
 {
@@ -107,8 +108,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"
+                       "%*shost [host [host ...]]\n",
+                       name,
+                       8 + name_length, "",
+                       8 + name_length, "");
        exit (1);
 }
 
@@ -118,7 +127,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:");
 
                if (optchar == -1)
                        break;
@@ -158,6 +167,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]);
@@ -171,18 +192,26 @@ 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);
@@ -201,10 +230,10 @@ static void print_host (pingobj_iter_t *iter)
                if ((context->latency_min < 0.0) || (context->latency_min > latency))
                        context->latency_min = latency;
 
-               printf ("%zu bytes from %s (%s): icmp_seq=%u time=%.2f ms\n",
+               printf ("%zu bytes from %s (%s): icmp_seq=%u ttl=%i time=%.2f ms\n",
                                data_len,
                                context->host, context->addr,
-                               sequence, latency);
+                               sequence, recv_ttl, latency);
        }
        else
        {
@@ -293,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;