Index: uspace/app/nettest1/nettest.c =================================================================== --- uspace/app/nettest1/nettest.c (revision 1712f8702ff958482cbcb0e5e50e7f6cfd6b8887) +++ uspace/app/nettest1/nettest.c (revision 0bbef9b2d0308bb42a78be2b94f57733bbcb8bcc) @@ -36,6 +36,4 @@ #include -#include - #include @@ -87,7 +85,6 @@ int sockets_close(int verbose, int *socket_ids, int sockets) { - ERROR_DECLARE; - - int index; + int index; + int rc; if (verbose) @@ -97,8 +94,9 @@ for (index = 0; index < sockets; index++) { - if (ERROR_OCCURRED(closesocket(socket_ids[index]))) { + rc = closesocket(socket_ids[index]); + if (rc != EOK) { printf("Socket %d (%d) error:\n", index, socket_ids[index]); - socket_print_error(stderr, ERROR_CODE, "Socket close: ", "\n"); - return ERROR_CODE; + socket_print_error(stderr, rc, "Socket close: ", "\n"); + return rc; } if (verbose) @@ -121,7 +119,6 @@ int sockets_connect(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t addrlen) { - ERROR_DECLARE; - - int index; + int index; + int rc; if (verbose) @@ -131,7 +128,8 @@ for (index = 0; index < sockets; index++) { - if (ERROR_OCCURRED(connect(socket_ids[index], address, addrlen))) { - socket_print_error(stderr, ERROR_CODE, "Socket connect: ", "\n"); - return ERROR_CODE; + rc = connect(socket_ids[index], address, addrlen); + if (rc != EOK) { + socket_print_error(stderr, rc, "Socket connect: ", "\n"); + return rc; } if (verbose) @@ -157,8 +155,7 @@ int sockets_sendto(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t addrlen, char *data, int size, int messages) { - ERROR_DECLARE; - int index; int message; + int rc; if (verbose) @@ -169,8 +166,9 @@ for (index = 0; index < sockets; index++) { for (message = 0; message < messages; message++) { - if (ERROR_OCCURRED(sendto(socket_ids[index], data, size, 0, address, addrlen))) { - printf("Socket %d (%d), message %d error:\n", index, socket_ids[index], message); - socket_print_error(stderr, ERROR_CODE, "Socket send: ", "\n"); - return ERROR_CODE; + rc = sendto(socket_ids[index], data, size, 0, address, addrlen); + if (rc != EOK) { + printf("Socket %d (%d), message %d error:\n", index, socket_ids[index], message); + socket_print_error(stderr, rc, "Socket send: ", "\n"); + return rc; } } @@ -239,9 +237,8 @@ int sockets_sendto_recvfrom(int verbose, int *socket_ids, int sockets, struct sockaddr *address, socklen_t *addrlen, char *data, int size, int messages) { - ERROR_DECLARE; - int value; int index; int message; + int rc; if (verbose) @@ -252,8 +249,9 @@ for (index = 0; index < sockets; index++) { for (message = 0; message < messages; message++) { - if (ERROR_OCCURRED(sendto(socket_ids[index], data, size, 0, address, *addrlen))) { - printf("Socket %d (%d), message %d error:\n", index, socket_ids[index], message); - socket_print_error(stderr, ERROR_CODE, "Socket send: ", "\n"); - return ERROR_CODE; + rc = sendto(socket_ids[index], data, size, 0, address, *addrlen); + if (rc != EOK) { + printf("Socket %d (%d), message %d error:\n", index, socket_ids[index], message); + socket_print_error(stderr, rc, "Socket send: ", "\n"); + return rc; } value = recvfrom(socket_ids[index], data, size, 0, address, addrlen); Index: uspace/app/nettest1/nettest1.c =================================================================== --- uspace/app/nettest1/nettest1.c (revision 1712f8702ff958482cbcb0e5e50e7f6cfd6b8887) +++ uspace/app/nettest1/nettest1.c (revision 0bbef9b2d0308bb42a78be2b94f57733bbcb8bcc) @@ -44,5 +44,4 @@ #include #include -#include #include @@ -57,4 +56,13 @@ /** Packet data pattern. */ #define NETTEST1_TEXT "Networking test 1 - sockets" + +int family = PF_INET; +sock_type_t type = SOCK_DGRAM; +char *data; +size_t size = 27; +int verbose = 0; + +struct sockaddr *address; +socklen_t addrlen; static void nettest1_print_help(void) @@ -108,31 +116,86 @@ } +static int nettest1_test(int *socket_ids, int nsockets, int nmessages) +{ + int rc; + + if (verbose) + printf("%d sockets, %d messages\n", nsockets, nmessages); + + rc = sockets_create(verbose, socket_ids, nsockets, family, type); + if (rc != EOK) + return rc; + + if (type == SOCK_STREAM) { + rc = sockets_connect(verbose, socket_ids, nsockets, address, addrlen); + if (rc != EOK) + return rc; + } + + rc = sockets_sendto_recvfrom(verbose, socket_ids, nsockets, address, &addrlen, data, size, nmessages); + if (rc != EOK) + return rc; + + rc = sockets_close(verbose, socket_ids, nsockets); + if (rc != EOK) + return rc; + + if (verbose) + printf("\tOK\n"); + + /****/ + + rc = sockets_create(verbose, socket_ids, nsockets, family, type); + if (rc != EOK) + return rc; + + if (type == SOCK_STREAM) { + rc = sockets_connect(verbose, socket_ids, nsockets, address, addrlen); + if (rc != EOK) + return rc; + } + + rc = sockets_sendto(verbose, socket_ids, nsockets, address, addrlen, data, size, nmessages); + if (rc != EOK) + return rc; + + rc = sockets_recvfrom(verbose, socket_ids, nsockets, address, &addrlen, data, size, nmessages); + if (rc != EOK) + return rc; + + rc = sockets_close(verbose, socket_ids, nsockets); + if (rc != EOK) + return rc; + + if (verbose) + printf("\tOK\n"); + + return EOK; +} int main(int argc, char *argv[]) { - ERROR_DECLARE; - - size_t size = 27; - 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; + socklen_t max_length; + uint8_t *address_data[sizeof(struct sockaddr_in6)]; + struct sockaddr_in *address_in; + struct sockaddr_in6 *address_in6; uint8_t *address_start; int *socket_ids; - char *data; int value; int index; struct timeval time_before; struct timeval time_after; + + int rc; + + max_length = sizeof(address_data); + address = (struct sockaddr *) address_data; + address_in = (struct sockaddr_in *) address; + address_in6 = (struct sockaddr_in6 *) address; // parse the command line arguments @@ -144,26 +207,37 @@ // short options with only one letter case 'f': - ERROR_PROPAGATE(arg_parse_name_int(argc, argv, &index, &family, 0, socket_parse_protocol_family)); + rc = arg_parse_name_int(argc, argv, &index, &family, 0, socket_parse_protocol_family); + if (rc != EOK) + return rc; break; case 'h': nettest1_print_help(); return EOK; - break; case 'm': - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &messages, 0)); + rc = arg_parse_int(argc, argv, &index, &messages, 0); + if (rc != EOK) + return rc; break; case 'n': - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &sockets, 0)); + rc = arg_parse_int(argc, argv, &index, &sockets, 0); + if (rc != EOK) + return rc; break; case 'p': - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 0)); + rc = arg_parse_int(argc, argv, &index, &value, 0); + if (rc != EOK) + return rc; port = (uint16_t) value; break; case 's': - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 0)); + rc = arg_parse_int(argc, argv, &index, &value, 0); + if (rc != EOK) + return rc; 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)); + rc = arg_parse_name_int(argc, argv, &index, &value, 0, socket_parse_socket_type); + if (rc != EOK) + return rc; type = (sock_type_t) value; break; @@ -174,17 +248,27 @@ 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)); + rc = arg_parse_name_int(argc, argv, &index, &family, 9, socket_parse_protocol_family); + if (rc != EOK) + return rc; } else if (str_lcmp(argv[index] + 2, "help", 5) == 0) { nettest1_print_help(); return EOK; } else if (str_lcmp(argv[index] + 2, "messages=", 6) == 0) { - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &messages, 8)); + rc = arg_parse_int(argc, argv, &index, &messages, 8); + if (rc != EOK) + return rc; } else if (str_lcmp(argv[index] + 2, "sockets=", 6) == 0) { - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &sockets, 8)); + rc = arg_parse_int(argc, argv, &index, &sockets, 8); + if (rc != EOK) + return rc; } else if (str_lcmp(argv[index] + 2, "port=", 5) == 0) { - ERROR_PROPAGATE(arg_parse_int(argc, argv, &index, &value, 7)); + rc = arg_parse_int(argc, argv, &index, &value, 7); + if (rc != EOK) + return rc; 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)); + rc = arg_parse_name_int(argc, argv, &index, &value, 7, socket_parse_socket_type); + if (rc != EOK) + return rc; type = (sock_type_t) value; } else if (str_lcmp(argv[index] + 2, "verbose", 8) == 0) { @@ -233,7 +317,8 @@ // 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; + rc = inet_pton(family, argv[argc - 1], address_start); + if (rc != EOK) { + fprintf(stderr, "Address parse error %d\n", rc); + return rc; } @@ -271,104 +356,20 @@ printf("Starting tests\n"); - if (verbose) - printf("1 socket, 1 message\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_create(verbose, socket_ids, 1, family, type)); - ERROR_PROPAGATE(sockets_close(verbose, socket_ids, 1)); - if (verbose) - printf("\tOK\n"); - - ERROR_PROPAGATE(sockets_create(verbose, socket_ids, 1, family, type)); - if (type == SOCK_STREAM) - ERROR_PROPAGATE(sockets_connect(verbose, socket_ids, 1, address, addrlen)); - ERROR_PROPAGATE(sockets_sendto_recvfrom(verbose, socket_ids, 1, address, &addrlen, data, size, 1)); - ERROR_PROPAGATE(sockets_close(verbose, socket_ids, 1)); - if (verbose) - printf("\tOK\n"); - - ERROR_PROPAGATE(sockets_create(verbose, socket_ids, 1, family, type)); - if (type == SOCK_STREAM) - ERROR_PROPAGATE(sockets_connect(verbose, socket_ids, 1, address, addrlen)); - ERROR_PROPAGATE(sockets_sendto(verbose, socket_ids, 1, address, addrlen, data, size, 1)); - ERROR_PROPAGATE(sockets_recvfrom(verbose, socket_ids, 1, address, &addrlen, data, size, 1)); - ERROR_PROPAGATE(sockets_close(verbose, socket_ids, 1)); - if (verbose) - printf("\tOK\n"); - - if (verbose) - printf("1 socket, %d messages\n", messages); - - ERROR_PROPAGATE(sockets_create(verbose, socket_ids, 1, family, type)); - if (type == SOCK_STREAM) - ERROR_PROPAGATE(sockets_connect(verbose, socket_ids, 1, address, addrlen)); - ERROR_PROPAGATE(sockets_sendto_recvfrom(verbose, socket_ids, 1, address, &addrlen, data, size, messages)); - ERROR_PROPAGATE(sockets_close(verbose, socket_ids, 1)); - if (verbose) - printf("\tOK\n"); - - ERROR_PROPAGATE(sockets_create(verbose, socket_ids, 1, family, type)); - if (type == SOCK_STREAM) - ERROR_PROPAGATE(sockets_connect(verbose, socket_ids, 1, address, addrlen)); - ERROR_PROPAGATE(sockets_sendto(verbose, socket_ids, 1, address, addrlen, data, size, messages)); - ERROR_PROPAGATE(sockets_recvfrom(verbose, socket_ids, 1, address, &addrlen, data, size, messages)); - ERROR_PROPAGATE(sockets_close(verbose, socket_ids, 1)); - if (verbose) - printf("\tOK\n"); - - if (verbose) - printf("%d sockets, 1 message\n", sockets); - - ERROR_PROPAGATE(sockets_create(verbose, socket_ids, sockets, family, type)); - ERROR_PROPAGATE(sockets_close(verbose, socket_ids, sockets)); - if (verbose) - printf("\tOK\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)); - ERROR_PROPAGATE(sockets_sendto_recvfrom(verbose, socket_ids, sockets, address, &addrlen, data, size, 1)); - ERROR_PROPAGATE(sockets_close(verbose, socket_ids, sockets)); - if (verbose) - printf("\tOK\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)); - ERROR_PROPAGATE(sockets_sendto(verbose, socket_ids, sockets, address, addrlen, data, size, 1)); - ERROR_PROPAGATE(sockets_recvfrom(verbose, socket_ids, sockets, address, &addrlen, data, size, 1)); - ERROR_PROPAGATE(sockets_close(verbose, socket_ids, sockets)); - if (verbose) - printf("\tOK\n"); - - if (verbose) - printf("%d sockets, %d messages\n", sockets, messages); - - ERROR_PROPAGATE(sockets_create(verbose, socket_ids, sockets, family, type)); - if (type == SOCK_STREAM) - ERROR_PROPAGATE(sockets_connect(verbose, socket_ids, sockets, address, addrlen)); - ERROR_PROPAGATE(sockets_sendto_recvfrom(verbose, socket_ids, sockets, address, &addrlen, data, size, messages)); - ERROR_PROPAGATE(sockets_close(verbose, socket_ids, sockets)); - if (verbose) - printf("\tOK\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)); - 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)); - ERROR_PROPAGATE(sockets_close(verbose, socket_ids, sockets)); - - 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"); + rc = gettimeofday(&time_before, NULL); + if (rc != EOK) { + fprintf(stderr, "Get time of day error %d\n", rc); + return rc; + } + + nettest1_test(socket_ids, 1, 1); + nettest1_test(socket_ids, 1, messages); + nettest1_test(socket_ids, sockets, 1); + nettest1_test(socket_ids, sockets, messages); + + rc = gettimeofday(&time_after, NULL); + if (rc != EOK) { + fprintf(stderr, "Get time of day error %d\n", rc); + return rc; + } printf("Tested in %d microseconds\n", tv_sub(&time_after, &time_before));