Changeset 3a4c6d9 in mainline for uspace/lib

Timestamp:

2025-11-14T16:58:23Z (3 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

1ec732a

Parents:

d101368

git-author:

Nataliia Korop <n.corop08@…> (2025-11-14 16:57:02)

git-committer:

Jiri Svoboda <jiri@…> (2025-11-14 16:58:23)

Message:

Packet capture (thx Nataliia Korop)

Location:

uspace/lib

Files:

• c/include/ipc/services.h (modified) (1 diff)
• meson.build (modified) (1 diff)
• nic/include/nic.h (modified) (2 diffs)
• nic/include/nic_driver.h (modified) (2 diffs)
• nic/include/nic_impl.h (modified) (1 diff)
• nic/meson.build (modified) (1 diff)
• nic/src/nic_driver.c (modified) (5 diffs)
• nic/src/nic_impl.c (modified) (3 diffs)
• pcap/doc/doxygoups.h (added)
• pcap/include/pcap.h (added)
• pcap/include/pcap_dumper.h (added)
• pcap/include/pcapdump_client.h (added)
• pcap/include/pcapdump_drv_iface.h (added)
• pcap/include/pcapdump_ipc.h (added)
• pcap/include/pcapdump_srv.h (added)
• pcap/meson.build (added)
• pcap/src/pcap.c (added)
• pcap/src/pcap_dumper.c (added)
• pcap/src/pcapdump_client.c (added)
• pcap/src/pcapdump_drv_iface.c (added)
• pcap/src/pcapdump_srv.c (added)

uspace/lib/c/include/ipc/services.h

@@ -67 +67 @@
 #define SERVICE_NAME_VBD      "vbd"
 #define SERVICE_NAME_VOLSRV   "volsrv"
-
 #endif
 

uspace/lib/meson.build

@@ -84 +84 @@
         'nettl',
         'ofw',
+        'pcap',
         'pcm',
         'pcut',

uspace/lib/nic/include/nic.h

@@ -44 +44 @@
 #include <device/hw_res_parsed.h>
 #include <ops/nic.h>
+#include <pcap_dumper.h>
 
 #define DEVICE_CATEGORY_NIC "nic"
@@ -278 +279 @@
 extern void nic_sw_period_stop(nic_t *);
 
+/* pcapdump interface */
+extern pcap_dumper_t *nic_get_pcap_dumper(nic_t *);
+
+extern errno_t nic_fun_add_to_cats(ddf_fun_t *fun);
+
 #endif // __NIC_H__
 

uspace/lib/nic/include/nic_driver.h

@@ -46 +46 @@
 #include <nic/nic.h>
 #include <async.h>
+#include <pcapdump_srv.h>
 
 #include "nic.h"
@@ -195 +196 @@
          */
         poll_request_handler on_poll_request;
+
+        /** Packets dumper. */
+        pcap_dumper_t dumper;
+
         /** Data specific for particular driver */
         void *specific;

uspace/lib/nic/include/nic_impl.h

@@ -87 +87 @@
 extern void nic_close_impl(ddf_fun_t *fun);
 
-extern void nic_device_added_impl(ddf_dev_t *dev);
-
 #endif
 

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

@@ -47 +47 @@
 #include <ops/nic.h>
 #include <errno.h>
+#include <pcapdump_drv_iface.h>
 
 #include "nic_driver.h"
@@ -522 +523 @@
          *               calls it inside send_frame handler (with locked main lock)
          */
+        pcapdump_packet(nic_get_pcap_dumper(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_dumper(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_dumper(nic_data));
+        if (pcap_rc != EOK) {
+                printf("Failed creating pcapdump port\n");
+        }
+
         return nic_data;
 }
@@ -1133 +1141 @@
 }
 
+pcap_dumper_t *nic_get_pcap_dumper(nic_t *nic_data)
+{
+        return &nic_data->dumper;
+}
+
 /** @}
  */

uspace/lib/nic/src/nic_impl.c

@@ -40 +40 @@
 #include <ipc/services.h>
 #include <ns.h>
+#include <pcapdump_drv_iface.h>
 #include "nic_driver.h"
 #include "nic_ev.h"
@@ -179 +180 @@
                 return EBUSY;
         }
-
+        pcapdump_packet(nic_get_pcap_dumper(nic_data), data, size);
         nic_data->send_frame(nic_data, data, size);
         fibril_rwlock_read_unlock(&nic_data->main_lock);
@@ -843 +844 @@
 }
 
+errno_t nic_fun_add_to_cats(ddf_fun_t *fun)
+{
+        errno_t rc;
+        rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
+        if (rc != EOK)
+                return rc;
+
+        rc = ddf_fun_add_to_category(fun, "pcap");
+        if (rc != EOK) {
+                return rc;
+        }
+        return EOK;
+}
+
 /** @}
  */