Changeset 0c2d9bb in mainline for uspace/app/nettest3/nettest3.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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:

merge mainline changes

File:

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

uspace/app/nettest3/nettest3.c

@@ -37 +37 @@
 #include <async.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <str.h>
 
@@ -52 +53 @@
 static char buf[BUF_SIZE];
 
-static struct sockaddr_in addr;
+static struct sockaddr *address;
+static socklen_t addrlen;
 
 static uint16_t port;
@@ -62 +64 @@
         char *endptr;
         dnsr_hostinfo_t *hinfo;
+        inet_addr_t addr;
+        char *addr_s;
 
         port = 7;
@@ -69 +73 @@
 
         /* Connect to local IP address by default */
-        addr.sin_family = AF_INET;
-        addr.sin_port = htons(port);
-        addr.sin_addr.s_addr = htonl(0x7f000001);
+        inet_addr(&addr, 127, 0, 0, 1);
 
         if (argc >= 2) {
                 printf("parsing address '%s'\n", argv[1]);
-                rc = inet_pton(AF_INET, argv[1], (uint8_t *)&addr.sin_addr.s_addr);
+                rc = inet_addr_parse(argv[1], &addr);
                 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) {
-                                printf("Host '%s' not resolved as IPv4 address.\n", argv[1]);
-                                return rc;
-                        }
+
+                        addr = hinfo->addr;
                 }
-                printf("result: rc=%d, family=%d, addr=%x\n", rc,
-                    addr.sin_family, addr.sin_addr.s_addr);
+                rc = inet_addr_format(&addr, &addr_s);
+                if (rc != EOK) {
+                        assert(rc == ENOMEM);
+                        printf("Out of memory.\n");
+                        return rc;
+                }
+                printf("result: rc=%d, ver=%d, addr=%s\n", rc,
+                    addr.version, addr_s);
+                free(addr_s);
         }
 
         if (argc >= 3) {
                 printf("parsing port '%s'\n", argv[2]);
-                addr.sin_port = htons(strtoul(argv[2], &endptr, 10));
+                port = htons(strtoul(argv[2], &endptr, 10));
                 if (*endptr != '\0') {
                         fprintf(stderr, "Error parsing port\n");
@@ -103 +108 @@
         }
 
+        rc = inet_addr_sockaddr(&hinfo->addr, port, &address, &addrlen);
+        if (rc != EOK) {
+                printf("Out of memory.\n");
+                return rc;
+        }
+
         printf("socket()\n");
-        fd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+        fd = socket(address->sa_family, SOCK_STREAM, IPPROTO_TCP);
         printf(" -> %d\n", fd);
         if (fd < 0)
@@ -110 +121 @@
 
         printf("connect()\n");
-        rc = connect(fd, (struct sockaddr *) &addr, sizeof(addr));
+        rc = connect(fd, address, addrlen);
         printf(" -> %d\n", rc);
         if (rc != 0)
@@ -133 +144 @@
         printf(" -> %d\n", rc);
 
+        free(address);
+
         return 0;
 }