Changeset 02a09ed in mainline for uspace/srv/net/inetsrv/inetsrv.c

Timestamp:

2013-06-28T20:20:03Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1d24ad3

Parents:

edf0d27

Message:

add basic infrastructure for IPv6 (inactive)
make inet_addr_t a universal address type

File:

• uspace/srv/net/inetsrv/inetsrv.c (modified) (5 diffs)

uspace/srv/net/inetsrv/inetsrv.c

@@ -46 +46 @@
 #include <stdlib.h>
 #include <sys/types.h>
-
+#include <net/socket_codes.h>
 #include "addrobj.h"
 #include "icmp.h"
@@ -202 +202 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_get_srcaddr_srv()");
         
+        addr32_t remote_v4 = IPC_GET_ARG1(*call);
+        uint8_t tos = IPC_GET_ARG2(*call);
+        
         inet_addr_t remote;
-        inet_addr_unpack(IPC_GET_ARG1(*call), &remote);
-        uint8_t tos = IPC_GET_ARG2(*call);
+        inet_addr_set(remote_v4, &remote);
         
         inet_addr_t local;
@@ -213 +215 @@
         }
         
-        uint32_t local_addr;
-        rc = inet_addr_pack(&local, &local_addr);
-        if (rc != EOK) {
-                async_answer_0(callid, rc);
+        addr32_t local_v4;
+        uint16_t family = inet_addr_get(&local, &local_v4, NULL);
+        if (family != AF_INET) {
+                async_answer_0(callid, EINVAL);
                 return;
         }
         
-        async_answer_1(callid, rc, (sysarg_t) local_addr);
+        async_answer_1(callid, rc, (sysarg_t) local_v4);
 }
 
@@ -228 +230 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_send_srv()");
         
+        addr32_t src_v4 = IPC_GET_ARG1(*call);
+        addr32_t dest_v4 = IPC_GET_ARG2(*call);
+        
         inet_dgram_t dgram;
         
-        inet_addr_unpack(IPC_GET_ARG1(*call), &dgram.src);
-        inet_addr_unpack(IPC_GET_ARG2(*call), &dgram.dest);
+        inet_addr_set(src_v4, &dgram.src);
+        inet_addr_set(dest_v4, &dgram.dest);
         dgram.tos = IPC_GET_ARG3(*call);
         
@@ -371 +376 @@
 int inet_ev_recv(inet_client_t *client, inet_dgram_t *dgram)
 {
-        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 rc;
-        
         async_exch_t *exch = async_exchange_begin(client->sess);
         
         ipc_call_t answer;
-        aid_t req = async_send_3(exch, INET_EV_RECV, (sysarg_t) src,
-            (sysarg_t) dest, dgram->tos, &answer);
-        rc = async_data_write_start(exch, dgram->data, dgram->size);
-        async_exchange_end(exch);
-        
-        if (rc != EOK) {
+        aid_t req = async_send_1(exch, INET_EV_RECV, dgram->tos, &answer);
+        
+        int rc = async_data_write_start(exch, &dgram->src, sizeof(inet_addr_t));
+        if (rc != EOK) {
+                async_exchange_end(exch);
                 async_forget(req);
                 return rc;
         }
         
+        rc = async_data_write_start(exch, &dgram->dest, sizeof(inet_addr_t));
+        if (rc != EOK) {
+                async_exchange_end(exch);
+                async_forget(req);
+                return rc;
+        }
+        
+        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;
+        
+        return (int) retval;
 }