Changeset a2e3ee6 in mainline for uspace/srv/net/dnsrsrv

Timestamp:

2013-06-20T16:45:58Z (13 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)

Location:

uspace/srv/net/dnsrsrv

Files:

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

uspace/srv/net/dnsrsrv/dns_type.h

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

uspace/srv/net/dnsrsrv/dnsrsrv.c

@@ -118 +118 @@
         
         uint32_t addr;
-        rc = inet2_addr_pack(&hinfo->addr, &addr);
+        rc = inet_addr_pack(&hinfo->addr, &addr);
         if (rc != EOK) {
                 async_answer_0(rcallid, rc);
@@ -151 +151 @@
         }
         
-        if (size != sizeof(inet2_addr_t)) {
+        if (size != sizeof(inet_addr_t)) {
                 async_answer_0(callid, EINVAL);
                 async_answer_0(iid, EINVAL);
@@ -177 +177 @@
         }
         
-        if (size != sizeof(inet2_addr_t)) {
+        if (size != sizeof(inet_addr_t)) {
                 async_answer_0(callid, EINVAL);
                 async_answer_0(iid, EINVAL);

uspace/srv/net/dnsrsrv/query.c

@@ -128 +128 @@
 
                         info->cname = str_dup(rr->name);
-                        inet2_addr_unpack(dns_uint32_t_decode(rr->rdata, rr->rdata_size),
+                        inet_addr_unpack(dns_uint32_t_decode(rr->rdata, rr->rdata_size),
                             &info->addr);
                         

uspace/srv/net/dnsrsrv/transport.c

@@ -57 +57 @@
 #define REQ_RETRY_MAX 3
 
-inet2_addr_t dns_server_addr;
+inet_addr_t dns_server_addr;
 
 typedef struct {
@@ -195 +195 @@
         addr.sin_family = AF_INET;
         addr.sin_port = htons(DNS_SERVER_PORT);
-        inet2_addr_sockaddr_in(&dns_server_addr, &addr);
+        inet_addr_sockaddr_in(&dns_server_addr, &addr);
 
         rc = dns_message_encode(req, &req_data, &req_size);

uspace/srv/net/dnsrsrv/transport.h

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