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

Timestamp:

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

Author:

Nataliia Korop <n.corop08@…>

Children:

e5b2777

Parents:

467d2b9

git-author:

Nataliia Korop <n.corop08@…> (2024-11-16 11:14:06)

git-committer:

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

Message:

set ops as number and with start req

File:

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

uspace/app/pcapctl/main.c

@@ -43 +43 @@
 #define NAME "pcapctl"
 #define DEFAULT_DEV_NUM 0
+#define DECIMAL_SYSTEM 10
 
-static errno_t start_dumping(int *dev_number, const char *name)
+static errno_t start_dumping(int *dev_number, const char *name, int *ops_index)
 {
         pcapctl_sess_t *sess = NULL;
@@ -52 +53 @@
         }
 
-        rc = pcapctl_dump_start(name, sess);
+        rc = pcapctl_is_valid_ops_number(ops_index, sess);
+        if (rc != EOK)
+        {
+                printf("Wrong number of ops: %d.\n", *ops_index);
+                pcapctl_dump_close(sess);
+                return rc;
+        }
+
+        rc = pcapctl_dump_start(name, ops_index, sess);
         if (rc != EOK) {
                 printf("Starting the dumping was not successful.\n");
@@ -70 +79 @@
         if (rc != EOK) {
                 printf("Stoping the dumping was not successful.\n");
-        }
-        pcapctl_dump_close(sess);
-        return EOK;
-}
-
-static errno_t set_dumper_ops(int *dev_number, const char *name)
-{
-        pcapctl_sess_t *sess = NULL;
-        errno_t rc = pcapctl_dump_open(dev_number, &sess);
-        if (rc != EOK) {
-                return rc;
-        }
-
-        rc = pcapctl_dump_set_ops(name, sess);
-        if (rc != EOK) {
-                printf("Setting dumper ops was not successful.\n");
         }
         pcapctl_dump_close(sess);
@@ -129 +122 @@
         bool start = false;
         bool stop = false;
-        bool set_ops = false;
         int dev_number = -1;
+        int ops_number = -1;
         const char *output_file_name = "";
-        const char *ops_name = "";
         int idx = 0;
         int ret = 0;
@@ -144 +136 @@
                 case 'd':
                         char *rest;
-                        long result = strtol(optarg, &rest, 10);
-                        dev_number = (int)result;
+                        long dev_result = strtol(optarg, &rest, DECIMAL_SYSTEM);
+                        dev_number = (int)dev_result;
                         errno_t rc = pcapctl_is_valid_device(&dev_number);
                         if (rc != EOK) {
@@ -168 +160 @@
                         break;
                 case 'o':
-                        set_ops = true;
-                        ops_name = optarg;
+                        char* ops_inval;
+                        long ops_result = strtol(optarg, &ops_inval, DECIMAL_SYSTEM);
+                        ops_number = (int)ops_result;
                         break;
                 }
@@ -178 +171 @@
         if (start) {
                 /* start with dev number and name */
-                start_dumping(&dev_number, output_file_name);
+                start_dumping(&dev_number, output_file_name, &ops_number);
         } else if (stop) {
                 /* stop with dev number */
                 stop_dumping(&dev_number);
-        } else if (set_ops) {
-                set_dumper_ops(&dev_number, ops_name);
         }
         return 0;