Changeset 03cd7a9e in mainline for uspace/lib/pcap/src/pcap_iface.c

Timestamp:

2024-12-13T08:44:05Z (15 months ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

f08447b

Parents:

59fe16d

git-author:

Nataliia Korop <n.corop08@…> (2024-10-28 09:57:08)

git-committer:

Nataliia Korop <n.corop08@…> (2024-12-13 08:44:05)

Message:

refactoring after 23.10

File:

• uspace/lib/pcap/src/pcap_iface.c (modified) (1 diff)

uspace/lib/pcap/src/pcap_iface.c

@@ -65 +65 @@
 };
 
-static pcap_writer_t pcap_writer = {
-        .ops = &file_ops,
-};
+// static size_t pcap_short_file_w32(pcap_writer_t *writer, uint32_t data)
+// {
+//      return fwrite(&data, 1, 4, (FILE *)writer->data);
+// }
 
-errno_t pcap_init(const char *name)
+// 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 = {
+//      .write_u32 = &pcap_short_file_w32,
+//      .write_u16 = &pcap_short_file_w16,
+//      .write_buffer = &pcap_short_file_wbuffer,
+//      .close = &pcap_short_file_close
+
+// };
+
+errno_t pcap_dumper_start(struct pcap_dumper *dumper, const char *name)
 {
-        errno_t rc = pcap_writer_to_file_init(&pcap_writer, name);
+        fibril_mutex_lock(&dumper->mutex);
+
+        /** When try to start when already started, close current and starts new */
+        if (dumper->to_dump == true)
+        {
+                pcap_dumper_stop(dumper);
+        }
+        errno_t rc = pcap_writer_to_file_init(&dumper->writer, name);
+        if (rc == EOK)
+        {
+                dumper->to_dump = true;
+        }
+        else
+        {
+                printf("Failed creating pcap dumper: %s", str_error(rc));
+        }
+        fibril_mutex_unlock(&dumper->mutex);
         return rc;
 }
 
-void pcap_add_packet(const void *data, size_t size)
+//udelat globalni
+void pcap_dumper_add_packet(struct pcap_dumper *dumper, const void *data, size_t size)
 {
-        if (pcap_writer.data == NULL)
+        fibril_mutex_lock(&dumper->mutex);
+
+        if (dumper->writer.data == NULL || !dumper->to_dump)
+        {
+                fibril_mutex_unlock(&dumper->mutex);
                 return;
-        pcap_writer_add_packet(&pcap_writer, data, size);
+        }
+        pcap_writer_add_packet(&dumper->writer, data, size);
+        fibril_mutex_unlock(&dumper->mutex);
 }
 
-void pcap_close_file(void)
+//udelt globalni
+void pcap_dumper_stop(struct pcap_dumper *dumper)
 {
-        pcap_writer.ops->close(&pcap_writer);
-        pcap_writer.data = NULL;
+        fibril_mutex_lock(&dumper->mutex);
+
+        /** If want to stop, when already stopped, do nothing */
+        if (dumper->to_dump == false) {
+                fibril_mutex_unlock(&dumper->mutex);
+                return;
+        }
+        dumper->to_dump = false;
+        dumper->writer.ops->close(&dumper->writer);
+        dumper->writer.data = NULL;
+        fibril_mutex_unlock(&dumper->mutex);
 }
 
 /** Initialize interface for dumping packets
  *
- * @param iface Device dumping interface
+ * @param dumper Device dumping interface
  *
  */
-errno_t pcap_iface_init(pcap_iface_t *iface)
+errno_t pcap_dumper_init(pcap_dumper_t *dumper)
 {
-        iface->to_dump = false;
-        iface->add_packet = pcap_add_packet;
-        iface->init = pcap_init;
-        iface->fini = pcap_close_file;
-
+        fibril_mutex_initialize(&dumper->mutex);
+        dumper->to_dump = false;
+        dumper->writer.ops = &file_ops;
         return EOK;
 }