Changeset e1e8f7a in mainline for uspace/lib/pcap/src/pcapdump_srv.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_srv.c (modified) (5 diffs)

uspace/lib/pcap/src/pcapdump_srv.c

@@ -44 +44 @@
 
 #include "pcapdump_srv.h"
+#include "pcapdump_ipc.h"
 
 static void pcapdump_start_srv(ipc_call_t *icall, pcap_dumper_t *dumper)
@@ -49 +50 @@
         char *data;
         size_t size;
+        int ops_index = (int)ipc_get_arg1(icall);
         errno_t rc = async_data_write_accept((void **) &data, true, 0, 0, 0, &size);
         if (rc != EOK) {
@@ -56 +58 @@
 
         assert(str_length(data) == size && "Data were damaged during transmission.\n");
+
+        rc = pcap_dumper_set_ops(dumper, ops_index);
+        if (rc != EOK)
+        {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Setting ops for dumper was not successful.\n");
+                free(data);
+                async_answer_0(icall, EOK);
+                return;
+        }
 
         rc = pcap_dumper_start(dumper, (const char *)data);
@@ -71 +82 @@
 }
 
-static void pcapdump_set_ops_srv(ipc_call_t *icall, pcap_dumper_t *dumper)
+
+static void pcapdump_get_ops_num_srv(ipc_call_t *icall)
 {
-        char *data;
-        size_t size;
-        errno_t rc = async_data_write_accept((void **) &data, true, 0, 0, 0, &size);
-        if (rc != EOK) {
-                async_answer_0(icall, rc);
-                return;
-        }
+        size_t count = pcap_dumper_get_ops_number();
 
-        assert(str_length(data) == size && "Data were damaged during transmission.\n");
+        log_msg(LOG_DEFAULT, LVL_NOTE, "Getting number of ops.\n");
 
-        rc = pcap_dumper_set_ops(dumper, (const char *)data);
-        free(data);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "Setting ops for dumper was not successful.\n");
-        }
-
-        log_msg(LOG_DEFAULT, LVL_NOTE, "Setting ops for dumper was successful.\n");
-
-        async_answer_0(icall, EOK);
+        async_answer_1(icall, EOK, count);
 }
 
@@ -119 +117 @@
                         pcapdump_stop_srv(&call, dumper);
                         break;
-                case PCAP_CONTROL_SET_OPS:
-                        pcapdump_set_ops_srv(&call, dumper);
+                case PCAP_CONTROL_GET_OPS_NUM:
+                        pcapdump_get_ops_num_srv(&call);
                         break;
                 default: