Changeset e948fde in mainline for uspace/app/nettest2/nettest2.c

Timestamp:

2013-09-29T21:43:49Z (11 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.

File:

• uspace/app/nettest2/nettest2.c (modified) (3 diffs)

uspace/app/nettest2/nettest2.c

@@ -60 +60 @@
 #define NETTEST2_TEXT  "Networking test 2 - transfer"
 
-static uint16_t family = PF_INET;
+static uint16_t family = AF_NONE;
 static size_t size = 28;
 static bool verbose = false;
@@ -271 +271 @@
                 /* Interpret as a host name */
                 dnsr_hostinfo_t *hinfo = NULL;
-                rc = dnsr_name2host(addr_s, &hinfo, family);
+                rc = dnsr_name2host(addr_s, &hinfo, ipver_from_af(family));
                 
                 if (rc != EOK) {
@@ -284 +284 @@
         struct sockaddr_in6 addr6;
         uint16_t af = inet_addr_sockaddr_in(&addr_addr, &addr, &addr6);
+        
+        if (family == AF_NONE)
+                family = af;
         
         if (af != family) {