From patchwork Mon Mar 9 12:42:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Medvedkin X-Patchwork-Id: 66451 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 34A5CA052E; Mon, 9 Mar 2020 13:43:02 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6BDAD1C0B2; Mon, 9 Mar 2020 13:42:39 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 3F1851C065 for ; Mon, 9 Mar 2020 13:42:35 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Mar 2020 05:42:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,533,1574150400"; d="scan'208";a="265243900" Received: from silpixa00400072.ir.intel.com ([10.237.222.213]) by fmsmga004.fm.intel.com with ESMTP; 09 Mar 2020 05:42:33 -0700 From: Vladimir Medvedkin To: dev@dpdk.org Date: Mon, 9 Mar 2020 12:42:22 +0000 Message-Id: <1583757743-375198-4-git-send-email-vladimir.medvedkin@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1583757743-375198-1-git-send-email-vladimir.medvedkin@intel.com> References: <1583757743-375198-1-git-send-email-vladimir.medvedkin@intel.com> Subject: [dpdk-dev] [PATCH 3/4] app/testfib: get rid of libresolv dependency X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Get rid of using inet_net_pton(). Implement it internally in the app. Signed-off-by: Vladimir Medvedkin --- app/test-fib/Makefile | 2 -- app/test-fib/main.c | 85 +++++++++++++++++++++++++-------------------------- 2 files changed, 41 insertions(+), 46 deletions(-) diff --git a/app/test-fib/Makefile b/app/test-fib/Makefile index 78b45fe..9da34eb 100644 --- a/app/test-fib/Makefile +++ b/app/test-fib/Makefile @@ -11,8 +11,6 @@ CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) CFLAGS += -DALLOW_EXPERIMENTAL_API -LDFLAGS += -lresolv - # all source are stored in SRCS-y SRCS-y := main.c diff --git a/app/test-fib/main.c b/app/test-fib/main.c index 7fd3420..5fb67f3 100644 --- a/app/test-fib/main.c +++ b/app/test-fib/main.c @@ -2,14 +2,10 @@ * Copyright(c) 2019 Intel Corporation */ -#include #include #include -#include -#include -#include -#include #include +#include #include #include @@ -444,46 +440,12 @@ gen_rnd_lookup_tbl(int af) } static int -parse_rt_4(FILE *f) -{ - int ret, i, j = 0; - char *s, *sp, *in[RT_NUM]; - static const char *dlm = " \t\n"; - int string_tok_nb = RTE_DIM(in); - struct rt_rule_4 *rt; - - rt = (struct rt_rule_4 *)config.rt; - - while (fgets(line, sizeof(line), f) != NULL) { - s = line; - for (i = 0; i != string_tok_nb; i++) { - in[i] = strtok_r(s, dlm, &sp); - if (in[i] == NULL) - return -EINVAL; - s = NULL; - } - - ret = inet_net_pton(AF_INET, in[RT_PREFIX], &rt[j].addr, - sizeof(rt[j].addr)); - if (ret == -1) - return -errno; - - rt[j].addr = rte_be_to_cpu_32(rt[j].addr); - rt[j].depth = ret; - config.nb_routes_per_depth[ret]++; - GET_CB_FIELD(in[RT_NEXTHOP], rt[j].nh, 0, - UINT32_MAX, 0); - j++; - } - return 0; -} - -static int -__inet_net_pton6(char *prefix, uint8_t *addr) +_inet_net_pton(int af, char *prefix, void *addr) { const char *dlm = "/"; char *s, *sp; int ret, depth; + unsigned max_depth; if ((prefix == NULL) || (addr == NULL)) return -EINVAL; @@ -492,17 +454,52 @@ __inet_net_pton6(char *prefix, uint8_t *addr) if (s == NULL) return -EINVAL; - ret = inet_pton(AF_INET6, s, addr); + ret = inet_pton(af, s, addr); if (ret != 1) return -errno; s = strtok_r(NULL, dlm, &sp); - GET_CB_FIELD(s, depth, 0, 128, 0); + max_depth = (af == AF_INET) ? 32 : 128; + GET_CB_FIELD(s, depth, 0, max_depth, 0); return depth; } static int +parse_rt_4(FILE *f) +{ + int ret, i, j = 0; + char *s, *sp, *in[RT_NUM]; + static const char *dlm = " \t\n"; + int string_tok_nb = RTE_DIM(in); + struct rt_rule_4 *rt; + + rt = (struct rt_rule_4 *)config.rt; + + while (fgets(line, sizeof(line), f) != NULL) { + s = line; + for (i = 0; i != string_tok_nb; i++) { + in[i] = strtok_r(s, dlm, &sp); + if (in[i] == NULL) + return -EINVAL; + s = NULL; + } + + ret = _inet_net_pton(AF_INET, in[RT_PREFIX], &rt[j].addr); + if (ret == -1) + return -errno; + + rt[j].addr = rte_be_to_cpu_32(rt[j].addr); + rt[j].depth = ret; + config.nb_routes_per_depth[ret]++; + GET_CB_FIELD(in[RT_NEXTHOP], rt[j].nh, 0, + UINT32_MAX, 0); + j++; + } + return 0; +} + +static int parse_rt_6(FILE *f) { int ret, i, j = 0; @@ -522,7 +519,7 @@ parse_rt_6(FILE *f) s = NULL; } - ret = __inet_net_pton6(in[RT_PREFIX], rt[j].addr); + ret = _inet_net_pton(AF_INET6, in[RT_PREFIX], rt[j].addr); if (ret < 0) return ret;