When tracing a flow, it shows the "relevant fields" that were used
to determine the results. However, this currently only includes fields
that are used for computing the actions but not the flow lookup. This
can be confusing so this patch includes the wildcards from the classifer
lookup as well.
Signed-off-by: Jesse Gross <je...@nicira.com>
---
ofproto/ofproto-dpif.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index a8e5cd5..9ebcbcc 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -5724,12 +5724,14 @@ ofproto_trace(struct ofproto_dpif *ofproto, const
struct flow *flow,
const struct ofpbuf *packet, struct ds *ds)
{
struct rule_dpif *rule;
+ struct flow_wildcards wc;
ds_put_cstr(ds, "Flow: ");
flow_format(ds, flow);
ds_put_char(ds, '\n');
- rule = rule_dpif_lookup(ofproto, flow, NULL);
+ flow_wildcards_init_catchall(&wc);
+ rule = rule_dpif_lookup(ofproto, flow, &wc);
trace_format_rule(ds, 0, rule);
if (rule == ofproto->miss_rule) {
@@ -5759,6 +5761,7 @@ ofproto_trace(struct ofproto_dpif *ofproto, const struct
flow *flow,
trace.xin.report_hook = trace_report;
xlate_actions(&trace.xin, &trace.xout);
+ flow_wildcards_or(&trace.xout.wc, &trace.xout.wc, &wc);
ds_put_char(ds, '\n');
trace_format_flow(ds, 0, "Final flow", &trace);
--
1.8.1.2
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
