Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/69105/?format=api
{ "id": 69105, "url": "http://patches.dpdk.org/api/patches/69105/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200422125745.19744-1-ibtisam.tariq@emumba.com/", "project": { "id": 1, "url": "http://patches.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": "<20200422125745.19744-1-ibtisam.tariq@emumba.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200422125745.19744-1-ibtisam.tariq@emumba.com", "date": "2020-04-22T12:57:43", "name": "[1/3] drivers/net/softnic/parser.c: Removing the re-implementation of inet_pton", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "464ba9baa98b5c13b05250ea33f2c76e60a25fc9", "submitter": { "id": 1680, "url": "http://patches.dpdk.org/api/people/1680/?format=api", "name": "Ibtisam Tariq", "email": "ibtisam.tariq@emumba.com" }, "delegate": { "id": 6690, "url": "http://patches.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200422125745.19744-1-ibtisam.tariq@emumba.com/mbox/", "series": [ { "id": 9568, "url": "http://patches.dpdk.org/api/series/9568/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=9568", "date": "2020-04-22T12:57:43", "name": "[1/3] drivers/net/softnic/parser.c: Removing the re-implementation of inet_pton", "version": 1, "mbox": "http://patches.dpdk.org/series/9568/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/69105/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/69105/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 9BCDDA00C2;\n\tWed, 22 Apr 2020 14:57:57 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 2E5181D622;\n\tWed, 22 Apr 2020 14:57:57 +0200 (CEST)", "from mail-lj1-f194.google.com (mail-lj1-f194.google.com\n [209.85.208.194]) by dpdk.org (Postfix) with ESMTP id 5C92F1D61F\n for <dev@dpdk.org>; Wed, 22 Apr 2020 14:57:56 +0200 (CEST)", "by mail-lj1-f194.google.com with SMTP id y4so2158467ljn.7\n for <dev@dpdk.org>; Wed, 22 Apr 2020 05:57:56 -0700 (PDT)", "from localhost.localdomain ([39.33.166.207])\n by smtp.gmail.com with ESMTPSA id c21sm4623556lfh.16.2020.04.22.05.57.53\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 22 Apr 2020 05:57:55 -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;\n bh=1ji4HraDM/9oyLNFclyrChpgkyCluV2TngQ+Utkh1u8=;\n b=cpxz05PYG5HgEygtmUDoBSRwLPjOwbwD1Mqxsip1XF0zkN2MYvWt7zexVtuzl/Y2ne\n q8lSUEIDK2U28UnQYn4Z1KO7o0ah6B+AKdXLHYDYcJhxF9amhBGS52JNjx6jb8yXzbiQ\n ISzO9ZNTX1hoduoo5ST4OXZFZZpgMipR4dzx6gRnx06Vf5zpoqlKynrLBREdzKntqIwp\n fvDyMnhUwYF+RQMo3QK+AGsY0RoNbz+dSoU83eQndhmhdAELWN69QAeQRqnoKrlHXqXg\n Ggz3rgnFIu/6OiSyqXQNG5x49V7Ra/epRLJ5t5S8k/fxCpebQ9vnrF8w0fMhOWItS84e\n wmfw==", "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;\n bh=1ji4HraDM/9oyLNFclyrChpgkyCluV2TngQ+Utkh1u8=;\n b=MLQxR4CDyZ9OjysSU1i4UMjNYNI7QhxePpfYoap7SoveUrxQGTahD7xHzE2PGLfdav\n rxa/nhjEfBqFK4gm+FLqX3vihkpkev7kfU1yrR6dCQuh2Vmv0T+RKgYc7ZzJJe2pKerB\n YcJh+oRRUZ+dmz8ydeP4KSo0UocNor6pWeoPSYiBFWxSIx4p22pnCb6Felo8gYiDEUCL\n VFjSEaU5QCp1CLFr7EpZ//gb9f2adalOmuCVomY2lXpaKlIstrkELnRJDChu6BJfFpiw\n rRazFSJLSsRprWMS4NmxL3dRx+XYGvQk5YAdXaJze3mzD6kpuu3yeTYWciumbtdVHQly\n VNeA==", "X-Gm-Message-State": "AGi0PubKVW8BO5dORSDL4pF27XRn0EmiwTJxIAcTdIQWkkgZ+++ud1DN\n 239gJJjs1VWQkpvAJZH2WUTAMA==", "X-Google-Smtp-Source": "\n APiQypLmcZ1otjyBnAKVNObeG2haCF5ymdV9PJ58rreUuPX1+Ac5aZYql6PwcU7/pqdi3d0lO71AvQ==", "X-Received": "by 2002:a2e:700e:: with SMTP id l14mr7768211ljc.135.1587560275710;\n Wed, 22 Apr 2020 05:57:55 -0700 (PDT)", "From": "Ibtisam Tariq <ibtisam.tariq@emumba.com>", "To": "cristian.dumitrescu@intel.com, jasvinder.singh@intel.com,\n radu.nicolau@intel.com, akhil.goyal@nxp.com", "Cc": "dev@dpdk.org,\n\tIbtisam Tariq <ibtisam.tariq@emumba.com>", "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\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\nBugzilla ID: 365\n\nCc: dev@dpdk.org\n\nReported-by: David Marchand <david.marchand@redhat.com>\nSigned-off-by: Ibtisam Tariq <ibtisam.tariq@emumba.com>\n---\n drivers/net/softnic/parser.c | 187 +----------------------------------\n 1 file changed, 3 insertions(+), 184 deletions(-)", "diff": "diff --git a/drivers/net/softnic/parser.c b/drivers/net/softnic/parser.c\nindex dc15ec8aa..bca78d51c 100644\n--- a/drivers/net/softnic/parser.c\n+++ b/drivers/net/softnic/parser.c\n@@ -4,24 +4,6 @@\n * All rights reserved.\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@@ -33,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 \n@@ -364,170 +347,6 @@ softnic_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 int 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/* 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@@ -577,7 +396,7 @@ softnic_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@@ -589,7 +408,7 @@ softnic_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": [ "1/3" ] }