mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-02 15:25:22 +00:00
Code Issues Releases Wiki Activity

ofp-util: Remove flow_stats_iterator, flows_stats_first(), flow_stats_next()

Browse Source 
Nothing uses these anymore.  ofputil_decode_flow_stats_reply() is a better
alternative.
This commit is contained in:
Ben Pfaff
2011-03-15 14:56:09 -07:00
parent 14865427e6
commit a6159a233e
2 changed files with 0 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lib/ofp-util.c
View File

@@ -1876,51 +1876,6 @@ hton_ofp_phy_port(struct ofp_phy_port *opp)
opp->peer = htonl(opp->peer); opp->peer = htonl(opp->peer);
} }
const struct ofp_flow_stats *
flow_stats_first(struct flow_stats_iterator *iter,
const struct ofp_stats_reply *osr)
{
iter->pos = osr->body;
iter->end = osr->body + (ntohs(osr->header.length)
- offsetof(struct ofp_stats_reply, body));
return flow_stats_next(iter);
}
const struct ofp_flow_stats *
flow_stats_next(struct flow_stats_iterator *iter)
{
ptrdiff_t bytes_left = iter->end - iter->pos;
const struct ofp_flow_stats *fs;
size_t length;
if (bytes_left < sizeof *fs) {
if (bytes_left != 0) {
VLOG_WARN_RL(&bad_ofmsg_rl,
"%td leftover bytes in flow stats reply", bytes_left);
}
return NULL;
}
fs = (const void *) iter->pos;
length = ntohs(fs->length);
if (length < sizeof *fs) {
VLOG_WARN_RL(&bad_ofmsg_rl, "flow stats length %zu is shorter than "
"min %zu", length, sizeof *fs);
return NULL;
} else if (length > bytes_left) {
VLOG_WARN_RL(&bad_ofmsg_rl, "flow stats length %zu but only %td "
"bytes left", length, bytes_left);
return NULL;
} else if ((length - sizeof *fs) % sizeof fs->actions[0]) {
VLOG_WARN_RL(&bad_ofmsg_rl, "flow stats length %zu has %zu bytes "
"left over in final action", length,
(length - sizeof *fs) % sizeof fs->actions[0]);
return NULL;
}
iter->pos += length;
return fs;
}
static int static int
check_action_exact_len(const union ofp_action *a, unsigned int len, check_action_exact_len(const union ofp_action *a, unsigned int len,
unsigned int required_len) unsigned int required_len)

7
lib/ofp-util.h
View File

@@ -258,13 +258,6 @@ struct ofpbuf *make_echo_request(void);
struct ofpbuf *make_echo_reply(const struct ofp_header *rq); struct ofpbuf *make_echo_reply(const struct ofp_header *rq);
void hton_ofp_phy_port(struct ofp_phy_port *); void hton_ofp_phy_port(struct ofp_phy_port *);
struct flow_stats_iterator {
const uint8_t *pos, *end;
};
const struct ofp_flow_stats *flow_stats_first(struct flow_stats_iterator *,
const struct ofp_stats_reply *);
const struct ofp_flow_stats *flow_stats_next(struct flow_stats_iterator *);
/* Actions. */ /* Actions. */