Changeset 87488278 in mainline for uspace/lib/nic/src/nic_driver.c

Timestamp:

2024-06-27T08:07:31Z (6 days ago)

Author:

GitHub <noreply@…>

Parents:

af3235d (diff), 2a0c827c (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.

git-author:

boba-buba <120932204+boba-buba@…> (2024-06-27 08:07:31)

git-committer:

GitHub <noreply@…> (2024-06-27 08:07:31)

Message:

Merge 2a0c827c42eafb070de3bbe3c98a1d8a2b77d719 into af3235d07726dfc8b146c760a25544ea3ac29f9d

File:

• uspace/lib/nic/src/nic_driver.c (modified) (5 diffs)

uspace/lib/nic/src/nic_driver.c

@@ -47 +47 @@
 #include <ops/nic.h>
 #include <errno.h>
+#include <pcapdump_iface.h>
 
 #include "nic_driver.h"
@@ -522 +523 @@
          *               calls it inside send_frame handler (with locked main lock)
          */
+        pcapdump_packet(nic_get_pcap_iface(nic_data), frame->data, frame->size);
         fibril_rwlock_read_lock(&nic_data->rxc_lock);
         nic_frame_type_t frame_type;
@@ -560 +562 @@
                 fibril_rwlock_write_unlock(&nic_data->stats_lock);
         }
+        //pcapdump_packet(nic_get_pcap_iface(nic_data), frame->data, frame->size);
         nic_release_frame(nic_data, frame);
 }
@@ -648 +651 @@
         nic_data->dev = device;
 
+        errno_t pcap_rc  = pcapdump_init(nic_get_pcap_iface(nic_data));
+        if (pcap_rc != EOK) {
+                printf("Failed creating pcapdump port\n");
+        }
+
         return nic_data;
 }
@@ -1133 +1141 @@
 }
 
+pcap_iface_t *nic_get_pcap_iface(nic_t *nic_data)
+{
+        return &nic_data->pcapdump;
+}
+
 /** @}
  */