From patchwork Mon Jul 13 09:57:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ibtisam Tariq X-Patchwork-Id: 73902 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 56B49A0540; Mon, 13 Jul 2020 11:59:01 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 393311D57C; Mon, 13 Jul 2020 11:59:01 +0200 (CEST) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 49DA31C19C for ; Mon, 13 Jul 2020 11:59:00 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id l2so12560065wmf.0 for ; Mon, 13 Jul 2020 02:59:00 -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=04+xpLPWm8lXvvfxFwXHkm1gJ8EKu9MvS6FHJ7R5mmM=; b=O0DnHoQyoUUP+qF9ePqhfevyI3ip3E9+ttrpHUwoN6p8eRaD63/E9oFzLXVV3xUf4P IlFu+WvuICRpqPBnEgFKq9xH/vuBpHSDGw5wMDstQIUwcOUo2tHJTwVoTcY+465F6Pcu hrA6UAzocqrbRjR1Mifl8UwnuWRslreIScrZvpQr0MlwHJsQcaNTojC+XIKxkfAL3uog PVyNolBR3r/DjQ0WZYlf6upbnrJ1cV8eO2lTzEXvqdIniu0JddKvXQW0Eo1tb4QkRueM w3ak+X9l3Q5BkjjE4AwYC4z2+YKQYfho4LVMH8VOBfbHoLBZFc+B7KkOs+ZbrOF/KQpT NqCg== 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=04+xpLPWm8lXvvfxFwXHkm1gJ8EKu9MvS6FHJ7R5mmM=; b=knqrp6pfyR3dn9dWDxMs3UMiJolvLY4hrlPP4zXyvFhba/ONP1vPzZBVyFf0nT8y/V M3w5xcxKJKzFrLt7L6me4WwWwECdnS5W1qViJB2m3mhX1hik3Lynf6BNoAx7i1Yk6gAT AOn8oZ9QA7Kkl/eTBlfbfTfnaIbF9fMp1Mj+eLwcRf7uICj5079j1l+PR2ANLhgW5isc y5uuZWR9WkSQzK4xOCP/aK1Pto1LddiFpwCqH+xkfrrqhpD6AhN38oFyjsbD6e9RYrRl UWPVpKN4EHuOpnxoB8dSsVMXBXdv4zq+RE9SHrxUjAnsaMX22WBzHZUNWzHuee/kQ8l3 URXQ== X-Gm-Message-State: AOAM5322eB/jFLcDsJ7UjRfKyM5pYrah6HoE7qrwszh6oOkMdQo73IGZ B007KBBNrlpP7WHL7tpa5o5gcg== X-Google-Smtp-Source: ABdhPJzrE1hz/59ypGFOBjj1gZComynpNYLA5agOxK2J+uyn1SEDesFQ+4RPLmif5Kev2uDCp6psew== X-Received: by 2002:a1c:2805:: with SMTP id o5mr18484553wmo.25.1594634339973; Mon, 13 Jul 2020 02:58:59 -0700 (PDT) Received: from localhost.localdomain ([39.33.130.90]) by smtp.gmail.com with ESMTPSA id v3sm23063823wrq.57.2020.07.13.02.58.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 02:58:59 -0700 (PDT) From: Ibtisam Tariq To: cristian.dumitrescu@intel.com, radu.nicolau@intel.com, akhil.goyal@nxp.com, jasvinder.singh@intel.com Cc: dev@dpdk.org, Ibtisam Tariq Date: Mon, 13 Jul 2020 09:57:28 +0000 Message-Id: <20200713095730.10331-1-ibtisam.tariq@emumba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200608075836.3609-3-ibtisam.tariq@emumba.com> References: <20200608075836.3609-3-ibtisam.tariq@emumba.com> Subject: [dpdk-dev] [PATCH v4 1/3] drivers/net/softnic: Remove the re-implementation of 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: 31ce8d888625 ("net/softnic: add command interface") Cc: jasvinder.singh@intel.com Reported-by: David Marchand Signed-off-by: Ibtisam Tariq --- v4: * None v3: * None v2: * Added fixed commit id in commit body --- 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;