Changes in uspace/app/nettest2/nettest2.c [fff7ef4:02a09ed] in mainline

File:

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

uspace/app/nettest2/nettest2.c

@@ -55 +55 @@
 
 /** Echo module name. */
-#define NAME    "Nettest2"
+#define NAME  "nettest2"
 
 /** Packet data pattern. */
-#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;
+#define NETTEST2_TEXT  "Networking test 2 - transfer"
+
+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)
@@ -107 +107 @@
 static void nettest2_fill_buffer(char *buffer, size_t size)
 {
-        size_t length;
-
-        length = 0;
+        size_t length = 0;
         while (size > length + sizeof(NETTEST2_TEXT) - 1) {
                 memcpy(buffer + length, NETTEST2_TEXT,
@@ -115 +113 @@
                 length += sizeof(NETTEST2_TEXT) - 1;
         }
-
+        
         memcpy(buffer + length, NETTEST2_TEXT, size - length);
         buffer[size] = '\0';
@@ -130 +128 @@
         int value;
         int rc;
-
+        
         switch (argv[*index][1]) {
         /*
@@ -136 +134 @@
          */
         case 'f':
-                rc = arg_parse_name_int(argc, argv, index, &family, 0,
+                rc = arg_parse_name_int(argc, argv, index, &value, 0,
                     socket_parse_protocol_family);
                 if (rc != EOK)
                         return rc;
+                
+                family = (uint16_t) value;
                 break;
         case 'h':
                 nettest2_print_help();
                 return EOK;
-                break;
         case 'm':
                 rc = arg_parse_int(argc, argv, index, &messages, 0);
                 if (rc != EOK)
                         return rc;
+                
                 break;
         case 'n':
@@ -154 +154 @@
                 if (rc != EOK)
                         return rc;
+                
                 break;
         case 'p':
@@ -159 +160 @@
                 if (rc != EOK)
                         return rc;
+                
                 port = (uint16_t) value;
                 break;
@@ -165 +167 @@
                 if (rc != EOK)
                         return rc;
+                
                 size = (value >= 0) ? (size_t) value : 0;
                 break;
@@ -172 +175 @@
                 if (rc != EOK)
                         return rc;
+                
                 type = (sock_type_t) value;
                 break;
@@ -177 +181 @@
                 verbose = true;
                 break;
+        
         /*
          * Long options with double dash ('-')
@@ -182 +187 @@
         case '-':
                 if (str_lcmp(argv[*index] + 2, "family=", 7) == 0) {
-                        rc = arg_parse_name_int(argc, argv, index, &family, 9,
+                        rc = arg_parse_name_int(argc, argv, index, &value, 9,
                             socket_parse_protocol_family);
                         if (rc != EOK)
                                 return rc;
+                        
+                        family = (uint16_t) value;
                 } else if (str_lcmp(argv[*index] + 2, "help", 5) == 0) {
                         nettest2_print_help();
@@ -201 +208 @@
                         if (rc != EOK)
                                 return rc;
+                        
                         port = (uint16_t) value;
                 } else if (str_lcmp(argv[*index] + 2, "type=", 5) == 0) {
@@ -207 +215 @@
                         if (rc != EOK)
                                 return rc;
+                        
                         type = (sock_type_t) value;
                 } else if (str_lcmp(argv[*index] + 2, "verbose", 8) == 0) {
@@ -219 +228 @@
                 return EINVAL;
         }
-
+        
         return EOK;
 }
@@ -225 +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.
@@ -255 +244 @@
         for (index = 1; (index < argc - 1) || ((index == argc - 1) &&
             (argv[index][0] == '-')); ++index) {
-
                 /* Options should start with dash ('-') */
                 if (argv[index][0] == '-') {
@@ -266 +254 @@
                 }
         }
-
-        /* 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:
@@ -295 +310 @@
                 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;
-                }
-
-                address_in.sin_addr.s_addr = host2uint32_t_be(hinfo->addr.ipv4);
-        }
-
+        
         /* Check data buffer size. */
         if (size <= 0) {
@@ -315 +317 @@
                 size = 1024;
         }
-
+        
         /*
          * Prepare the buffer. Allocate size bytes plus one for terminating
          * null character.
          */
-        data = (char *) malloc(size + 1);
+        char *data = (char *) malloc(size + 1);
         if (!data) {
                 fprintf(stderr, "Failed to allocate data buffer.\n");
                 return ENOMEM;
         }
-
+        
         /* Fill buffer with a pattern. */
         nettest2_fill_buffer(data, size);
-
+        
         /* Check socket count. */
         if (sockets <= 0) {
@@ -335 +337 @@
                 sockets = 2;
         }
-
+        
         /*
          * Prepare the socket buffer.
          * 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;
-
+        
         if (verbose)
                 printf("Starting tests\n");
-
+        
         rc = sockets_create(verbose, socket_ids, sockets, family, type);
         if (rc != EOK)
                 return rc;
-
+        
         if (type == SOCK_STREAM) {
                 rc = sockets_connect(verbose, socket_ids, sockets,
@@ -360 +363 @@
                         return rc;
         }
-
+        
         if (verbose)
                 printf("\n");
-
+        
+        struct timeval time_before;
         rc = gettimeofday(&time_before, NULL);
         if (rc != EOK) {
@@ -369 +373 @@
                 return rc;
         }
-
+        
         rc = sockets_sendto_recvfrom(verbose, socket_ids, sockets, address,
             &addrlen, data, size, messages);
         if (rc != EOK)
                 return rc;
-
+        
+        struct timeval time_after;
         rc = gettimeofday(&time_after, NULL);
         if (rc != EOK) {
@@ -380 +385 @@
                 return rc;
         }
-
+        
         if (verbose)
                 printf("\tOK\n");
-
+        
         printf("sendto + recvfrom tested in %ld microseconds\n",
             tv_sub(&time_after, &time_before));
-
+        
         rc = gettimeofday(&time_before, NULL);
         if (rc != EOK) {
@@ -392 +397 @@
                 return rc;
         }
-
+        
         rc = sockets_sendto(verbose, socket_ids, sockets, address, addrlen,
             data, size, messages);
         if (rc != EOK)
                 return rc;
-
+        
         rc = sockets_recvfrom(verbose, socket_ids, sockets, address, &addrlen,
             data, size, messages);
         if (rc != EOK)
                 return rc;
-
+        
         rc = gettimeofday(&time_after, NULL);
         if (rc != EOK) {
@@ -408 +413 @@
                 return rc;
         }
-
+        
         if (verbose)
                 printf("\tOK\n");
-
+        
         printf("sendto, recvfrom tested in %ld microseconds\n",
             tv_sub(&time_after, &time_before));
-
+        
         rc = sockets_close(verbose, socket_ids, sockets);
         if (rc != EOK)
                 return rc;
-
+        
         if (verbose)
                 printf("\nExiting\n");
-
+        
         return EOK;
 }