diff options
author | Jarno Rajahalme <jrajahalme@nicira.com> | 2015-08-28 14:55:11 -0700 |
---|---|---|
committer | Jarno Rajahalme <jrajahalme@nicira.com> | 2015-08-28 14:55:11 -0700 |
commit | 74ff3298c8806bb09d0c7e40a25b889ab7564769 (patch) | |
tree | eb79e22f9460a0699825569a14710e393ee3358d /ovn/northd | |
parent | d8ef07e70995e56005e3bc55b86cdb7d0e2066e5 (diff) | |
download | openvswitch-74ff3298c8806bb09d0c7e40a25b889ab7564769.tar.gz |
userspace: Define and use struct eth_addr.
Define struct eth_addr and use it instead of a uint8_t array for all
ethernet addresses in OVS userspace. The struct is always the right
size, and it can be assigned without an explicit memcpy, which makes
code more readable.
"struct eth_addr" is a good type name for this as many utility
functions are already named accordingly.
struct eth_addr can be accessed as bytes as well as ovs_be16's, which
makes the struct 16-bit aligned. All use seems to be 16-bit aligned,
so some algorithms on the ethernet addresses can be made a bit more
efficient making use of this fact.
As the struct fits into a register (in 64-bit systems) we pass it by
value when possible.
This patch also changes the few uses of Linux specific ETH_ALEN to
OVS's own ETH_ADDR_LEN, and removes the OFP_ETH_ALEN, as it is no
longer needed.
This work stemmed from a desire to make all struct flow members
assignable for unrelated exploration purposes. However, I think this
might be a nice code readability improvement by itself.
Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Diffstat (limited to 'ovn/northd')
-rw-r--r-- | ovn/northd/ovn-northd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c index 9d3d6580b..befe122fe 100644 --- a/ovn/northd/ovn-northd.c +++ b/ovn/northd/ovn-northd.c @@ -701,9 +701,9 @@ build_port_security(const char *eth_addr_field, size_t n = 0; for (size_t i = 0; i < n_port_security; i++) { - uint8_t ea[ETH_ADDR_LEN]; + struct eth_addr ea; - if (eth_addr_from_string(port_security[i], ea)) { + if (eth_addr_from_string(port_security[i], &ea)) { ds_put_format(match, ETH_ADDR_FMT, ETH_ADDR_ARGS(ea)); ds_put_char(match, ' '); n++; @@ -779,9 +779,9 @@ build_lflows(struct northd_context *ctx, struct hmap *datapaths, /* Ingress table 1: Destination lookup, unicast handling (priority 50), */ HMAP_FOR_EACH (op, key_node, ports) { for (size_t i = 0; i < op->nb->n_macs; i++) { - uint8_t mac[ETH_ADDR_LEN]; + struct eth_addr mac; - if (eth_addr_from_string(op->nb->macs[i], mac)) { + if (eth_addr_from_string(op->nb->macs[i], &mac)) { struct ds match, actions; ds_init(&match); |