Changes in / [e846bec:325ea9c] in mainline

Location:

uspace

Files:

• app/pcapctl/main.c (modified) (1 diff)
• drv/nic/e1k/e1k.c (modified) (4 diffs)
• drv/nic/virtio-net/virtio-net.c (modified) (4 diffs)
• lib/nic/include/nic.h (modified) (1 diff)
• lib/nic/src/nic_driver.c (modified) (4 diffs)
• lib/nic/src/nic_impl.c (modified) (2 diffs)
• lib/pcap/include/pcap.h (modified) (1 diff)
• lib/pcap/src/pcap.c (modified) (2 diffs)
• lib/pcap/src/pcap_iface.c (modified) (1 diff)

uspace/app/pcapctl/main.c

@@ -40 +40 @@
 
 #define NAME "pcapctl"
+
+#define LOGGER(msg, ...) \
+     fprintf(stderr, \
+         "[PCAP %s:%d]: " msg "\n", \
+         __FILE__, __LINE__, \
+         ##__VA_ARGS__\
+     )
 
 pcapctl_sess_t sess;

uspace/drv/nic/e1k/e1k.c

@@ -49 +49 @@
 #include <nic.h>
 #include <ops/nic.h>
-#include <pcapdump_iface.h>
 #include "e1k.h"
 
+#include "pcapdump_iface.h"
+#include "pcap_iface.h"
 #define NAME  "e1k"
 
@@ -1191 +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);
@@ -2206 +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) {
-                ddf_msg(LVL_ERROR, "Failed adding function to category pcap");
+        if (rc != EOK)
                 goto err_add_to_cat;
-        }
 
         return EOK;
@@ -2375 +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/virtio-net/virtio-net.c

@@ -43 +43 @@
 
 #include <virtio-pci.h>
-#include <pcapdump_iface.h>
-
+#include "pcapdump_iface.h"
+#include "pcap_iface.h"
 #define NAME    "virtio-net"
 
@@ -93 +93 @@
                 if (frame) {
                         memcpy(frame->data, &hdr[1], len - sizeof(*hdr));
+                        pcapdump_packet(nic_get_pcap_iface(nic), frame->data, frame->size);
                         nic_received_frame(nic, frame);
                 } else {
@@ -352 +353 @@
         /* Copy packet data into the buffer just past the header */
         memcpy(&hdr[1], data, size);
-
+        pcapdump_packet(nic_get_pcap_iface(nic), data, size);
         /*
          * Set the descriptor, put it into the virtqueue and notify the device
@@ -432 +433 @@
             ddf_dev_get_name(dev));
 
+        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) {
-                ddf_msg(LVL_ERROR, "Failed adding function to category pcap");
+        if (rc != EOK)
                 goto unbind;
-        }
 
         return EOK;

uspace/lib/nic/include/nic.h

@@ -44 +44 @@
 #include <device/hw_res_parsed.h>
 #include <ops/nic.h>
-#include <pcap_iface.h>
+
+#include "pcap_iface.h"
 
 #define DEVICE_CATEGORY_NIC "nic"

uspace/lib/nic/src/nic_driver.c

@@ -47 +47 @@
 #include <ops/nic.h>
 #include <errno.h>
-#include <pcapdump_iface.h>
 
 #include "nic_driver.h"
@@ -523 +522 @@
          *               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;
@@ -562 +560 @@
                 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);
 }
@@ -650 +647 @@
 
         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;

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"
@@ -180 +179 @@
                 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);

uspace/lib/pcap/include/pcap.h

@@ -64 +64 @@
         uint32_t snaplen;
         uint32_t additional; /** The LinkType and additional information field is in the form */
-} pcap_file_header_t;
+} __attribute__((packed, aligned(4))) pcap_file_header_t;
 
 typedef struct pcap_packet_header {

uspace/lib/pcap/src/pcap.c

@@ -35 +35 @@
  * @brief Headers and functions for .pcap file and packets to be dumped
  */
+
+#define LOGGER(msg, ...) \
+     fprintf(stderr, \
+         "[PCAP %s:%d]: " msg "\n", \
+         __FILE__, __LINE__, \
+         ##__VA_ARGS__\
+     )
 
 #include "pcap.h"
@@ -101 +108 @@
         if (writer->data == NULL) {
                 rc = EINVAL;
+                LOGGER("Failed to create %s: %s.", filename, str_error(rc));
                 return rc;
         }

uspace/lib/pcap/src/pcap_iface.c

@@ -82 +82 @@
 }
 
-void pcap_close_file(void)
+void pcap_close_file()
 {
         pcap_writer.ops->close(&pcap_writer);