Changeset e948fde in mainline for uspace/lib/c/generic

Timestamp:

2013-09-29T21:43:49Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5a324d99

Parents:

f023251

Message:

dnsr_name2host should use ip_ver_t instead of AF.

Location:

uspace/lib/c/generic

Files:

• dnsr.c (modified) (2 diffs)
• inet/addr.c (modified) (1 diff)

uspace/lib/c/generic/dnsr.c

@@ -67 +67 @@
 }
 
-int dnsr_name2host(const char *name, dnsr_hostinfo_t **rinfo, uint16_t af)
+int dnsr_name2host(const char *name, dnsr_hostinfo_t **rinfo, ip_ver_t ver)
 {
         dnsr_hostinfo_t *info = calloc(1, sizeof(dnsr_hostinfo_t));
@@ -76 +76 @@
         
         ipc_call_t answer;
-        aid_t req = async_send_1(exch, DNSR_NAME2HOST, (sysarg_t) af,
+        aid_t req = async_send_1(exch, DNSR_NAME2HOST, (sysarg_t) ver,
             &answer);
         

uspace/lib/c/generic/inet/addr.c

@@ -250 +250 @@
 }
 
+ip_ver_t ipver_from_af(int af)
+{
+        switch (af) {
+        case AF_NONE:
+                return ip_any;
+        case AF_INET:
+                return ip_v4;
+        case AF_INET6:
+                return ip_v6;
+        default:
+                assert(false);
+                return EINVAL;
+        }
+}
+
 void inet_naddr_addr(const inet_naddr_t *naddr, inet_addr_t *addr)
 {