From patchwork Wed Apr 22 12:57:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ibtisam Tariq X-Patchwork-Id: 69105 X-Patchwork-Delegate: gakhil@marvell.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 9BCDDA00C2; Wed, 22 Apr 2020 14:57:57 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2E5181D622; Wed, 22 Apr 2020 14:57:57 +0200 (CEST) Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com [209.85.208.194]) by dpdk.org (Postfix) with ESMTP id 5C92F1D61F for ; Wed, 22 Apr 2020 14:57:56 +0200 (CEST) Received: by mail-lj1-f194.google.com with SMTP id y4so2158467ljn.7 for ; Wed, 22 Apr 2020 05:57:56 -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; bh=1ji4HraDM/9oyLNFclyrChpgkyCluV2TngQ+Utkh1u8=; b=cpxz05PYG5HgEygtmUDoBSRwLPjOwbwD1Mqxsip1XF0zkN2MYvWt7zexVtuzl/Y2ne q8lSUEIDK2U28UnQYn4Z1KO7o0ah6B+AKdXLHYDYcJhxF9amhBGS52JNjx6jb8yXzbiQ ISzO9ZNTX1hoduoo5ST4OXZFZZpgMipR4dzx6gRnx06Vf5zpoqlKynrLBREdzKntqIwp fvDyMnhUwYF+RQMo3QK+AGsY0RoNbz+dSoU83eQndhmhdAELWN69QAeQRqnoKrlHXqXg Ggz3rgnFIu/6OiSyqXQNG5x49V7Ra/epRLJ5t5S8k/fxCpebQ9vnrF8w0fMhOWItS84e wmfw== 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; bh=1ji4HraDM/9oyLNFclyrChpgkyCluV2TngQ+Utkh1u8=; b=MLQxR4CDyZ9OjysSU1i4UMjNYNI7QhxePpfYoap7SoveUrxQGTahD7xHzE2PGLfdav rxa/nhjEfBqFK4gm+FLqX3vihkpkev7kfU1yrR6dCQuh2Vmv0T+RKgYc7ZzJJe2pKerB YcJh+oRRUZ+dmz8ydeP4KSo0UocNor6pWeoPSYiBFWxSIx4p22pnCb6Felo8gYiDEUCL VFjSEaU5QCp1CLFr7EpZ//gb9f2adalOmuCVomY2lXpaKlIstrkELnRJDChu6BJfFpiw rRazFSJLSsRprWMS4NmxL3dRx+XYGvQk5YAdXaJze3mzD6kpuu3yeTYWciumbtdVHQly VNeA== X-Gm-Message-State: AGi0PubKVW8BO5dORSDL4pF27XRn0EmiwTJxIAcTdIQWkkgZ+++ud1DN 239gJJjs1VWQkpvAJZH2WUTAMA== X-Google-Smtp-Source: APiQypLmcZ1otjyBnAKVNObeG2haCF5ymdV9PJ58rreUuPX1+Ac5aZYql6PwcU7/pqdi3d0lO71AvQ== X-Received: by 2002:a2e:700e:: with SMTP id l14mr7768211ljc.135.1587560275710; Wed, 22 Apr 2020 05:57:55 -0700 (PDT) Received: from localhost.localdomain ([39.33.166.207]) by smtp.gmail.com with ESMTPSA id c21sm4623556lfh.16.2020.04.22.05.57.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 05:57:55 -0700 (PDT) From: Ibtisam Tariq To: cristian.dumitrescu@intel.com, jasvinder.singh@intel.com, radu.nicolau@intel.com, akhil.goyal@nxp.com Cc: dev@dpdk.org, Ibtisam Tariq Date: Wed, 22 Apr 2020 17:57:43 +0500 Message-Id: <20200422125745.19744-1-ibtisam.tariq@emumba.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH 1/3] drivers/net/softnic/parser.c: Removing 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. Replacing implementation of inet_pton4 and inet_pton6 with libc inet_pton function Bugzilla ID: 365 Cc: dev@dpdk.org Reported-by: David Marchand Signed-off-by: Ibtisam Tariq --- drivers/net/softnic/parser.c | 187 +---------------------------------- 1 file changed, 3 insertions(+), 184 deletions(-) diff --git a/drivers/net/softnic/parser.c b/drivers/net/softnic/parser.c index dc15ec8aa..bca78d51c 100644 --- a/drivers/net/softnic/parser.c +++ b/drivers/net/softnic/parser.c @@ -4,24 +4,6 @@ * All rights reserved. */ -/* For inet_pton4() and inet_pton6() functions: - * - * Copyright (c) 1996 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS - * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE - * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS - * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - */ - #include #include #include @@ -33,6 +15,7 @@ #include #include #include +#include #include @@ -364,170 +347,6 @@ softnic_parse_mpls_labels(char *string, uint32_t *labels, uint32_t *n_labels) 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 int 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; -} - static struct rte_ether_addr * my_ether_aton(const char *a) { @@ -577,7 +396,7 @@ softnic_parse_ipv4_addr(const char *token, struct in_addr *ipv4) if (strlen(token) >= INET_ADDRSTRLEN) return -EINVAL; - if (inet_pton4(token, (unsigned char *)ipv4) != 1) + if (inet_pton(AF_INET, token, ipv4) != 1) return -EINVAL; return 0; @@ -589,7 +408,7 @@ softnic_parse_ipv6_addr(const char *token, struct in6_addr *ipv6) if (strlen(token) >= INET6_ADDRSTRLEN) return -EINVAL; - if (inet_pton6(token, (unsigned char *)ipv6) != 1) + if (inet_pton(AF_INET6, token, ipv6) != 1) return -EINVAL; return 0; From patchwork Wed Apr 22 12:57:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ibtisam Tariq X-Patchwork-Id: 69106 X-Patchwork-Delegate: gakhil@marvell.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 B8F94A00C2; Wed, 22 Apr 2020 14:58:24 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 901B41D637; Wed, 22 Apr 2020 14:58:24 +0200 (CEST) Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com [209.85.208.194]) by dpdk.org (Postfix) with ESMTP id 87B8E1D636 for ; Wed, 22 Apr 2020 14:58:23 +0200 (CEST) Received: by mail-lj1-f194.google.com with SMTP id g4so2184055ljl.2 for ; Wed, 22 Apr 2020 05:58:23 -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=2UOSQjJ2geoqHw9KR6ApUjh9qfvVeOFF5uopv5Fbv/o=; b=vXNimMMWYT8qWvv8D9ArkES5vJt62uPPDIa6hLEEpqqSVqkViCMYM1oHbOlLQgulaN JWroPNNd2RH/XezP1YFkiacQSMeD+nDeanEtytDBMh4jP6s3+arUTiMbaMbxKc04hLIV BiziZjaVfDbAThSIMA+cKc7wgYDWisBB206oKqae8nt3s4LOzNobiTWf8+FDLuvmwBb6 pBE+8OqmfoSJIMNl5xutqnl6GNzw7a+LkGns+5qT/AH1yXrjdQC76OcxEO9uPrQIUyib hbwGcL+KWsodFSDnmi3/Jw0oC6pI/xsC+K85+KVqJ/BehsSDKZXZZfDFqheYo1R8RzF3 9Zlg== 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=2UOSQjJ2geoqHw9KR6ApUjh9qfvVeOFF5uopv5Fbv/o=; b=DgfRGjjJFRga/hAg2kHcKXE4hxgBzpj4eUwNpYiOEBldMnvDTYeQ+KjMctH46Scjf1 s23ju/s2q9VPQF4CzlqeRPb8G0VTHQkpQodZB5CuyJg6+cutuX6lZg/2Vm++v+Q9gPfd +0H7JzZCEu0cD86QqM3i7GDIQETdo9XsBXHSE3H0fTYuSuVnqbBHBGf9b13T2JzdT03i d9pZUj6JNGE5FLWZfnS3NHyiub6jvI2mCD7AijZMNHtNI5eqDyuGcAt/1EgdbJT9ovgM wdqb88ZaqQ7Oh16NkCuv2epkFzNcS/iehSpIEPKjY/ju64OH2viB/3m9MH+hHdzPHyvK WrHw== X-Gm-Message-State: AGi0PuarSnnhT2ny+kofB2Vua4WqZSuK+ZhIAjpvpcwXkMMZR8Oue+iP 3EaE5ZBSnffKkXrMJwEVrf/7Iw== X-Google-Smtp-Source: APiQypITrHC3JawEjkgEy1QvB1bmHTF/fU5xf2oX1cGybAF7deF2csraEyC0j+YgvxHCHRDVu+2vSA== X-Received: by 2002:a2e:909a:: with SMTP id l26mr15743595ljg.262.1587560303040; Wed, 22 Apr 2020 05:58:23 -0700 (PDT) Received: from localhost.localdomain ([39.33.166.207]) by smtp.gmail.com with ESMTPSA id c21sm4623556lfh.16.2020.04.22.05.58.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 05:58:22 -0700 (PDT) From: Ibtisam Tariq To: cristian.dumitrescu@intel.com, jasvinder.singh@intel.com, radu.nicolau@intel.com, akhil.goyal@nxp.com Cc: dev@dpdk.org, Ibtisam Tariq Date: Wed, 22 Apr 2020 17:57:44 +0500 Message-Id: <20200422125745.19744-2-ibtisam.tariq@emumba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200422125745.19744-1-ibtisam.tariq@emumba.com> References: <20200422125745.19744-1-ibtisam.tariq@emumba.com> Subject: [dpdk-dev] [PATCH 2/3] examples/ip_pipeline/parser.c: Removing 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. Replacing implementation of inet_pton4 and inet_pton6 with libc inet_pton function Bugzilla ID: 365 Cc: dev@dpdk.org Reported-by: David Marchand Signed-off-by: Ibtisam Tariq --- examples/ip_pipeline/parser.c | 189 +--------------------------------- 1 file changed, 3 insertions(+), 186 deletions(-) diff --git a/examples/ip_pipeline/parser.c b/examples/ip_pipeline/parser.c index fb0769fe3..6ddf0bec4 100644 --- a/examples/ip_pipeline/parser.c +++ b/examples/ip_pipeline/parser.c @@ -4,25 +4,6 @@ * All rights reserved. */ -/* - * For inet_pton4() and inet_pton6() functions: - * - * Copyright (c) 1996 by Internet Software Consortium. - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS - * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE - * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS - * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - */ - #include #include #include @@ -34,6 +15,7 @@ #include #include #include +#include #include #include @@ -348,171 +330,6 @@ parse_mpls_labels(char *string, uint32_t *labels, uint32_t *n_labels) 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; -} - static struct rte_ether_addr * my_ether_aton(const char *a) { @@ -562,7 +379,7 @@ parse_ipv4_addr(const char *token, struct in_addr *ipv4) if (strlen(token) >= INET_ADDRSTRLEN) return -EINVAL; - if (inet_pton4(token, (unsigned char *)ipv4) != 1) + if (inet_pton(AF_INET, token, ipv4) != 1) return -EINVAL; return 0; @@ -574,7 +391,7 @@ parse_ipv6_addr(const char *token, struct in6_addr *ipv6) if (strlen(token) >= INET6_ADDRSTRLEN) return -EINVAL; - if (inet_pton6(token, (unsigned char *)ipv6) != 1) + if (inet_pton(AF_INET6, token, ipv6) != 1) return -EINVAL; return 0; From patchwork Wed Apr 22 12:57:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ibtisam Tariq X-Patchwork-Id: 69107 X-Patchwork-Delegate: gakhil@marvell.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 58126A00C2; Wed, 22 Apr 2020 14:58:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 425D21D646; Wed, 22 Apr 2020 14:58:34 +0200 (CEST) Received: from mail-lj1-f193.google.com (mail-lj1-f193.google.com [209.85.208.193]) by dpdk.org (Postfix) with ESMTP id 36F351D644 for ; Wed, 22 Apr 2020 14:58:33 +0200 (CEST) Received: by mail-lj1-f193.google.com with SMTP id w20so2196552ljj.0 for ; Wed, 22 Apr 2020 05:58:33 -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=R4FRIUOyNvQ11VOrJtuZlZV04Uqro64bNk+IqWLn8/U=; b=KRUXnFu/o3YVx1RnlTaHg8fyo4MTpLhCx00B4PwG2fNdEweB94j/k93QjMUsZsl2U7 WBrLB4g9EaIzHCpBVpxf7SNQ1Rkh04MwOum1aaBGn1NMwj14y0i1WgKPmTJLQh08M1s2 N6ddPrUCedc4nxWlrG5JcmOMuG6qTS1FhxA/a8GULZaTEJc0jV4BDCHHyvu7So8D09jw 4gF7576mUlQEr7Cga2zL0sw8yV5iNTpFnEkruaM9u674YdoQE7k/rCjsfl/hpb8bDKo0 NKAU8sF/lF5qWJzftmwfC8kVkT31fFyTTRmBZeZBntofvdsDEEWiuUNGl0rvuDG9sAJA MzAA== 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=R4FRIUOyNvQ11VOrJtuZlZV04Uqro64bNk+IqWLn8/U=; b=SFUvTa8vyMbEiTrLoGhi0L7ciWd8VUTgIdrv7FHTdggQ4UmUSQ1u8Ll+JuT+7RFrXx SXdObFccvUToiDXA1zz2lnIhQ3f6go9nXziVN5hDlpiJ1GvqyLKlXpekbXTAjXmFtPKt lM1IWP+7X0iBweU0Ywaa3JQnJXRy4r6SkrZmusHKBnE3KIb0KmiVfRfQ1XOLNMdOGZCi sMv1QVeZHCvAG+CSCpfs2+S6M+cH7V2/GtPYh/2fXmjpjbELCc3F+3wqL+IFUqg7SJUX RatOjnP1CFbOFz81C2QfJ2EMBmtePELtQffqSK/JnjQCjs9ztSoyZVrf+jzCkLjOZW+s oQQw== X-Gm-Message-State: AGi0PuZqvGD1d6nKV8oonG150bX9iuBv4zHMQGEfUB1sYz621nx1QU4q 1uGlG6xlVfRsSe6jCYORy/cYJA== X-Google-Smtp-Source: APiQypJU9MwQprwlXbSYDKCLp4FMkTGDO8Fh6RyEMNT5Xj/lmNNUHkgPmgG8HePv639KpVeYlKN0dg== X-Received: by 2002:a05:651c:291:: with SMTP id b17mr16188588ljo.166.1587560312748; Wed, 22 Apr 2020 05:58:32 -0700 (PDT) Received: from localhost.localdomain ([39.33.166.207]) by smtp.gmail.com with ESMTPSA id c21sm4623556lfh.16.2020.04.22.05.58.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 05:58:32 -0700 (PDT) From: Ibtisam Tariq To: cristian.dumitrescu@intel.com, jasvinder.singh@intel.com, radu.nicolau@intel.com, akhil.goyal@nxp.com Cc: dev@dpdk.org, Ibtisam Tariq Date: Wed, 22 Apr 2020 17:57:45 +0500 Message-Id: <20200422125745.19744-3-ibtisam.tariq@emumba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200422125745.19744-1-ibtisam.tariq@emumba.com> References: <20200422125745.19744-1-ibtisam.tariq@emumba.com> Subject: [dpdk-dev] [PATCH 3/3] examples/ipsec-secgw/parser.c: Removing 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. Replacing implementation of inet_pton4 and inet_pton6 with libc inet_pton function Bugzilla ID: 365 Cc: dev@dpdk.org Reported-by: David Marchand Signed-off-by: Ibtisam Tariq --- 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..b9cb7409a 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, token, 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, token, ipv6) != 1) return -EINVAL; return 0;