mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-01 14:55:18 +00:00
Code Issues Releases Wiki Activity

Add support for 'hard_timeout' in OF1.2 flow_removed message.

Browse Source 
ofputil_decode_flow_removed() doesn't yet support OF1.2 at all so that
piece is missing but this otherwise should be complete.

CC: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Ben Pfaff
2012-08-09 11:01:48 -07:00
parent 06516c654a
commit fa2bad0ffc
4 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ofp-print.c
View File

@@ -856,8 +856,14 @@ ofp_print_flow_removed(struct ds *string, const struct ofp_header *oh)
} }
ds_put_cstr(string, " duration"); ds_put_cstr(string, " duration");
ofp_print_duration(string, fr.duration_sec, fr.duration_nsec); ofp_print_duration(string, fr.duration_sec, fr.duration_nsec);
ds_put_format(string, " idle%"PRIu16" pkts%"PRIu64" bytes%"PRIu64"\n", ds_put_format(string, " idle%"PRIu16, fr.idle_timeout);
fr.idle_timeout, fr.packet_count, fr.byte_count); if (fr.hard_timeout) {
/* The hard timeout was only added in OF1.2, so only print it if it is
* actually in use to avoid gratuitous change to the formatting. */
ds_put_format(string, " hard%"PRIu16, fr.hard_timeout);
}
ds_put_format(string, " pkts%"PRIu64" bytes%"PRIu64"\n",
fr.packet_count, fr.byte_count);
} }
static void static void

3
lib/ofp-util.c
View File

@@ -1837,6 +1837,7 @@ ofputil_decode_flow_removed(struct ofputil_flow_removed *fr,
fr->duration_sec = ntohl(ofr->duration_sec); fr->duration_sec = ntohl(ofr->duration_sec);
fr->duration_nsec = ntohl(ofr->duration_nsec); fr->duration_nsec = ntohl(ofr->duration_nsec);
fr->idle_timeout = ntohs(ofr->idle_timeout); fr->idle_timeout = ntohs(ofr->idle_timeout);
fr->hard_timeout = 0;
fr->packet_count = ntohll(ofr->packet_count); fr->packet_count = ntohll(ofr->packet_count);
fr->byte_count = ntohll(ofr->byte_count); fr->byte_count = ntohll(ofr->byte_count);
} else if (raw == OFPRAW_NXT_FLOW_REMOVED) { } else if (raw == OFPRAW_NXT_FLOW_REMOVED) {
@@ -1858,6 +1859,7 @@ ofputil_decode_flow_removed(struct ofputil_flow_removed *fr,
fr->duration_sec = ntohl(nfr->duration_sec); fr->duration_sec = ntohl(nfr->duration_sec);
fr->duration_nsec = ntohl(nfr->duration_nsec); fr->duration_nsec = ntohl(nfr->duration_nsec);
fr->idle_timeout = ntohs(nfr->idle_timeout); fr->idle_timeout = ntohs(nfr->idle_timeout);
fr->hard_timeout = 0;
fr->packet_count = ntohll(nfr->packet_count); fr->packet_count = ntohll(nfr->packet_count);
fr->byte_count = ntohll(nfr->byte_count); fr->byte_count = ntohll(nfr->byte_count);
} else { } else {
@@ -1891,6 +1893,7 @@ ofputil_encode_flow_removed(const struct ofputil_flow_removed *fr,
ofr->duration_sec = htonl(fr->duration_sec); ofr->duration_sec = htonl(fr->duration_sec);
ofr->duration_nsec = htonl(fr->duration_nsec); ofr->duration_nsec = htonl(fr->duration_nsec);
ofr->idle_timeout = htons(fr->idle_timeout); ofr->idle_timeout = htons(fr->idle_timeout);
ofr->hard_timeout = htons(fr->hard_timeout);
ofr->packet_count = htonll(fr->packet_count); ofr->packet_count = htonll(fr->packet_count);
ofr->byte_count = htonll(fr->byte_count); ofr->byte_count = htonll(fr->byte_count);
oxm_put_match(msg, &fr->rule); oxm_put_match(msg, &fr->rule);

1
lib/ofp-util.h
View File

@@ -248,6 +248,7 @@ struct ofputil_flow_removed {
uint32_t duration_sec; uint32_t duration_sec;
uint32_t duration_nsec; uint32_t duration_nsec;
uint16_t idle_timeout; uint16_t idle_timeout;
uint16_t hard_timeout;
uint64_t packet_count; /* Packet count, UINT64_MAX if unknown. */ uint64_t packet_count; /* Packet count, UINT64_MAX if unknown. */
uint64_t byte_count; /* Byte count, UINT64_MAX if unknown. */ uint64_t byte_count; /* Byte count, UINT64_MAX if unknown. */
}; };

1
ofproto/ofproto.c
View File

@@ -3142,6 +3142,7 @@ ofproto_rule_send_removed(struct rule *rule, uint8_t reason)
calc_flow_duration__(rule->created, time_msec(), calc_flow_duration__(rule->created, time_msec(),
&fr.duration_sec, &fr.duration_nsec); &fr.duration_sec, &fr.duration_nsec);
fr.idle_timeout = rule->idle_timeout; fr.idle_timeout = rule->idle_timeout;
fr.hard_timeout = rule->hard_timeout;
rule->ofproto->ofproto_class->rule_get_stats(rule, &fr.packet_count, rule->ofproto->ofproto_class->rule_get_stats(rule, &fr.packet_count,
&fr.byte_count); &fr.byte_count);