Changes in / [90ba06c:f2cb80a] in mainline

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/nic/include/nic.h (modified) (2 diffs)
• uspace/lib/nic/include/nic_driver.h (modified) (2 diffs)
• uspace/lib/nic/meson.build (modified) (1 diff)
• uspace/lib/nic/src/nic_driver.c (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

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

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;
+
 } e1000_t;
 
@@ -1189 +1192 @@
                 if (frame != NULL) {
                         memcpy(frame->data, e1000->rx_frame_virt[next_tail], frame_size);
+                        pcapdump_packet(nic_get_pcap_iface(nic), frame->data, frame->size);
+
                         nic_received_frame(nic, frame);
                 } else {
@@ -2203 +2208 @@
                 goto err_add_to_cat;
 
+        errno_t pcap_rc  = pcapdump_init(nic_get_pcap_iface(nic));
+
+        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 +2380 @@
 
         memcpy(e1000->tx_frame_virt[tdt], 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/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

@@ -78 +78 @@
         '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 +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;
+}
+
 /** @}
  */

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;
 }