From: Ben Pfaff <blp@nicira.com>
Date: Tue, 14 Dec 2010 00:18:58 +0000 (-0800)
Subject: classifier: Insert commas after fields that lacked them in cls_rule_format().
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92ec574173978b410ad28f6cfa34255629204d13;p=openvswitch

classifier: Insert commas after fields that lacked them in cls_rule_format().
---

diff --git a/lib/classifier.c b/lib/classifier.c
index 236b1204..ba10272f 100644
--- a/lib/classifier.c
+++ b/lib/classifier.c
@@ -447,9 +447,9 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s)
     format_ip_netmask(s, "nw_dst", f->nw_dst, wc->nw_dst_mask);
     if (!skip_proto && !(w & FWW_NW_PROTO)) {
         if (f->dl_type == htons(ETH_TYPE_ARP)) {
-            ds_put_format(s, "arp_op=%"PRIu8, f->nw_proto);
+            ds_put_format(s, "opcode=%"PRIu8",", f->nw_proto);
         } else {
-            ds_put_format(s, "nw_proto=%"PRIu8, f->nw_proto);
+            ds_put_format(s, "nw_proto=%"PRIu8",", f->nw_proto);
         }
     }
     if (!(w & FWW_NW_TOS)) {
@@ -457,17 +457,17 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s)
     }
     if (f->nw_proto == IP_TYPE_ICMP) {
         if (!(w & FWW_TP_SRC)) {
-            ds_put_format(s, "icmp_type=%"PRIu16, ntohs(f->tp_src));
+            ds_put_format(s, "icmp_type=%"PRIu16",", ntohs(f->tp_src));
         }
         if (!(w & FWW_TP_DST)) {
-            ds_put_format(s, "icmp_code=%"PRIu16, ntohs(f->tp_dst));
+            ds_put_format(s, "icmp_code=%"PRIu16",", ntohs(f->tp_dst));
         }
     } else {
         if (!(w & FWW_TP_SRC)) {
-            ds_put_format(s, "tp_src=%"PRIu16, ntohs(f->tp_src));
+            ds_put_format(s, "tp_src=%"PRIu16",", ntohs(f->tp_src));
         }
         if (!(w & FWW_TP_DST)) {
-            ds_put_format(s, "tp_dst=%"PRIu16, ntohs(f->tp_dst));
+            ds_put_format(s, "tp_dst=%"PRIu16",", ntohs(f->tp_dst));
         }
     }