Changeset e1e8f7a in mainline for uspace/lib/pcap/src/pcapdump_client.c

Timestamp:

2024-12-13T08:44:05Z (15 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/lib/pcap/src/pcapdump_client.c (modified) (6 diffs)

uspace/lib/pcap/src/pcapdump_client.c

@@ -41 +41 @@
 #include <ctype.h>
 #include "pcapdump_client.h"
-#include "pcapdump_srv.h"
+#include "pcapdump_ipc.h"
 
 /** Finish an async exchange on the pcapctl session
@@ -100 +100 @@
         }
         if (*index + 1 > (int)count || *index < 0) {
+                return EINVAL;
+        }
+        return EOK;
+}
+
+
+errno_t pcapctl_is_valid_ops_number(int *index, pcapctl_sess_t* sess)
+{
+        async_exch_t *exch = async_exchange_begin(sess->sess);
+        ipc_call_t answer;
+        aid_t req = async_send_0(exch, PCAP_CONTROL_GET_OPS_NUM, &answer);
+
+        async_exchange_end(exch);
+
+        errno_t retval;
+        async_wait_for(req, &retval);
+
+        if (retval != EOK) {
+                return retval;
+        }
+
+        int ops_count = (int)ipc_get_arg1(&answer);
+        if (*index + 1 > ops_count || *index < 0)
+        {
                 return EINVAL;
         }
@@ -149 +173 @@
                 return ENOMEM;
 
-        printf("number: %d\n", *index);
         if (*index == -1) {
                 *index = 0;
@@ -190 +213 @@
  * @return EOK on success or an error code
  */
-errno_t pcapctl_dump_start(const char *name, pcapctl_sess_t *sess)
+errno_t pcapctl_dump_start(const char *name, int *ops_index, pcapctl_sess_t *sess)
 {
         errno_t rc;
@@ -196 +219 @@
 
         size_t size = str_size(name);
-        aid_t req = async_send_0(exch, PCAP_CONTROL_SET_START, NULL);
+        aid_t req = async_send_1(exch, PCAP_CONTROL_SET_START, *ops_index, NULL);
 
         rc = async_data_write_start(exch, name, size);
@@ -227 +250 @@
 }
 
-errno_t pcapctl_dump_set_ops(const char *ops_name, pcapctl_sess_t *sess)
-{
-        errno_t rc;
-        async_exch_t *exch = async_exchange_begin(sess->sess);
-
-        size_t size = str_size(ops_name);
-        aid_t req = async_send_0(exch, PCAP_CONTROL_SET_OPS, NULL);
-
-        rc = async_data_write_start(exch, ops_name, size);
-
-        pcapctl_dump_exchange_end(exch);
-
-        if (rc != EOK) {
-                async_forget(req);
-                return rc;
-        }
-
-        errno_t retval;
-        async_wait_for(req, &retval);
-        return retval;
-}
 
 /** @}