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

Timestamp:

2024-12-13T08:44:05Z (14 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/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 NAME "pcap"
+
 /** Initialize writing to .pcap file.
  *
@@ -48 +51 @@
 static errno_t pcap_writer_to_file_init(pcap_writer_t *writer, const char *filename)
 {
-        errno_t rc;
         writer->data = fopen(filename, "a");
         if (writer->data == NULL) {
-                rc = EINVAL;
-                return rc;
+                return EINVAL;
         }
         pcap_writer_add_header(writer);
 
-        rc = EOK;
-        return rc;
+        return EOK;
+}
+
+static errno_t pcap_writer_to_file_init_append(pcap_writer_t *writer, const char *filename)
+{
+        writer->data = fopen(filename, "a");
+        if (writer->data == NULL) {
+                return EINVAL;
+        }
+
+        return EOK;
 }
 
@@ -82 +92 @@
 }
 
-static pcap_writer_ops_t file_ops = {
+static const pcap_writer_ops_t file_ops = {
         .open = &pcap_writer_to_file_init,
         .write_u32 = &pcap_file_w32,
@@ -90 +100 @@
 };
 
-static size_t pcap_short_file_w32(pcap_writer_t *writer, uint32_t data)
-{
-        return fwrite(&data, 1, 4, (FILE *)writer->data);
-}
-
-static size_t pcap_short_file_w16(pcap_writer_t *writer, uint16_t data)
-{
-        return fwrite(&data, 1, 2, (FILE *)writer->data);
-}
-
 static size_t pcap_short_file_wbuffer(pcap_writer_t *writer, const void *data, size_t size)
 {
-        return fwrite(data, 1, size < 60 ? size : 60, (FILE *)writer->data);
-}
-
-static void pcap_short_file_close(pcap_writer_t *writer)
-{
-        fclose((FILE *)writer->data);
-}
-
-static pcap_writer_ops_t short_file_ops = {
+        return fwrite(data, 1, size < 60 ? size : 60, (FILE *)writer->data); //define
+}
+
+static const pcap_writer_ops_t short_file_ops = {
         .open = &pcap_writer_to_file_init,
-        .write_u32 = &pcap_short_file_w32,
-        .write_u16 = &pcap_short_file_w16,
+        .write_u32 = &pcap_file_w32,
+        .write_u16 = &pcap_file_w16,
         .write_buffer = &pcap_short_file_wbuffer,
-        .close = &pcap_short_file_close
+        .close = &pcap_file_close
 
 };
+
+static const pcap_writer_ops_t append_file_ops = {
+        .open = &pcap_writer_to_file_init_append,
+        .write_u32 = &pcap_file_w32,
+        .write_u16 = &pcap_file_w16,
+        .write_buffer = &pcap_file_wbuffer,
+        .close = &pcap_file_close
+};
+
+static pcap_writer_ops_t ops[3] = {file_ops, short_file_ops, append_file_ops};
+
+int pcap_dumper_get_ops_number(void)
+{
+        return (int)(sizeof(ops) / sizeof(pcap_writer_ops_t));
+}
 
 errno_t pcap_dumper_start(struct pcap_dumper *dumper, const char *name)
@@ -137 +147 @@
 }
 
-errno_t pcap_dumper_set_ops(struct pcap_dumper *dumper, const char *name)
+errno_t pcap_dumper_set_ops(struct pcap_dumper *dumper, int index)
 {
         fibril_mutex_lock(&dumper->mutex);
         errno_t rc = EOK;
-        if (!str_cmp(name, "short_file")) {
-                dumper->writer.ops = &short_file_ops;
-        } else if (!str_cmp(name, "full_file")) {
-                dumper->writer.ops = &file_ops;
-        } else {
-                rc = EINVAL;
-        }
+        dumper->writer.ops = &ops[index];
         fibril_mutex_unlock(&dumper->mutex);
         return rc;
@@ -190 +194 @@
         dumper->writer.ops = NULL;
 
-        errno_t rc = log_init("pcap");
+        errno_t rc = log_init(NAME);
         if (rc != EOK) {
-                printf("pcap : Failed to initialize log.\n");
+                printf("%s : Failed to initialize log.\n", NAME);
                 return 1;
         }