Changeset caac052 in mainline for uspace/lib/pcap/src

Timestamp:

2024-12-22T16:47:50Z (10 months ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

46e2152

Parents:

373dded

Message:

pcapcat: docs, no literals, time fix in pcap lib

Location:

uspace/lib/pcap/src

Files:

• pcap.c (modified) (2 diffs)
• pcap_dumper.c (modified) (2 diffs)

uspace/lib/pcap/src/pcap.c

@@ -48 +48 @@
         getrealtime(&ts);
         header->seconds_stamp = (uint32_t)ts.tv_sec;
-        header->magic_stamp = (uint32_t)ts.tv_nsec;
+        header->magic_stamp = (uint32_t)ts.tv_sec / 1000;
 }
 
@@ -55 +55 @@
  * @param writer        Writer that has destination buffer and ops to write to destination buffer.
  * @param linktype      Linktype for the file header.
- * @param nano          True for nanoseconds, false for microseconds in timestamp.
  */
-void pcap_writer_add_header(pcap_writer_t *writer, uint32_t linktype, bool nano)
+void pcap_writer_add_header(pcap_writer_t *writer, uint32_t linktype)
 {
-        uint32_t magic_version = PCAP_MAGIC_MICRO;
-        if (nano) {
-                magic_version = PCAP_MAGIC_NANO;
-        }
-        pcap_file_header_t file_header = { magic_version, PCAP_MAJOR_VERSION, PCAP_MINOR_VERSION,
+        pcap_file_header_t file_header = { (uint32_t)PCAP_MAGIC_MICRO, PCAP_MAJOR_VERSION, PCAP_MINOR_VERSION,
                 0x00000000, 0x00000000, (uint32_t)PCAP_SNAP_LEN, linktype };
         writer->ops->write_buffer(writer, &file_header, sizeof(file_header));

uspace/lib/pcap/src/pcap_dumper.c

@@ -60 +60 @@
                 return EINVAL;
         }
-        pcap_writer_add_header(writer, (uint32_t)PCAP_LINKTYPE_ETHERNET, false);
+        pcap_writer_add_header(writer, (uint32_t)PCAP_LINKTYPE_ETHERNET);
 
         return EOK;
@@ -98 +98 @@
                 return EINVAL;
         }
-        pcap_writer_add_header(writer, (uint32_t)PCAP_LINKTYPE_USB_LINUX_MMAPPED, false);
+        pcap_writer_add_header(writer, (uint32_t)PCAP_LINKTYPE_USB_LINUX_MMAPPED);
 
         return EOK;