src/oping.c: Added -D <interface name> command line option.

[liboping.git] / src / oping.c

diff --git a/src/oping.c b/src/oping.c
index 0ef6ec662dc5213ff6398d9bcb0c2d09d630426f..fc4cb5faeb5f9cdbd393188ca8596e8d2db5bc43 100644 (file)
--- a/src/oping.c
+++ b/src/oping.c
@@ -73,6 +73,7 @@ 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_device     = NULL;
 static char   *opt_filename   = NULL;
 static int     opt_count      = -1;
 static int     opt_send_ttl   = 64;
@@ -107,7 +108,7 @@ static void context_destroy (ping_context_t *context)
        free (context);
 }
 
-static void usage_exit (const char *name)
+static void usage_exit (const char *name, int status)
 {
        int name_length;
 
@@ -122,13 +123,14 @@ static void usage_exit (const char *name)
                        "  -i interval  interval with which to send ICMP packets\n"
                        "  -t ttl       time to live for each ICMP packet\n"
                        "  -I srcaddr   source address\n"
+                       "  -D device    outgoing interface name\n"
                        "  -f filename  filename to read hosts from\n"
 
                        "\noping "PACKAGE_VERSION", http://verplant.org/liboping/\n"
                        "by Florian octo Forster <octo@verplant.org>\n"
                        "for contributions see `AUTHORS'\n",
                        name);
-       exit (1);
+       exit (status);
 }
 
 static int read_options (int argc, char **argv)
@@ -137,7 +139,7 @@ static int read_options (int argc, char **argv)
 
        while (1)
        {
-               optchar = getopt (argc, argv, "46c:hi:I:t:f:");
+               optchar = getopt (argc, argv, "46c:hi:I:t:f:D:");
 
                if (optchar == -1)
                        break;
@@ -188,6 +190,10 @@ static int read_options (int argc, char **argv)
                                }
                                break;
 
+                       case 'D':
+                               opt_device = optarg;
+                               break;
+
                        case 't':
                        {
                                int new_send_ttl;
@@ -201,8 +207,10 @@ static int read_options (int argc, char **argv)
                        }
 
                        case 'h':
+                               usage_exit (argv[0], 0);
+                               break;
                        default:
-                               usage_exit (argv[0]);
+                               usage_exit (argv[0], 1);
                }
        }
 
@@ -329,7 +337,7 @@ int main (int argc, char **argv)
        optind = read_options (argc, argv);
 
        if ((optind >= argc) && (opt_filename == NULL)) {
-               usage_exit (argv[0]);
+               usage_exit (argv[0], 1);
        }
 
        if (geteuid () != 0)
@@ -373,6 +381,15 @@ int main (int argc, char **argv)
                }
        }
 
+       if (opt_device != NULL)
+       {
+               if (ping_setopt (ping, PING_OPT_DEVICE, (void *) opt_device) != 0)
+               {
+                       fprintf (stderr, "Setting device failed: %s\n",
+                                       ping_get_error (ping));
+               }
+       }
+
        if (opt_filename != NULL)
        {
                FILE *infile;