Changeset 0e94b979 in mainline for uspace/srv/inet/inetcfg.c

Timestamp:

2012-03-08T21:12:44Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

291c792

Parents:

a88a6eac

Message:

Listing configured addresses.

File:

• uspace/srv/inet/inetcfg.c (modified) (6 diffs)

uspace/srv/inet/inetcfg.c

@@ -42 +42 @@
 #include <loc.h>
 #include <stdlib.h>
+#include <str.h>
 #include <sys/types.h>
 
@@ -67 +68 @@
         addr->naddr = *naddr;
         addr->ilink = ilink;
+        addr->name = str_dup("foo");
         inet_addrobj_add(addr);
 
@@ -88 +90 @@
 static int inetcfg_addr_get(sysarg_t addr_id, inet_addr_info_t *ainfo)
 {
+        inet_addrobj_t *addr;
+
+        addr = inet_addrobj_get_by_id(addr_id);
+        if (addr == NULL)
+                return ENOENT;
+
+        ainfo->naddr = addr->naddr;
+        ainfo->ilink = addr->ilink->svc_id;
+        ainfo->name = str_dup(addr->name);
+
+        return EOK;
+}
+
+static int inetcfg_get_addr_list(sysarg_t **addrs, size_t *count)
+{
+        return inet_addrobj_get_id_list(addrs, count);
+}
+
+static int inetcfg_get_link_list(sysarg_t **addrs, size_t *count)
+{
         return ENOTSUP;
 }
 
-static int inetcfg_get_addr_list(sysarg_t **addrs, size_t *count)
-{
-        return ENOTSUP;
-}
-
-static int inetcfg_get_link_list(sysarg_t **addrs, size_t *count)
-{
-        return ENOTSUP;
-}
-
-static int inetcfg_link_get(sysarg_t addr_id, inet_link_info_t *ainfo)
-{
-        return ENOTSUP;
+static int inetcfg_link_get(sysarg_t link_id, inet_link_info_t *linfo)
+{
+        inet_link_t *ilink;
+
+        ilink = inet_link_get_by_id(link_id);
+        if (ilink == NULL) {
+                return ENOENT;
+        }
+
+        linfo->name = str_dup(ilink->svc_name);
+        return EOK;
 }
 
@@ -140 +160 @@
 static void inetcfg_addr_get_srv(ipc_callid_t callid, ipc_call_t *call)
 {
+        ipc_callid_t rcallid;
+        size_t max_size;
+
         sysarg_t addr_id;
         inet_addr_info_t ainfo;
@@ -147 +170 @@
         log_msg(LVL_DEBUG, "inetcfg_addr_get_srv()");
 
+        ainfo.naddr.ipv4 = 0;
+        ainfo.naddr.bits = 0;
+        ainfo.ilink = 0;
+        ainfo.name = NULL;
+
+        if (!async_data_read_receive(&rcallid, &max_size)) {
+                async_answer_0(rcallid, EREFUSED);
+                async_answer_0(callid, EREFUSED);
+                return;
+        }
+
         rc = inetcfg_addr_get(addr_id, &ainfo);
-        async_answer_2(callid, rc, ainfo.naddr.ipv4, ainfo.naddr.bits);
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                return;
+        }
+
+        sysarg_t retval = async_data_read_finalize(rcallid, ainfo.name,
+            min(max_size, str_size(ainfo.name)));
+        free(ainfo.name);
+
+        async_answer_3(callid, retval, ainfo.naddr.ipv4, ainfo.naddr.bits,
+            ainfo.ilink);
 }
 
 
 static void inetcfg_get_addr_list_srv(ipc_callid_t callid, ipc_call_t *call)
+{
+        ipc_callid_t rcallid;
+        size_t count;
+        size_t max_size;
+        size_t act_size;
+        size_t size;
+        sysarg_t *id_buf;
+        int rc;
+
+        log_msg(LVL_DEBUG, "inetcfg_get_addr_list_srv()");
+
+        if (!async_data_read_receive(&rcallid, &max_size)) {
+                async_answer_0(rcallid, EREFUSED);
+                async_answer_0(callid, EREFUSED);
+                return;
+        }
+
+        rc = inetcfg_get_addr_list(&id_buf, &count);
+        if (rc != EOK) {
+                async_answer_0(rcallid, rc);
+                async_answer_0(callid, rc);
+                return;
+        }
+
+        act_size = count * sizeof(sysarg_t);
+        size = min(act_size, max_size);
+
+        sysarg_t retval = async_data_read_finalize(rcallid, id_buf, size);
+        free(id_buf);
+
+        async_answer_1(callid, retval, act_size);
+}
+
+static void inetcfg_link_get_srv(ipc_callid_t callid, ipc_call_t *call)
+{
+        ipc_callid_t rcallid;
+        size_t max_size;
+
+        sysarg_t link_id;
+        inet_link_info_t linfo;
+        int rc;
+
+        link_id = IPC_GET_ARG1(*call);
+        log_msg(LVL_DEBUG, "inetcfg_link_get_srv()");
+
+        linfo.name = NULL;
+
+        if (!async_data_read_receive(&rcallid, &max_size)) {
+                async_answer_0(rcallid, EREFUSED);
+                async_answer_0(callid, EREFUSED);
+                return;
+        }
+
+        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)));
+        free(linfo.name);
+
+        async_answer_0(callid, retval);
+}
+
+static void inetcfg_get_link_list_srv(ipc_callid_t callid, ipc_call_t *call)
 {
         ipc_callid_t rcallid;
@@ -161 +273 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "inetcfg_get_addr_list_srv()");
-
-        if (!async_data_read_receive(&rcallid, &max_size)) {
-                async_answer_0(rcallid, EREFUSED);
-                async_answer_0(callid, EREFUSED);
-                return;
-        }
-
-        rc = inetcfg_get_addr_list(&id_buf, &act_size);
-        if (rc != EOK) {
-                async_answer_0(rcallid, rc);
-                async_answer_0(callid, rc);
-                return;
-        }
-
-        size = min(act_size, max_size);
-
-        sysarg_t retval = async_data_read_finalize(rcallid, id_buf, size);
-        free(id_buf);
-
-        async_answer_1(callid, retval, act_size);
-}
-
-static void inetcfg_link_get_srv(ipc_callid_t callid, ipc_call_t *call)
-{
-        sysarg_t link_id;
-        inet_link_info_t linfo;
-        int rc;
-
-        link_id = IPC_GET_ARG1(*call);
-        log_msg(LVL_DEBUG, "inetcfg_link_get_srv()");
-
-        rc = inetcfg_link_get(link_id, &linfo);
-        async_answer_0(callid, rc);
-}
-
-static void inetcfg_get_link_list_srv(ipc_callid_t callid, ipc_call_t *call)
-{
-        ipc_callid_t rcallid;
-        size_t max_size;
-        size_t act_size;
-        size_t size;
-        sysarg_t *id_buf;
-        int rc;
-
         log_msg(LVL_DEBUG, "inetcfg_get_link_list_srv()");