X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=app%2Ftest%2Ftest_cmdline_ipaddr.c;h=f540063508ae5139d8d42d8d13bc781dce48dd82;hb=7dc92d17298d8fd05a912606f02a094566ec0b3f;hp=471d2ff140578adb2720609deeb99e06248370bd;hpb=aaa662e75c23c61a1d79bd4d1f9f35b4967c39db;p=dpdk.git diff --git a/app/test/test_cmdline_ipaddr.c b/app/test/test_cmdline_ipaddr.c index 471d2ff140..f540063508 100644 --- a/app/test/test_cmdline_ipaddr.c +++ b/app/test/test_cmdline_ipaddr.c @@ -1,48 +1,9 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation */ - #include #include #include -#include - -#ifndef __linux__ -#ifndef __FreeBSD__ -#include -#else -#include -#endif -#endif #include @@ -51,7 +12,7 @@ #include "test_cmdline.h" -#define IP4(a,b,c,d) {((uint32_t)(((a) & 0xff)) | \ +#define IP4(a,b,c,d) {.s_addr = (uint32_t)(((a) & 0xff) | \ (((b) & 0xff) << 8) | \ (((c) & 0xff) << 16) | \ ((d) & 0xff) << 24)} @@ -61,7 +22,11 @@ /* create IPv6 address, swapping bytes where needed */ #ifndef s6_addr16 -# define s6_addr16 __u6_addr.__u6_addr16 +#ifdef RTE_EXEC_ENV_WINDOWS +#define s6_addr16 u.Word +#else +#define s6_addr16 __u6_addr.__u6_addr16 +#endif #endif #define IP6(a,b,c,d,e,f,g,h) .ipv6 = \ {.s6_addr16 = \ @@ -116,8 +81,6 @@ const struct ipaddr_str ipaddr_valid_strs[] = { CMDLINE_IPADDR_V4 | CMDLINE_IPADDR_NETWORK}, {"192.168.1.0/24", {AF_INET, {IP4(192,168,1,0)}, 24}, CMDLINE_IPADDR_V4 | CMDLINE_IPADDR_NETWORK}, - {"012.34.56.78/24", {AF_INET, {IP4(12,34,56,78)}, 24}, - CMDLINE_IPADDR_V4 | CMDLINE_IPADDR_NETWORK}, {"34.56.78.90/1", {AF_INET, {IP4(34,56,78,90)}, 1}, CMDLINE_IPADDR_V4 | CMDLINE_IPADDR_NETWORK}, {"::", {AF_INET6, {IP6(0,0,0,0,0,0,0,0)}, 0}, @@ -204,8 +167,6 @@ const char * ipaddr_garbage_network6_strs[] = { }; #define IPv6_GARBAGE_PREFIX 64 - - const char * ipaddr_invalid_strs[] = { /** IPv4 **/ @@ -293,26 +254,13 @@ const char * ipaddr_invalid_strs[] = { /** misc **/ /* too long */ - "1234:1234:1234:1234:1234:1234:1234:1234:1234:1234:1234" + "1234:1234:1234:1234:1234:1234:1234:1234:1234:1234:1234", "random invalid text", "", "\0", " ", }; -#define IPADDR_VALID_STRS_SIZE \ - (sizeof(ipaddr_valid_strs) / sizeof(ipaddr_valid_strs[0])) -#define IPADDR_GARBAGE_ADDR4_STRS_SIZE \ - (sizeof(ipaddr_garbage_addr4_strs) / sizeof(ipaddr_garbage_addr4_strs[0])) -#define IPADDR_GARBAGE_ADDR6_STRS_SIZE \ - (sizeof(ipaddr_garbage_addr6_strs) / sizeof(ipaddr_garbage_addr6_strs[0])) -#define IPADDR_GARBAGE_NETWORK4_STRS_SIZE \ - (sizeof(ipaddr_garbage_network4_strs) / sizeof(ipaddr_garbage_network4_strs[0])) -#define IPADDR_GARBAGE_NETWORK6_STRS_SIZE \ - (sizeof(ipaddr_garbage_network6_strs) / sizeof(ipaddr_garbage_network6_strs[0])) -#define IPADDR_INVALID_STRS_SIZE \ - (sizeof(ipaddr_invalid_strs) / sizeof(ipaddr_invalid_strs[0])) - static void dump_addr(cmdline_ipaddr_t addr) { @@ -405,7 +353,7 @@ test_parse_ipaddr_valid(void) } /* test valid strings */ - for (i = 0; i < IPADDR_VALID_STRS_SIZE; i++) { + for (i = 0; i < RTE_DIM(ipaddr_valid_strs); i++) { /* test each valid string against different flags */ for (flags = 1; flags < 0x8; flags++) { @@ -453,7 +401,7 @@ test_parse_ipaddr_valid(void) } /* test garbage ipv4 address strings */ - for (i = 0; i < IPADDR_GARBAGE_ADDR4_STRS_SIZE; i++) { + for (i = 0; i < RTE_DIM(ipaddr_garbage_addr4_strs); i++) { struct in_addr tmp = IPv4_GARBAGE_ADDR; @@ -495,7 +443,7 @@ test_parse_ipaddr_valid(void) } /* test garbage ipv6 address strings */ - for (i = 0; i < IPADDR_GARBAGE_ADDR6_STRS_SIZE; i++) { + for (i = 0; i < RTE_DIM(ipaddr_garbage_addr6_strs); i++) { cmdline_ipaddr_t tmp = {.addr = IPv6_GARBAGE_ADDR}; @@ -538,7 +486,7 @@ test_parse_ipaddr_valid(void) /* test garbage ipv4 network strings */ - for (i = 0; i < IPADDR_GARBAGE_NETWORK4_STRS_SIZE; i++) { + for (i = 0; i < RTE_DIM(ipaddr_garbage_network4_strs); i++) { struct in_addr tmp = IPv4_GARBAGE_ADDR; @@ -580,7 +528,7 @@ test_parse_ipaddr_valid(void) } /* test garbage ipv6 address strings */ - for (i = 0; i < IPADDR_GARBAGE_NETWORK6_STRS_SIZE; i++) { + for (i = 0; i < RTE_DIM(ipaddr_garbage_network6_strs); i++) { cmdline_ipaddr_t tmp = {.addr = IPv6_GARBAGE_ADDR}; @@ -637,7 +585,7 @@ test_parse_ipaddr_invalid_data(void) memset(&result, 0, sizeof(result)); /* test invalid strings */ - for (i = 0; i < IPADDR_INVALID_STRS_SIZE; i++) { + for (i = 0; i < RTE_DIM(ipaddr_invalid_strs); i++) { /* test each valid string against different flags */ for (flags = 1; flags < 0x8; flags++) {