Changes in uspace/lib/c/generic/inetcfg.c [77ad86c:a2e3ee6] in mainline

File:

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

uspace/lib/c/generic/inetcfg.c

@@ -136 +136 @@
     sysarg_t link_id, sysarg_t *addr_id)
 {
-        async_exch_t *exch = async_exchange_begin(inetcfg_sess);
-
-        ipc_call_t answer;
-        aid_t req = async_send_3(exch, INETCFG_ADDR_CREATE_STATIC, naddr->ipv4,
-            naddr->bits, link_id, &answer);
+        uint32_t naddr_addr;
+        uint8_t naddr_bits;
+        int rc = inet_naddr_pack(naddr, &naddr_addr, &naddr_bits);
+        if (rc != EOK)
+                return rc;
+        
+        async_exch_t *exch = async_exchange_begin(inetcfg_sess);
+        
+        ipc_call_t answer;
+        aid_t req = async_send_3(exch, INETCFG_ADDR_CREATE_STATIC,
+            (sysarg_t) naddr_addr, (sysarg_t) 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_forget(req);
-                return retval;
-        }
-
+        
+        async_exchange_end(exch);
+        
+        if (retval != EOK) {
+                async_forget(req);
+                return retval;
+        }
+        
         async_wait_for(req, &retval);
         *addr_id = IPC_GET_ARG1(answer);
-
+        
         return retval;
 }
@@ -196 +202 @@
         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);
+        
+        inet_naddr_unpack(IPC_GET_ARG1(answer), IPC_GET_ARG2(answer),
+            &ainfo->naddr);
         ainfo->ilink = IPC_GET_ARG3(answer);
         ainfo->name = str_dup(name_buf);
@@ -284 +290 @@
     inet_addr_t *router, sysarg_t *sroute_id)
 {
-        async_exch_t *exch = async_exchange_begin(inetcfg_sess);
-
+        uint32_t dest_addr;
+        uint8_t dest_bits;
+        int rc = inet_naddr_pack(dest, &dest_addr, &dest_bits);
+        if (rc != EOK)
+                return rc;
+        
+        uint32_t router_addr;
+        rc = inet_addr_pack(router, &router_addr);
+        if (rc != EOK)
+                return rc;
+        
+        async_exch_t *exch = async_exchange_begin(inetcfg_sess);
+        
         ipc_call_t answer;
         aid_t req = async_send_3(exch, INETCFG_SROUTE_CREATE,
-            dest->ipv4, dest->bits, router->ipv4, &answer);
+            (sysarg_t) dest_addr, (sysarg_t) dest_bits, (sysarg_t) router_addr,
+            &answer);
         sysarg_t retval = async_data_write_start(exch, name, str_size(name));
-
-        async_exchange_end(exch);
-
-        if (retval != EOK) {
-                async_forget(req);
-                return retval;
-        }
-
+        
+        async_exchange_end(exch);
+        
+        if (retval != EOK) {
+                async_forget(req);
+                return retval;
+        }
+        
         async_wait_for(req, &retval);
         *sroute_id = IPC_GET_ARG1(answer);
-
+        
         return retval;
 }
@@ -345 +363 @@
         name_buf[act_size] = '\0';
 
-        srinfo->dest.ipv4 = IPC_GET_ARG1(answer);
-        srinfo->dest.bits = IPC_GET_ARG2(answer);
-        srinfo->router.ipv4 = IPC_GET_ARG3(answer);
+        inet_naddr_unpack(IPC_GET_ARG1(answer), IPC_GET_ARG2(answer),
+            &srinfo->dest);
+        inet_addr_unpack(IPC_GET_ARG3(answer), &srinfo->router);
         srinfo->name = str_dup(name_buf);