projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
openflow: Separate OF1.0, OF1.1 flow_mod constants and types.
[openvswitch]
/
utilities
/
ovs-ofctl.c
diff --git
a/utilities/ovs-ofctl.c
b/utilities/ovs-ofctl.c
index 258115ec55fa54e5c0832762c1e43232cad83dde..00ba06b18f05f45476a5374f12e70a567d82b9fa 100644
(file)
--- a/
utilities/ovs-ofctl.c
+++ b/
utilities/ovs-ofctl.c
@@
-1843,7
+1843,7
@@
read_flows_from_file(const char *filename, struct classifier *cls, int index)
version->cookie = fm.new_cookie;
version->idle_timeout = fm.idle_timeout;
version->hard_timeout = fm.hard_timeout;
version->cookie = fm.new_cookie;
version->idle_timeout = fm.idle_timeout;
version->hard_timeout = fm.hard_timeout;
- version->flags = fm.flags & (OFPFF_SEND_FLOW_REM | OFPFF_EMERG);
+ version->flags = fm.flags & (OFPFF_SEND_FLOW_REM | OFPFF
10
_EMERG);
version->ofpacts = fm.ofpacts;
version->ofpacts_len = fm.ofpacts_len;
version->ofpacts = fm.ofpacts;
version->ofpacts_len = fm.ofpacts_len;
@@
-1868,8
+1868,8
@@
recv_flow_stats_reply(struct vconn *vconn, ovs_be32 send_xid,
struct ofpbuf *reply = *replyp;
for (;;) {
struct ofpbuf *reply = *replyp;
for (;;) {
- ovs_be16 flags;
int retval;
int retval;
+ bool more;
/* Get a flow stats reply message, if we don't already have one. */
if (!reply) {
/* Get a flow stats reply message, if we don't already have one. */
if (!reply) {
@@
-1897,10
+1897,10
@@
recv_flow_stats_reply(struct vconn *vconn, ovs_be32 send_xid,
return true;
case EOF:
return true;
case EOF:
-
flags = ((const struct ofp_stats_msg *) reply->l2)->flags
;
+
more = ofpmp_more(reply->l2)
;
ofpbuf_delete(reply);
reply = NULL;
ofpbuf_delete(reply);
reply = NULL;
- if (!
(flags & htons(OFPSF_REPLY_MORE))
) {
+ if (!
more
) {
*replyp = NULL;
return false;
}
*replyp = NULL;
return false;
}