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

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)

Location:

uspace/srv/net/dnsrsrv

Files:

• dns_msg.c (modified) (1 diff)
• dns_type.h (modified) (2 diffs)
• dnsrsrv.c (modified) (2 diffs)
• query.c (modified) (1 diff)
• transport.c (modified) (4 diffs)
• transport.h (modified) (2 diffs)

uspace/srv/net/dnsrsrv/dns_msg.c

@@ -299 +299 @@
         assert(buf_size >= 4);
 
-        w = ((uint32_t)buf[0] << 24) +
-            ((uint32_t)buf[1] << 16) +
-            ((uint32_t)buf[2] << 8) +
+        w = ((uint32_t) buf[0] << 24) +
+            ((uint32_t) buf[1] << 16) +
+            ((uint32_t) buf[2] << 8) +
             buf[3];
 

uspace/srv/net/dnsrsrv/dns_type.h

@@ -39 +39 @@
 #include <adt/list.h>
 #include <inet/inet.h>
+#include <inet/addr2.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -115 +116 @@
         char *cname;
         /** Host address */
-        inet_addr_t addr;
+        inet2_addr_t addr;
 } dns_host_info_t;
 

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);
 }
 

uspace/srv/net/dnsrsrv/query.c

@@ -128 +128 @@
 
                         info->cname = str_dup(rr->name);
-                        info->addr.ipv4 = dns_uint32_t_decode(rr->rdata, rr->rdata_size);
-                        log_msg(LOG_DEFAULT, LVL_DEBUG, "info->name = '%s' "
-                            "info->addr = %x", info->cname, info->addr.ipv4);
-
+                        inet2_addr_unpack(dns_uint32_t_decode(rr->rdata, rr->rdata_size),
+                            &info->addr);
+                        
                         dns_message_destroy(msg);
                         dns_message_destroy(amsg);

uspace/srv/net/dnsrsrv/transport.c

@@ -52 +52 @@
 
 /** Request timeout (microseconds) */
-#define REQ_TIMEOUT (5*1000*1000)
+#define REQ_TIMEOUT (5 * 1000 * 1000)
 
 /** Maximum number of retries */
 #define REQ_RETRY_MAX 3
+
+inet2_addr_t dns_server_addr;
 
 typedef struct {
@@ -72 +74 @@
 static fid_t recv_fid;
 static int transport_fd = -1;
-inet_addr_t dns_server_addr;
 
 /** Outstanding requests */
@@ -194 +195 @@
         addr.sin_family = AF_INET;
         addr.sin_port = htons(DNS_SERVER_PORT);
-        addr.sin_addr.s_addr = host2uint32_t_be(dns_server_addr.ipv4);
+        inet2_addr_sockaddr_in(&dns_server_addr, &addr);
 
         rc = dns_message_encode(req, &req_data, &req_size);
@@ -204 +205 @@
         while (ntry < REQ_RETRY_MAX) {
                 rc = sendto(transport_fd, req_data, req_size, 0,
-                    (struct sockaddr *)&addr, sizeof(addr));
+                    (struct sockaddr *) &addr, sizeof(addr));
                 if (rc != EOK)
                         goto error;

uspace/srv/net/dnsrsrv/transport.h

@@ -37 +37 @@
 #define TRANSPORT_H
 
-#include <inet/addr.h>
+#include <inet/addr2.h>
 #include "dns_type.h"
+
+extern inet2_addr_t dns_server_addr;
 
 extern int transport_init(void);
@@ -44 +46 @@
 extern int dns_request(dns_message_t *, dns_message_t **);
 
-extern inet_addr_t dns_server_addr;
-
-
 #endif