aboutsummaryrefslogtreecommitdiff
path: root/ofproto
diff options
context:
space:
mode:
authorJustin Pettit <jpettit@nicira.com>2013-03-06 17:11:35 -0800
committerJustin Pettit <jpettit@nicira.com>2013-03-07 17:45:59 -0800
commite2cf1363d629c4e9c202bd5be43e75a5fafbab59 (patch)
tree53dd18ec2f7ae8449808c6d38945479fc5255d65 /ofproto
parent7c17de2b7a26c2a3e3842650b971b7d9b1236d7a (diff)
ofproto-dpif: Print slow-path actions instead of "drop" in dump-flows.
The command "ovs-appctl dpif/dump-flows" would print slow-path actions as "drop", which could be confusing to users. This is different from "ovs-dpctl dump-flows", which prints a descriptive reason. This commit replaces "drop" with the reason. Bug #14840 Signed-off-by: Justin Pettit <jpettit@nicira.com>
Diffstat (limited to 'ofproto')
-rw-r--r--ofproto/ofproto-dpif.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index b204fce3..862c021a 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -8063,7 +8063,18 @@ ofproto_unixctl_dpif_dump_flows(struct unixctl_conn *conn,
}
ds_put_cstr(&ds, ", actions:");
- format_odp_actions(&ds, subfacet->actions, subfacet->actions_len);
+ if (subfacet->slow) {
+ uint64_t slow_path_stub[128 / 8];
+ const struct nlattr *actions;
+ size_t actions_len;
+
+ compose_slow_path(ofproto, &subfacet->facet->flow, subfacet->slow,
+ slow_path_stub, sizeof slow_path_stub,
+ &actions, &actions_len);
+ format_odp_actions(&ds, actions, actions_len);
+ } else {
+ format_odp_actions(&ds, subfacet->actions, subfacet->actions_len);
+ }
ds_put_char(&ds, '\n');
}