Changeset 42c2e65 in mainline

Timestamp:

2023-12-13T08:35:34Z (5 months ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

dc5c303

Parents:

7cf5ddb

Message:

Packet capture prototype

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/lib/c/include/ipc/services.h (modified) (1 diff)
• uspace/lib/meson.build (modified) (1 diff)
• 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

@@ -201 +201 @@
         INTERFACE_WNDMGT_CB =
             FOURCC_COMPACT('w', 'm', 'g', 't') | IFACE_EXCHANGE_SERIALIZE | IFACE_MOD_CALLBACK,
+        INTERFACE_PCAP_CONTROL =
+            FOURCC_COMPACT('p', 'c', 't', 'l') | IFACE_EXCHANGE_SERIALIZE,
 } iface_t;
 

uspace/app/meson.build

@@ -71 +71 @@
         'nic',
         'nterm',
+        'pcapctl',
         'pci',
         'ping',

uspace/drv/nic/e1k/e1k.c

@@ -51 +51 @@
 #include "e1k.h"
 
+#include "pcapdump_iface.h"
+#include "pcap_iface.h"
 #define NAME  "e1k"
 
@@ -174 +176 @@
         /** Lock for EEPROM access */
         fibril_mutex_t eeprom_lock;
+
+        /** Interface for dumping packets */
+        pcap_iface_t pcapdump;
+
 } e1000_t;
 
@@ -1189 +1195 @@
                 if (frame != NULL) {
                         memcpy(frame->data, e1000->rx_frame_virt[next_tail], frame_size);
+                        pcapdump_packet(&e1000->pcapdump, frame->data, frame->size);
+
                         nic_received_frame(nic, frame);
                 } else {
@@ -2203 +2211 @@
                 goto err_add_to_cat;
 
+        errno_t pcap_rc  = pcapdump_init(&e1000->pcapdump);
+
+        if (pcap_rc != EOK) {
+                printf("Failed creating pcapdump port\n");
+        }
+        rc = ddf_fun_add_to_category(fun, "pcap");
+        if (rc != EOK)
+                goto err_add_to_cat;
+
         return EOK;
 
@@ -2366 +2383 @@
 
         memcpy(e1000->tx_frame_virt[tdt], data, size);
-
+        pcapdump_packet(&e1000->pcapdump, 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/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

@@ -72 +72 @@
         'minix',
         'nettl',
+        'pcap',
         'pcm',
         'pcut',

uspace/srv/locsrv/locsrv.c

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