Changeset 7e45c5a in mainline

Timestamp:

2024-04-07T13:05:47Z (3 weeks ago)

Author:

GitHub <noreply@…>

Parents:

522eecf (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-04-07 13:05:47)

git-committer:

GitHub <noreply@…> (2024-04-07 13:05:47)

Message:

Merge 2a0c827c42eafb070de3bbe3c98a1d8a2b77d719 into 522eecf2e7a8efe0c2e371007898fcb15dccdfa1

Files:

• abi/include/abi/ipc/interfaces.h (modified) (1 diff)
• uspace/app/meson.build (modified) (1 diff)
• uspace/app/pcapctl/doc/doxygroups.h (added)
• uspace/app/pcapctl/main.c (added)
• uspace/app/pcapctl/meson.build (added)
• uspace/drv/nic/e1k/e1k.c (modified) (5 diffs)
• uspace/drv/nic/e1k/meson.build (modified) (1 diff)
• uspace/drv/nic/ne2k/ne2k.c (modified) (3 diffs)
• uspace/drv/nic/rtl8139/driver.c (modified) (3 diffs)
• uspace/drv/nic/rtl8169/driver.c (modified) (2 diffs)
• uspace/drv/nic/virtio-net/virtio-net.c (modified) (3 diffs)
• uspace/lib/c/include/ipc/services.h (modified) (1 diff)
• uspace/lib/meson.build (modified) (1 diff)
• uspace/lib/nic/include/nic.h (modified) (2 diffs)
• uspace/lib/nic/include/nic_driver.h (modified) (2 diffs)
• uspace/lib/nic/include/nic_impl.h (modified) (1 diff)
• uspace/lib/nic/meson.build (modified) (1 diff)
• uspace/lib/nic/src/nic_driver.c (modified) (5 diffs)
• uspace/lib/nic/src/nic_impl.c (modified) (3 diffs)
• uspace/lib/pcap/doc/doxygoups.h (added)
• uspace/lib/pcap/include/pcap.h (added)
• uspace/lib/pcap/include/pcap_iface.h (added)
• uspace/lib/pcap/include/pcapctl_dump.h (added)
• uspace/lib/pcap/include/pcapdump_iface.h (added)
• uspace/lib/pcap/meson.build (added)
• uspace/lib/pcap/src/pcap.c (added)
• uspace/lib/pcap/src/pcap_iface.c (added)
• uspace/lib/pcap/src/pcapctl_dump.c (added)
• uspace/lib/pcap/src/pcapdump_iface.c (added)
• uspace/srv/locsrv/locsrv.c (modified) (1 diff)

abi/include/abi/ipc/interfaces.h

@@ -202 +202 @@
             FOURCC_COMPACT('w', 'm', 'g', 't') | IFACE_EXCHANGE_SERIALIZE | IFACE_MOD_CALLBACK,
         INTERFACE_TBARCFG_NOTIFY =
-            FOURCC_COMPACT('t', 'b', 'c', 'f') | IFACE_EXCHANGE_SERIALIZE
+            FOURCC_COMPACT('t', 'b', 'c', 'f') | IFACE_EXCHANGE_SERIALIZE,
+        INTERFACE_PCAP_CONTROL =
+            FOURCC_COMPACT('p', 'c', 't', 'l') | IFACE_EXCHANGE_SERIALIZE,
 } iface_t;
 

uspace/app/meson.build

@@ -72 +72 @@
         'nic',
         'nterm',
+        'pcapctl',
         'ofw',
         'pci',

uspace/drv/nic/e1k/e1k.c

@@ -49 +49 @@
 #include <nic.h>
 #include <ops/nic.h>
+#include <pcapdump_iface.h>
 #include "e1k.h"
 
@@ -174 +175 @@
         /** Lock for EEPROM access */
         fibril_mutex_t eeprom_lock;
+
 } e1000_t;
 
@@ -1189 +1191 @@
                 if (frame != NULL) {
                         memcpy(frame->data, e1000->rx_frame_virt[next_tail], frame_size);
+
                         nic_received_frame(nic, frame);
                 } else {
@@ -2199 +2202 @@
                 goto err_fun_bind;
 
-        rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
-        if (rc != EOK)
-                goto err_add_to_cat;
-
+        rc = nic_fun_add_to_cats(fun);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed adding function to categories");
+                ddf_fun_unbind(fun);
+                return rc;
+        }
         return EOK;
 
-err_add_to_cat:
-        ddf_fun_unbind(fun);
+        // err_add_to_cat:
+        // ddf_fun_unbind(fun);
 err_fun_bind:
 err_rx_structure:
@@ -2366 +2371 @@
 
         memcpy(e1000->tx_frame_virt[tdt], data, size);
