[ovs-dev] [bundle 1/2] bundle: Treat slave_type properly as 32-bit value.

[Ethan Jackson]

Looks Good, thanks.

Ethan

On Wed, Jul 20, 2011 at 09:52, Ben Pfaff <blp at nicira.com> wrote:
> Found by sparse.
> ---
>  lib/bundle.c |    9 +++++----
>  1 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/lib/bundle.c b/lib/bundle.c
> index 0b0e361..996955f 100644
> --- a/lib/bundle.c
> +++ b/lib/bundle.c
> @@ -69,7 +69,8 @@ int
>  bundle_check(const struct nx_action_bundle *nab, int max_ports)
>  {
>     static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
> -    uint16_t n_slaves, fields, algorithm, slave_type, subtype;
> +    uint16_t n_slaves, fields, algorithm, subtype;
> +    uint32_t slave_type;
>     size_t slaves_size, i;
>     int error;
>
> @@ -77,7 +78,7 @@ bundle_check(const struct nx_action_bundle *nab, int max_ports)
>     n_slaves = ntohs(nab->n_slaves);
>     fields = ntohs(nab->fields);
>     algorithm = ntohs(nab->algorithm);
> -    slave_type = ntohs(nab->slave_type);
> +    slave_type = ntohl(nab->slave_type);
>     slaves_size = ntohs(nab->len) - sizeof *nab;
>
>     error = ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_BAD_ARGUMENT);
> @@ -204,7 +205,7 @@ bundle_parse(struct ofpbuf *b, const char *s)
>     }
>
>     if (!strcasecmp(slave_type, "ofport")) {
> -        nab->slave_type = htons(NXM_OF_IN_PORT);
> +        nab->slave_type = htonl(NXM_OF_IN_PORT);
>     } else {
>         ovs_fatal(0, "%s: unknown slave_type `%s'", s, slave_type);
>     }
> @@ -233,7 +234,7 @@ bundle_format(const struct nx_action_bundle *nab, struct ds *s)
>         algorithm = "<unknown>";
>     }
>
> -    switch (ntohs(nab->slave_type)) {
> +    switch (ntohl(nab->slave_type)) {
>     case NXM_OF_IN_PORT:
>         slave_type = "ofport";
>         break;
> --
> 1.7.4.4
>
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
>