Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/53497/?format=api
{ "id": 53497, "url": "http://patches.dpdk.org/api/patches/53497/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190516180427.17270-8-stephen@networkplumber.org/", "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": "<20190516180427.17270-8-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20190516180427.17270-8-stephen@networkplumber.org", "date": "2019-05-16T18:04:27", "name": "[v2,7/7] cmdline: use ether_unformat_addr", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "b9077f5afb0d2f709ddb1b34e7c683f3ec1831b5", "submitter": { "id": 27, "url": "http://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20190516180427.17270-8-stephen@networkplumber.org/mbox/", "series": [ { "id": 4699, "url": "http://patches.dpdk.org/api/series/4699/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4699", "date": "2019-05-16T18:04:20", "name": "ether: improvements and optimizations", "version": 2, "mbox": "http://patches.dpdk.org/series/4699/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/53497/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/53497/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 [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 9A6351B114;\n\tThu, 16 May 2019 20:04:51 +0200 (CEST)", "from mail-pf1-f193.google.com (mail-pf1-f193.google.com\n\t[209.85.210.193]) by dpdk.org (Postfix) with ESMTP id A52F1E3EB\n\tfor <dev@dpdk.org>; Thu, 16 May 2019 20:04:44 +0200 (CEST)", "by mail-pf1-f193.google.com with SMTP id g9so2233451pfo.11\n\tfor <dev@dpdk.org>; Thu, 16 May 2019 11:04:44 -0700 (PDT)", "from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127])\n\tby smtp.gmail.com with ESMTPSA id\n\td67sm9376657pfa.35.2019.05.16.11.04.42\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tThu, 16 May 2019 11:04:43 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=networkplumber-org.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=Nb6q/fgxdbKmGAd57UFtM9Hr3OsljJL5p2+aKfTU5Nk=;\n\tb=eA+93IlCa9DhE8NfpEv3VqZoA7uVo+AxLsWC1T08u2j8rw7/F1BVnvULFdJ5MdDPLX\n\tUeXJvVE2ZWH4ysJSJ9blyEsvpPwbVgRwI9Jzjzy6og9NP5vEh2IkdKUlaqLjVd5hKjf3\n\trmNbT62qUBbehd5so8Pq4WwNASqAObb43jRAHW78OPdxq4sQLWn5CAZaZTLes+FQtvUt\n\ta0WZ8gwy6xIRO/F2DFMGyg8SmCkDJG8VtTZVVogGB1hu/fAA5GjhoR9Ttx48MiIskKqp\n\tD7fHtKlYSnz8eUEdxatzVUAXDzyWiZ0Q9Mvvwtd/YtdDuYd9p2r+Q36m4v2msxkN4fG8\n\tkwLQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=Nb6q/fgxdbKmGAd57UFtM9Hr3OsljJL5p2+aKfTU5Nk=;\n\tb=oiQbRr8XTleyZ8q4OvSZ6HpEDCxWpFpeyHwzeZhBL9Ev+KB+B2qDQCp6Twr9rTeG3g\n\twi1yC5WL9CkX2c9tLJzCGCyle687Bahquf5XHBY2jDxZr50M7QsEFPE8drT4p5u42UXq\n\tBKw9bjJU1L+Y4J6rh5A2E+PPmm1Oc6ZacPNV+5e6i+XPiBk28Hn8jyYKiGcTT50Hk7ti\n\t/+IWMvN+KTSCSLAk5+RxNXRh5naeV+4UzCLJDKTd/16qjMUy3eJMvk+MB+RGyP+hwdfV\n\t5O5tHfXjKdx6/50bEuOT5utkLQcgE2+nZ/JOX1kQ0zeFKS4XRnDpGQzAtRoLqIvfUI7g\n\tRLuQ==", "X-Gm-Message-State": "APjAAAUgB7TLS7UzYFxC8qfX8IoWYhV8xjlBv9cpx8un+1v8o3zc1mCU\n\tLj8BnulvhxWNv7NO+cqdikPih1ApIaE=", "X-Google-Smtp-Source": "APXvYqzombjM+zpb77J9Je+x5HJM/cxGL1hmCK22wcRSgaf2dT/VW/mlpPNqn1rMtddAzLw+iyfL7w==", "X-Received": "by 2002:a62:5f02:: with SMTP id t2mr15525655pfb.7.1558029883581; \n\tThu, 16 May 2019 11:04:43 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>", "Date": "Thu, 16 May 2019 11:04:27 -0700", "Message-Id": "<20190516180427.17270-8-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190516180427.17270-1-stephen@networkplumber.org>", "References": "<20190516180427.17270-1-stephen@networkplumber.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v2 7/7] cmdline: use ether_unformat_addr", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Now that there is a version of ether_aton in rte_ether, it can\nbe used by the cmdline ethernet address parser.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n lib/Makefile | 2 +-\n lib/librte_cmdline/Makefile | 3 +-\n lib/librte_cmdline/cmdline_parse_etheraddr.c | 69 ++------------------\n lib/librte_cmdline/meson.build | 3 +\n 4 files changed, 13 insertions(+), 64 deletions(-)", "diff": "diff --git a/lib/Makefile b/lib/Makefile\nindex 82b2c4bfa8ea..cc36fe7591f0 100644\n--- a/lib/Makefile\n+++ b/lib/Makefile\n@@ -20,7 +20,7 @@ DIRS-$(CONFIG_RTE_LIBRTE_TIMER) += librte_timer\n DEPDIRS-librte_timer := librte_eal\n DIRS-$(CONFIG_RTE_LIBRTE_CFGFILE) += librte_cfgfile\n DIRS-$(CONFIG_RTE_LIBRTE_CMDLINE) += librte_cmdline\n-DEPDIRS-librte_cmdline := librte_eal\n+DEPDIRS-librte_cmdline := librte_eal librte_net\n DIRS-$(CONFIG_RTE_LIBRTE_ETHER) += librte_ethdev\n DEPDIRS-librte_ethdev := librte_net librte_eal librte_mempool librte_ring\n DEPDIRS-librte_ethdev += librte_mbuf\ndiff --git a/lib/librte_cmdline/Makefile b/lib/librte_cmdline/Makefile\nindex c64142b8d5a0..04057d7c671f 100644\n--- a/lib/librte_cmdline/Makefile\n+++ b/lib/librte_cmdline/Makefile\n@@ -7,6 +7,7 @@ include $(RTE_SDK)/mk/rte.vars.mk\n LIB = librte_cmdline.a\n \n CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3\n+CFLAGS += -DALLOW_EXPERIMENTAL_API\n \n EXPORT_MAP := rte_cmdline_version.map\n \n@@ -25,7 +26,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_vt100.c\n SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_socket.c\n SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += cmdline_parse_portlist.c\n \n-LDLIBS += -lrte_eal\n+LDLIBS += -lrte_net -lrte_eal\n \n # install includes\n INCS := cmdline.h cmdline_parse.h cmdline_parse_num.h cmdline_parse_ipaddr.h\ndiff --git a/lib/librte_cmdline/cmdline_parse_etheraddr.c b/lib/librte_cmdline/cmdline_parse_etheraddr.c\nindex 24e04755cd9e..f9ba31b49447 100644\n--- a/lib/librte_cmdline/cmdline_parse_etheraddr.c\n+++ b/lib/librte_cmdline/cmdline_parse_etheraddr.c\n@@ -12,9 +12,9 @@\n #include <ctype.h>\n #include <string.h>\n #include <sys/types.h>\n-#include <net/ethernet.h>\n \n #include <rte_string_fns.h>\n+#include <rte_ether.h>\n \n #include \"cmdline_parse.h\"\n #include \"cmdline_parse_etheraddr.h\"\n@@ -26,67 +26,13 @@ struct cmdline_token_ops cmdline_token_etheraddr_ops = {\n \t.get_help = cmdline_get_help_etheraddr,\n };\n \n-/* the format can be either XX:XX:XX:XX:XX:XX or XXXX:XXXX:XXXX */\n-#define ETHER_ADDRSTRLENLONG 18\n-#define ETHER_ADDRSTRLENSHORT 15\n-\n-#ifdef __linux__\n-#define ea_oct ether_addr_octet\n-#else\n-#define ea_oct octet\n-#endif\n-\n-\n-static struct ether_addr *\n-my_ether_aton(const char *a)\n-{\n-\tint i;\n-\tchar *end;\n-\tunsigned long o[ETHER_ADDR_LEN];\n-\tstatic struct ether_addr ether_addr;\n-\n-\ti = 0;\n-\tdo {\n-\t\terrno = 0;\n-\t\to[i] = strtoul(a, &end, 16);\n-\t\tif (errno != 0 || end == a || (end[0] != ':' && end[0] != 0))\n-\t\t\treturn NULL;\n-\t\ta = end + 1;\n-\t} while (++i != sizeof (o) / sizeof (o[0]) && end[0] != 0);\n-\n-\t/* Junk at the end of line */\n-\tif (end[0] != 0)\n-\t\treturn NULL;\n-\n-\t/* Support the format XX:XX:XX:XX:XX:XX */\n-\tif (i == ETHER_ADDR_LEN) {\n-\t\twhile (i-- != 0) {\n-\t\t\tif (o[i] > UINT8_MAX)\n-\t\t\t\treturn NULL;\n-\t\t\tether_addr.ea_oct[i] = (uint8_t)o[i];\n-\t\t}\n-\t/* Support the format XXXX:XXXX:XXXX */\n-\t} else if (i == ETHER_ADDR_LEN / 2) {\n-\t\twhile (i-- != 0) {\n-\t\t\tif (o[i] > UINT16_MAX)\n-\t\t\t\treturn NULL;\n-\t\t\tether_addr.ea_oct[i * 2] = (uint8_t)(o[i] >> 8);\n-\t\t\tether_addr.ea_oct[i * 2 + 1] = (uint8_t)(o[i] & 0xff);\n-\t\t}\n-\t/* unknown format */\n-\t} else\n-\t\treturn NULL;\n-\n-\treturn (struct ether_addr *)ðer_addr;\n-}\n-\n int\n cmdline_parse_etheraddr(__attribute__((unused)) cmdline_parse_token_hdr_t *tk,\n \tconst char *buf, void *res, unsigned ressize)\n {\n \tunsigned int token_len = 0;\n-\tchar ether_str[ETHER_ADDRSTRLENLONG+1];\n-\tstruct ether_addr *tmp;\n+\tchar ether_str[ETHER_ADDR_FMT_SIZE];\n+\tstruct ether_addr tmp;\n \n \tif (res && ressize < sizeof(struct ether_addr))\n \t\treturn -1;\n@@ -98,17 +44,16 @@ cmdline_parse_etheraddr(__attribute__((unused)) cmdline_parse_token_hdr_t *tk,\n \t\ttoken_len++;\n \n \t/* if token doesn't match possible string lengths... */\n-\tif ((token_len != ETHER_ADDRSTRLENLONG - 1) &&\n-\t\t\t(token_len != ETHER_ADDRSTRLENSHORT - 1))\n+\tif (token_len >= ETHER_ADDR_FMT_SIZE) \n \t\treturn -1;\n \n \tstrlcpy(ether_str, buf, token_len + 1);\n \n-\ttmp = my_ether_aton(ether_str);\n-\tif (tmp == NULL)\n+\tif (ether_unformat_addr(ether_str, &tmp) < 0)\n \t\treturn -1;\n+\n \tif (res)\n-\t\tmemcpy(res, tmp, sizeof(struct ether_addr));\n+\t\tmemcpy(res, &tmp, sizeof(struct ether_addr));\n \treturn token_len;\n }\n \ndiff --git a/lib/librte_cmdline/meson.build b/lib/librte_cmdline/meson.build\nindex 0fa61385fccf..c01033fd796f 100644\n--- a/lib/librte_cmdline/meson.build\n+++ b/lib/librte_cmdline/meson.build\n@@ -4,6 +4,8 @@\n # This library is processed before EAL\n includes = [global_inc]\n \n+cflags += '-DALLOW_EXPERIMENTAL_API'\n+\n version = 2\n sources = files('cmdline.c',\n \t'cmdline_cirbuf.c',\n@@ -28,3 +30,4 @@ headers = files('cmdline.h',\n \t'cmdline_socket.h',\n \t'cmdline_cirbuf.h',\n \t'cmdline_parse_portlist.h')\n+deps += ['net']\n", "prefixes": [ "v2", "7/7" ] }