mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-30 22:05:19 +00:00
Code Issues Releases Wiki Activity

ofp-util: Make put_stats__() public as ofputil_put_stats_header().

Browse Source 
An upcoming commit will introduce a user outside of ofp-util.c.

The change to put_stats_reply__() is larger than strictly necessary to
avoid making really ugly line breaks.

Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Ben Pfaff
2012-06-29 16:35:17 -07:00
parent e8fa940e4a
commit 5cc63216b1
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/ofp-util.c
View File

@@ -3268,10 +3268,10 @@ update_openflow_length(struct ofpbuf *buffer)
oh->length = htons(buffer->size);
}
static void
put_stats__(ovs_be32 xid, uint8_t ofp_type,
ovs_be16 ofpst_type, ovs_be32 nxst_subtype,
struct ofpbuf *msg)
void
ofputil_put_stats_header(ovs_be32 xid, uint8_t ofp_type,
ovs_be16 ofpst_type, ovs_be32 nxst_subtype,
struct ofpbuf *msg)
{
if (ofpst_type == htons(OFPST_VENDOR)) {
struct nicira_stats_msg *nsm;
@@ -3304,8 +3304,8 @@ ofputil_make_stats_request(size_t openflow_len, uint16_t ofpst_type,
struct ofpbuf *msg;
msg = *bufferp = ofpbuf_new(openflow_len);
put_stats__(alloc_xid(), OFPT10_STATS_REQUEST,
htons(ofpst_type), htonl(nxst_subtype), msg);
ofputil_put_stats_header(alloc_xid(), OFPT10_STATS_REQUEST,
htons(ofpst_type), htonl(nxst_subtype), msg);
ofpbuf_padto(msg, openflow_len);
return msg->data;
@@ -3314,13 +3314,16 @@ ofputil_make_stats_request(size_t openflow_len, uint16_t ofpst_type,
static void
put_stats_reply__(const struct ofp_stats_msg *request, struct ofpbuf *msg)
{
ovs_be32 nxst_subtype;
assert(request->header.type == OFPT10_STATS_REQUEST ||
request->header.type == OFPT10_STATS_REPLY);
put_stats__(request->header.xid, OFPT10_STATS_REPLY, request->type,
(request->type != htons(OFPST_VENDOR)
? htonl(0)
: ((const struct nicira_stats_msg *) request)->subtype),
msg);
nxst_subtype = (request->type != htons(OFPST_VENDOR)
? htonl(0)
: ((const struct nicira_stats_msg *) request)->subtype);
ofputil_put_stats_header(request->header.xid, OFPT10_STATS_REPLY,
request->type, nxst_subtype, msg);
}
/* Creates a statistics reply message with total length 'openflow_len'

4
lib/ofp-util.h
View File

@@ -531,6 +531,10 @@ void *ofputil_make_stats_reply(size_t openflow_len,
const struct ofp_stats_msg *request,
struct ofpbuf **);
void ofputil_put_stats_header(ovs_be32 xid, uint8_t ofp_type,
ovs_be16 ofpst_type, ovs_be32 nxst_subtype,
struct ofpbuf *);
void ofputil_start_stats_reply(const struct ofp_stats_msg *request,
struct list *);
struct ofpbuf *ofputil_reserve_stats_reply(size_t len, struct list *);