Changeset 4c14b88 in mainline for uspace/app/nettest1/nettest1.c

Timestamp:

2013-12-31T07:57:14Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1b973dc

Parents:

6297465 (diff), 208b5f5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

mainline changes

File:

• uspace/app/nettest1/nettest1.c (modified) (4 diffs)

uspace/app/nettest1/nettest1.c

@@ -38 +38 @@
 #include "print_error.h"
 
+#include <assert.h>
 #include <malloc.h>
 #include <stdio.h>
@@ -59 +60 @@
 #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;
@@ -326 +327 @@
         }
         
-        char *addr_s = argv[argc - 1];
+        char *host = argv[argc - 1];
         
         /* Interpret as address */
-        inet_addr_t addr_addr;
-        rc = inet_addr_parse(addr_s, &addr_addr);
+        inet_addr_t iaddr;
+        rc = inet_addr_parse(host, &iaddr);
         
         if (rc != EOK) {
                 /* Interpret as a host name */
                 dnsr_hostinfo_t *hinfo = NULL;
-                rc = dnsr_name2host(addr_s, &hinfo, family);
+                rc = dnsr_name2host(host, &hinfo, ipver_from_af(family));
                 
                 if (rc != EOK) {
-                        printf("Error resolving host '%s'.\n", addr_s);
+                        printf("Error resolving host '%s'.\n", host);
                         return EINVAL;
                 }
                 
-                addr_addr = hinfo->addr;
-        }
-        
-        struct sockaddr_in addr;
-        struct sockaddr_in6 addr6;
-        uint16_t af = inet_addr_sockaddr_in(&addr_addr, &addr, &addr6);
-        
-        if (af != family) {
+                iaddr = hinfo->addr;
+        }
+        
+        rc = inet_addr_sockaddr(&iaddr, port, &address, &addrlen);
+        if (rc != EOK) {
+                assert(rc == ENOMEM);
+                printf("Out of memory.\n");
+                return ENOMEM;
+        }
+        
+        if (family == AF_NONE)
+                family = address->sa_family;
+        
+        if (address->sa_family != family) {
                 printf("Address family does not match explicitly set family.\n");
                 return EINVAL;
-        }
-        
-        /* Prepare the address buffer */
-        
-        switch (af) {
-        case AF_INET:
-                addr.sin_port = htons(port);
-                address = (struct sockaddr *) &addr;
-                addrlen = sizeof(addr);
-                break;
-        case AF_INET6:
-                addr6.sin6_port = htons(port);
-                address = (struct sockaddr *) &addr6;
-                addrlen = sizeof(addr6);
-                break;
-        default:
-                fprintf(stderr, "Address family is not supported\n");
-                return EAFNOSUPPORT;
         }
         
@@ -434 +423 @@
             &time_before));
         
+        free(address);
+        
         if (verbose)
                 printf("Exiting\n");