-
         tx_descriptor_addr->phys_addr = PTR_TO_U64(e1000->tx_frame_phys[tdt]);
         tx_descriptor_addr->length = size;

uspace/drv/nic/e1k/meson.build

@@ -27 +27 @@
 #
 
-deps = [ 'nic' ]
+deps = [ 'nic' , 'pcap' ]
 src = files('e1k.c')

uspace/drv/nic/ne2k/ne2k.c

@@ -43 +43 @@
 #include <str_error.h>
 #include <async.h>
+#include <ddf/log.h>
 #include "dp8390.h"
 
@@ -443 +444 @@
         }
 
-        rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
+        rc = nic_fun_add_to_cats(fun);
         if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed adding function to categories");
                 ddf_fun_unbind(fun);
-                ddf_fun_destroy(fun);
                 return rc;
         }
@@ -476 +477 @@
         nic_driver_implement(&ne2k_driver_ops, &ne2k_dev_ops, &ne2k_nic_iface);
 
+        ddf_log_init(NAME);
         return ddf_driver_main(&ne2k_driver);
 }

uspace/drv/nic/rtl8139/driver.c

@@ -42 +42 @@
 #include <stdio.h>
 #include <str.h>
+#include <pcapdump_iface.h>
 
 #include "defs.h"
@@ -1307 +1308 @@
                 goto err_fun_create;
         }
-        rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
+
+        rc = nic_fun_add_to_cats(fun);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding function to category");
-                goto err_fun_bind;
+                ddf_msg(LVL_ERROR, "Failed adding function to categories");
+                ddf_fun_unbind(fun);
+                return rc;
         }
 
@@ -1318 +1321 @@
         return EOK;
 
-err_fun_bind:
-        ddf_fun_unbind(fun);
+        // err_fun_bind:
+        // ddf_fun_unbind(fun);
 err_fun_create:
         ddf_fun_destroy(fun);

uspace/drv/nic/rtl8169/driver.c

@@ -457 +457 @@
         }
 
-        rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
+        rc = nic_fun_add_to_cats(fun);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding function to category");
-                goto err_fun_bind;
+                ddf_msg(LVL_ERROR, "Failed adding function to categories");
+                ddf_fun_unbind(fun);
+                return rc;
         }
 
@@ -467 +468 @@
         return EOK;
 
-err_fun_bind:
-        ddf_fun_unbind(fun);
+        // err_fun_bind:
+        // ddf_fun_unbind(fun);
 err_fun_create:
         ddf_fun_destroy(fun);

uspace/drv/nic/virtio-net/virtio-net.c

@@ -43 +43 @@
 
 #include <virtio-pci.h>
+#include <pcapdump_iface.h>
 
 #define NAME    "virtio-net"
@@ -422 +423 @@
         }
 
-        rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
+        rc = nic_fun_add_to_cats(fun);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding function to category");
-                goto unbind;
+                ddf_msg(LVL_ERROR, "Failed adding function to categories");
+                ddf_fun_unbind(fun);
+                return rc;
         }
 
@@ -433 +435 @@
         return EOK;
 
-unbind:
-        ddf_fun_unbind(fun);
+        // unbind:
+        // ddf_fun_unbind(fun);
 destroy:
         ddf_fun_destroy(fun);

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

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

uspace/lib/meson.build

@@ -81 +81 @@
         'minix',
         'nettl',
+        'pcap',
         'ofw',
         'pcm',

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 +279 @@
 extern void nic_sw_period_stop(nic_t *);
 
+/* pcapdump interface */
+extern pcap_iface_t *nic_get_pcap_iface(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_iface.h>
 
 #include "nic.h"
@@ -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/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_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;
+}
+
 /** @}
  */

uspace/lib/nic/src/nic_impl.c

@@ -40 +40 @@
 #include <ipc/services.h>
 #include <ns.h>
+#include <pcapdump_iface.h>
 #include "nic_driver.h"
 #include "nic_ev.h"
@@ -179 +180 @@
                 return EBUSY;
         }
-
+        pcapdump_packet(nic_get_pcap_iface(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)
+                goto err_add_to_cat;
+
+        rc = ddf_fun_add_to_category(fun, "pcap");
+        if (rc != EOK) {
+                //ddf_msg(LVL_ERROR, "Failed adding function to category pcap");
+                goto err_add_to_cat;
+        }
+        return EOK;
+
+err_add_to_cat:
+        ddf_fun_unbind(fun);
+        return rc;
+}
+
 /** @}
  */

uspace/srv/locsrv/locsrv.c

@@ -1393 +1393 @@
         categ_dir_add_cat(&cdir, cat);
 
+        cat = category_new("pcap");
+        categ_dir_add_cat(&cdir, cat);
         return true;
 }