Changeset 6b66de6b in mainline

Timestamp:

2024-02-14T09:18:19Z (11 months ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

86f862c

Parents:

dc5c303

git-author:

Nataliia Korop <n.corop08@…> (2023-12-19 14:05:46)

git-committer:

Nataliia Korop <n.corop08@…> (2024-02-14 09:18:19)

Message:

pcapdump moved to nic_t struct

Location:

uspace

Files:

• drv/nic/e1k/e1k.c (modified) (4 diffs)
• lib/nic/include/nic.h (modified) (2 diffs)
• lib/nic/include/nic_driver.h (modified) (2 diffs)
• lib/nic/meson.build (modified) (1 diff)
• lib/nic/src/nic_driver.c (modified) (1 diff)

uspace/drv/nic/e1k/e1k.c

@@ -177 +177 @@
         fibril_mutex_t eeprom_lock;
 
-        /** Interface for dumping packets */
-        pcap_iface_t pcapdump;
 
 } e1000_t;
@@ -1195 +1193 @@
                 if (frame != NULL) {
                         memcpy(frame->data, e1000->rx_frame_virt[next_tail], frame_size);
-                        pcapdump_packet(&e1000->pcapdump, frame->data, frame->size);
+                        pcapdump_packet(nic_get_pcap_iface(nic), frame->data, frame->size);
 
                         nic_received_frame(nic, frame);
@@ -2211 +2209 @@
                 goto err_add_to_cat;
 
-        errno_t pcap_rc  = pcapdump_init(&e1000->pcapdump);
+        errno_t pcap_rc  = pcapdump_init(nic_get_pcap_iface(nic));
 
         if (pcap_rc != EOK) {
@@ -2383 +2381 @@
 
         memcpy(e1000->tx_frame_virt[tdt], data, size);
-        pcapdump_packet(&e1000->pcapdump, data, size);
+        pcapdump_packet(nic_get_pcap_iface(nic), data, size);
         tx_descriptor_addr->phys_addr = PTR_TO_U64(e1000->tx_frame_phys[tdt]);
         tx_descriptor_addr->length = size;

uspace/lib/nic/include/nic.h

@@ -44 +44 @@
 #include <device/hw_res_parsed.h>
 #include <ops/nic.h>
+
+#include "pcap_iface.h"
 
 #define DEVICE_CATEGORY_NIC "nic"
@@ -278 +280 @@
 extern void nic_sw_period_stop(nic_t *);
 
+/* pcapdump interface */
+extern pcap_iface_t* nic_get_pcap_iface(nic_t *);
+
 #endif // __NIC_H__
 

uspace/lib/nic/include/nic_driver.h

@@ -50 +50 @@
 #include "nic_rx_control.h"
 #include "nic_wol_virtues.h"
+#include "pcap/include/pcapdump_iface.h"
 
 struct sw_poll_info {
@@ -195 +196 @@
          */
         poll_request_handler on_poll_request;
+
+        /** Interface for dumping packets */
+        pcap_iface_t pcapdump;
+
         /** Data specific for particular driver */
         void *specific;

uspace/lib/nic/meson.build

@@ -27 +27 @@
 #
 
-deps = [ 'drv' ]
+deps = [ 'drv' , 'pcap' ]
 c_args = [ '-DLIBNIC_INTERNAL', ]
 src = files(

uspace/lib/nic/src/nic_driver.c

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