Changeset 6c60a7c in mainline

Timestamp:

2024-12-13T08:33:34Z (10 months ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

c7bd3f9e

Parents:

1a59a89

git-author:

Nataliia Korop <n.corop08@…> (2024-04-11 09:36:03)

git-committer:

Nataliia Korop <n.corop08@…> (2024-12-13 08:33:34)

Message:

inetsrv dumps

Location:

uspace

Files:

• lib/nic/src/nic_driver.c (modified) (2 diffs)
• lib/nic/src/nic_impl.c (modified) (2 diffs)
• lib/pcap/include/pcapdump_iface.h (modified) (1 diff)
• lib/pcap/src/pcapctl_dump.c (modified) (4 diffs)
• lib/pcap/src/pcapdump_iface.c (modified) (1 diff)
• srv/net/inetsrv/inetsrv.c (modified) (6 diffs)
• srv/net/inetsrv/meson.build (modified) (1 diff)

uspace/lib/nic/src/nic_driver.c

@@ -523 +523 @@
          *               calls it inside send_frame handler (with locked main lock)
          */
-        pcapdump_packet(nic_get_pcap_iface(nic_data), frame->data, frame->size);
+        //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;
@@ -651 +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");
-        }
+        // 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

@@ -180 +180 @@
                 return EBUSY;
         }
-        pcapdump_packet(nic_get_pcap_iface(nic_data), data, size);
+        //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);
@@ -849 +849 @@
         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;
+                return rc;
+
+        // rc = ddf_fun_add_to_category(fun, "pcap");
+        // if (rc != EOK) {
+        //      return rc;
+        // }
+        return EOK;
 }
 

uspace/lib/pcap/include/pcapdump_iface.h

@@ -51 +51 @@
 extern void pcapdump_packet(pcap_iface_t *, const void *, size_t);
 
+extern void pcapdump_conn(ipc_call_t *, void *);
 #endif
 

uspace/lib/pcap/src/pcapctl_dump.c

@@ -52 +52 @@
 }
 
-static errno_t pcapctl_cat_get_svc(int *index, service_id_t *svc)
-{
-        errno_t rc;
-        category_id_t pcap_cat;
-        size_t count;
-        service_id_t *pcap_svcs = NULL;
-
-        rc = loc_category_get_id("pcap", &pcap_cat, 0);
-        if (rc != EOK) {
-                printf("Error resolving category 'pcap'.\n");
-                return rc;
-        }
-
-        rc = loc_category_get_svcs(pcap_cat, &pcap_svcs, &count);
-        if (rc != EOK) {
-                printf("Error resolving list of pcap services.\n");
-                free(pcap_svcs);
-                return rc;
-        }
-        if (*index < (int)count) {
-                *svc =  pcap_svcs[*index];
-                free(pcap_svcs);
-                return EOK;
-        }
-
-        return ENOENT;
-}
+// static errno_t pcapctl_cat_get_svc(int *index, service_id_t *svc)
+// {
+//      errno_t rc;
+//      category_id_t pcap_cat;
+//      size_t count;
+//      service_id_t *pcap_svcs = NULL;
+
+//      rc = loc_category_get_id("pcap", &pcap_cat, 0);
+//      if (rc != EOK) {
+//              printf("Error resolving category 'pcap'.\n");
+//              return rc;
+//      }
+
+//      rc = loc_category_get_svcs(pcap_cat, &pcap_svcs, &count);
+//      if (rc != EOK) {
+//              printf("Error resolving list of pcap services.\n");
+//              free(pcap_svcs);
+//              return rc;
+//      }
+//      if (*index < (int)count) {
+//              *svc =  pcap_svcs[*index];
+//              free(pcap_svcs);
+//              return EOK;
+//      }
+
+//      return ENOENT;
+// }
 
 errno_t pcapctl_is_valid_device(int *index)
@@ -149 +149 @@
                 return ENOMEM;
 
-        rc  = pcapctl_cat_get_svc(index, &svc);
-        if (rc != EOK) {
-                printf("Error finding the device with index: %d\n", *index);
-                goto error;
-        }
+        // rc  = pcapctl_cat_get_svc(index, &svc);
+        // if (rc != EOK) {
+        //      printf("Error finding the device with index: %d\n", *index);
+        //      goto error;
+        // }
+
+        rc = loc_service_get_id("net/inet", &svc, 0);
+        if (rc != EOK)
+                return ENOENT;
 
         async_sess_t *new_session = loc_service_connect(svc, INTERFACE_PCAP_CONTROL, 0);
@@ -161 +165 @@
                 goto error;
         }
+        printf("got new session\n");
         sess->sess = new_session;
         *rsess = sess;
@@ -186 +191 @@
 errno_t pcapctl_dump_start(const char *name, pcapctl_sess_t *sess)
 {
+        printf("pcapctl_dump_start\n");
         errno_t rc;
         async_exch_t *exch = async_exchange_begin(sess->sess);

uspace/lib/pcap/src/pcapdump_iface.c

@@ -83 +83 @@
 }
 
-static void pcapdump_conn(ipc_call_t *icall, void *arg)
+void pcapdump_conn(ipc_call_t *icall, void *arg)
 {
         pcap_iface_t *iface = (pcap_iface_t *)arg;
-
+        printf("pcapdump_conn\n");
         assert((iface != NULL) && "pcapdump requires pcap interface\n");
 

uspace/srv/net/inetsrv/inetsrv.c

@@ -49 +49 @@
 #include <stdint.h>
 #include <task.h>
+#include <pcapdump_iface.h>
 #include "addrobj.h"
 #include "icmp.h"
@@ -63 +64 @@
 #define NAME "inetsrv"
 
+/** Interface for dumping packets */
+pcap_iface_t pcapdump;
+
 static inet_naddr_t solicited_node_mask = {
         .version = ip_v6,
@@ -117 +121 @@
         if (rc != EOK)
                 return rc;
-
+        rc = async_create_port(INTERFACE_PCAP_CONTROL,
+            pcapdump_conn, &pcapdump, &port);
+        if (rc != EOK) {
+                return rc;
+        }
         rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
@@ -202 +210 @@
                     dgram->dest.addr, dgram, proto, ttl, df);
         }
-
+        printf("SENDING: packet size is - %d\n", dgram->size);
+        pcapdump_packet(&pcapdump, dgram->data, dgram->size);
         log_msg(LOG_DEFAULT, LVL_DEBUG, "dgram to be routed");
 
@@ -541 +550 @@
                         dgram.data = packet->data;
                         dgram.size = packet->size;
-
+                        printf("RECEIVING: packet size is - %d\n", packet->size);
+                        pcapdump_packet(&pcapdump, packet->data, packet->size);
                         return inet_recv_dgram_local(&dgram, packet->proto);
                 } else {
@@ -562 +572 @@
                 return 1;
         }
-
+        rc = pcap_iface_init(&pcapdump);
+
+        if (rc != EOK) {
+                printf("Failed creating pcap interface: %s", str_error(rc));
+                return rc;
+        }
         rc = inet_init();
         if (rc != EOK)
                 return 1;
 
+        printf(NAME ": Initialized dump iface from inetsrv.\n");
         printf(NAME ": Accepting connections.\n");
 

uspace/srv/net/inetsrv/meson.build

@@ -27 +27 @@
 #
 
-deps = [ 'inet', 'sif' ]
+deps = [ 'inet', 'sif', 'pcap' ]
+
 src = files(
         'addrobj.c',