Changeset 26de91a in mainline for uspace/app/netspeed/netspeed.c

Timestamp:

2013-10-04T17:19:20Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9749e47

Parents:

e2839d7

Message:

IPv4 and v6 should not need separate handling by a simple client that is just connecting to a host/address. Add IPv6/DNS support in applications where missing.

File:

• uspace/app/netspeed/netspeed.c (modified) (7 diffs)

uspace/app/netspeed/netspeed.c

@@ -36 +36 @@
  */
 
+#include <assert.h>
+#include <inet/dnsr.h>
+#include <net/in.h>
+#include <net/inet.h>
+#include <net/socket.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -41 +46 @@
 #include <str_error.h>
 #include <task.h>
-
-#include <net/in.h>
-#include <net/inet.h>
-#include <net/socket.h>
 
 #define NAME "netspeed"
@@ -114 +115 @@
 }
 
-static int client(sock_type_t sock_type, const char *address, unsigned port,
+static int client(sock_type_t sock_type, const char *host, unsigned port,
     unsigned long count, char *buf, size_t bufsize)
 {
-        struct sockaddr_in addr;
-        
-        addr.sin_family = AF_INET;
-        addr.sin_port = htons(port);
-        
-        int rc = inet_pton(AF_INET, address, (void *) &addr.sin_addr.s_addr);
-        if (rc != EOK) {
-                fprintf(stderr, "inet_pton failed: %s\n", str_error(rc));
-                return rc;
-        }
-        
-        int conn_sd = socket(PF_INET, sock_type, 0);
+        inet_addr_t iaddr;
+        struct sockaddr *saddr;
+        socklen_t saddrlen;
+        
+        int rc = inet_addr_parse(host, &iaddr);
+        if (rc != EOK) {
+                dnsr_hostinfo_t *hinfo = NULL;
+                rc = dnsr_name2host(host, &hinfo, ip_any);
+                if (rc != EOK) {
+                        fprintf(stderr, "Error resolving host '%s'.\n", host);
+                        return ENOENT;
+                }
+                
+                iaddr = hinfo->addr;
+        }
+        
+        rc = inet_addr_sockaddr(&iaddr, port, &saddr, &saddrlen);
+        if (rc != EOK) {
+                assert(rc == ENOMEM);
+                fprintf(stderr, "Out of memory.\n");
+                return ENOMEM;
+        }
+        
+        int conn_sd = socket(saddr->sa_family, sock_type, 0);
         if (conn_sd < 0) {
                 fprintf(stderr, "socket failed: %s\n", str_error(rc));
@@ -135 +148 @@
         
         if (sock_type == SOCK_STREAM) {
-                rc = connect(conn_sd, (struct sockaddr *) &addr, sizeof(addr));
+                rc = connect(conn_sd, saddr, saddrlen);
                 if (rc != EOK) {
                         fprintf(stderr, "connect failed: %s\n", str_error(rc));
@@ -151 +164 @@
                         rc = send(conn_sd, buf, bufsize, 0);
                 } else {
-                        rc = sendto(conn_sd, buf, bufsize, 0,
-                            (struct sockaddr *) &addr, sizeof(addr));
+                        rc = sendto(conn_sd, buf, bufsize, 0, saddr, saddrlen);
                 }
                 if (rc != EOK) {
@@ -161 +173 @@
         
         closesocket(conn_sd);
+        free(saddr);
         return rc;
 }
@@ -167 +180 @@
 {
         fprintf(stderr, "Usage: netspeed <tcp|udp> server [port] <buffer size>\n");
-        fprintf(stderr, "       netspeed <tcp|udp> client <ip> <port> <count> <buffer size>\n");
+        fprintf(stderr, "       netspeed <tcp|udp> client <host> <port> <count> <buffer size>\n");
 }