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

uspace/lib/pcap/src/pcapdump_srv.c

@@ -60 +60 @@
         assert(str_length(data) == size && "Data were damaged during transmission.\n");
 
+        // Deadlock solution when trying to start dump while dumping (to the same device)
+        if (dumper->to_dump) {
+                free(data);
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Trying to start dumping while dumping.\n");
+                async_answer_0(icall, EBUSY);
+                return;
+        }
+
         rc = pcap_dumper_set_ops(dumper, ops_index);
-        if (rc != EOK)
-        {
+        if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "Setting ops for dumper was not successful.\n");
                 free(data);
@@ -82 +89 @@
         async_answer_0(icall, EOK);
 }
-
 
 static void pcapdump_get_ops_num_srv(ipc_call_t *icall)
@@ -128 +134 @@
 }
 
-
-
 /** @}
  */