From: Ben Pfaff <blp@nicira.com>
Date: Mon, 9 Jul 2012 21:21:00 +0000 (-0700)
Subject: ofp-actions: Add hex dump of bad actions to log message on error.
X-Git-Tag: sliver-openvswitch-1.8.90-0~48^2~267
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0c449c5683a64592215c3bcc051437bd7bffffa3;p=sliver-openvswitch.git

ofp-actions: Add hex dump of bad actions to log message on error.

This should make debugging easier in such cases.

Bug #12460.
Reported-by: Natasha Gude <natasha@nicira.com>
Reported-by: James Schmidt <jschmidt@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c
index 2254f5326..93f6bf77b 100644
--- a/lib/ofp-actions.c
+++ b/lib/ofp-actions.c
@@ -450,8 +450,15 @@ ofpacts_from_openflow10(const union ofp_action *in, size_t n_in,
         }
     }
     if (left) {
-        VLOG_WARN_RL(&rl, "bad action format at offset %zu",
-                     (n_in - left) * sizeof *a);
+        if (!VLOG_DROP_WARN(&rl)) {
+            struct ds s;
+
+            ds_init(&s);
+            ds_put_hex_dump(&s, in, n_in * sizeof *a, 0, false);
+            VLOG_WARN("bad action format at offset %#x:\n%s",
+                      (n_in - left) * sizeof *a, ds_cstr(&s));
+            ds_destroy(&s);
+        }
         return OFPERR_OFPBAC_BAD_LEN;
     }