Changes in uspace/lib/pcap/src/pcapctl_dump.c [384f081:e4cc266] in mainline

File:

• uspace/lib/pcap/src/pcapctl_dump.c (modified) (8 diffs)

uspace/lib/pcap/src/pcapctl_dump.c

@@ -38 +38 @@
 #include <str.h>
 #include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
+
 #include "pcapctl_dump.h"
 #include "pcapdump_iface.h"
@@ -52 +51 @@
 }
 
-static errno_t pcapctl_cat_get_svc(int *index, service_id_t *svc)
-{
+static errno_t pcapctl_cat_get_svc(const char *drv_name, service_id_t* svc) {
         errno_t rc;
         category_id_t pcap_cat;
@@ -68 +66 @@
         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)
-{
-        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;
+        for (unsigned i = 0; i < count; ++i) {
+                char *name = NULL;
+                loc_service_get_name(pcap_svcs[i], &name);
+                if (!str_cmp(drv_name, name)) {
+                        *svc =  pcap_svcs[i];
+                        return EOK;
+                }
         }
-        if (*index + 1 > (int)count || *index < 0) {
-                return EINVAL;
-        }
-        return EOK;
+        free(pcap_svcs);
+        return 1;
 }
 
-/**
- *
- */
-errno_t pcapctl_list(void)
-{
+extern errno_t pcapctl_list(void) {
+
         errno_t rc;
         category_id_t pcap_cat;
@@ -128 +101 @@
         }
 
-        fprintf(stdout, "Devices:\n");
+        fprintf(stdout, "Services:\n");
         for (unsigned i = 0; i < count; ++i) {
                 char *name = NULL;
                 loc_service_get_name(pcap_svcs[i], &name);
-                fprintf(stdout, "%d. %s\n", i, name);
+                fprintf(stdout, "service: %s\n", name);
         }
         free(pcap_svcs);
@@ -138 +111 @@
 }
 
-/**
- *
- */
-errno_t pcapctl_dump_open(int *index, pcapctl_sess_t **rsess)
+
+errno_t pcapctl_dump_open(const char *svcname, pcapctl_sess_t **rsess)
 {
         errno_t rc;
@@ -149 +120 @@
                 return ENOMEM;
 
-        rc  = pcapctl_cat_get_svc(index, &svc);
+        rc  = pcapctl_cat_get_svc(svcname, &svc);
         if (rc != EOK) {
-                printf("Error finding the device with index: %d\n", *index);
                 goto error;
         }
-
         async_sess_t *new_session = loc_service_connect(svc, INTERFACE_PCAP_CONTROL, 0);
         if (new_session == NULL) {
@@ -161 +130 @@
                 goto error;
         }
+
         sess->sess = new_session;
         *rsess = sess;
@@ -169 +139 @@
 }
 
-/**
- *
- */
 errno_t pcapctl_dump_close(pcapctl_sess_t *sess)
 {