X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=lib%2Fclassifier.c;h=ba10272f77a0b632a8031efd2a1e91b0d7fcc99b;hb=1452b28ca636521b6e16f76787524f83205ec7a3;hp=236b1204217b6b34f659f81754daff58faac994c;hpb=8fe2b9682c74b4735a5a7503568a586e3353ca85;p=openvswitch 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)); } }