Changes in uspace/srv/net/dnsrsrv/dnsrsrv.c [e948fde:959d2ec] in mainline

File:

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

uspace/srv/net/dnsrsrv/dnsrsrv.c

@@ -60 +60 @@
         rc = transport_init();
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing transport.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing tarnsport.");
                 return EIO;
         }
@@ -84 +84 @@
 }
 
-static void dnsr_name2host_srv(dnsr_client_t *client, ipc_callid_t iid,
-    ipc_call_t *icall)
-{
+static void dnsr_name2host_srv(dnsr_client_t *client, ipc_callid_t callid,
+    ipc_call_t *call)
+{
+        char *name;
+        dns_host_info_t *hinfo;
+        ipc_callid_t rcallid;
+        size_t size;
+        sysarg_t retval;
+        size_t act_size;
+        int rc;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_get_srvaddr_srv()");
-        
-        ip_ver_t ver = IPC_GET_ARG1(*icall);
-        
-        char *name;
-        int rc = async_data_write_accept((void **) &name, true, 0,
+
+        rc = async_data_write_accept((void **) &name, true, 0,
             DNS_NAME_MAX_SIZE, 0, NULL);
         if (rc != EOK) {
-                async_answer_0(iid, rc);
-                return;
-        }
-        
-        dns_host_info_t *hinfo;
-        rc = dns_name2host(name, &hinfo, ver);
-        if (rc != EOK) {
-                async_answer_0(iid, rc);
-                return;
-        }
-        
-        ipc_callid_t callid;
-        size_t size;
-        if (!async_data_read_receive(&callid, &size)) {
+                async_answer_0(callid, rc);
+                return;
+        }
+
+        if (!async_data_read_receive(&rcallid, &size)) {
+                async_answer_0(rcallid, EREFUSED);
                 async_answer_0(callid, EREFUSED);
-                async_answer_0(iid, EREFUSED);
-                return;
-        }
-        
-        if (size != sizeof(inet_addr_t)) {
-                async_answer_0(callid, EINVAL);
-                async_answer_0(iid, EINVAL);
-                return;
-        }
-        
-        rc = async_data_read_finalize(callid, &hinfo->addr, size);
-        if (rc != EOK) {
+                return;
+        }
+
+        rc = dns_name2host(name, &hinfo);
+        if (rc != EOK) {
+                async_answer_0(rcallid, rc);
                 async_answer_0(callid, rc);
-                async_answer_0(iid, rc);
-                return;
-        }
-        
-        if (!async_data_read_receive(&callid, &size)) {
-                async_answer_0(callid, EREFUSED);
-                async_answer_0(iid, EREFUSED);
-                return;
-        }
-        
-        size_t act_size = str_size(hinfo->cname);
+                return;
+        }
+
+        act_size = str_size(hinfo->cname);
         if (act_size > size) {
-                async_answer_0(callid, EINVAL);
-                async_answer_0(iid, EINVAL);
-                return;
-        }
-        
-        rc = async_data_read_finalize(callid, hinfo->cname, act_size);
-        if (rc != EOK)
-                async_answer_0(callid, rc);
-        
-        async_answer_0(iid, (sysarg_t) rc);
-        
+                async_answer_0(rcallid, EOVERFLOW);
+                async_answer_0(callid, EOVERFLOW);
+                return;
+        }
+
+        retval = async_data_read_finalize(rcallid, hinfo->cname, act_size);
+        async_answer_1(callid, retval, hinfo->addr.ipv4);
+
         dns_hostinfo_destroy(hinfo);
 }
 
-static void dnsr_get_srvaddr_srv(dnsr_client_t *client, ipc_callid_t iid,
-    ipc_call_t *icall)
+static void dnsr_get_srvaddr_srv(dnsr_client_t *client, ipc_callid_t callid,
+    ipc_call_t *call)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_get_srvaddr_srv()");
-        
-        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(inet_addr_t)) {
-                async_answer_0(callid, EINVAL);
-                async_answer_0(iid, EINVAL);
-                return;
-        }
-        
-        // FIXME locking
-        
-        int rc = async_data_read_finalize(callid, &dns_server_addr, size);
-        if (rc != EOK)
-                async_answer_0(callid, rc);
-        
-        async_answer_0(iid, rc);
-}
-
-static void dnsr_set_srvaddr_srv(dnsr_client_t *client, ipc_callid_t iid,
-    ipc_call_t *icall)
+        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)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "dnsr_set_srvaddr_srv()");
-        
-        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(inet_addr_t)) {
-                async_answer_0(callid, EINVAL);
-                async_answer_0(iid, EINVAL);
-                return;
-        }
-        
-        // FIXME locking
-        
-        int rc = async_data_write_finalize(callid, &dns_server_addr, size);
-        if (rc != EOK) {
-                async_answer_0(callid, rc);
-                async_answer_0(iid, rc);
-        }
-        
-        async_answer_0(iid, (sysarg_t) rc);
+
+        dns_server_addr.ipv4 = IPC_GET_ARG1(*call);
+
+        async_answer_0(callid, EOK);
 }