Changes in uspace/app/pcapctl/main.c [e4cc266:6c1e7c0] in mainline

File:

• uspace/app/pcapctl/main.c (modified) (3 diffs)

uspace/app/pcapctl/main.c

@@ -36 +36 @@
 #include <str.h>
 #include <errno.h>
+#include <arg_parse.h>
+#include <getopt.h>
 
 #include "pcapctl_dump.h"
 
 #define NAME "pcapctl"
+#define DEFAULT_DEV_NUM 0
 
-pcapctl_sess_t* sess;
-
-static errno_t start_dumping(const char *svc_name, const char *name)
+static errno_t start_dumping(int *dev_number, const char *name)
 {
-        errno_t rc = pcapctl_dump_open(svc_name, &sess);
+        pcapctl_sess_t *sess = NULL;
+        errno_t rc = pcapctl_dump_open(dev_number, &sess);
         if (rc != EOK) {
                 return 1;
         }
+
         pcapctl_dump_start(name, sess);
         pcapctl_dump_close(sess);
@@ -54 +57 @@
 }
 
-/** Session might */
-static errno_t stop_dumping(const char *svc_name)
+static errno_t stop_dumping(int *dev_number)
 {
-        errno_t rc = pcapctl_dump_open(svc_name, &sess);
+        pcapctl_sess_t *sess = NULL;
+        errno_t rc = pcapctl_dump_open(dev_number, &sess);
         if (rc != EOK) {
                 return 1;
         }
-
         pcapctl_dump_stop(sess);
         pcapctl_dump_close(sess);
@@ -67 +69 @@
 }
 
-static void list_devs(void) {
+static void list_devs(void)
+{
         pcapctl_list();
 }
 
-static void usage(const char *progname)
+/**
+ * Array of supported commandline options
+ */
+static const struct option opts[] = {
+        { "device", required_argument, 0, 'd' },
+        { "list", no_argument, 0, 'l' },
+        { "help", no_argument, 0, 'h' },
+        { "outfile", required_argument, 0, 'f' },
+        { "start", no_argument, 0, 'r' },
+        { "stop", no_argument, 0, 't' },
+        { 0, 0, 0, 0 }
+};
+
+static void usage(void)
 {
-        fprintf(stderr, "Usage:\n");
-        fprintf(stderr, "  %s list: List of devices\n", progname);
-        fprintf(stderr, "  %s start <device> <outfile>: Packets dumped from <device> will be written to <outfile>\n", progname);
-        fprintf(stderr, "  %s stop <device>: Dumping from <device> stops\n", progname);
+        printf("Usage:\n"
+            NAME " --list | -l \n"
+            "\tList of devices\n"
+            NAME " --start | -r --device= | -d <device number from list> --outfile= | -f <outfile>\n"
+            "\tPackets dumped from device will be written to <outfile>\n"
+            NAME " --stop | -t --device= | -d <device>\n"
+            "\tDumping from <device> stops\n"
+            NAME " --start | -s --outfile= | -f <outfile>\n"
+            "\tPackets dumped from the 0. device from the list will be written to <outfile>\n"
+            NAME " --help | -h\n"
+            "\tShow this application help.\n");
 }
 
 int main(int argc, char *argv[])
 {
-        if (argc < 2) {
-                usage(argv[0]);
-                return 1;
-        } else {
-                if (str_cmp(argv[1], "--help") == 0 || str_cmp(argv[1], "-h") == 0) {
-                        usage(argv[0]);
-                        return 0;
-                } else if (str_cmp(argv[1], "list") == 0) {
+        bool start = false;
+        bool stop = false;
+        int dev_number = DEFAULT_DEV_NUM;
+        const char *output_file_name;
+        int idx = 0;
+        int ret = 0;
+        if (argc == 1) {
+                usage();
+                return 0;
+        }
+        while (ret != -1) {
+                ret = getopt_long(argc, argv, "d:lhf:rt", opts, &idx);
+                switch (ret) {
+                case 'd':
+                        char *rest;
+                        long result = strtol(optarg, &rest, 10);
+                        dev_number = (int)result;
+                        errno_t rc = pcapctl_is_valid_device(&dev_number);
+                        if (rc != EOK) {
+                                printf("Device with index %d not found\n", dev_number);
+                                return 1;
+                        }
+                        break;
+                case 'l':
                         list_devs();
                         return 0;
-                } else if (str_cmp(argv[1], "start") == 0) {
-                        if (argc != 4) {
-                                usage(argv[0]);
-                                return 1;
-                        }
-                        start_dumping(argv[2], argv[3]);
-                } else if (str_cmp(argv[1], "stop") == 0) {
-                        if (argc != 3) {
-                                usage(argv[0]);
-                                return 1;
-                        }
-                        stop_dumping(argv[2]);
-                        fprintf(stdout, "Dumping was stopped\n");
-                        return EOK;
-                } else {
-                        usage(argv[0]);
-                        return 1;
+                case 'h':
+                        usage();
+                        return 0;
+                case 'f':
+                        output_file_name = optarg;
+                        break;
+                case 'r':
+                        start = true;
+                        break;
+                case 't':
+                        stop = true;
+                        break;
                 }
+        }
+
+        printf("%s: HelenOS Packet Dumping utility: device - %d\n", NAME, dev_number);
+
+        if (start) {
+                // start with dev number and optional..name
+                start_dumping(&dev_number, output_file_name);
+        } else if (stop) {
+                //stop with dev number
+                stop_dumping(&dev_number);
         }
         return 0;