Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/73903/?format=api
{ "id": 73903, "url": "http://patchwork.dpdk.org/api/patches/73903/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20200713095730.10331-2-ibtisam.tariq@emumba.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20200713095730.10331-2-ibtisam.tariq@emumba.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200713095730.10331-2-ibtisam.tariq@emumba.com", "date": "2020-07-13T09:57:29", "name": "[v4,2/3] examples/ip_pipeline: Remove the re-implementation of inet_pton", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "95ee4adaa9b583b75f4e260a3e11999889dfa3ba", "submitter": { "id": 1680, "url": "http://patchwork.dpdk.org/api/people/1680/?format=api", "name": "Ibtisam Tariq", "email": "ibtisam.tariq@emumba.com" }, "delegate": { "id": 24651, "url": "http://patchwork.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20200713095730.10331-2-ibtisam.tariq@emumba.com/mbox/", "series": [ { "id": 10984, "url": "http://patchwork.dpdk.org/api/series/10984/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=10984", "date": "2020-07-13T09:57:28", "name": "[v4,1/3] drivers/net/softnic: Remove the re-implementation of", "version": 4, "mbox": "http://patchwork.dpdk.org/series/10984/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/73903/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/73903/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id D4FFFA0540;\n\tMon, 13 Jul 2020 11:59:09 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id D7D811D5E2;\n\tMon, 13 Jul 2020 11:59:08 +0200 (CEST)", "from mail-wm1-f67.google.com (mail-wm1-f67.google.com\n [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 8A1B61C19C\n for <dev@dpdk.org>; Mon, 13 Jul 2020 11:59:08 +0200 (CEST)", "by mail-wm1-f67.google.com with SMTP id 22so12701642wmg.1\n for <dev@dpdk.org>; Mon, 13 Jul 2020 02:59:08 -0700 (PDT)", "from localhost.localdomain ([39.33.130.90])\n by smtp.gmail.com with ESMTPSA id v3sm23063823wrq.57.2020.07.13.02.59.05\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 13 Jul 2020 02:59:07 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=emumba-com.20150623.gappssmtp.com; s=20150623;\n h=from:to:cc:subject:date:message-id:in-reply-to:references;\n bh=5DCTGZrBQq8Qq1ETO8HqlFAJC7w6dckeRzECMjeBnZk=;\n b=vCb0XCPO47m8aZBkShHBWOQ3puyC+qYJS0WaJVmmpwN9qo5Y4Ue55Np6rHEg7RHHAx\n PsjzlkjsjjgPjJ4B/eOQ+AeEcCpimz6H2ZKc9HCJTEqjUsQ90OS5q4Yko/3ouSc4OTho\n 9FpJpsZbEsP/uyuV1u2hiYCfzB310jvVp391P7W16E0UyXp4asAbPImTgGFQEf6X9maa\n dZ7k1TEAPw3hg7m5NAsijyjIABWuCx8vf7nRv3fr1WUjGzmgUphIYmMvikNfjjRw5LkU\n 4U5T2VYgx6fEPe03z/4L5i8ebPhvjSQi77IcJSNs0nrU2XxSB6ZVH+DZIdNaqIBb2RgE\n SZuQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20161025;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n :references;\n bh=5DCTGZrBQq8Qq1ETO8HqlFAJC7w6dckeRzECMjeBnZk=;\n b=brb0+X83DqLn4Imc5GSfAkhqU+7xJiQkQVzvvOijKos2qT0zk0dLg+zyTcSmDjMSgt\n yexU0lUn0ecPSC4oGWLknvAbx5R/A7BVvJr02Iv+nHNRvmSfrRZcRfXvoRdsle2OS1HV\n fWeUAKILVafsLiVCxCETFArMHl/0OxaIi1s1uDGKXjA034WU3QrPb/gdBm8YAYOqIbZh\n m8aMZSxPwBbSX0L6cxi0W5vCil8d6ILhXeipAVSNx6q6JRPCWAUtb9PAGPaqsMJTuCcE\n 1rqa75ilvGcpgOsJ+7ofqSiVFSSyTC5AjNw7vWufnwI3AaMKn+MLcjoSZ+hW03UWr2y8\n jAHQ==", "X-Gm-Message-State": "AOAM530odmho5CBix9WdlJHmrVm9CU12qHtU5iJnyKU2pupT9EH9Edv6\n ec3zg8MNJKFj8tAUVsRt6OasdQ==", "X-Google-Smtp-Source": "\n ABdhPJytjsewAL8vSVH/WC5qyen47ZjCOra7ihTQL+R900of86AVQ+5Na23MuGSNNuwyyjEJ9LF6Mg==", "X-Received": "by 2002:a7b:cf18:: with SMTP id\n l24mr17855452wmg.116.1594634348244;\n Mon, 13 Jul 2020 02:59:08 -0700 (PDT)", "From": "Ibtisam Tariq <ibtisam.tariq@emumba.com>", "To": "cristian.dumitrescu@intel.com, radu.nicolau@intel.com,\n akhil.goyal@nxp.com,\n jasvinder.singh@intel.com", "Cc": "dev@dpdk.org, Ibtisam Tariq <ibtisam.tariq@emumba.com>,\n piotrx.t.azarewicz@intel.com", "Date": "Mon, 13 Jul 2020 09:57:29 +0000", "Message-Id": "<20200713095730.10331-2-ibtisam.tariq@emumba.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20200713095730.10331-1-ibtisam.tariq@emumba.com>", "References": "<20200608075836.3609-3-ibtisam.tariq@emumba.com>\n <20200713095730.10331-1-ibtisam.tariq@emumba.com>", "Subject": "[dpdk-dev] [PATCH v4 2/3] examples/ip_pipeline: Remove the\n\tre-implementation of inet_pton", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "inet_pton4 and inet_pton6 was reimplemented. Replacing implementation of\ninet_pton4 and inet_pton6 with libc inet_pton function\n\nBugzilla ID: 365\nFixes: ed7a0490f7e2 (\"examples/ip_pipeline: add string parsing helpers\")\nCc: piotrx.t.azarewicz@intel.com\n\nReported-by: David Marchand <david.marchand@redhat.com>\nSigned-off-by: Ibtisam Tariq <ibtisam.tariq@emumba.com>\n---\nv4:\n* None\n\nv3:\n* None\n\nv2:\n* Added fixed id in commit body\n---\n examples/ip_pipeline/parser.c | 189 +---------------------------------\n 1 file changed, 3 insertions(+), 186 deletions(-)", "diff": "diff --git a/examples/ip_pipeline/parser.c b/examples/ip_pipeline/parser.c\nindex fb0769fe3..6ddf0bec4 100644\n--- a/examples/ip_pipeline/parser.c\n+++ b/examples/ip_pipeline/parser.c\n@@ -4,25 +4,6 @@\n * All rights reserved.\n */\n \n-/*\n- * For inet_pton4() and inet_pton6() functions:\n- *\n- * Copyright (c) 1996 by Internet Software Consortium.\n- *\n- * Permission to use, copy, modify, and distribute this software for any\n- * purpose with or without fee is hereby granted, provided that the above\n- * copyright notice and this permission notice appear in all copies.\n- *\n- * THE SOFTWARE IS PROVIDED \"AS IS\" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS\n- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES\n- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE\n- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL\n- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR\n- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS\n- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS\n- * SOFTWARE.\n- */\n-\n #include <stdint.h>\n #include <stdlib.h>\n #include <stdio.h>\n@@ -34,6 +15,7 @@\n #include <libgen.h>\n #include <unistd.h>\n #include <sys/wait.h>\n+#include <arpa/inet.h>\n \n #include <rte_errno.h>\n #include <rte_string_fns.h>\n@@ -348,171 +330,6 @@ parse_mpls_labels(char *string, uint32_t *labels, uint32_t *n_labels)\n \treturn 0;\n }\n \n-#define INADDRSZ 4\n-#define IN6ADDRSZ 16\n-\n-/* int\n- * inet_pton4(src, dst)\n- * like inet_aton() but without all the hexadecimal and shorthand.\n- * return:\n- * 1 if `src' is a valid dotted quad, else 0.\n- * notice:\n- * does not touch `dst' unless it's returning 1.\n- * author:\n- * Paul Vixie, 1996.\n- */\n-static int\n-inet_pton4(const char *src, unsigned char *dst)\n-{\n-\tstatic const char digits[] = \"0123456789\";\n-\tint saw_digit, octets, ch;\n-\tunsigned char tmp[INADDRSZ], *tp;\n-\n-\tsaw_digit = 0;\n-\toctets = 0;\n-\t*(tp = tmp) = 0;\n-\twhile ((ch = *src++) != '\\0') {\n-\t\tconst char *pch;\n-\n-\t\tpch = strchr(digits, ch);\n-\t\tif (pch != NULL) {\n-\t\t\tunsigned int new = *tp * 10 + (pch - digits);\n-\n-\t\t\tif (new > 255)\n-\t\t\t\treturn 0;\n-\t\t\tif (!saw_digit) {\n-\t\t\t\tif (++octets > 4)\n-\t\t\t\t\treturn 0;\n-\t\t\t\tsaw_digit = 1;\n-\t\t\t}\n-\t\t\t*tp = (unsigned char)new;\n-\t\t} else if (ch == '.' && saw_digit) {\n-\t\t\tif (octets == 4)\n-\t\t\t\treturn 0;\n-\t\t\t*++tp = 0;\n-\t\t\tsaw_digit = 0;\n-\t\t} else\n-\t\t\treturn 0;\n-\t}\n-\tif (octets < 4)\n-\t\treturn 0;\n-\n-\tmemcpy(dst, tmp, INADDRSZ);\n-\treturn 1;\n-}\n-\n-/* int\n- * inet_pton6(src, dst)\n- * convert presentation level address to network order binary form.\n- * return:\n- * 1 if `src' is a valid [RFC1884 2.2] address, else 0.\n- * notice:\n- * (1) does not touch `dst' unless it's returning 1.\n- * (2) :: in a full address is silently ignored.\n- * credit:\n- * inspired by Mark Andrews.\n- * author:\n- * Paul Vixie, 1996.\n- */\n-static int\n-inet_pton6(const char *src, unsigned char *dst)\n-{\n-\tstatic const char xdigits_l[] = \"0123456789abcdef\",\n-\t\txdigits_u[] = \"0123456789ABCDEF\";\n-\tunsigned char tmp[IN6ADDRSZ], *tp = 0, *endp = 0, *colonp = 0;\n-\tconst char *xdigits = 0, *curtok = 0;\n-\tint ch = 0, saw_xdigit = 0, count_xdigit = 0;\n-\tunsigned int val = 0;\n-\tunsigned dbloct_count = 0;\n-\n-\tmemset((tp = tmp), '\\0', IN6ADDRSZ);\n-\tendp = tp + IN6ADDRSZ;\n-\tcolonp = NULL;\n-\t/* Leading :: requires some special handling. */\n-\tif (*src == ':')\n-\t\tif (*++src != ':')\n-\t\t\treturn 0;\n-\tcurtok = src;\n-\tsaw_xdigit = count_xdigit = 0;\n-\tval = 0;\n-\n-\twhile ((ch = *src++) != '\\0') {\n-\t\tconst char *pch;\n-\n-\t\tpch = strchr((xdigits = xdigits_l), ch);\n-\t\tif (pch == NULL)\n-\t\t\tpch = strchr((xdigits = xdigits_u), ch);\n-\t\tif (pch != NULL) {\n-\t\t\tif (count_xdigit >= 4)\n-\t\t\t\treturn 0;\n-\t\t\tval <<= 4;\n-\t\t\tval |= (pch - xdigits);\n-\t\t\tif (val > 0xffff)\n-\t\t\t\treturn 0;\n-\t\t\tsaw_xdigit = 1;\n-\t\t\tcount_xdigit++;\n-\t\t\tcontinue;\n-\t\t}\n-\t\tif (ch == ':') {\n-\t\t\tcurtok = src;\n-\t\t\tif (!saw_xdigit) {\n-\t\t\t\tif (colonp)\n-\t\t\t\t\treturn 0;\n-\t\t\t\tcolonp = tp;\n-\t\t\t\tcontinue;\n-\t\t\t} else if (*src == '\\0') {\n-\t\t\t\treturn 0;\n-\t\t\t}\n-\t\t\tif (tp + sizeof(int16_t) > endp)\n-\t\t\t\treturn 0;\n-\t\t\t*tp++ = (unsigned char) ((val >> 8) & 0xff);\n-\t\t\t*tp++ = (unsigned char) (val & 0xff);\n-\t\t\tsaw_xdigit = 0;\n-\t\t\tcount_xdigit = 0;\n-\t\t\tval = 0;\n-\t\t\tdbloct_count++;\n-\t\t\tcontinue;\n-\t\t}\n-\t\tif (ch == '.' && ((tp + INADDRSZ) <= endp) &&\n-\t\t inet_pton4(curtok, tp) > 0) {\n-\t\t\ttp += INADDRSZ;\n-\t\t\tsaw_xdigit = 0;\n-\t\t\tdbloct_count += 2;\n-\t\t\tbreak; /* '\\0' was seen by inet_pton4(). */\n-\t\t}\n-\t\treturn 0;\n-\t}\n-\tif (saw_xdigit) {\n-\t\tif (tp + sizeof(int16_t) > endp)\n-\t\t\treturn 0;\n-\t\t*tp++ = (unsigned char) ((val >> 8) & 0xff);\n-\t\t*tp++ = (unsigned char) (val & 0xff);\n-\t\tdbloct_count++;\n-\t}\n-\tif (colonp != NULL) {\n-\t\t/* if we already have 8 double octets, having a colon means error */\n-\t\tif (dbloct_count == 8)\n-\t\t\treturn 0;\n-\n-\t\t/*\n-\t\t * Since some memmove()'s erroneously fail to handle\n-\t\t * overlapping regions, we'll do the shift by hand.\n-\t\t */\n-\t\tconst int n = tp - colonp;\n-\t\tint i;\n-\n-\t\tfor (i = 1; i <= n; i++) {\n-\t\t\tendp[-i] = colonp[n - i];\n-\t\t\tcolonp[n - i] = 0;\n-\t\t}\n-\t\ttp = endp;\n-\t}\n-\tif (tp != endp)\n-\t\treturn 0;\n-\tmemcpy(dst, tmp, IN6ADDRSZ);\n-\treturn 1;\n-}\n-\n static struct rte_ether_addr *\n my_ether_aton(const char *a)\n {\n@@ -562,7 +379,7 @@ parse_ipv4_addr(const char *token, struct in_addr *ipv4)\n \tif (strlen(token) >= INET_ADDRSTRLEN)\n \t\treturn -EINVAL;\n \n-\tif (inet_pton4(token, (unsigned char *)ipv4) != 1)\n+\tif (inet_pton(AF_INET, token, ipv4) != 1)\n \t\treturn -EINVAL;\n \n \treturn 0;\n@@ -574,7 +391,7 @@ parse_ipv6_addr(const char *token, struct in6_addr *ipv6)\n \tif (strlen(token) >= INET6_ADDRSTRLEN)\n \t\treturn -EINVAL;\n \n-\tif (inet_pton6(token, (unsigned char *)ipv6) != 1)\n+\tif (inet_pton(AF_INET6, token, ipv6) != 1)\n \t\treturn -EINVAL;\n \n \treturn 0;\n", "prefixes": [ "v4", "2/3" ] }