git://git.onelab.eu
/
sliver-openvswitch.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8fe2b96
)
classifier: Insert commas after fields that lacked them in cls_rule_format().
author
Ben Pfaff
<blp@nicira.com>
Tue, 14 Dec 2010 00:18:58 +0000
(16:18 -0800)
committer
Ben Pfaff
<blp@nicira.com>
Wed, 15 Dec 2010 17:48:18 +0000
(09:48 -0800)
lib/classifier.c
patch
|
blob
|
history
diff --git
a/lib/classifier.c
b/lib/classifier.c
index
236b120
..
ba10272
100644
(file)
--- 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)) {
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 {
} 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)) {
}
}
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)) {
}
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)) {
}
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)) {
}
} 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)) {
}
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));
}
}
}
}