Changeset 78edb5e in mainline for uspace/app/pcapctl/main.c

Timestamp:

2024-03-19T15:15:50Z (2 months ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

8d9217d

Parents:

e4cc266

Message:

choose nic: without —deviced

File:

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

uspace/app/pcapctl/main.c

@@ -41 +41 @@
 #define NAME "pcapctl"
 
-pcapctl_sess_t* sess;
+//pcapctl_sess_t* sess = NULL;
 
 static errno_t start_dumping(const char *svc_name, const char *name)
 {
+        pcapctl_sess_t* sess = NULL;
         errno_t rc = pcapctl_dump_open(svc_name, &sess);
         if (rc != EOK) {
                 return 1;
         }
+
         pcapctl_dump_start(name, sess);
         pcapctl_dump_close(sess);
@@ -57 +59 @@
 static errno_t stop_dumping(const char *svc_name)
 {
+        pcapctl_sess_t* sess = NULL;
         errno_t rc = pcapctl_dump_open(svc_name, &sess);
         if (rc != EOK) {
                 return 1;
         }
-
         pcapctl_dump_stop(sess);
         pcapctl_dump_close(sess);
@@ -71 +73 @@
 }
 
-static void usage(const char *progname)
+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 \n"
+                "\tList of devices\n"
+                NAME " start --device= | -d <device number from list> <outfile>\n"
+                "\tPackets dumped from device will be written to <outfile>\n"
+                NAME " stop --device= | -d <device>\n"
+                "\tDumping from <device> stops\n"
+                NAME " start <outfile>\n"
+                "\tPackets dumped from the 1st device from the list will be written to <outfile>\n"
+                NAME " --help | -h\n"
+                "\tShow this application help.\n");
 }
 
@@ -82 +91 @@
 {
         if (argc < 2) {
-                usage(argv[0]);
+                usage();
                 return 1;
         } else {
+                /** help*/
                 if (str_cmp(argv[1], "--help") == 0 || str_cmp(argv[1], "-h") == 0) {
-                        usage(argv[0]);
+                        usage();
                         return 0;
+                /** list*/
                 } else if (str_cmp(argv[1], "list") == 0) {
                         list_devs();
                         return 0;
+                /** start with/out devnum */
                 } else if (str_cmp(argv[1], "start") == 0) {
-                        if (argc != 4) {
-                                usage(argv[0]);
+                        if (argc == 3) {
+                                start_dumping((char *)"0", argv[2]);
+                                return 0;
+                        }
+                        else if (argc == 4) {
+                                start_dumping(argv[2], argv[3]);
+                                return 0;
+                        } else {
+                                usage();
                                 return 1;
                         }
-                        start_dumping(argv[2], argv[3]);
+                /** Stop with/out devnum */
                 } else if (str_cmp(argv[1], "stop") == 0) {
-                        if (argc != 3) {
-                                usage(argv[0]);
+                        if (argc == 2) {
+                                stop_dumping((char *)"0");
+                                fprintf(stdout, "Dumping was stopped\n");
+                                return 0;
+                        }
+                        else if (argc == 3) {
+
+                                stop_dumping(argv[2]);
+                                fprintf(stdout, "Dumping was stopped\n");
+                        } else {
+                                usage();
                                 return 1;
                         }
-                        stop_dumping(argv[2]);
-                        fprintf(stdout, "Dumping was stopped\n");
-                        return EOK;
                 } else {
-                        usage(argv[0]);
+                        usage();
                         return 1;
                 }