ofp-print: always print the flow nw_tos if not wildcarded
authorRomain Lenglet <romain.lenglet@berabera.info>
Fri, 5 Nov 2010 01:47:50 +0000 (10:47 +0900)
committerJesse Gross <jesse@nicira.com>
Fri, 5 Nov 2010 04:58:06 +0000 (21:58 -0700)
Print the nw_tos field for all flows if it is not wildcarded, instead
of only if the dl_type is IP and the nw_proto is not ICMP, TCP, or
UDP.

lib/ofp-print.c

index 7337f6810145b0a707b09e9352935cc06cdc803f..bc777568b259c7dd6a16ebbbc517607a4589f282 100644 (file)
@@ -737,10 +737,10 @@ ofp_match_to_string(const struct ofp_match *om, int verbosity)
         } else {
             print_wild(&f, "nw_proto=", w & OFPFW_NW_PROTO, verbosity,
                        "%u", om->nw_proto);
-            print_wild(&f, "nw_tos=", w & OFPFW_NW_TOS, verbosity,
-                       "%u", om->nw_tos);
         }
     }
+    print_wild(&f, "nw_tos=", w & OFPFW_NW_TOS, verbosity,
+               "%u", om->nw_tos);
     if (om->nw_proto == IP_TYPE_ICMP) {
         print_wild(&f, "icmp_type=", w & OFPFW_ICMP_TYPE, verbosity,
                    "%d", ntohs(om->icmp_type));