Changeset 86f862c in mainline

Timestamp:

2024-02-19T06:27:40Z (2 months ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

f2cb80a

Parents:

6b66de6b

Message:

small typos and ccheck

Location:

uspace

Files:

• drv/nic/e1k/e1k.c (modified) (1 diff)
• lib/nic/include/nic.h (modified) (1 diff)
• lib/nic/src/nic_driver.c (modified) (1 diff)
• lib/pcap/src/pcap.c (modified) (1 diff)
• lib/pcap/src/pcap_iface.c (modified) (1 diff)

uspace/drv/nic/e1k/e1k.c

@@ -176 +176 @@
         /** Lock for EEPROM access */
         fibril_mutex_t eeprom_lock;
-
 
 } e1000_t;

uspace/lib/nic/include/nic.h

@@ -281 +281 @@
 
 /* pcapdump interface */
-extern pcap_iface_t* nic_get_pcap_iface(nic_t *);
+extern pcap_iface_t *nic_get_pcap_iface(nic_t *);
 
 #endif // __NIC_H__

uspace/lib/nic/src/nic_driver.c

@@ -1133 +1133 @@
 }
 
-pcap_iface_t* nic_get_pcap_iface(nic_t *nic_data) {
-
+pcap_iface_t *nic_get_pcap_iface(nic_t *nic_data)
+{
         return &nic_data->pcapdump;
 }

uspace/lib/pcap/src/pcap.c

@@ -52 +52 @@
 void pcap_set_time(pcap_packet_header_t *header, bool nano) // maybe without bool nano as nano is in pcapng
 {
-        time_t sec = time(NULL);
-        header->seconds_stamp = (uint32_t)sec;
-        header->magic_stamp = nano ? header->seconds_stamp / 1000000000 : header->seconds_stamp / 1000000;
+        struct timespec ts;
+        getrealtime(&ts);
+        header->seconds_stamp = (uint32_t)ts.tv_sec;
+        header->magic_stamp = (uint32_t)ts.tv_nsec / 1000;
 }
 

uspace/lib/pcap/src/pcap_iface.c

@@ -77 +77 @@
 void pcap_add_packet(const void *data, size_t size)
 {
-        if (&pcap_writer.data == NULL)
+        if (pcap_writer.data == NULL)
                 return;
         pcap_writer_add_packet(&pcap_writer, data, size);