[RFC,2/4] net/ether: add eth_unformat_addr
Checks
Commit Message
Make a function that coresponds with eth_aton_r which can
be used to convert string to ether_addr.
This also allows rte_ethdev to no longer depend on the
cmdline library.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
lib/librte_net/rte_ether.c | 12 ++++++++++++
lib/librte_net/rte_ether.h | 14 ++++++++++++++
lib/librte_net/rte_net_version.map | 1 +
3 files changed, 27 insertions(+)
Comments
On Thu, May 16, 2019 at 12:20 AM Stephen Hemminger <
stephen@networkplumber.org> wrote:
> Make a function that coresponds with eth_aton_r which can
>
nit: corresponds
be used to convert string to ether_addr.
>
> This also allows rte_ethdev to no longer depend on the
> cmdline library.
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
> lib/librte_net/rte_ether.c | 12 ++++++++++++
> lib/librte_net/rte_ether.h | 14 ++++++++++++++
> lib/librte_net/rte_net_version.map | 1 +
> 3 files changed, 27 insertions(+)
>
> diff --git a/lib/librte_net/rte_ether.c b/lib/librte_net/rte_ether.c
> index d4b41f122a16..ca7c841db197 100644
> --- a/lib/librte_net/rte_ether.c
> +++ b/lib/librte_net/rte_ether.c
> @@ -27,3 +27,15 @@ ether_format_addr(char *buf, uint16_t size,
> eth_addr->addr_bytes[4],
> eth_addr->addr_bytes[5]);
> }
> +
> +int __rte_experimental
>
You don't need the experimental tag in the .c.
+ether_unformat_addr(const char *str, struct ether_addr *eth_addr)
> +{
> + return (sscanf(str, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
> + ð_addr->addr_bytes[0],
> + ð_addr->addr_bytes[1],
> + ð_addr->addr_bytes[2],
> + ð_addr->addr_bytes[3],
> + ð_addr->addr_bytes[4],
> + ð_addr->addr_bytes[5]) == 6) ? 0 : -1;
> +}
>
Using scanf this way, you won't detect trailing characters
And I am not sure this format would detect something like:
00:11:22:33:44:555
diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h
> index 46d40412763c..b94e64b2195e 100644
> --- a/lib/librte_net/rte_ether.h
> +++ b/lib/librte_net/rte_ether.h
> @@ -248,6 +248,20 @@ void
> ether_format_addr(char *buf, uint16_t size,
> const struct ether_addr *eth_addr);
>
> +/**
> + * Convert string with Ethernet address to an ether_addr.
> + *
> + * @param str
> + * A pointer to buffer contains the formatted MAC address.
> + * @param eth_addr
> + * A pointer to a ether_addr structure.
> + * @return
> + * 0 if successful
> + * -1 and sets rte_errno if invalid string
> + */
> +int __rte_experimental
> +ether_unformat_addr(const char *str, struct ether_addr *eth_addr);
> +
> /**
> * Ethernet header: Contains the destination address, source address
> * and frame type.
> diff --git a/lib/librte_net/rte_net_version.map
> b/lib/librte_net/rte_net_version.map
> index 49d34093781c..bbf14ff1cdfa 100644
> --- a/lib/librte_net/rte_net_version.map
> +++ b/lib/librte_net/rte_net_version.map
> @@ -26,4 +26,5 @@ EXPERIMENTAL {
>
> rte_net_make_rarp_packet;
> rte_net_skip_ip6_ext;
> + eth_unformat_addr;
>
Ditto previous patch, can we prefix this with rte_ ?
@@ -27,3 +27,15 @@ ether_format_addr(char *buf, uint16_t size,
eth_addr->addr_bytes[4],
eth_addr->addr_bytes[5]);
}
+
+int __rte_experimental
+ether_unformat_addr(const char *str, struct ether_addr *eth_addr)
+{
+ return (sscanf(str, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
+ ð_addr->addr_bytes[0],
+ ð_addr->addr_bytes[1],
+ ð_addr->addr_bytes[2],
+ ð_addr->addr_bytes[3],
+ ð_addr->addr_bytes[4],
+ ð_addr->addr_bytes[5]) == 6) ? 0 : -1;
+}
@@ -248,6 +248,20 @@ void
ether_format_addr(char *buf, uint16_t size,
const struct ether_addr *eth_addr);
+/**
+ * Convert string with Ethernet address to an ether_addr.
+ *
+ * @param str
+ * A pointer to buffer contains the formatted MAC address.
+ * @param eth_addr
+ * A pointer to a ether_addr structure.
+ * @return
+ * 0 if successful
+ * -1 and sets rte_errno if invalid string
+ */
+int __rte_experimental
+ether_unformat_addr(const char *str, struct ether_addr *eth_addr);
+
/**
* Ethernet header: Contains the destination address, source address
* and frame type.
@@ -26,4 +26,5 @@ EXPERIMENTAL {
rte_net_make_rarp_packet;
rte_net_skip_ip6_ext;
+ eth_unformat_addr;
};