From: Simon Horman <horms@verge.net.au>
Date: Fri, 12 Oct 2012 00:26:29 +0000 (+0900)
Subject: ofp-print: Do not display flow mod cookie if it is UINT64_MAX
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66e7d7a2cd928a5f1c64c7289b042d2fe2ebc21e;p=openvswitch

ofp-print: Do not display flow mod cookie if it is UINT64_MAX

Internally UINT64_MAX is used to denote that the cookie
should not be changed, so it seems appropriate
to omit this value when pretty printing flow mods.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/lib/ofp-print.c b/lib/ofp-print.c
index 0970a922..8654783a 100644
--- a/lib/ofp-print.c
+++ b/lib/ofp-print.c
@@ -743,7 +743,7 @@ ofp_print_flow_mod(struct ds *s, const struct ofp_header *oh, int verbosity)
     if (ds_last(s) != ' ') {
         ds_put_char(s, ' ');
     }
-    if (fm.new_cookie != htonll(0)) {
+    if (fm.new_cookie != htonll(0) && fm.new_cookie != htonll(UINT64_MAX)) {
         ds_put_format(s, "cookie:0x%"PRIx64" ", ntohll(fm.new_cookie));
     }
     if (fm.cookie_mask != htonll(0)) {