From: Justin Pettit <jpettit@nicira.com>
Date: Thu, 17 Jan 2013 08:31:20 +0000 (-0800)
Subject: ofproto: Add "actions=" to drop action in "ovs-appctl bridge/dump-flows".
X-Git-Tag: sliver-openvswitch-1.9.90-3~8^2~17
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=aa30ae4e84a2d44dea72e2f7b6fe8ccdbd4f70b1

ofproto: Add "actions=" to drop action in "ovs-appctl bridge/dump-flows".

The function flow_stats_ds() did its own formatting when there were no
actions, but this didn't include "action=".  There's actually no reason
to special-case this, since ofpact_format() properly handles actions
with a zero length and prints it properly.

Signed-off-by: Justin Pettit <jpettit@nicira.com>
---

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index ddf51f8b3..918b9b466 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -2809,11 +2809,7 @@ flow_stats_ds(struct rule *rule, struct ds *results)
     ds_put_format(results, "n_bytes=%"PRIu64", ", byte_count);
     cls_rule_format(&rule->cr, results);
     ds_put_char(results, ',');
-    if (rule->ofpacts_len > 0) {
-        ofpacts_format(rule->ofpacts, rule->ofpacts_len, results);
-    } else {
-        ds_put_cstr(results, "drop");
-    }
+    ofpacts_format(rule->ofpacts, rule->ofpacts_len, results);
     ds_put_cstr(results, "\n");
 }