Changeset 291c792 in mainline

Timestamp:

2012-03-08T21:54:25Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fa101c4

Parents:

0e94b979

Message:

Set address object name upon creation.

Location:

uspace

Files:

• lib/c/generic/inetcfg.c (modified) (1 diff)
• srv/inet/inetcfg.c (modified) (5 diffs)

uspace/lib/c/generic/inetcfg.c

@@ -138 +138 @@
         async_exch_t *exch = async_exchange_begin(inetcfg_sess);
 
-        int rc = async_req_3_1(exch, INETCFG_ADDR_CREATE_STATIC, naddr->ipv4,
-            naddr->bits, link_id, addr_id);
-        async_exchange_end(exch);
-
-        return rc;
+        ipc_call_t answer;
+        aid_t req = async_send_3(exch, INETCFG_ADDR_CREATE_STATIC, naddr->ipv4,
+            naddr->bits, link_id, &answer);
+        sysarg_t retval = async_data_write_start(exch, name, str_size(name));
+
+        async_exchange_end(exch);
+
+        if (retval != EOK) {
+                async_wait_for(req, NULL);
+                return retval;
+        }
+
+        async_wait_for(req, &retval);
+        *addr_id = IPC_GET_ARG1(answer);
+
+        return retval;
 }
 

uspace/srv/inet/inetcfg.c

@@ -50 +50 @@
 #include "inetcfg.h"
 
-static int inetcfg_addr_create_static(inet_naddr_t *naddr, sysarg_t link_id,
-    sysarg_t *addr_id)
+static int inetcfg_addr_create_static(char *name, inet_naddr_t *naddr,
+    sysarg_t link_id, sysarg_t *addr_id)
 {
         inet_link_t *ilink;
@@ -68 +68 @@
         addr->naddr = *naddr;
         addr->ilink = ilink;
-        addr->name = str_dup("foo");
+        addr->name = str_dup(name);
         inet_addrobj_add(addr);
 
@@ -129 +129 @@
     ipc_call_t *call)
 {
+        char *name;
         inet_naddr_t naddr;
         sysarg_t link_id;
@@ -136 +137 @@
         log_msg(LVL_DEBUG, "inetcfg_addr_create_static_srv()");
 
+        rc = async_data_write_accept((void **) &name, true, 0, LOC_NAME_MAXLEN,
+            0, NULL);
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                return;
+        }
+
         naddr.ipv4 = IPC_GET_ARG1(*call);
         naddr.bits = IPC_GET_ARG2(*call);
@@ -141 +149 @@
 
         addr_id = 0;
-        rc = inetcfg_addr_create_static(&naddr, link_id, &addr_id);
+        rc = inetcfg_addr_create_static(name, &naddr, link_id, &addr_id);
+        free(name);
         async_answer_1(callid, rc, addr_id);
 }