Changeset a2e3ee6 in mainline for uspace/lib/c/generic/inet.c

Timestamp:

2013-06-20T16:45:58Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

08bb73b

Parents:

19a4f73

Message:

use new network address infrastructure (towards IPv6 support)

File:

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

uspace/lib/c/generic/inet.c

@@ -107 +107 @@
 int inet_send(inet_dgram_t *dgram, uint8_t ttl, inet_df_t df)
 {
-        async_exch_t *exch = async_exchange_begin(inet_sess);
-
+        uint32_t src;
+        int rc = inet_addr_pack(&dgram->src, &src);
+        if (rc != EOK)
+                return rc;
+        
+        uint32_t dest;
+        rc = inet_addr_pack(&dgram->dest, &dest);
+        if (rc != EOK)
+                return EOK;
+        
+        async_exch_t *exch = async_exchange_begin(inet_sess);
+        
         ipc_call_t answer;
-        aid_t req = async_send_5(exch, INET_SEND, dgram->src.ipv4,
-            dgram->dest.ipv4, dgram->tos, ttl, df, &answer);
-        int rc = async_data_write_start(exch, dgram->data, dgram->size);
-        async_exchange_end(exch);
-
+        aid_t req = async_send_5(exch, INET_SEND, (sysarg_t) src,
+            (sysarg_t) dest, dgram->tos, ttl, df, &answer);
+        rc = async_data_write_start(exch, dgram->data, dgram->size);
+        
+        async_exchange_end(exch);
+        
         if (rc != EOK) {
                 async_forget(req);
                 return rc;
         }
-
+        
         sysarg_t retval;
         async_wait_for(req, &retval);
         if (retval != EOK)
                 return retval;
-
+        
         return EOK;
 }
@@ -130 +141 @@
 int inet_get_srcaddr(inet_addr_t *remote, uint8_t tos, inet_addr_t *local)
 {
-        sysarg_t local_addr;
-        async_exch_t *exch = async_exchange_begin(inet_sess);
-
-        int rc = async_req_2_1(exch, INET_GET_SRCADDR, remote->ipv4,
-            tos, &local_addr);
-        async_exchange_end(exch);
-
-        if (rc != EOK)
-                return rc;
-
-        local->ipv4 = local_addr;
-        return EOK;
-}
-
-int inet2_get_srcaddr(inet2_addr_t *remote, uint8_t tos, inet2_addr_t *local)
-{
         uint32_t remote_addr;
-        int rc = inet2_addr_pack(remote, &remote_addr);
+        int rc = inet_addr_pack(remote, &remote_addr);
         if (rc != EOK)
                 return rc;
@@ -162 +157 @@
                 return rc;
         
-        inet2_addr_unpack(local_addr, local);
+        inet_addr_unpack(local_addr, local);
         return EOK;
 }
@@ -170 +165 @@
         int rc;
         inet_dgram_t dgram;
-
-        dgram.src.ipv4 = IPC_GET_ARG1(*call);
-        dgram.dest.ipv4 = IPC_GET_ARG2(*call);
+        
+        inet_addr_unpack(IPC_GET_ARG1(*call), &dgram.src);
+        inet_addr_unpack(IPC_GET_ARG2(*call), &dgram.dest);
         dgram.tos = IPC_GET_ARG3(*call);