Index: uspace/app/nettest2/nettest2.c =================================================================== --- uspace/app/nettest2/nettest2.c (revision 3d459fcecedd05c16f0147a90e81b3f544b21bc3) +++ uspace/app/nettest2/nettest2.c (revision 10b229fa61e2abbefde8b390c24e38124ec70b0d) @@ -28,10 +28,13 @@ /** @addtogroup nettest - * @{ + * @{ */ /** @file - * Networking test 2 application - transfer. - */ + * Networking test 2 application - transfer. + */ + +#include "nettest.h" +#include "print_error.h" #include @@ -49,254 +52,12 @@ #include -#include "nettest.h" -#include "print_error.h" - -/** Echo module name. - */ +/** Echo module name. */ #define NAME "Nettest2" -/** Packet data pattern. - */ +/** Packet data pattern. */ #define NETTEST2_TEXT "Networking test 2 - transfer" -/** Module entry point. - * Starts testing. - * @param[in] argc The number of command line parameters. - * @param[in] argv The command line parameters. - * @returns EOK on success. - */ -int main(int argc, char * argv[]); - -/** Prints the application help. - */ -void nettest2_print_help(void); - -/** Refreshes the data. - * Fills the data block with the NETTEST1_TEXT pattern. - * @param[out] data The data block. - * @param[in] size The data block size in bytes. - */ -void nettest2_refresh_data(char * data, size_t size); - -int main(int argc, char * argv[]){ - ERROR_DECLARE; - - size_t size = 28; - int verbose = 0; - sock_type_t type = SOCK_DGRAM; - int sockets = 10; - int messages = 10; - int family = PF_INET; - uint16_t port = 7; - - socklen_t max_length = sizeof(struct sockaddr_in6); - uint8_t address_data[max_length]; - struct sockaddr * address = (struct sockaddr *) address_data; - struct sockaddr_in * address_in = (struct sockaddr_in *) address; - struct sockaddr_in6 * address_in6 = (struct sockaddr_in6 *) address; - socklen_t addrlen; -// char address_string[INET6_ADDRSTRLEN]; - uint8_t * address_start; - - int * socket_ids; - char * data; - int value; - int index; - struct timeval time_before; - struct timeval time_after; - - // parse the command line arguments - // stop before the last argument if it does not start with the minus sign ('-') - for(index = 1; (index < argc - 1) || ((index == argc - 1) && (argv[index][0] == '-')); ++ index){ - // options should start with the minus sign ('-') - if(argv[index][0] == '-'){ - switch(argv[index][1]){ - // short options with only one letter - case 'f': - ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &family, 0, socket_parse_protocol_family)); - break; - case 'h': - nettest2_print_help(); - return EOK; - break; - case 'm': - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &messages, 0)); - break; - case 'n': - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &sockets, 0)); - break; - case 'p': - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 0)); - port = (uint16_t) value; - break; - case 's': - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 0)); - size = (value >= 0) ? (size_t) value : 0; - break; - case 't': - ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &value, 0, socket_parse_socket_type)); - type = (sock_type_t) value; - break; - case 'v': - verbose = 1; - break; - // long options with the double minus sign ('-') - case '-': - if(str_lcmp(argv[index] + 2, "family=", 7) == 0){ - ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &family, 9, socket_parse_protocol_family)); - }else if(str_lcmp(argv[index] + 2, "help", 5) == 0){ - nettest2_print_help(); - return EOK; - }else if(str_lcmp(argv[index] + 2, "messages=", 6) == 0){ - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &messages, 8)); - }else if(str_lcmp(argv[index] + 2, "sockets=", 6) == 0){ - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &sockets, 8)); - }else if(str_lcmp(argv[index] + 2, "port=", 5) == 0){ - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 7)); - port = (uint16_t) value; - }else if(str_lcmp(argv[index] + 2, "type=", 5) == 0){ - ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &value, 7, socket_parse_socket_type)); - type = (sock_type_t) value; - }else if(str_lcmp(argv[index] + 2, "verbose", 8) == 0){ - verbose = 1; - }else{ - nettest2_print_help(); - return EINVAL; - } - break; - default: - nettest2_print_help(); - return EINVAL; - } - }else{ - nettest2_print_help(); - return EINVAL; - } - } - - // if not before the last argument containing the address - if(index >= argc){ - printf("Command line error: missing address\n"); - nettest2_print_help(); - return EINVAL; - } - - // prepare the address buffer - bzero(address_data, max_length); - switch(family){ - case PF_INET: - address_in->sin_family = AF_INET; - address_in->sin_port = htons(port); - address_start = (uint8_t *) &address_in->sin_addr.s_addr; - addrlen = sizeof(struct sockaddr_in); - break; - case PF_INET6: - address_in6->sin6_family = AF_INET6; - address_in6->sin6_port = htons(port); - address_start = (uint8_t *) &address_in6->sin6_addr.s6_addr; - addrlen = sizeof(struct sockaddr_in6); - break; - default: - fprintf(stderr, "Address family is not supported\n"); - return EAFNOSUPPORT; - } - - // parse the last argument which should contain the address - if(ERROR_OCCURRED(inet_pton(family, argv[argc - 1], address_start))){ - fprintf(stderr, "Address parse error %d\n", ERROR_CODE); - return ERROR_CODE; - } - - // check the buffer size - if(size <= 0){ - fprintf(stderr, "Data buffer size too small (%d). Using 1024 bytes instead.\n", size); - size = 1024; - } - - // prepare the buffer - // size plus terminating null (\0) - data = (char *) malloc(size + 1); - if(! data){ - fprintf(stderr, "Failed to allocate data buffer.\n"); - return ENOMEM; - } - nettest2_refresh_data(data, size); - - // check the socket count - if(sockets <= 0){ - fprintf(stderr, "Socket count too small (%d). Using 2 instead.\n", sockets); - sockets = 2; - } - - // prepare the socket buffer - // count plus the terminating null (\0) - socket_ids = (int *) malloc(sizeof(int) * (sockets + 1)); - if(! socket_ids){ - fprintf(stderr, "Failed to allocate receive buffer.\n"); - return ENOMEM; - } - socket_ids[sockets] = NULL; - - if(verbose){ - printf("Starting tests\n"); - } - - ERROR_PROPAGATE(sockets_create(verbose, socket_ids, sockets, family, type)); - - if(type == SOCK_STREAM){ - ERROR_PROPAGATE(sockets_connect(verbose, socket_ids, sockets, address, addrlen)); - } - - if(verbose){ - printf("\n"); - } - - if(ERROR_OCCURRED(gettimeofday(&time_before, NULL))){ - fprintf(stderr, "Get time of day error %d\n", ERROR_CODE); - return ERROR_CODE; - } - - ERROR_PROPAGATE(sockets_sendto_recvfrom(verbose, socket_ids, sockets, address, &addrlen, data, size, messages)); - - if(ERROR_OCCURRED(gettimeofday(&time_after, NULL))){ - fprintf(stderr, "Get time of day error %d\n", ERROR_CODE); - return ERROR_CODE; - } - - if(verbose){ - printf("\tOK\n"); - } - - printf("sendto + recvfrom tested in %d microseconds\n", tv_sub(&time_after, &time_before)); - - if(ERROR_OCCURRED(gettimeofday(&time_before, NULL))){ - fprintf(stderr, "Get time of day error %d\n", ERROR_CODE); - return ERROR_CODE; - } - - ERROR_PROPAGATE(sockets_sendto(verbose, socket_ids, sockets, address, addrlen, data, size, messages)); - ERROR_PROPAGATE(sockets_recvfrom(verbose, socket_ids, sockets, address, &addrlen, data, size, messages)); - - if(ERROR_OCCURRED(gettimeofday(&time_after, NULL))){ - fprintf(stderr, "Get time of day error %d\n", ERROR_CODE); - return ERROR_CODE; - } - - if(verbose){ - printf("\tOK\n"); - } - - printf("sendto, recvfrom tested in %d microseconds\n", tv_sub(&time_after, &time_before)); - - ERROR_PROPAGATE(sockets_close(verbose, socket_ids, sockets)); - - if(verbose){ - printf("\nExiting\n"); - } - - return EOK; -} - -void nettest2_print_help(void){ +static void nettest2_print_help(void) +{ printf( "Network Networking test 2 aplication - UDP transfer\n" \ @@ -326,10 +87,18 @@ } -void nettest2_refresh_data(char * data, size_t size){ +/** Refreshes the data. + * + * Fills the data block with the NETTEST1_TEXT pattern. + * + * @param[out] data The data block. + * @param[in] size The data block size in bytes. + */ +static void nettest2_refresh_data(char *data, size_t size) +{ size_t length; // fill the data length = 0; - while(size > length + sizeof(NETTEST2_TEXT) - 1){ + while (size > length + sizeof(NETTEST2_TEXT) - 1) { memcpy(data + length, NETTEST2_TEXT, sizeof(NETTEST2_TEXT) - 1); length += sizeof(NETTEST2_TEXT) - 1; @@ -339,4 +108,218 @@ } + +int main(int argc, char *argv[]) +{ + ERROR_DECLARE; + + size_t size = 28; + int verbose = 0; + sock_type_t type = SOCK_DGRAM; + int sockets = 10; + int messages = 10; + int family = PF_INET; + uint16_t port = 7; + + socklen_t max_length = sizeof(struct sockaddr_in6); + uint8_t address_data[max_length]; + struct sockaddr *address = (struct sockaddr *) address_data; + struct sockaddr_in *address_in = (struct sockaddr_in *) address; + struct sockaddr_in6 *address_in6 = (struct sockaddr_in6 *) address; + socklen_t addrlen; + uint8_t *address_start; + + int *socket_ids; + char *data; + int value; + int index; + struct timeval time_before; + struct timeval time_after; + + // parse the command line arguments + // stop before the last argument if it does not start with the minus sign ('-') + for (index = 1; (index < argc - 1) || ((index == argc - 1) && (argv[index][0] == '-')); ++ index) { + // options should start with the minus sign ('-') + if (argv[index][0] == '-') { + switch(argv[index][1]){ + // short options with only one letter + case 'f': + ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &family, 0, socket_parse_protocol_family)); + break; + case 'h': + nettest2_print_help(); + return EOK; + break; + case 'm': + ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &messages, 0)); + break; + case 'n': + ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &sockets, 0)); + break; + case 'p': + ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 0)); + port = (uint16_t) value; + break; + case 's': + ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 0)); + size = (value >= 0) ? (size_t) value : 0; + break; + case 't': + ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &value, 0, socket_parse_socket_type)); + type = (sock_type_t) value; + break; + case 'v': + verbose = 1; + break; + // long options with the double minus sign ('-') + case '-': + if (str_lcmp(argv[index] + 2, "family=", 7) == 0) { + ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &family, 9, socket_parse_protocol_family)); + } else if (str_lcmp(argv[index] + 2, "help", 5) == 0) { + nettest2_print_help(); + return EOK; + } else if (str_lcmp(argv[index] + 2, "messages=", 6) == 0) { + ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &messages, 8)); + } else if (str_lcmp(argv[index] + 2, "sockets=", 6) == 0) { + ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &sockets, 8)); + } else if (str_lcmp(argv[index] + 2, "port=", 5) == 0) { + ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 7)); + port = (uint16_t) value; + } else if (str_lcmp(argv[index] + 2, "type=", 5) == 0) { + ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &value, 7, socket_parse_socket_type)); + type = (sock_type_t) value; + } else if (str_lcmp(argv[index] + 2, "verbose", 8) == 0) { + verbose = 1; + } else { + nettest2_print_help(); + return EINVAL; + } + break; + default: + nettest2_print_help(); + return EINVAL; + } + } else { + nettest2_print_help(); + return EINVAL; + } + } + + // if not before the last argument containing the address + if (index >= argc) { + printf("Command line error: missing address\n"); + nettest2_print_help(); + return EINVAL; + } + + // prepare the address buffer + bzero(address_data, max_length); + switch (family) { + case PF_INET: + address_in->sin_family = AF_INET; + address_in->sin_port = htons(port); + address_start = (uint8_t *) &address_in->sin_addr.s_addr; + addrlen = sizeof(struct sockaddr_in); + break; + case PF_INET6: + address_in6->sin6_family = AF_INET6; + address_in6->sin6_port = htons(port); + address_start = (uint8_t *) &address_in6->sin6_addr.s6_addr; + addrlen = sizeof(struct sockaddr_in6); + break; + default: + fprintf(stderr, "Address family is not supported\n"); + return EAFNOSUPPORT; + } + + // parse the last argument which should contain the address + if (ERROR_OCCURRED(inet_pton(family, argv[argc - 1], address_start))) { + fprintf(stderr, "Address parse error %d\n", ERROR_CODE); + return ERROR_CODE; + } + + // check the buffer size + if (size <= 0) { + fprintf(stderr, "Data buffer size too small (%d). Using 1024 bytes instead.\n", size); + size = 1024; + } + + // prepare the buffer + // size plus terminating null (\0) + data = (char *) malloc(size + 1); + if (!data) { + fprintf(stderr, "Failed to allocate data buffer.\n"); + return ENOMEM; + } + nettest2_refresh_data(data, size); + + // check the socket count + if (sockets <= 0) { + fprintf(stderr, "Socket count too small (%d). Using 2 instead.\n", sockets); + sockets = 2; + } + + // prepare the socket buffer + // count plus the terminating null (\0) + socket_ids = (int *) malloc(sizeof(int) * (sockets + 1)); + if (!socket_ids) { + fprintf(stderr, "Failed to allocate receive buffer.\n"); + return ENOMEM; + } + socket_ids[sockets] = NULL; + + if (verbose) + printf("Starting tests\n"); + + ERROR_PROPAGATE(sockets_create(verbose, socket_ids, sockets, family, type)); + + if (type == SOCK_STREAM) + ERROR_PROPAGATE(sockets_connect(verbose, socket_ids, sockets, address, addrlen)); + + if (verbose) + printf("\n"); + + if (ERROR_OCCURRED(gettimeofday(&time_before, NULL))) { + fprintf(stderr, "Get time of day error %d\n", ERROR_CODE); + return ERROR_CODE; + } + + ERROR_PROPAGATE(sockets_sendto_recvfrom(verbose, socket_ids, sockets, address, &addrlen, data, size, messages)); + + if (ERROR_OCCURRED(gettimeofday(&time_after, NULL))) { + fprintf(stderr, "Get time of day error %d\n", ERROR_CODE); + return ERROR_CODE; + } + + if (verbose) + printf("\tOK\n"); + + printf("sendto + recvfrom tested in %d microseconds\n", tv_sub(&time_after, &time_before)); + + if (ERROR_OCCURRED(gettimeofday(&time_before, NULL))) { + fprintf(stderr, "Get time of day error %d\n", ERROR_CODE); + return ERROR_CODE; + } + + ERROR_PROPAGATE(sockets_sendto(verbose, socket_ids, sockets, address, addrlen, data, size, messages)); + ERROR_PROPAGATE(sockets_recvfrom(verbose, socket_ids, sockets, address, &addrlen, data, size, messages)); + + if (ERROR_OCCURRED(gettimeofday(&time_after, NULL))) { + fprintf(stderr, "Get time of day error %d\n", ERROR_CODE); + return ERROR_CODE; + } + + if (verbose) + printf("\tOK\n"); + + printf("sendto, recvfrom tested in %d microseconds\n", tv_sub(&time_after, &time_before)); + + ERROR_PROPAGATE(sockets_close(verbose, socket_ids, sockets)); + + if (verbose) + printf("\nExiting\n"); + + return EOK; +} + /** @} */