Changes in uspace/app/nettest2/nettest2.c [26de91a:c442f63] in mainline

File:

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

uspace/app/nettest2/nettest2.c

@@ -38 +38 @@
 #include "print_error.h"
 
-#include <assert.h>
 #include <malloc.h>
 #include <stdio.h>
@@ -61 +60 @@
 #define NETTEST2_TEXT  "Networking test 2 - transfer"
 
-static uint16_t family = AF_NONE;
+static uint16_t family = PF_INET;
 static size_t size = 28;
 static bool verbose = false;
@@ -272 +271 @@
                 /* Interpret as a host name */
                 dnsr_hostinfo_t *hinfo = NULL;
-                rc = dnsr_name2host(addr_s, &hinfo, ipver_from_af(family));
+                rc = dnsr_name2host(addr_s, &hinfo, family);
                 
                 if (rc != EOK) {
@@ -282 +281 @@
         }
         
+        struct sockaddr_in addr;
+        struct sockaddr_in6 addr6;
+        uint16_t af = inet_addr_sockaddr_in(&addr_addr, &addr, &addr6);
+        
+        if (af != family) {
+                printf("Address family does not match explicitly set family.\n");
+                return EINVAL;
+        }
+        
+        /* Prepare the address buffer */
+        
         struct sockaddr *address;
         socklen_t addrlen;
-        rc = inet_addr_sockaddr(&addr_addr, 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;
+        
+        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;
         }
         
@@ -412 +424 @@
                 return rc;
         
-        free(address);
-        
         if (verbose)
                 printf("\nExiting\n");