Changeset e948fde in mainline for uspace/app

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/app

Files:

• dnsres/dnsres.c (modified) (3 diffs)
• nettest1/nettest1.c (modified) (3 diffs)
• nettest2/nettest2.c (modified) (3 diffs)
• nettest3/nettest3.c (modified) (1 diff)
• nterm/conn.c (modified) (1 diff)
• ping/ping.c (modified) (1 diff)
• ping6/ping6.c (modified) (1 diff)

uspace/app/dnsres/dnsres.c

@@ -54 +54 @@
         }
         
-        uint16_t af;
+        uint16_t ver;
         char *hname;
         
@@ -63 +63 @@
                 }
                 
-                af = AF_INET;
+                ver = ip_v4;
                 hname = argv[2];
         } else if (str_cmp(argv[1], "-6") == 0) {
@@ -71 +71 @@
                 }
                 
-                af = AF_INET6;
+                ver = ip_v6;
                 hname = argv[2];
         } else {
-                af = 0;
+                ver = ip_any;
                 hname = argv[1];
         }
         
         dnsr_hostinfo_t *hinfo;
-        int rc = dnsr_name2host(hname, &hinfo, af);
+        int rc = dnsr_name2host(hname, &hinfo, ver);
         if (rc != EOK) {
                 printf("%s: Error resolving '%s'.\n", NAME, hname);

uspace/app/nettest1/nettest1.c

@@ -59 +59 @@
 #define NETTEST1_TEXT  "Networking test 1 - sockets"
 
-static uint16_t family = AF_INET;
+static uint16_t family = AF_NONE;
 static sock_type_t type = SOCK_DGRAM;
 static size_t size = 27;
@@ -335 +335 @@
                 /* 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) {
@@ -348 +348 @@
         struct sockaddr_in6 addr6;
         uint16_t af = inet_addr_sockaddr_in(&addr_addr, &addr, &addr6);
+        
+        if (family == AF_NONE)
+                family = af;
         
         if (af != family) {

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) {

uspace/app/nettest3/nettest3.c

@@ -78 +78 @@
                 if (rc != EOK) {
                         /* Try interpreting as a host name */
-                        rc = dnsr_name2host(argv[1], &hinfo, AF_INET);
+                        rc = dnsr_name2host(argv[1], &hinfo, ip_v4);
                         if (rc != EOK) {
                                 printf("Error resolving host '%s'.\n", argv[1]);
                                 return rc;
                         }
-                        
+
                         uint16_t af = inet_addr_sockaddr_in(&hinfo->addr, &addr, NULL);
                         if (af != AF_INET) {

uspace/app/nterm/conn.c

@@ -84 +84 @@
                 /* Interpret as a host name */
                 dnsr_hostinfo_t *hinfo = NULL;
-                rc = dnsr_name2host(addr_s, &hinfo, 0);
+                rc = dnsr_name2host(addr_s, &hinfo, ip_any);
                 
                 if (rc != EOK) {

uspace/app/ping/ping.c

@@ -262 +262 @@
         if (rc != EOK) {
                 /* Try interpreting as a host name */
-                rc = dnsr_name2host(argv[optind], &hinfo, AF_INET);
+                rc = dnsr_name2host(argv[optind], &hinfo, ip_v4);
                 if (rc != EOK) {
                         printf("Error resolving host '%s'.\n", argv[optind]);

uspace/app/ping6/ping6.c

@@ -262 +262 @@
         if (rc != EOK) {
                 /* Try interpreting as a host name */
-                rc = dnsr_name2host(argv[optind], &hinfo, AF_INET);
+                rc = dnsr_name2host(argv[optind], &hinfo, ip_v6);
                 if (rc != EOK) {
                         printf("Error resolving host '%s'.\n", argv[optind]);