Refactor to remove some duplicated logic in match_format()
implemenation and make the output more uniform.
Signed-off-by: Andy Zhou <az...@nicira.com>
---
lib/dynamic-string.h | 8 +++++
lib/match.c | 84 +++++++++++++++++++++++--------------------------
tests/ofproto-dpif.at | 6 ++--
3 files changed, 50 insertions(+), 48 deletions(-)
diff --git a/lib/dynamic-string.h b/lib/dynamic-string.h
index 2272343..7a68d33 100644
--- a/lib/dynamic-string.h
+++ b/lib/dynamic-string.h
@@ -89,4 +89,12 @@ ds_put_char(struct ds *ds, char c)
}
}
+static inline void
+ds_put_cstr_if(struct ds *ds, char *str, bool b)
+{
+ if (b) {
+ ds_put_cstr(ds, str);
+ }
+}
+
#endif /* dynamic-string.h */
diff --git a/lib/match.c b/lib/match.c
index 1154b20..12113e6 100644
--- a/lib/match.c
+++ b/lib/match.c
@@ -779,7 +779,6 @@ format_ipv6_netmask(struct ds *s, const char *name,
}
}
-
static void
format_be16_masked(struct ds *s, const char *name,
ovs_be16 value, ovs_be16 mask)
@@ -797,23 +796,42 @@ format_be16_masked(struct ds *s, const char *name,
}
static void
+format_uint32_masked(struct ds *s, const char *name,
+ uint32_t value, uint32_t mask)
+{
+ if (mask) {
+ ds_put_format(s, "%s=", name);
+ ds_put_cstr_if(s, "0x", value >= 10);
+ ds_put_format(s, "%"PRIx32, value);
+ if (mask != UINT32_MAX) {
+ ds_put_format(s, "/0x%"PRIx32, mask);
+ }
+ ds_put_char(s, ',');
+ }
+}
+
+static void
+format_be64_masked(struct ds *s, const char *name,
+ ovs_be64 value, ovs_be64 mask)
+{
+ if (mask != htonll(0)) {
+ ds_put_format(s, "%s=", name);
+ ds_put_cstr_if(s, "0x", ntohll(value) >= 10);
+ ds_put_format(s, "%"PRIx64, ntohll(value));
+ if (mask != OVS_BE64_MAX) {
+ ds_put_format(s, "/0x%"PRIx64, ntohll(mask));
+ }
+ ds_put_char(s, ',');
+ }
+}
+
+static void
format_flow_tunnel(struct ds *s, const struct match *match)
{
const struct flow_wildcards *wc = &match->wc;
const struct flow_tnl *tnl = &match->flow.tunnel;
- switch (wc->masks.tunnel.tun_id) {
- case 0:
- break;
- case OVS_BE64_MAX:
- ds_put_format(s, "tun_id=%#"PRIx64",", ntohll(tnl->tun_id));
- break;
- default:
- ds_put_format(s, "tun_id=%#"PRIx64"/%#"PRIx64",",
- ntohll(tnl->tun_id),
- ntohll(wc->masks.tunnel.tun_id));
- break;
- }
+ format_be64_masked(s, "tun_id", tnl->tun_id, wc->masks.tunnel.tun_id);
format_ip_netmask(s, "tun_src", tnl->ip_src, wc->masks.tunnel.ip_src);
format_ip_netmask(s, "tun_dst", tnl->ip_dst, wc->masks.tunnel.ip_dst);
@@ -848,17 +866,7 @@ match_format(const struct match *match, struct ds *s,
unsigned int priority)
ds_put_format(s, "priority=%u,", priority);
}
- switch (wc->masks.pkt_mark) {
- case 0:
- break;
- case UINT32_MAX:
- ds_put_format(s, "pkt_mark=%#"PRIx32",", f->pkt_mark);
- break;
- default:
- ds_put_format(s, "pkt_mark=%#"PRIx32"/%#"PRIx32",",
- f->pkt_mark, wc->masks.pkt_mark);
- break;
- }
+ format_uint32_masked(s, "pkt_mark", f->pkt_mark, wc->masks.pkt_mark);
if (wc->masks.skb_priority) {
ds_put_format(s, "skb_priority=%#"PRIx32",", f->skb_priority);
@@ -915,32 +923,18 @@ match_format(const struct match *match, struct ds *s,
unsigned int priority)
}
}
for (i = 0; i < FLOW_N_REGS; i++) {
- switch (wc->masks.regs[i]) {
- case 0:
- break;
- case UINT32_MAX:
- ds_put_format(s, "reg%d=0x%"PRIx32",", i, f->regs[i]);
- break;
- default:
- ds_put_format(s, "reg%d=0x%"PRIx32"/0x%"PRIx32",",
- i, f->regs[i], wc->masks.regs[i]);
- break;
+ #define REGNAME_LEN 20
+ char regname[REGNAME_LEN];
+ if (snprintf(regname, REGNAME_LEN, "reg%d", i) >= REGNAME_LEN) {
+ strcpy(regname, "reg?");
}
+ format_uint32_masked(s, regname, f->regs[i], wc->masks.regs[i]);
}
format_flow_tunnel(s, match);
- switch (wc->masks.metadata) {
- case 0:
- break;
- case OVS_BE64_MAX:
- ds_put_format(s, "metadata=%#"PRIx64",", ntohll(f->metadata));
- break;
- default:
- ds_put_format(s, "metadata=%#"PRIx64"/%#"PRIx64",",
- ntohll(f->metadata), ntohll(wc->masks.metadata));
- break;
- }
+ format_be64_masked(s, "metadata", f->metadata, wc->masks.metadata);
+
if (wc->masks.in_port.ofp_port) {
ds_put_cstr(s, "in_port=");
ofputil_format_port(f->in_port.ofp_port, s);
diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at
index b78e156..df08241 100644
--- a/tests/ofproto-dpif.at
+++ b/tests/ofproto-dpif.at
@@ -1457,7 +1457,7 @@ Datapath actions: 2
])
AT_CHECK([head -n 2 stdout], [0], [dnl
Bridge: br0
-Flow:
pkt_mark=0x2,skb_priority=0x1,arp,metadata=0,in_port=1,vlan_tci=0x0000,dl_src=50:54:00:00:00:01,dl_dst=50:54:00:00:00:02,arp_spa=0.0.0.0,arp_tpa=0.0.0.0,arp_sha=00:00:00:00:00:00,arp_tha=00:00:00:00:00:00
+Flow:
pkt_mark=2,skb_priority=0x1,arp,metadata=0,in_port=1,vlan_tci=0x0000,dl_src=50:54:00:00:00:01,dl_dst=50:54:00:00:00:02,arp_spa=0.0.0.0,arp_tpa=0.0.0.0,arp_sha=00:00:00:00:00:00,arp_tha=00:00:00:00:00:00
])
# Test command: ofproto/trace dp_name odp_flow packet
@@ -1468,7 +1468,7 @@ Datapath actions: 2
])
AT_CHECK([head -n 2 stdout], [0], [dnl
Bridge: br0
-Flow:
pkt_mark=0x2,skb_priority=0x1,arp,metadata=0,in_port=1,vlan_tci=0x0000,dl_src=50:54:00:00:00:01,dl_dst=50:54:00:00:00:02,arp_spa=0.0.0.0,arp_tpa=0.0.0.0,arp_sha=00:00:00:00:00:00,arp_tha=00:00:00:00:00:00
+Flow:
pkt_mark=2,skb_priority=0x1,arp,metadata=0,in_port=1,vlan_tci=0x0000,dl_src=50:54:00:00:00:01,dl_dst=50:54:00:00:00:02,arp_spa=0.0.0.0,arp_tpa=0.0.0.0,arp_sha=00:00:00:00:00:00,arp_tha=00:00:00:00:00:00
])
# Test command: ofproto/trace br_name br_flow packet
@@ -1479,7 +1479,7 @@ Datapath actions: 1
])
AT_CHECK([head -n 2 stdout], [0], [dnl
Bridge: br0
-Flow:
pkt_mark=0x1,skb_priority=0x2,arp,metadata=0,in_port=2,vlan_tci=0x0000,dl_src=50:54:00:00:00:02,dl_dst=50:54:00:00:00:01,arp_spa=0.0.0.0,arp_tpa=0.0.0.0,arp_sha=00:00:00:00:00:00,arp_tha=00:00:00:00:00:00
+Flow:
pkt_mark=1,skb_priority=0x2,arp,metadata=0,in_port=2,vlan_tci=0x0000,dl_src=50:54:00:00:00:02,dl_dst=50:54:00:00:00:01,arp_spa=0.0.0.0,arp_tpa=0.0.0.0,arp_sha=00:00:00:00:00:00,arp_tha=00:00:00:00:00:00
])
OVS_VSWITCHD_STOP
--
1.7.9.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
