Changeset 02a09ed in mainline for uspace/app/nettest2/nettest2.c

Timestamp:

2013-06-28T20:20:03Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1d24ad3

Parents:

edf0d27

Message:

add basic infrastructure for IPv6 (inactive)
make inet_addr_t a universal address type

File:

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

uspace/app/nettest2/nettest2.c

@@ -60 +60 @@
 #define NETTEST2_TEXT  "Networking test 2 - transfer"
 
-static size_t size;
-static bool verbose;
-static sock_type_t type;
-static int sockets;
-static int messages;
-static int family;
-static uint16_t port;
+static uint16_t family = PF_INET;
+static size_t size = 28;
+static bool verbose = false;
+static sock_type_t type = SOCK_DGRAM;
+static int sockets = 10;
+static int messages = 10;
+static uint16_t port = 7;
 
 static void nettest2_print_help(void)
@@ -234 +234 @@
 int main(int argc, char *argv[])
 {
-        struct sockaddr *address;
-        struct sockaddr_in address_in;
-        struct sockaddr_in6 address_in6;
-        dnsr_hostinfo_t *hinfo;
-        socklen_t addrlen;
-        uint8_t *address_start;
-
-        int *socket_ids;
-        char *data;
         int index;
-        struct timeval time_before;
-        struct timeval time_after;
-
         int rc;
-
-        size = 28;
-        verbose = false;
-        type = SOCK_DGRAM;
-        sockets = 10;
-        messages = 10;
-        family = PF_INET;
-        port = 7;
-
+        
         /*
          * Parse the command line arguments.
@@ -264 +244 @@
         for (index = 1; (index < argc - 1) || ((index == argc - 1) &&
             (argv[index][0] == '-')); ++index) {
-
                 /* Options should start with dash ('-') */
                 if (argv[index][0] == '-') {
@@ -276 +255 @@
         }
         
-        /* If not before the last argument containing the host */
+        /* The last argument containing the host */
         if (index >= argc) {
-                printf("Command line error: missing host name\n");
+                printf("Host name missing.\n");
                 nettest2_print_help();
                 return EINVAL;
         }
-
+        
+        char *addr_s = argv[argc - 1];
+        
+        /* Interpret as address */
+        inet_addr_t addr_addr;
+        rc = inet_addr_parse(addr_s, &addr_addr);
+        
+        if (rc != EOK) {
+                /* Interpret as a host name */
+                dnsr_hostinfo_t *hinfo = NULL;
+                rc = dnsr_name2host(addr_s, &hinfo);
+                
+                if (rc != EOK) {
+                        printf("Error resolving host '%s'.\n", addr_s);
+                        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) {
+                printf("Address family does not match explicitly set family.\n");
+                return EINVAL;
+        }
+        
         /* Prepare the address buffer */
-
-        switch (family) {
-        case PF_INET:
-                address_in.sin_family = AF_INET;
-                address_in.sin_port = htons(port);
-                address = (struct sockaddr *) &address_in;
-                addrlen = sizeof(address_in);
-                address_start = (uint8_t *) &address_in.sin_addr.s_addr;
-                break;
-        case PF_INET6:
-                address_in6.sin6_family = AF_INET6;
-                address_in6.sin6_port = htons(port);
-                address = (struct sockaddr *) &address_in6;
-                addrlen = sizeof(address_in6);
-                address_start = (uint8_t *) &address_in6.sin6_addr.s6_addr;
+        
+        struct sockaddr *address;
+        socklen_t addrlen;
+        
+        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;
-        }
-
-        /* Parse the last argument which should contain the host/address */
-        rc = inet_pton(family, argv[argc - 1], address_start);
-        if (rc != EOK) {
-                /* Try interpreting as a host name */
-                rc = dnsr_name2host(argv[argc - 1], &hinfo);
-                if (rc != EOK) {
-                        printf("Error resolving host '%s'.\n", argv[argc - 1]);
-                        return rc;
-                }
-                
-                rc = inet_addr_sockaddr_in(&hinfo->addr, &address_in);
-                if (rc != EOK) {
-                        printf("Host '%s' not resolved as IPv4 address.\n", argv[argc - 1]);
-                        return rc;
-                }
         }
         
@@ -333 +322 @@
          * null character.
          */
-        data = (char *) malloc(size + 1);
+        char *data = (char *) malloc(size + 1);
         if (!data) {
                 fprintf(stderr, "Failed to allocate data buffer.\n");
@@ -353 +342 @@
          * Allocate count entries plus the terminating null (\0)
          */
-        socket_ids = (int *) malloc(sizeof(int) * (sockets + 1));
+        int *socket_ids = (int *) malloc(sizeof(int) * (sockets + 1));
         if (!socket_ids) {
                 fprintf(stderr, "Failed to allocate receive buffer.\n");
                 return ENOMEM;
         }
+        
         socket_ids[sockets] = 0;
         
@@ -377 +367 @@
                 printf("\n");
         
+        struct timeval time_before;
         rc = gettimeofday(&time_before, NULL);
         if (rc != EOK) {
@@ -388 +379 @@
                 return rc;
         
+        struct timeval time_after;
         rc = gettimeofday(&time_after, NULL);
         if (rc != EOK) {