Changeset e846bec in mainline for uspace/lib/pcap

Timestamp:

2024-03-10T10:46:00Z (2 years ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

e4cc266

Parents:

325ea9c (diff), 6eab537d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'topic/packet-capture' into topic/packet-capture-list

Location:

uspace/lib/pcap

Files:

• include/pcap.h (modified) (1 diff)
• src/pcap.c (modified) (2 diffs)
• src/pcap_iface.c (modified) (1 diff)

uspace/lib/pcap/include/pcap.h

@@ -64 +64 @@
         uint32_t snaplen;
         uint32_t additional; /** The LinkType and additional information field is in the form */
-} __attribute__((packed, aligned(4))) pcap_file_header_t;
+} pcap_file_header_t;
 
 typedef struct pcap_packet_header {

uspace/lib/pcap/src/pcap.c

@@ -35 +35 @@
  * @brief Headers and functions for .pcap file and packets to be dumped
  */
-
-#define LOGGER(msg, ...) \
-     fprintf(stderr, \
-         "[PCAP %s:%d]: " msg "\n", \
-         __FILE__, __LINE__, \
-         ##__VA_ARGS__\
-     )
 
 #include "pcap.h"
@@ -108 +101 @@
         if (writer->data == NULL) {
                 rc = EINVAL;
-                LOGGER("Failed to create %s: %s.", filename, str_error(rc));
                 return rc;
         }

uspace/lib/pcap/src/pcap_iface.c

@@ -82 +82 @@
 }
 
-void pcap_close_file()
+void pcap_close_file(void)
 {
         pcap_writer.ops->close(&pcap_writer);