[ovs-dev] [ofp-print 08/15] classifier: Insert commas after fields that lacked them in cls_rule_format().
Justin Pettit
jpettit at nicira.com
Tue Dec 14 22:13:53 UTC 2010
Looks good.
--Justin
On Dec 14, 2010, at 12:23 PM, Ben Pfaff wrote:
> ---
> lib/classifier.c | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/lib/classifier.c b/lib/classifier.c
> index 236b120..ba10272 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));
> }
> }
>
> --
> 1.7.1
>
>
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev_openvswitch.org
More information about the dev
mailing list