From patchwork Thu Jul 9 10:38:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ibtisam Tariq X-Patchwork-Id: 73637 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 A85A2A0528; Thu, 9 Jul 2020 12:41:30 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 885461DCCF; Thu, 9 Jul 2020 12:41:30 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 25C4A1DCC2 for ; Thu, 9 Jul 2020 12:41:29 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id f2so1800952wrp.7 for ; Thu, 09 Jul 2020 03:41:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=emumba-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Tf6e0Ti9TRv7WbqI4vY+ZzP0fqh1Prk4kgMtNTCmJ6Q=; b=BU7Ot/5kG1RdvxeeyxyXv1hLrec/ejuDTxvADAuOYnnvkAbMP9aICpRdERJSXKO+Nk nMEC+15NN8wsEPYs1v4VOh6Wg6tLcC2wfDoVLIG7E2hxw7mNXc7itA8bnuX/1O2Vt2cW kHbjzf4HLq6m7G9pEvL5PjYAsI78vkqwlXvoDh/sCx2Ih63Yq91jqGyDJcJgAJFke/uh 2CIr84bkn+1rpNjd/Y/j5zyyLo5Au2HqwHlaFw6nhhT1xq/AbPcurkrE70ECsdVwFPzn /bn/J6c7EgURxamathI8usYBH1LMrRsXuSfxyKGFnbuhdsBhxs0AWYS+FhAHv3Pf3tjW zazg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Tf6e0Ti9TRv7WbqI4vY+ZzP0fqh1Prk4kgMtNTCmJ6Q=; b=sVk7EbQCADBiiUfp4E4ERAYx+Ip0RwgSLLa7VQgrew+4gThHSKQckPUETGWxkgsLj1 ulHNojXWrpO+LaKb8uxeKgtVto/rLqfMdGjALVSOKdgwlzKjnaOlPbvvEH3GMiOfMsmY NubKOh8qVYJrFydkRmChKI8sjJwR9XCB3SHfrN0WMV4Xjvo5L+xabsLGsqhNhej7h4NE byWcm0xN0wLCjsQ9WaV0We9p3y0UrOsYLvDWUhl3OyH+NWOwd1OvrSwpDUg4a52BZ08x prMQHU18FO8NB9DYIopp/37ufKlJXBJGHHIf96JkT8HlT4Sxem51+tr2NJSO4CILXSLv pS1Q== X-Gm-Message-State: AOAM533D7868jLC+KlPeXljOCa9zy27sqp3js9YllIebOB9krAkJ8+mz Ssd26tKwFCSeoF+jKum1Q8x7EfJBNd2w5axF X-Google-Smtp-Source: ABdhPJzLMVvGKyyvqG5a0rmE6K6G6KKcSCYNV2WNNrGcz9eDLVecsHhaq5V8LmKNTj9rcM8UmJ0I0w== X-Received: by 2002:a5d:4991:: with SMTP id r17mr35007108wrq.1.1594291288842; Thu, 09 Jul 2020 03:41:28 -0700 (PDT) Received: from localhost.localdomain ([39.33.130.90]) by smtp.gmail.com with ESMTPSA id w128sm4198534wmb.19.2020.07.09.03.41.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 03:41:28 -0700 (PDT) From: Ibtisam Tariq To: jasvinder.singh@intel.com, cristian.dumitrescu@intel.com, radu.nicolau@intel.com, akhil.goyal@nxp.com Cc: dev@dpdk.org, Ibtisam Tariq , roy.fan.zhang@intel.com Date: Thu, 9 Jul 2020 10:38:37 +0000 Message-Id: <20200709103837.12393-3-ibtisam.tariq@emumba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200709103837.12393-1-ibtisam.tariq@emumba.com> References: <20200608075836.3609-3-ibtisam.tariq@emumba.com> <20200709103837.12393-1-ibtisam.tariq@emumba.com> Subject: [dpdk-dev] [PATCH v3 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" 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 --- v3: * Added header file for FreeBSD. v2: * Fixed the name of variable, passed as input to inet_pton function. * Added 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;