[ovs-dev] [flow monitor v2 06/12] ofp-util: Make put_stats__() public as ofputil_put_stats_header().

[Justin Pettit]

Looks good.

--Justin


On Jul 6, 2012, at 2:49 PM, Ben Pfaff wrote:

> 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 at nicira.com>
> ---
> lib/ofp-util.c |   25 ++++++++++++++-----------
> lib/ofp-util.h |    4 ++++
> 2 files changed, 18 insertions(+), 11 deletions(-)
> 
> diff --git a/lib/ofp-util.c b/lib/ofp-util.c
> index 99f92a8..caf124d 100644
> --- a/lib/ofp-util.c
> +++ b/lib/ofp-util.c
> @@ -3266,10 +3266,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;
> @@ -3302,8 +3302,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;
> @@ -3312,13 +3312,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'
> diff --git a/lib/ofp-util.h b/lib/ofp-util.h
> index 703de50..5b1e8ed 100644
> --- a/lib/ofp-util.h
> +++ b/lib/ofp-util.h
> @@ -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 *);
> -- 
> 1.7.2.5
> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev