Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/17043/?format=api
{ "id": 17043, "url": "http://patches.dpdk.org/api/patches/17043/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/d2b7538da8ad507fa1a62c2236ad26f17b90b077.1479309720.git.adrien.mazarguil@6wind.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": "<d2b7538da8ad507fa1a62c2236ad26f17b90b077.1479309720.git.adrien.mazarguil@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/d2b7538da8ad507fa1a62c2236ad26f17b90b077.1479309720.git.adrien.mazarguil@6wind.com", "date": "2016-11-16T16:23:45", "name": "[dpdk-dev,19/22] app/testpmd: add items ipv4/ipv6 to flow command", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "69516d50d86425edc75049a2e1bf17d31d6414a1", "submitter": { "id": 165, "url": "http://patches.dpdk.org/api/people/165/?format=api", "name": "Adrien Mazarguil", "email": "adrien.mazarguil@6wind.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/d2b7538da8ad507fa1a62c2236ad26f17b90b077.1479309720.git.adrien.mazarguil@6wind.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/17043/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/17043/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 1BBA6D4EE;\n\tWed, 16 Nov 2016 17:25:44 +0100 (CET)", "from mail-wm0-f42.google.com (mail-wm0-f42.google.com\n\t[74.125.82.42]) by dpdk.org (Postfix) with ESMTP id 056B856A2\n\tfor <dev@dpdk.org>; Wed, 16 Nov 2016 17:24:53 +0100 (CET)", "by mail-wm0-f42.google.com with SMTP id f82so83962521wmf.1\n\tfor <dev@dpdk.org>; Wed, 16 Nov 2016 08:24:53 -0800 (PST)", "from 6wind.com (guy78-3-82-239-227-177.fbx.proxad.net.\n\t[82.239.227.177]) by smtp.gmail.com with ESMTPSA id\n\tb7sm24276572wjm.39.2016.11.16.08.24.50\n\t(version=TLS1_2 cipher=AES128-SHA bits=128/128);\n\tWed, 16 Nov 2016 08:24:51 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=6wind-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=srbTlLFSaXqe5DX5pHzn8SlVGsVVx5UTDcaC5N///Mg=;\n\tb=Fz/AcseqylT6yfhuiZRRMzKb4fBX/bJz1EMa7Cdvzneyh9PAkRvBMTUDGdFVyVwpVY\n\tzrcRaKBECUw5lWIpwbagYNpm37xedDGrNKUU1rDeZVzkcgT0v1RFyC7309JRbEpzutO6\n\tPp6634JZBE+mM0dOZsgchiKE/jmi5YKC4+lzNg2DpponppDKj5L/9Jux1JqecYNExQlK\n\t8J8npOYNdpAPxshIszNyHpjEbapCxYCVQ6Sz2NN2Fcs30tJq2+t6QIPaK4rM99BoxXPP\n\t+TJU5a5mAJOEwQj8fx8r4mZ2pyiEUMlVZfmOPea7CxlLLyPWFPuB+4Ns+vU/xwxiRWpm\n\tVgQQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=srbTlLFSaXqe5DX5pHzn8SlVGsVVx5UTDcaC5N///Mg=;\n\tb=hNNwluekwXdMI9dgNcFaLm++tnIofuJJjfWaKsjSI7jQhjsbC8GFZGieyFUj5XkiFD\n\tMso5DYVL05iGdTAKez0j73A8AHfF0kNEqct0TJyzFIGtaUapQfoofWuOmFrNKzDtlvn7\n\tVA9heJHnil0cXq+I78tPWDUFhRiLWhXr6cwoVPWyoO2xYrEFeTT3HqrgzmFP0hyiXpML\n\tz3Cx6kPmndWbXnsEHL//zJ2v/UELBDDWcMKf3GkFknumQSBJRrzVAU5U9e6cHrOy7opi\n\tRYBQ0rbVgenAAf4UuysWgCbtc/OkPMlE34qLxSjsYWXe4XeOO/yxb6XsP1cvuzpV65eP\n\tzCSg==", "X-Gm-Message-State": "ABUngvcZrHgTL5h5BQTPif/AKQpqHay7XZjMRS8KrvGXs8IUKr1uuFruMqfawlFoR1Yjxfmh", "X-Received": "by 10.28.152.79 with SMTP id a76mr11215672wme.47.1479313492532; \n\tWed, 16 Nov 2016 08:24:52 -0800 (PST)", "From": "Adrien Mazarguil <adrien.mazarguil@6wind.com>", "To": "dev@dpdk.org", "Cc": "Thomas Monjalon <thomas.monjalon@6wind.com>,\n\tPablo de Lara <pablo.de.lara.guarch@intel.com>,\n\tOlivier Matz <olivier.matz@6wind.com>", "Date": "Wed, 16 Nov 2016 17:23:45 +0100", "Message-Id": "<d2b7538da8ad507fa1a62c2236ad26f17b90b077.1479309720.git.adrien.mazarguil@6wind.com>", "X-Mailer": "git-send-email 2.1.4", "In-Reply-To": "<cover.1479309719.git.adrien.mazarguil@6wind.com>", "References": "<cover.1471632644.git.adrien.mazarguil@6wind.com>\n\t<cover.1479309719.git.adrien.mazarguil@6wind.com>", "Subject": "[dpdk-dev] [PATCH 19/22] app/testpmd: add items ipv4/ipv6 to flow\n\tcommand", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Add the ability to match basic fields from IPv4 and IPv6 headers (source\nand destination addresses only).\n\nSigned-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>\n---\n app/test-pmd/cmdline_flow.c | 177 +++++++++++++++++++++++++++++++++++++++\n 1 file changed, 177 insertions(+)", "diff": "diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c\nindex f2bd405..75096df 100644\n--- a/app/test-pmd/cmdline_flow.c\n+++ b/app/test-pmd/cmdline_flow.c\n@@ -38,6 +38,7 @@\n #include <errno.h>\n #include <ctype.h>\n #include <string.h>\n+#include <arpa/inet.h>\n \n #include <rte_common.h>\n #include <rte_ethdev.h>\n@@ -61,6 +62,8 @@ enum index {\n \tBOOLEAN,\n \tSTRING,\n \tMAC_ADDR,\n+\tIPV4_ADDR,\n+\tIPV6_ADDR,\n \tRULE_ID,\n \tPORT_ID,\n \tGROUP_ID,\n@@ -124,6 +127,12 @@ enum index {\n \tITEM_VLAN,\n \tITEM_VLAN_TPID,\n \tITEM_VLAN_TCI,\n+\tITEM_IPV4,\n+\tITEM_IPV4_SRC,\n+\tITEM_IPV4_DST,\n+\tITEM_IPV6,\n+\tITEM_IPV6_SRC,\n+\tITEM_IPV6_DST,\n \n \t/* Validate/create actions. */\n \tACTIONS,\n@@ -349,6 +358,8 @@ static const enum index next_item[] = {\n \tITEM_RAW,\n \tITEM_ETH,\n \tITEM_VLAN,\n+\tITEM_IPV4,\n+\tITEM_IPV6,\n \t0,\n };\n \n@@ -396,6 +407,20 @@ static const enum index item_vlan[] = {\n \t0,\n };\n \n+static const enum index item_ipv4[] = {\n+\tITEM_IPV4_SRC,\n+\tITEM_IPV4_DST,\n+\tITEM_NEXT,\n+\t0,\n+};\n+\n+static const enum index item_ipv6[] = {\n+\tITEM_IPV6_SRC,\n+\tITEM_IPV6_DST,\n+\tITEM_NEXT,\n+\t0,\n+};\n+\n static const enum index next_action[] = {\n \tACTION_END,\n \tACTION_VOID,\n@@ -441,6 +466,12 @@ static int parse_string(struct context *, const struct token *,\n static int parse_mac_addr(struct context *, const struct token *,\n \t\t\t const char *, unsigned int,\n \t\t\t void *, unsigned int);\n+static int parse_ipv4_addr(struct context *, const struct token *,\n+\t\t\t const char *, unsigned int,\n+\t\t\t void *, unsigned int);\n+static int parse_ipv6_addr(struct context *, const struct token *,\n+\t\t\t const char *, unsigned int,\n+\t\t\t void *, unsigned int);\n static int parse_port(struct context *, const struct token *,\n \t\t const char *, unsigned int,\n \t\t void *, unsigned int);\n@@ -511,6 +542,20 @@ static const struct token token_list[] = {\n \t\t.call = parse_mac_addr,\n \t\t.comp = comp_none,\n \t},\n+\t[IPV4_ADDR] = {\n+\t\t.name = \"{IPv4 address}\",\n+\t\t.type = \"IPV4 ADDRESS\",\n+\t\t.help = \"standard IPv4 address notation\",\n+\t\t.call = parse_ipv4_addr,\n+\t\t.comp = comp_none,\n+\t},\n+\t[IPV6_ADDR] = {\n+\t\t.name = \"{IPv6 address}\",\n+\t\t.type = \"IPV6 ADDRESS\",\n+\t\t.help = \"standard IPv6 address notation\",\n+\t\t.call = parse_ipv6_addr,\n+\t\t.comp = comp_none,\n+\t},\n \t[RULE_ID] = {\n \t\t.name = \"{rule id}\",\n \t\t.type = \"RULE ID\",\n@@ -849,6 +894,48 @@ static const struct token token_list[] = {\n \t\t.next = NEXT(item_vlan, NEXT_ENTRY(UNSIGNED), item_param),\n \t\t.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vlan, tci)),\n \t},\n+\t[ITEM_IPV4] = {\n+\t\t.name = \"ipv4\",\n+\t\t.help = \"match IPv4 header\",\n+\t\t.priv = PRIV_ITEM(IPV4, sizeof(struct rte_flow_item_ipv4)),\n+\t\t.next = NEXT(item_ipv4),\n+\t\t.call = parse_vc,\n+\t},\n+\t[ITEM_IPV4_SRC] = {\n+\t\t.name = \"src\",\n+\t\t.help = \"source address\",\n+\t\t.next = NEXT(item_ipv4, NEXT_ENTRY(IPV4_ADDR), item_param),\n+\t\t.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv4,\n+\t\t\t\t\t hdr.src_addr)),\n+\t},\n+\t[ITEM_IPV4_DST] = {\n+\t\t.name = \"dst\",\n+\t\t.help = \"destination address\",\n+\t\t.next = NEXT(item_ipv4, NEXT_ENTRY(IPV4_ADDR), item_param),\n+\t\t.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv4,\n+\t\t\t\t\t hdr.dst_addr)),\n+\t},\n+\t[ITEM_IPV6] = {\n+\t\t.name = \"ipv6\",\n+\t\t.help = \"match IPv6 header\",\n+\t\t.priv = PRIV_ITEM(IPV6, sizeof(struct rte_flow_item_ipv6)),\n+\t\t.next = NEXT(item_ipv6),\n+\t\t.call = parse_vc,\n+\t},\n+\t[ITEM_IPV6_SRC] = {\n+\t\t.name = \"src\",\n+\t\t.help = \"source address\",\n+\t\t.next = NEXT(item_ipv6, NEXT_ENTRY(IPV6_ADDR), item_param),\n+\t\t.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv6,\n+\t\t\t\t\t hdr.src_addr)),\n+\t},\n+\t[ITEM_IPV6_DST] = {\n+\t\t.name = \"dst\",\n+\t\t.help = \"destination address\",\n+\t\t.next = NEXT(item_ipv6, NEXT_ENTRY(IPV6_ADDR), item_param),\n+\t\t.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ipv6,\n+\t\t\t\t\t hdr.dst_addr)),\n+\t},\n \t/* Validate/create actions. */\n \t[ACTIONS] = {\n \t\t.name = \"actions\",\n@@ -1520,6 +1607,96 @@ parse_mac_addr(struct context *ctx, const struct token *token,\n \treturn -1;\n }\n \n+/**\n+ * Parse an IPv4 address.\n+ *\n+ * Last argument (ctx->args) is retrieved to determine storage size and\n+ * location.\n+ */\n+static int\n+parse_ipv4_addr(struct context *ctx, const struct token *token,\n+\t\tconst char *str, unsigned int len,\n+\t\tvoid *buf, unsigned int size)\n+{\n+\tconst struct arg *arg = pop_args(ctx);\n+\tchar str2[len + 1];\n+\tstruct in_addr tmp;\n+\tint ret;\n+\n+\t/* Argument is expected. */\n+\tif (!arg)\n+\t\treturn -1;\n+\tsize = arg->size;\n+\t/* Bit-mask fill is not supported. */\n+\tif (arg->mask || size != sizeof(tmp))\n+\t\tgoto error;\n+\t/* Only network endian is supported. */\n+\tif (!arg->hton)\n+\t\tgoto error;\n+\tmemcpy(str2, str, len);\n+\tstr2[len] = '\\0';\n+\tret = inet_pton(AF_INET, str2, &tmp);\n+\tif (ret != 1) {\n+\t\t/* Attempt integer parsing. */\n+\t\tpush_args(ctx, arg);\n+\t\treturn parse_int(ctx, token, str, len, buf, size);\n+\t}\n+\tif (!ctx->object)\n+\t\treturn len;\n+\tbuf = (uint8_t *)ctx->object + arg->offset;\n+\tmemcpy(buf, &tmp, size);\n+\tif (ctx->objmask)\n+\t\tmemset((uint8_t *)ctx->objmask + arg->offset, 0xff, size);\n+\treturn len;\n+error:\n+\tpush_args(ctx, arg);\n+\treturn -1;\n+}\n+\n+/**\n+ * Parse an IPv6 address.\n+ *\n+ * Last argument (ctx->args) is retrieved to determine storage size and\n+ * location.\n+ */\n+static int\n+parse_ipv6_addr(struct context *ctx, const struct token *token,\n+\t\tconst char *str, unsigned int len,\n+\t\tvoid *buf, unsigned int size)\n+{\n+\tconst struct arg *arg = pop_args(ctx);\n+\tchar str2[len + 1];\n+\tstruct in6_addr tmp;\n+\tint ret;\n+\n+\t(void)token;\n+\t/* Argument is expected. */\n+\tif (!arg)\n+\t\treturn -1;\n+\tsize = arg->size;\n+\t/* Bit-mask fill is not supported. */\n+\tif (arg->mask || size != sizeof(tmp))\n+\t\tgoto error;\n+\t/* Only network endian is supported. */\n+\tif (!arg->hton)\n+\t\tgoto error;\n+\tmemcpy(str2, str, len);\n+\tstr2[len] = '\\0';\n+\tret = inet_pton(AF_INET6, str2, &tmp);\n+\tif (ret != 1)\n+\t\tgoto error;\n+\tif (!ctx->object)\n+\t\treturn len;\n+\tbuf = (uint8_t *)ctx->object + arg->offset;\n+\tmemcpy(buf, &tmp, size);\n+\tif (ctx->objmask)\n+\t\tmemset((uint8_t *)ctx->objmask + arg->offset, 0xff, size);\n+\treturn len;\n+error:\n+\tpush_args(ctx, arg);\n+\treturn -1;\n+}\n+\n /** Boolean values (even indices stand for false). */\n static const char *const boolean_name[] = {\n \t\"0\", \"1\",\n", "prefixes": [ "dpdk-dev", "19/22" ] }