From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C1F1BA0350; Mon, 29 Jun 2020 07:23:10 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 852151B5E1; Mon, 29 Jun 2020 07:23:09 +0200 (CEST) Received: from mail-il1-f193.google.com (mail-il1-f193.google.com [209.85.166.193]) by dpdk.org (Postfix) with ESMTP id 999392C01 for ; Mon, 29 Jun 2020 07:23:08 +0200 (CEST) Received: by mail-il1-f193.google.com with SMTP id r12so6140800ilh.4 for ; Sun, 28 Jun 2020 22:23:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=emumba-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=fpsONIgRxRTZuuFbYAIlQvjzIongSxkDoztDcOoDTLA=; b=lQoWDwZYoRr3Veuof0Vt8Wj5zzZXNo0LAsF5GCXsyKIrmpvXV/U4GQh3wgbdBECdCf zYmHyJuG5KoMwMYbv6V6NOsPWuU91kj/rjAAKd4l5Bz+xDK9+PYeCHBtm1i7UkKGOSEs Ak/oSPfMhxNNEG7Yk68xX4qD57DDvE4cFk2dI47dFtmqHS/+f4cwb1ZswYpblLzWxekA lCFmbqarVpPpadsPDTwD4dyO70qV4G/veaRntFfBsIC4OXZd5TFD+spiT7dvAO70tmGf vmiYDAkWINXBMgnt9WvK9hasyoq1kJYOvssOr4mPs8OX7GzRjlFsCDZs2dqh+y6G/6O+ lmIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=fpsONIgRxRTZuuFbYAIlQvjzIongSxkDoztDcOoDTLA=; b=CQ/IvSVXkA/uzOHDm3WoF7fpXVEx9W0viwqKM737rXv3r0o2uB/cg3ZDXcYRdV/CAo 7uenOd4F1Mwa48hOYie5BB/9d/iBrJWG7q0jY7A3wZv6oaoi3Ta8yRiOVRfpnnfbqYAo AAibZsKHKn2A+UB6auyp0tSxFNdAf8KNrTeCiExdGk/tFdLsp2YYXt5Z0O0Tsq4U2NUe DGOnwN+xr27aMmSQVlBdVzvkefInz4ADuWITgtvFVcgSdXL7nOT0OsuR6oTYG0/aaBT8 eijDJbT3fd4clzHzHns+uDOYk/kU30ETpx5VoP9djMGcuaEZgO7wfQ7tOijZKUB0iweR 5uAg== X-Gm-Message-State: AOAM533QJCKHDqXgM7tYy5eXvym/DyFncPfiZmE0bCk6//ngVRcghJln jG0oZ2meHsBXnMLS/rtDy3kpppnubxzst5S4B2pu/A== X-Google-Smtp-Source: ABdhPJzpwSSWXKtgeMY7QnMU2Ox9MY8Ylt5nQkPeBM+5x+fdEZs7s6SWQ3xqFV4+PdivQ5qNsOOJwB1OEJlpGsMWTcU= X-Received: by 2002:a92:5f12:: with SMTP id t18mr14709499ilb.267.1593408187970; Sun, 28 Jun 2020 22:23:07 -0700 (PDT) MIME-Version: 1.0 References: <20200608075836.3609-1-ibtisam.tariq@emumba.com> <20200608075836.3609-3-ibtisam.tariq@emumba.com> In-Reply-To: From: Ibtisam Tariq Date: Mon, 29 Jun 2020 10:22:56 +0500 Message-ID: To: "Ananyev, Konstantin" Cc: "Singh, Jasvinder" , "Dumitrescu, Cristian" , "Nicolau, Radu" , "akhil.goyal@nxp.com" , "dev@dpdk.org" , "Zhang, Roy Fan" Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [dpdk-dev] [PATCH v2 3/3] examples/ipsec-secgw: Remove the re-implementation of inet_pton 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" Thank you Ananyev. I will update it and send it after testing on freebsd. On Mon, Jun 22, 2020 at 5:17 PM Ananyev, Konstantin < konstantin.ananyev@intel.com> wrote: > > > > > > inet_pton4 and inet_pton6 was reimplemented. Replace implementation of > > inet_pton4 and inet_pton6 with libc inet_pton function > > > > Bugzilla ID: 365 > > Fixes: 0d547ed03717 ("examples/ipsec-secgw: support configuration file") > > Cc: roy.fan.zhang@intel.com > > > > Reported-by: David Marchand > > Signed-off-by: Ibtisam Tariq > > LGTM > One thing to address - freebsd build is failing: > http://mails.dpdk.org/archives/test-report/2020-June/134949.html > Presumably extra include ( ?) is missing. > > > --- > > v2: > > * Fixed the name of variable, passed as input to inet_pton function. > > * Add fixed id in commit body > > --- > > examples/ipsec-secgw/parser.c | 171 +--------------------------------- > > 1 file changed, 3 insertions(+), 168 deletions(-) > > > > diff --git a/examples/ipsec-secgw/parser.c > b/examples/ipsec-secgw/parser.c > > index 65eb7e9e2..58ef3de0a 100644 > > --- a/examples/ipsec-secgw/parser.c > > +++ b/examples/ipsec-secgw/parser.c > > @@ -10,6 +10,7 @@ > > #include > > #include > > #include > > +#include > > > > #include "ipsec.h" > > #include "parser.h" > > @@ -39,172 +40,6 @@ parse_tokenize_string(char *string, char *tokens[], > uint32_t *n_tokens) > > return 0; > > } > > > > -#define INADDRSZ 4 > > -#define IN6ADDRSZ 16 > > - > > -/* int > > - * inet_pton4(src, dst) > > - * like inet_aton() but without all the hexadecimal and shorthand. > > - * return: > > - * 1 if `src' is a valid dotted quad, else 0. > > - * notice: > > - * does not touch `dst' unless it's returning 1. > > - * author: > > - * Paul Vixie, 1996. > > - */ > > -static int > > -inet_pton4(const char *src, unsigned char *dst) > > -{ > > - static const char digits[] = "0123456789"; > > - int saw_digit, octets, ch; > > - unsigned char tmp[INADDRSZ], *tp; > > - > > - saw_digit = 0; > > - octets = 0; > > - *(tp = tmp) = 0; > > - while ((ch = *src++) != '\0') { > > - const char *pch; > > - > > - pch = strchr(digits, ch); > > - if (pch != NULL) { > > - unsigned int new = *tp * 10 + (pch - digits); > > - > > - if (new > 255) > > - return 0; > > - if (!saw_digit) { > > - if (++octets > 4) > > - return 0; > > - saw_digit = 1; > > - } > > - *tp = (unsigned char)new; > > - } else if (ch == '.' && saw_digit) { > > - if (octets == 4) > > - return 0; > > - *++tp = 0; > > - saw_digit = 0; > > - } else > > - return 0; > > - } > > - if (octets < 4) > > - return 0; > > - > > - memcpy(dst, tmp, INADDRSZ); > > - return 1; > > -} > > - > > -/* int > > - * inet_pton6(src, dst) > > - * convert presentation level address to network order binary form. > > - * return: > > - * 1 if `src' is a valid [RFC1884 2.2] address, else 0. > > - * notice: > > - * (1) does not touch `dst' unless it's returning 1. > > - * (2) :: in a full address is silently ignored. > > - * credit: > > - * inspired by Mark Andrews. > > - * author: > > - * Paul Vixie, 1996. > > - */ > > -static int > > -inet_pton6(const char *src, unsigned char *dst) > > -{ > > - static const char xdigits_l[] = "0123456789abcdef", > > - xdigits_u[] = "0123456789ABCDEF"; > > - unsigned char tmp[IN6ADDRSZ], *tp = 0, *endp = 0, *colonp = 0; > > - const char *xdigits = 0, *curtok = 0; > > - int ch = 0, saw_xdigit = 0, count_xdigit = 0; > > - unsigned int val = 0; > > - unsigned dbloct_count = 0; > > - > > - memset((tp = tmp), '\0', IN6ADDRSZ); > > - endp = tp + IN6ADDRSZ; > > - colonp = NULL; > > - /* Leading :: requires some special handling. */ > > - if (*src == ':') > > - if (*++src != ':') > > - return 0; > > - curtok = src; > > - saw_xdigit = count_xdigit = 0; > > - val = 0; > > - > > - while ((ch = *src++) != '\0') { > > - const char *pch; > > - > > - pch = strchr((xdigits = xdigits_l), ch); > > - if (pch == NULL) > > - pch = strchr((xdigits = xdigits_u), ch); > > - if (pch != NULL) { > > - if (count_xdigit >= 4) > > - return 0; > > - val <<= 4; > > - val |= (pch - xdigits); > > - if (val > 0xffff) > > - return 0; > > - saw_xdigit = 1; > > - count_xdigit++; > > - continue; > > - } > > - if (ch == ':') { > > - curtok = src; > > - if (!saw_xdigit) { > > - if (colonp) > > - return 0; > > - colonp = tp; > > - continue; > > - } else if (*src == '\0') { > > - return 0; > > - } > > - if (tp + sizeof(int16_t) > endp) > > - return 0; > > - *tp++ = (unsigned char) ((val >> 8) & 0xff); > > - *tp++ = (unsigned char) (val & 0xff); > > - saw_xdigit = 0; > > - count_xdigit = 0; > > - val = 0; > > - dbloct_count++; > > - continue; > > - } > > - if (ch == '.' && ((tp + INADDRSZ) <= endp) && > > - inet_pton4(curtok, tp) > 0) { > > - tp += INADDRSZ; > > - saw_xdigit = 0; > > - dbloct_count += 2; > > - break; /* '\0' was seen by inet_pton4(). */ > > - } > > - return 0; > > - } > > - if (saw_xdigit) { > > - if (tp + sizeof(int16_t) > endp) > > - return 0; > > - *tp++ = (unsigned char) ((val >> 8) & 0xff); > > - *tp++ = (unsigned char) (val & 0xff); > > - dbloct_count++; > > - } > > - if (colonp != NULL) { > > - /* if we already have 8 double octets, having a colon > > - * means error */ > > - if (dbloct_count == 8) > > - return 0; > > - > > - /* > > - * Since some memmove()'s erroneously fail to handle > > - * overlapping regions, we'll do the shift by hand. > > - */ > > - const int n = tp - colonp; > > - int i; > > - > > - for (i = 1; i <= n; i++) { > > - endp[-i] = colonp[n - i]; > > - colonp[n - i] = 0; > > - } > > - tp = endp; > > - } > > - if (tp != endp) > > - return 0; > > - memcpy(dst, tmp, IN6ADDRSZ); > > - return 1; > > -} > > - > > int > > parse_ipv4_addr(const char *token, struct in_addr *ipv4, uint32_t *mask) > > { > > @@ -229,7 +64,7 @@ parse_ipv4_addr(const char *token, struct in_addr > *ipv4, uint32_t *mask) > > if (strlen(ip_str) >= INET_ADDRSTRLEN) > > return -EINVAL; > > > > - if (inet_pton4(ip_str, (unsigned char *)ipv4) != 1) > > + if (inet_pton(AF_INET, ip_str, ipv4) != 1) > > return -EINVAL; > > > > return 0; > > @@ -260,7 +95,7 @@ parse_ipv6_addr(const char *token, struct in6_addr > *ipv6, uint32_t *mask) > > if (strlen(ip_str) >= INET6_ADDRSTRLEN) > > return -EINVAL; > > > > - if (inet_pton6(ip_str, (unsigned char *)ipv6) != 1) > > + if (inet_pton(AF_INET6, ip_str, ipv6) != 1) > > return -EINVAL; > > > > return 0; > > -- > > 2.17.1 > > -- Regards, Ibtisam Tariq