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

uspace/lib/pcap/src/pcap_dumper.c

@@ -39 +39 @@
 #include "pcap_dumper.h"
 
-#define SHORT_OPS_BYTE_COUNT 60
+#define SHORT_OPS_BYTE_COUNT 0x3C
 
 /** Initialize writing to .pcap file.
@@ -50 +50 @@
 static errno_t pcap_writer_to_file_init(pcap_writer_t *writer, const char *filename)
 {
+        /** For overwriting file if already exists. */
+        writer->data = fopen(filename, "w");
+        if (writer->data == NULL) {
+                return EINVAL;
+        }
+        fclose(writer->data);
+
         writer->data = fopen(filename, "a");
         if (writer->data == NULL) {
@@ -71 +78 @@
 static errno_t pcap_writer_to_file_usb_init(pcap_writer_t *writer, const char *filename)
 {
+        /** For overwriting file if already exists. */
+        writer->data = fopen(filename, "w");
+        if (writer->data == NULL) {
+                return EINVAL;
+        }
+        fclose(writer->data);
+
         writer->data = fopen(filename, "a");
         if (writer->data == NULL) {
@@ -140 +154 @@
 };
 
-static pcap_writer_ops_t ops[4] = {file_ops, short_file_ops, append_file_ops, usb_file_ops};
+static pcap_writer_ops_t ops[4] = { file_ops, short_file_ops, append_file_ops, usb_file_ops };
 
 int pcap_dumper_get_ops_number(void)
@@ -150 +164 @@
 {
         fibril_mutex_lock(&dumper->mutex);
-
-        /** When try to start when already started, close current and starts new */
-        if (dumper->to_dump) {
-                pcap_dumper_stop(dumper);
-        }
 
         errno_t rc = dumper->writer.ops->open(&dumper->writer, name);
@@ -201 +210 @@
 }
 
-
-
 /** @}
  */