Changeset fb31682 in mainline for uspace/app/pcapctl/main.c

Timestamp:

2024-12-13T08:44:05Z (10 months ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

87b490e3

Parents:

28ed2d89

git-author:

Nataliia Korop <n.corop08@…> (2024-11-29 10:41:19)

git-committer:

Nataliia Korop <n.corop08@…> (2024-12-13 08:44:05)

Message:

user friendly options, trying to start while dumping → err msg

File:

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

uspace/app/pcapctl/main.c

@@ -44 +44 @@
 #define NAME "pcapctl"
 #define DEFAULT_DEV_NUM 0
-#define DEFAULT_OPS_NUM 0
 #define DECIMAL_SYSTEM 10
+
+#define DEFAULT_FILE_OPS 0
+#define SHORT_FILE_OPS 1
+#define APPEND_FILE_OPS 2
+#define USB_FILE_OPS 3
 
 static errno_t start_dumping(int *dev_number, const char *name, int *ops_index)
@@ -56 +60 @@
 
         rc = pcapctl_is_valid_ops_number(ops_index, sess);
-        if (rc != EOK)
-        {
+        if (rc != EOK) {
                 printf("Wrong number of ops: %d.\n", *ops_index);
                 pcapctl_dump_close(sess);
@@ -65 +68 @@
         rc = pcapctl_dump_start(name, ops_index, sess);
         if (rc != EOK) {
+                if (rc == EBUSY) {
+                        printf("Dumping for device %d is in process, stop to start dumping to file %s.\n", *dev_number, name);
+                }
                 printf("Starting the dumping was not successful.\n");
         }
@@ -95 +101 @@
  */
 static const struct option opts[] = {
+        { "append", required_argument, 0, 'A' }, // file as argument and ops 0 if not exist and 2 if exists
+        { "new", required_argument, 0, 'N' }, // file name as argument
+        { "truncated", required_argument, 0, 'T' }, // truncated ops
+        { "usb", required_argument, 0, 'U' }, //??
         { "device", required_argument, 0, 'd' },
         { "list", no_argument, 0, 'l' },
@@ -102 +112 @@
         { "stop", no_argument, 0, 't' },
         { "ops", required_argument, 0, 'p' },
-        { "force", no_argument, 0, 'f'},
+        { "force", no_argument, 0, 'f' },
         { 0, 0, 0, 0 }
 };
@@ -109 +119 @@
 {
         vfs_stat_t stats;
-
-    if (vfs_stat_path(path, &stats) != EOK)
-        return false;
-
-    return true;
+        if (vfs_stat_path(path, &stats) != EOK) {
+                return false;
+        } else {
+                return true;
+        }
 }
 
@@ -121 +131 @@
             NAME " --list | -l \n"
             "\tList of devices\n"
-            NAME " --start | -r --device= | -d <device number from list> --outfile= | -f <outfile>\n"
+            NAME " --start | -r --device= | -d <device number from list> --outfile= | -o <outfile> --ops= | p <ops index>\n"
             "\tPackets dumped from device will be written to <outfile>\n"
-            NAME " --stop | -t --device= | -d <device>\n"
+            NAME " --stop | -t --device= | -d <device number from list>\n"
             "\tDumping from <device> stops\n"
-            NAME " --start | -s --outfile= | -f <outfile>\n"
+            NAME " --start | -r --outfile= | -o <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");
+            "\tShow this application help.\n"
+            NAME " --force | -f"
+            "\tTo open existing file and write to it.\n");
 }
 
@@ -136 +148 @@
         bool stop = false;
         int dev_number = DEFAULT_DEV_NUM;
-        int ops_number = DEFAULT_OPS_NUM;
+        int ops_number = DEFAULT_FILE_OPS;
         bool forced = false;
         const char *output_file_name = "";
@@ -146 +158 @@
         }
         while (ret != -1) {
-                ret = getopt_long(argc, argv, "d:lho:rtp:f", opts, &idx);
+                ret = getopt_long(argc, argv, "A:N:T:U:d:lho:rtp:f", opts, &idx);
                 switch (ret) {
                 case 'd':
@@ -158 +170 @@
                         }
                         break;
+                case 'A':
+                        output_file_name = optarg;
+                        if (file_exists(output_file_name)) {
+                                ops_number = APPEND_FILE_OPS;
+                        }
+                        break;
+                case 'N':
+                        output_file_name = optarg;
+                        break;
+                case 'T':
+                        output_file_name = optarg;
+                        ops_number = SHORT_FILE_OPS;
+                        break;
+                case 'U':
+                        output_file_name = optarg;
+                        ops_number = USB_FILE_OPS;
+                        break;
                 case 'l':
                         list_devs();
@@ -174 +203 @@
                         break;
                 case 'p':
-                        char* ops_inval;
+                        char *ops_inval;
                         long ops_result = strtol(optarg, &ops_inval, DECIMAL_SYSTEM);
                         ops_number = (int)ops_result;
@@ -184 +213 @@
         }
 
-        printf("%s: HelenOS Packet Dumping utility: device - %d.\n", NAME, dev_number);
+        if (!str_cmp(output_file_name, "") && start) {
+                printf("Dumping destination was not specified. Specify with --outfile | -o\n");
+                return 1;
+        }
+
+        printf("%s: HelenOS Packet Dumping utility: device - %d, ops - %d.\n", NAME, dev_number, ops_number);
 
         if (start) {
 
-                if (file_exists(output_file_name) && !forced)
-                {
-                        printf("File %s already exists. If you want to write to it, then use flag --force.\n", output_file_name);
+                if (file_exists(output_file_name) && !forced && ops_number != 2) {
+                        printf("File %s already exists. If you want to overwrite to it, then use flag --force.\n", output_file_name);
                         return 0;
                 }
@@ -201 +234 @@
         } else {
                 usage();
+                return 1;
         }
         return 0;