Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/73904/?format=api
{ "id": 73904, "url": "http://patchwork.dpdk.org/api/patches/73904/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20200713095730.10331-3-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-3-ibtisam.tariq@emumba.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200713095730.10331-3-ibtisam.tariq@emumba.com", "date": "2020-07-13T09:57:30", "name": "[v4,3/3] examples/ipsec-secgw: Remove the re-implementation of inet_pton", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "9cb5a3dd05235bd49acc12a22f2ab2d27d2666e2", "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-3-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/73904/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/73904/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 757B3A0540;\n\tMon, 13 Jul 2020 11:59:17 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 042201D5EB;\n\tMon, 13 Jul 2020 11:59:16 +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 699791C19C\n for <dev@dpdk.org>; Mon, 13 Jul 2020 11:59:15 +0200 (CEST)", "by mail-wm1-f67.google.com with SMTP id w3so12551678wmi.4\n for <dev@dpdk.org>; Mon, 13 Jul 2020 02:59:15 -0700 (PDT)", "from localhost.localdomain ([39.33.130.90])\n by smtp.gmail.com with ESMTPSA id v3sm23063823wrq.57.2020.07.13.02.59.12\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 13 Jul 2020 02:59:14 -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=MclLn4B2qV1eU/HDXhKQoB2pnEDplME24mGhCuJPW3U=;\n b=q52oBr1Eg/NZVi/D+/xJbRRroLkcQeIVoANFJbKtEHGaFJR6QA1ctNOzLIWAO8zCQG\n P6GVLnw60JvWGz9GJEmJIycNKZ211Wvhheze1wcf2WFeD0ln28Z05qlD3hI/i/o5tKsQ\n naG8iyQj+uHYzfl12OF/3dCyx5YpEPgYm2VG1/gZor6fnhd5kcL16VK8AKYr3Gf+4J46\n 54iJDi8mqGepwwjkgxNw+Xsp012BQriY+Gz7CaLT/JZJMJX6rohSxNK9KZBcWt8MUFM6\n 9DkZZa1UUq48gMfEMA6CLeN3cnyvXReqHil0AYgFa1NfFLOT4SuiGk92w20jJA8pCRm/\n xx5w==", "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=MclLn4B2qV1eU/HDXhKQoB2pnEDplME24mGhCuJPW3U=;\n b=HoAjEGZgvFL66VXrZVBwlltFrrNfvlDu0nQcl+YC/Py4Vxq4PHDe5UvuTUFOtsEu2t\n KU1pK8/SS64g/HqzuDRNmmQya1ptzakzRG/0wZeVaCvw5XroUWu9Y0HlMckGmnqtmBv7\n x4TpyDqLPFcFTEIKHrvlYPQnjRUsUexno5UkNXCsj393uDpAwWoqOBrAyI4YzNdLmm3N\n HC0JGsuEo0iwfdMGfO8ZWpXX99Bd8bnWnaFifW5FT75aAjlKiDrkIN9GopObbBaRlqBm\n EflfItJoQkr/waGIdY+W2GKsqjAj2NtqwJFqScEC4h/FWwF3gwlofAOlOdxN+Nfusq2Z\n xkVA==", "X-Gm-Message-State": "AOAM530htWbTPJmNtaVw24w4RU7t6kpw0sl9GMVPXOPFiLBxTlg/K+eZ\n z3weWok8iBsvEWdgF1ka4Jxl9g==", "X-Google-Smtp-Source": "\n ABdhPJznFZLm7LHA6otboEZX6bZhoiXeToXsTyINwRsTiKfHw89h2axH/GZC4Jzaa3S4Tvz5nUyYHg==", "X-Received": "by 2002:a1c:bc54:: with SMTP id m81mr17858006wmf.22.1594634355151;\n Mon, 13 Jul 2020 02:59:15 -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 roy.fan.zhang@intel.com", "Date": "Mon, 13 Jul 2020 09:57:30 +0000", "Message-Id": "<20200713095730.10331-3-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 3/3] examples/ipsec-secgw: 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. Replace implementation of\ninet_pton4 and inet_pton6 with libc inet_pton function\n\nBugzilla ID: 365\nFixes: 0d547ed03717 (\"examples/ipsec-secgw: support configuration file\")\nCc: roy.fan.zhang@intel.com\n\nReported-by: David Marchand <david.marchand@redhat.com>\nSigned-off-by: Ibtisam Tariq <ibtisam.tariq@emumba.com>\n---\nv4:\n* Added header file for FreeBSD.\n\nv3:\n* None\n\nv2:\n* Fixed the name of variable, passed as input to inet_pton function.\n* Added fixed id in commit body\n---\n examples/ipsec-secgw/parser.c | 172 +---------------------------------\n 1 file changed, 4 insertions(+), 168 deletions(-)", "diff": "diff --git a/examples/ipsec-secgw/parser.c b/examples/ipsec-secgw/parser.c\nindex 65eb7e9e2..99c3d3879 100644\n--- a/examples/ipsec-secgw/parser.c\n+++ b/examples/ipsec-secgw/parser.c\n@@ -10,6 +10,8 @@\n #include <cmdline_parse_ipaddr.h>\n #include <cmdline_socket.h>\n #include <cmdline.h>\n+#include <arpa/inet.h>\n+#include <sys/socket.h>\n \n #include \"ipsec.h\"\n #include \"parser.h\"\n@@ -39,172 +41,6 @@ parse_tokenize_string(char *string, char *tokens[], uint32_t *n_tokens)\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\n-\t\t * 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 int\n parse_ipv4_addr(const char *token, struct in_addr *ipv4, uint32_t *mask)\n {\n@@ -229,7 +65,7 @@ parse_ipv4_addr(const char *token, struct in_addr *ipv4, uint32_t *mask)\n \tif (strlen(ip_str) >= INET_ADDRSTRLEN)\n \t\treturn -EINVAL;\n \n-\tif (inet_pton4(ip_str, (unsigned char *)ipv4) != 1)\n+\tif (inet_pton(AF_INET, ip_str, ipv4) != 1)\n \t\treturn -EINVAL;\n \n \treturn 0;\n@@ -260,7 +96,7 @@ parse_ipv6_addr(const char *token, struct in6_addr *ipv6, uint32_t *mask)\n \tif (strlen(ip_str) >= INET6_ADDRSTRLEN)\n \t\treturn -EINVAL;\n \n-\tif (inet_pton6(ip_str, (unsigned char *)ipv6) != 1)\n+\tif (inet_pton(AF_INET6, ip_str, ipv6) != 1)\n \t\treturn -EINVAL;\n \n \treturn 0;\n", "prefixes": [ "v4", "3/3" ] }