Changeset b8b1adb1 in mainline for uspace/srv

Timestamp:

2013-09-15T16:00:37Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

947e2ef

Parents:

695b6ff

Message:

Add link listing to inet utility, showing MAC address.

Location:

uspace/srv/net/inetsrv

Files:

• inet_link.c (modified) (1 diff)
• inet_link.h (modified) (1 diff)
• inetcfg.c (modified) (10 diffs)
• inetsrv.h (modified) (3 diffs)

uspace/srv/net/inetsrv/inet_link.c

@@ -493 +493 @@
 }
 
+/** Get IDs of all links. */
+int inet_link_get_id_list(sysarg_t **rid_list, size_t *rcount)
+{
+        sysarg_t *id_list;
+        size_t count, i;
+
+        fibril_mutex_lock(&inet_discovery_lock);
+        count = list_count(&inet_link_list);
+
+        id_list = calloc(count, sizeof(sysarg_t));
+        if (id_list == NULL) {
+                fibril_mutex_unlock(&inet_discovery_lock);
+                return ENOMEM;
+        }
+
+        i = 0;
+        list_foreach(inet_link_list, link_list, inet_link_t, ilink) {
+                id_list[i++] = ilink->svc_id;
+                log_msg(LOG_DEFAULT, LVL_NOTE, "add link to list");
+        }
+
+        fibril_mutex_unlock(&inet_discovery_lock);
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "return %zu links", count);
+        *rid_list = id_list;
+        *rcount = count;
+
+        return EOK;
+}
+
 /** @}
  */

uspace/srv/net/inetsrv/inet_link.h

@@ -47 +47 @@
     uint8_t, uint8_t, int);
 extern inet_link_t *inet_link_get_by_id(sysarg_t);
+extern int inet_link_get_id_list(sysarg_t **, size_t *);
 
 #endif

uspace/srv/net/inetsrv/inetcfg.c

@@ -44 +44 @@
 #include <str.h>
 #include <sys/types.h>
+#include <types/inetcfg.h>
 
 #include "addrobj.h"
@@ -151 +152 @@
 static int inetcfg_get_link_list(sysarg_t **addrs, size_t *count)
 {
-        return ENOTSUP;
+        return inet_link_get_id_list(addrs, count);
 }
 
@@ -170 +171 @@
         linfo->name = str_dup(ilink->svc_name);
         linfo->def_mtu = ilink->def_mtu;
+        if (ilink->mac_valid) {
+                addr48(ilink->mac, linfo->mac_addr);
+        } else {
+                memset(linfo->mac_addr, 0, sizeof(linfo->mac_addr));
+        }
+
         return EOK;
 }
@@ -411 +418 @@
 {
         ipc_callid_t rcallid;
+        size_t count;
         size_t max_size;
         size_t act_size;
@@ -417 +425 @@
         int rc;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_get_link_list_srv()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_get_addr_list_srv()");
 
         if (!async_data_read_receive(&rcallid, &max_size)) {
@@ -425 +433 @@
         }
 
-        rc = inetcfg_get_link_list(&id_buf, &act_size);
+        rc = inetcfg_get_link_list(&id_buf, &count);
         if (rc != EOK) {
                 async_answer_0(rcallid, rc);
@@ -432 +440 @@
         }
 
+        act_size = count * sizeof(sysarg_t);
         size = min(act_size, max_size);
 
@@ -476 +485 @@
 static void inetcfg_link_get_srv(ipc_callid_t callid, ipc_call_t *call)
 {
-        ipc_callid_t rcallid;
-        size_t max_size;
+        ipc_callid_t name_callid;
+        ipc_callid_t laddr_callid;
+        size_t name_max_size;
+        size_t laddr_max_size;
 
         sysarg_t link_id;
@@ -488 +499 @@
         linfo.name = NULL;
 
-        if (!async_data_read_receive(&rcallid, &max_size)) {
-                async_answer_0(rcallid, EREFUSED);
+        if (!async_data_read_receive(&name_callid, &name_max_size)) {
+                async_answer_0(name_callid, EREFUSED);
+                async_answer_0(callid, EREFUSED);
+                return;
+        }
+
+        if (!async_data_read_receive(&laddr_callid, &laddr_max_size)) {
+                async_answer_0(name_callid, EREFUSED);
                 async_answer_0(callid, EREFUSED);
                 return;
@@ -496 +513 @@
         rc = inetcfg_link_get(link_id, &linfo);
         if (rc != EOK) {
-                async_answer_0(rcallid, rc);
-                async_answer_0(callid, rc);
-                return;
-        }
-
-        sysarg_t retval = async_data_read_finalize(rcallid, linfo.name,
-            min(max_size, str_size(linfo.name)));
+                async_answer_0(laddr_callid, rc);
+                async_answer_0(name_callid, rc);
+                async_answer_0(callid, rc);
+                return;
+        }
+
+        sysarg_t retval = async_data_read_finalize(name_callid, linfo.name,
+            min(name_max_size, str_size(linfo.name)));
+        if (retval != EOK) {
+                free(linfo.name);
+                async_answer_0(laddr_callid, retval);
+                async_answer_0(callid, retval);
+                return;
+        }
+
+        retval = async_data_read_finalize(laddr_callid, &linfo.mac_addr,
+            min(laddr_max_size, sizeof(linfo.mac_addr)));
+
         free(linfo.name);
 

uspace/srv/net/inetsrv/inetsrv.h

@@ -44 +44 @@
 #include <ipc/loc.h>
 #include <sys/types.h>
+#include <types/inet.h>
 #include <async.h>
 
@@ -73 +74 @@
 } inetping6_client_t;
 
-/** Address object info */
-typedef struct {
-        /** Network address */
-        inet_naddr_t naddr;
-        /** Link service ID */
-        sysarg_t ilink;
-        /** Address object name */
-        char *name;
-} inet_addr_info_t;
-
-/** IP link info */
-typedef struct {
-        /** Link service name */
-        char *name;
-        /** Default MTU */
-        size_t def_mtu;
-} inet_link_info_t;
-
-/** Static route info */
-typedef struct {
-        /** Destination network address */
-        inet_naddr_t dest;
-        /** Router address */
-        inet_addr_t router;
-        /** Static route name */
-        char *name;
-} inet_sroute_info_t;
-
 typedef struct {
         /** Source address */
@@ -125 +98 @@
         size_t size;
 } inet_packet_t;
-
-typedef struct {
-        service_id_t iplink;
-        inet_addr_t src;
-        inet_addr_t dest;
-        uint8_t tos;
-        void *data;
-        size_t size;
-} inet_dgram_t;
 
 typedef struct {