Changeset 3e66428 in mainline for uspace/srv/net/dnsrsrv/dnsrsrv.c

Timestamp:

2013-06-20T14:10:51Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

19a4f73

Parents:

b49d872

Message:

new network address infrastructure (towards IPv6 support)

File:

• uspace/srv/net/dnsrsrv/dnsrsrv.c (modified) (2 diffs)

uspace/srv/net/dnsrsrv/dnsrsrv.c

@@ -116 +116 @@
                 return;
         }
+        
+        uint32_t addr;
+        rc = inet2_addr_pack(&hinfo->addr, &addr);
+        if (rc != EOK) {
+                async_answer_0(rcallid, rc);
+                async_answer_0(callid, rc);
+                return;
+        }
 
         act_size = str_size(hinfo->cname);
@@ -125 +133 @@
 
         retval = async_data_read_finalize(rcallid, hinfo->cname, act_size);
-        async_answer_1(callid, retval, hinfo->addr.ipv4);
+        async_answer_1(callid, retval, (sysarg_t) addr);
 
         dns_hostinfo_destroy(hinfo);
 }
 
-static void dnsr_get_srvaddr_srv(dnsr_client_t *client, ipc_callid_t callid,
-    ipc_call_t *call)
+static void dnsr_get_srvaddr_srv(dnsr_client_t *client, ipc_callid_t iid,
+    ipc_call_t *icall)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_get_srvaddr_srv()");
-        async_answer_1(callid, EOK, dns_server_addr.ipv4);
-}
-
-static void dnsr_set_srvaddr_srv(dnsr_client_t *client, ipc_callid_t callid,
-    ipc_call_t *call)
+        
+        ipc_callid_t callid;
+        size_t size;
+        if (!async_data_read_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+        
+        if (size != sizeof(inet2_addr_t)) {
+                async_answer_0(callid, EINVAL);
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+        
+        // FIXME locking
+        
+        sysarg_t retval =
+            async_data_read_finalize(callid, &dns_server_addr, size);
+        async_answer_0(iid, retval);
+}
+
+static void dnsr_set_srvaddr_srv(dnsr_client_t *client, ipc_callid_t iid,
+    ipc_call_t *icall)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "dnsr_set_srvaddr_srv()");
-
-        dns_server_addr.ipv4 = IPC_GET_ARG1(*call);
-
-        async_answer_0(callid, EOK);
+        
+        ipc_callid_t callid;
+        size_t size;
+        if (!async_data_write_receive(&callid, &size)) {
+                async_answer_0(callid, EREFUSED);
+                async_answer_0(iid, EREFUSED);
+                return;
+        }
+        
+        if (size != sizeof(inet2_addr_t)) {
+                async_answer_0(callid, EINVAL);
+                async_answer_0(iid, EINVAL);
+                return;
+        }
+        
+        // FIXME locking
+        
+        sysarg_t retval =
+            async_data_write_finalize(callid, &dns_server_addr, size);
+        async_answer_0(iid, retval);
 }