Changeset 0e94b979 in mainline for uspace/lib/c/generic/inetcfg.c

Timestamp:

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

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial

Children:

291c792

Parents:

a88a6eac

Message:

Listing configured addresses.

File:

• uspace/lib/c/generic/inetcfg.c (modified) (3 diffs)

uspace/lib/c/generic/inetcfg.c

@@ -35 +35 @@
 #include <loc.h>
 #include <stdlib.h>
+#include <str.h>
 
 static async_sess_t *inetcfg_sess = NULL;
@@ -156 +157 @@
 int inetcfg_addr_get(sysarg_t addr_id, inet_addr_info_t *ainfo)
 {
-        sysarg_t ipv4, bits;
-        async_exch_t *exch = async_exchange_begin(inetcfg_sess);
-
-        int rc = async_req_1_2(exch, INETCFG_ADDR_GET, addr_id,
-            &ipv4, &bits);
-        async_exchange_end(exch);
-
-        if (rc != EOK)
-                return rc;
-
-        ainfo->naddr.ipv4 = ipv4;
-        ainfo->naddr.bits = bits;
+        ipc_call_t dreply;
+        sysarg_t dretval;
+        size_t act_size;
+        char name_buf[LOC_NAME_MAXLEN + 1];
+
+        async_exch_t *exch = async_exchange_begin(inetcfg_sess);
+
+        ipc_call_t answer;
+        aid_t req = async_send_1(exch, INETCFG_ADDR_GET, addr_id, &answer);
+        aid_t dreq = async_data_read(exch, name_buf, LOC_NAME_MAXLEN, &dreply);
+        async_wait_for(dreq, &dretval);
+
+        async_exchange_end(exch);
+
+        if (dretval != EOK) {
+                async_wait_for(req, NULL);
+                return dretval;
+        }
+
+        sysarg_t retval;
+        async_wait_for(req, &retval);
+
+        if (retval != EOK)
+                return retval;
+
+        act_size = IPC_GET_ARG2(dreply);
+        assert(act_size <= LOC_NAME_MAXLEN);
+        name_buf[act_size] = '\0';
+
+        ainfo->naddr.ipv4 = IPC_GET_ARG1(answer);
+        ainfo->naddr.bits = IPC_GET_ARG2(answer);
+        ainfo->ilink = IPC_GET_ARG3(answer);
+        ainfo->name = str_dup(name_buf);
+
         return EOK;
 }
@@ -185 +208 @@
 int inetcfg_link_get(sysarg_t link_id, inet_link_info_t *linfo)
 {
-        async_exch_t *exch = async_exchange_begin(inetcfg_sess);
-
-        int rc = async_req_1_0(exch, INETCFG_LINK_GET, link_id);
-        async_exchange_end(exch);
-
-        if (rc != EOK)
-                return rc;
-
-        linfo->dummy = 0;
+        ipc_call_t dreply;
+        sysarg_t dretval;
+        size_t act_size;
+        char name_buf[LOC_NAME_MAXLEN + 1];
+
+        async_exch_t *exch = async_exchange_begin(inetcfg_sess);
+
+        ipc_call_t answer;
+        aid_t req = async_send_1(exch, INETCFG_LINK_GET, link_id, &answer);
+        aid_t dreq = async_data_read(exch, name_buf, LOC_NAME_MAXLEN, &dreply);
+        async_wait_for(dreq, &dretval);
+
+        async_exchange_end(exch);
+
+        if (dretval != EOK) {
+                async_wait_for(req, NULL);
+                return dretval;
+        }
+
+        sysarg_t retval;
+        async_wait_for(req, &retval);
+
+        if (retval != EOK)
+                return retval;
+
+        act_size = IPC_GET_ARG2(dreply);
+        assert(act_size <= LOC_NAME_MAXLEN);
+        name_buf[act_size] = '\0';
+
+        linfo->name = str_dup(name_buf);
+
         return EOK;
 }