[ovs-dev] [ofp-print 05/18] ofp-print: Print NXST_FLOW replies.
Ben Pfaff
blp at nicira.com
Thu Dec 9 00:26:57 UTC 2010
---
lib/ofp-print.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
lib/ofp-util.c | 16 +++++++++++
lib/ofp-util.h | 5 +++-
3 files changed, 102 insertions(+), 1 deletions(-)
diff --git a/lib/ofp-print.c b/lib/ofp-print.c
index 83d61b5..b35e698 100644
--- a/lib/ofp-print.c
+++ b/lib/ofp-print.c
@@ -1130,6 +1130,82 @@ ofp_print_ofpst_flow_reply(struct ds *string, const struct ofp_header *oh,
}
static void
+ofp_print_nxst_flow_reply(struct ds *string, const struct ofp_header *oh)
+{
+ struct ofpbuf b;
+
+ ofpbuf_use_const(&b, ofputil_nxstats_body(oh),
+ ofputil_nxstats_body_len(oh));
+ while (b.size > 0) {
+ const struct nx_flow_stats *fs;
+ union ofp_action *actions;
+ struct cls_rule rule;
+ size_t actions_len, n_actions;
+ size_t length;
+ int match_len;
+ int error;
+
+ fs = ofpbuf_try_pull(&b, sizeof *fs);
+ if (!fs) {
+ ds_put_format(string, " ***%td leftover bytes at end***", b.size);
+ break;
+ }
+
+ length = ntohs(fs->length);
+ if (length < sizeof *fs) {
+ ds_put_format(string, " ***nx_flow_stats claims length %zu***",
+ length);
+ break;
+ }
+
+ match_len = ntohs(fs->match_len);
+ if (match_len > length - sizeof *fs) {
+ ds_put_format(string, " ***length=%zu match_len=%d***",
+ length, match_len);
+ break;
+ }
+
+ ds_put_format(string, " cookie=0x%"PRIx64", ", ntohll(fs->cookie));
+ ds_put_format(string, "duration_sec=%"PRIu32"s, ",
+ ntohl(fs->duration_sec));
+ ds_put_format(string, "duration_nsec=%"PRIu32"ns, ",
+ ntohl(fs->duration_nsec));
+ ds_put_format(string, "table_id=%"PRIu8", ", fs->table_id);
+ ds_put_format(string, "priority=%"PRIu16", ", ntohs(fs->priority));
+ ds_put_format(string, "n_packets=%"PRIu64", ",
+ ntohll(fs->packet_count));
+ ds_put_format(string, "n_bytes=%"PRIu64", ", ntohll(fs->byte_count));
+ if (fs->idle_timeout != htons(OFP_FLOW_PERMANENT)) {
+ ds_put_format(string, "idle_timeout=%"PRIu16",",
+ ntohs(fs->idle_timeout));
+ }
+ if (fs->hard_timeout != htons(OFP_FLOW_PERMANENT)) {
+ ds_put_format(string, "hard_timeout=%"PRIu16",",
+ ntohs(fs->hard_timeout));
+ }
+
+ error = nx_pull_match(&b, match_len, ntohs(fs->priority), &rule);
+ if (error) {
+ ofp_print_error(string, error);
+ break;
+ }
+
+ actions_len = length - sizeof *fs - ROUND_UP(match_len, 8);
+ error = ofputil_pull_actions(&b, actions_len, &actions, &n_actions);
+ if (error) {
+ ofp_print_error(string, error);
+ break;
+ }
+
+ cls_rule_format(&rule, string);
+ ds_put_char(string, ' ');
+ ofp_print_actions(string, (const struct ofp_action_header *) actions,
+ n_actions * sizeof *actions);
+ ds_put_char(string, '\n');
+ }
+}
+
+static void
ofp_print_ofpst_aggregate_request(struct ds *string,
const struct ofp_header *oh, int verbosity)
{
@@ -1506,7 +1582,13 @@ ofp_to_string__(const struct ofp_header *oh,
case OFPUTIL_NXT_FLOW_REMOVED:
case OFPUTIL_NXST_FLOW_REQUEST:
case OFPUTIL_NXST_AGGREGATE_REQUEST:
+ /* XXX */
+ break;
+
case OFPUTIL_NXST_FLOW_REPLY:
+ ofp_print_nxst_flow_reply(string, oh);
+ break;
+
case OFPUTIL_NXST_AGGREGATE_REPLY:
/* XXX */
break;
diff --git a/lib/ofp-util.c b/lib/ofp-util.c
index cbba506..aa51333 100644
--- a/lib/ofp-util.c
+++ b/lib/ofp-util.c
@@ -1331,6 +1331,22 @@ ofputil_stats_body_len(const struct ofp_header *oh)
return ntohs(oh->length) - sizeof(struct ofp_stats_request);
}
+/* Returns the first byte of the body of the nicira_stats_msg in 'oh'. */
+const void *
+ofputil_nxstats_body(const struct ofp_header *oh)
+{
+ assert(oh->type == OFPT_STATS_REQUEST || oh->type == OFPT_STATS_REPLY);
+ return ((const struct nicira_stats_msg *) oh) + 1;
+}
+
+/* Returns the length of the body of the nicira_stats_msg in 'oh'. */
+size_t
+ofputil_nxstats_body_len(const struct ofp_header *oh)
+{
+ assert(oh->type == OFPT_STATS_REQUEST || oh->type == OFPT_STATS_REPLY);
+ return ntohs(oh->length) - sizeof(struct nicira_stats_msg);
+}
+
struct ofpbuf *
make_flow_mod(uint16_t command, const struct cls_rule *rule,
size_t actions_len)
diff --git a/lib/ofp-util.h b/lib/ofp-util.h
index abd811f..a0c103f 100644
--- a/lib/ofp-util.h
+++ b/lib/ofp-util.h
@@ -180,7 +180,10 @@ void *ofputil_make_nxstats_request(size_t openflow_len, uint32_t subtype,
struct ofpbuf **);
const void *ofputil_stats_body(const struct ofp_header *);
-size_t ofputil_stats_body_len(const struct ofp_header *oh);
+size_t ofputil_stats_body_len(const struct ofp_header *);
+
+const void *ofputil_nxstats_body(const struct ofp_header *);
+size_t ofputil_nxstats_body_len(const struct ofp_header *);
struct ofpbuf *make_flow_mod(uint16_t command, const struct cls_rule *,
size_t actions_len);
--
1.7.1
More information about the dev
mailing list