Thanks, applied to master.
On Wed, Jul 17, 2013 at 05:04:18PM -0700, Alex Wang wrote:
> Looks good to me, thanks
>
>
> On Fri, Jun 28, 2013 at 2:45 PM, Ben Pfaff <b...@nicira.com> wrote:
>
> > This is the convention that I've meant to maintain, but missed a number of
> > messages. This corrects them.
> >
> > Signed-off-by: Ben Pfaff <b...@nicira.com>
> > ---
> > lib/learning-switch.c | 28 ++++++++++++++--------------
> > lib/ofp-msgs.h | 28 ++++++++++++++--------------
> > lib/ofp-print.c | 28 ++++++++++++++--------------
> > lib/rconn.c | 28 ++++++++++++++--------------
> > ofproto/ofproto.c | 30 +++++++++++++++---------------
> > 5 files changed, 71 insertions(+), 71 deletions(-)
> >
> > diff --git a/lib/learning-switch.c b/lib/learning-switch.c
> > index f2b3319..352ace3 100644
> > --- a/lib/learning-switch.c
> > +++ b/lib/learning-switch.c
> > @@ -378,20 +378,20 @@ lswitch_process_packet(struct lswitch *sw, const
> > struct ofpbuf *msg)
> > case OFPTYPE_GET_ASYNC_REPLY:
> > case OFPTYPE_SET_ASYNC_CONFIG:
> > case OFPTYPE_METER_MOD:
> > - case OFPTYPE_GROUP_REQUEST:
> > - case OFPTYPE_GROUP_REPLY:
> > - case OFPTYPE_GROUP_DESC_REQUEST:
> > - case OFPTYPE_GROUP_DESC_REPLY:
> > - case OFPTYPE_GROUP_FEATURES_REQUEST:
> > - case OFPTYPE_GROUP_FEATURES_REPLY:
> > - case OFPTYPE_METER_REQUEST:
> > - case OFPTYPE_METER_REPLY:
> > - case OFPTYPE_METER_CONFIG_REQUEST:
> > - case OFPTYPE_METER_CONFIG_REPLY:
> > - case OFPTYPE_METER_FEATURES_REQUEST:
> > - case OFPTYPE_METER_FEATURES_REPLY:
> > - case OFPTYPE_TABLE_FEATURES_REQUEST:
> > - case OFPTYPE_TABLE_FEATURES_REPLY:
> > + case OFPTYPE_GROUP_STATS_REQUEST:
> > + case OFPTYPE_GROUP_STATS_REPLY:
> > + case OFPTYPE_GROUP_DESC_STATS_REQUEST:
> > + case OFPTYPE_GROUP_DESC_STATS_REPLY:
> > + case OFPTYPE_GROUP_FEATURES_STATS_REQUEST:
> > + case OFPTYPE_GROUP_FEATURES_STATS_REPLY:
> > + case OFPTYPE_METER_STATS_REQUEST:
> > + case OFPTYPE_METER_STATS_REPLY:
> > + case OFPTYPE_METER_CONFIG_STATS_REQUEST:
> > + case OFPTYPE_METER_CONFIG_STATS_REPLY:
> > + case OFPTYPE_METER_FEATURES_STATS_REQUEST:
> > + case OFPTYPE_METER_FEATURES_STATS_REPLY:
> > + case OFPTYPE_TABLE_FEATURES_STATS_REQUEST:
> > + case OFPTYPE_TABLE_FEATURES_STATS_REPLY:
> > default:
> > if (VLOG_IS_DBG_ENABLED()) {
> > char *s = ofp_to_string(msg->data, msg->size, 2);
> > diff --git a/lib/ofp-msgs.h b/lib/ofp-msgs.h
> > index 2501e38..3ead49e 100644
> > --- a/lib/ofp-msgs.h
> > +++ b/lib/ofp-msgs.h
> > @@ -519,34 +519,34 @@ enum ofptype {
> > * OFPRAW_OFPST11_QUEUE_REPLY.
> > * OFPRAW_OFPST13_QUEUE_REPLY. */
> >
> > - OFPTYPE_GROUP_REQUEST, /* OFPRAW_OFPST11_GROUP_REQUEST. */
> > + OFPTYPE_GROUP_STATS_REQUEST, /* OFPRAW_OFPST11_GROUP_REQUEST. */
> >
> > - OFPTYPE_GROUP_REPLY, /* OFPRAW_OFPST11_GROUP_REPLY.
> > + OFPTYPE_GROUP_STATS_REPLY, /* OFPRAW_OFPST11_GROUP_REPLY.
> > * OFPRAW_OFPST13_GROUP_REPLY. */
> >
> > - OFPTYPE_GROUP_DESC_REQUEST, /*
> > OFPRAW_OFPST11_GROUP_DESC_REQUEST. */
> > + OFPTYPE_GROUP_DESC_STATS_REQUEST, /*
> > OFPRAW_OFPST11_GROUP_DESC_REQUEST. */
> >
> > - OFPTYPE_GROUP_DESC_REPLY, /* OFPRAW_OFPST11_GROUP_DESC_REPLY.
> > */
> > + OFPTYPE_GROUP_DESC_STATS_REPLY, /* OFPRAW_OFPST11_GROUP_DESC_REPLY.
> > */
> >
> > - OFPTYPE_GROUP_FEATURES_REQUEST, /*
> > OFPRAW_OFPST12_GROUP_FEATURES_REQUEST. */
> > + OFPTYPE_GROUP_FEATURES_STATS_REQUEST, /*
> > OFPRAW_OFPST12_GROUP_FEATURES_REQUEST. */
> >
> > - OFPTYPE_GROUP_FEATURES_REPLY, /*
> > OFPRAW_OFPST12_GROUP_FEATURES_REPLY. */
> > + OFPTYPE_GROUP_FEATURES_STATS_REPLY, /*
> > OFPRAW_OFPST12_GROUP_FEATURES_REPLY. */
> >
> > - OFPTYPE_METER_REQUEST, /* OFPRAW_OFPST13_METER_REQUEST. */
> > + OFPTYPE_METER_STATS_REQUEST, /* OFPRAW_OFPST13_METER_REQUEST. */
> >
> > - OFPTYPE_METER_REPLY, /* OFPRAW_OFPST13_METER_REPLY. */
> > + OFPTYPE_METER_STATS_REPLY, /* OFPRAW_OFPST13_METER_REPLY. */
> >
> > - OFPTYPE_METER_CONFIG_REQUEST, /*
> > OFPRAW_OFPST13_METER_CONFIG_REQUEST. */
> > + OFPTYPE_METER_CONFIG_STATS_REQUEST, /*
> > OFPRAW_OFPST13_METER_CONFIG_REQUEST. */
> >
> > - OFPTYPE_METER_CONFIG_REPLY, /*
> > OFPRAW_OFPST13_METER_CONFIG_REPLY. */
> > + OFPTYPE_METER_CONFIG_STATS_REPLY, /*
> > OFPRAW_OFPST13_METER_CONFIG_REPLY. */
> >
> > - OFPTYPE_METER_FEATURES_REQUEST, /*
> > OFPRAW_OFPST13_METER_FEATURES_REQUEST. */
> > + OFPTYPE_METER_FEATURES_STATS_REQUEST, /*
> > OFPRAW_OFPST13_METER_FEATURES_REQUEST. */
> >
> > - OFPTYPE_METER_FEATURES_REPLY, /*
> > OFPRAW_OFPST13_METER_FEATURES_REPLY. */
> > + OFPTYPE_METER_FEATURES_STATS_REPLY, /*
> > OFPRAW_OFPST13_METER_FEATURES_REPLY. */
> >
> > - OFPTYPE_TABLE_FEATURES_REQUEST, /*
> > OFPRAW_OFPST13_TABLE_FEATURES_REQUEST. */
> > + OFPTYPE_TABLE_FEATURES_STATS_REQUEST, /*
> > OFPRAW_OFPST13_TABLE_FEATURES_REQUEST. */
> >
> > - OFPTYPE_TABLE_FEATURES_REPLY, /*
> > OFPRAW_OFPST13_TABLE_FEATURES_REPLY. */
> > + OFPTYPE_TABLE_FEATURES_STATS_REPLY, /*
> > OFPRAW_OFPST13_TABLE_FEATURES_REPLY. */
> >
> > OFPTYPE_PORT_DESC_STATS_REQUEST, /* OFPRAW_OFPST_PORT_DESC_REQUEST. */
> >
> > diff --git a/lib/ofp-print.c b/lib/ofp-print.c
> > index 76bd09c..1d8b98c 100644
> > --- a/lib/ofp-print.c
> > +++ b/lib/ofp-print.c
> > @@ -2142,14 +2142,14 @@ ofp_to_string__(const struct ofp_header *oh, enum
> > ofpraw raw,
> > case OFPTYPE_QUEUE_GET_CONFIG_REPLY:
> > case OFPTYPE_GET_ASYNC_REQUEST:
> > case OFPTYPE_GET_ASYNC_REPLY:
> > - case OFPTYPE_GROUP_REQUEST:
> > - case OFPTYPE_GROUP_REPLY:
> > - case OFPTYPE_GROUP_DESC_REQUEST:
> > - case OFPTYPE_GROUP_DESC_REPLY:
> > - case OFPTYPE_GROUP_FEATURES_REQUEST:
> > - case OFPTYPE_GROUP_FEATURES_REPLY:
> > - case OFPTYPE_TABLE_FEATURES_REQUEST:
> > - case OFPTYPE_TABLE_FEATURES_REPLY:
> > + case OFPTYPE_GROUP_STATS_REQUEST:
> > + case OFPTYPE_GROUP_STATS_REPLY:
> > + case OFPTYPE_GROUP_DESC_STATS_REQUEST:
> > + case OFPTYPE_GROUP_DESC_STATS_REPLY:
> > + case OFPTYPE_GROUP_FEATURES_STATS_REQUEST:
> > + case OFPTYPE_GROUP_FEATURES_STATS_REPLY:
> > + case OFPTYPE_TABLE_FEATURES_STATS_REQUEST:
> > + case OFPTYPE_TABLE_FEATURES_STATS_REPLY:
> > ofp_print_not_implemented(string);
> > break;
> >
> > @@ -2218,30 +2218,30 @@ ofp_to_string__(const struct ofp_header *oh, enum
> > ofpraw raw,
> > ofp_print_role_message(string, oh);
> > break;
> >
> > - case OFPTYPE_METER_REQUEST:
> > - case OFPTYPE_METER_CONFIG_REQUEST:
> > + case OFPTYPE_METER_STATS_REQUEST:
> > + case OFPTYPE_METER_CONFIG_STATS_REQUEST:
> > ofp_print_stats_request(string, oh);
> > ofp_print_meter_stats_request(string, oh);
> > break;
> >
> > - case OFPTYPE_METER_REPLY:
> > + case OFPTYPE_METER_STATS_REPLY:
> > ofp_print_stats_reply(string, oh);
> > ofp_print_meter_stats_reply(string, oh);
> > break;
> >
> > - case OFPTYPE_METER_CONFIG_REPLY:
> > + case OFPTYPE_METER_CONFIG_STATS_REPLY:
> > ofp_print_stats_reply(string, oh);
> > ofp_print_meter_config_reply(string, oh);
> > break;
> >
> > - case OFPTYPE_METER_FEATURES_REPLY:
> > + case OFPTYPE_METER_FEATURES_STATS_REPLY:
> > ofp_print_stats_reply(string, oh);
> > ofp_print_meter_features_reply(string, oh);
> > break;
> >
> > case OFPTYPE_DESC_STATS_REQUEST:
> > case OFPTYPE_PORT_DESC_STATS_REQUEST:
> > - case OFPTYPE_METER_FEATURES_REQUEST:
> > + case OFPTYPE_METER_FEATURES_STATS_REQUEST:
> > ofp_print_stats_request(string, oh);
> > break;
> >
> > diff --git a/lib/rconn.c b/lib/rconn.c
> > index ffd2738..3e38c7d 100644
> > --- a/lib/rconn.c
> > +++ b/lib/rconn.c
> > @@ -1137,14 +1137,14 @@ is_admitted_msg(const struct ofpbuf *b)
> > case OFPTYPE_QUEUE_GET_CONFIG_REPLY:
> > case OFPTYPE_GET_ASYNC_REQUEST:
> > case OFPTYPE_GET_ASYNC_REPLY:
> > - case OFPTYPE_GROUP_REQUEST:
> > - case OFPTYPE_GROUP_REPLY:
> > - case OFPTYPE_GROUP_DESC_REQUEST:
> > - case OFPTYPE_GROUP_DESC_REPLY:
> > - case OFPTYPE_GROUP_FEATURES_REQUEST:
> > - case OFPTYPE_GROUP_FEATURES_REPLY:
> > - case OFPTYPE_TABLE_FEATURES_REQUEST:
> > - case OFPTYPE_TABLE_FEATURES_REPLY:
> > + case OFPTYPE_GROUP_STATS_REQUEST:
> > + case OFPTYPE_GROUP_STATS_REPLY:
> > + case OFPTYPE_GROUP_DESC_STATS_REQUEST:
> > + case OFPTYPE_GROUP_DESC_STATS_REPLY:
> > + case OFPTYPE_GROUP_FEATURES_STATS_REQUEST:
> > + case OFPTYPE_GROUP_FEATURES_STATS_REPLY:
> > + case OFPTYPE_TABLE_FEATURES_STATS_REQUEST:
> > + case OFPTYPE_TABLE_FEATURES_STATS_REPLY:
> > return false;
> >
> > case OFPTYPE_PACKET_IN:
> > @@ -1170,12 +1170,12 @@ is_admitted_msg(const struct ofpbuf *b)
> > case OFPTYPE_QUEUE_STATS_REPLY:
> > case OFPTYPE_PORT_DESC_STATS_REQUEST:
> > case OFPTYPE_PORT_DESC_STATS_REPLY:
> > - case OFPTYPE_METER_REQUEST:
> > - case OFPTYPE_METER_REPLY:
> > - case OFPTYPE_METER_CONFIG_REQUEST:
> > - case OFPTYPE_METER_CONFIG_REPLY:
> > - case OFPTYPE_METER_FEATURES_REQUEST:
> > - case OFPTYPE_METER_FEATURES_REPLY:
> > + case OFPTYPE_METER_STATS_REQUEST:
> > + case OFPTYPE_METER_STATS_REPLY:
> > + case OFPTYPE_METER_CONFIG_STATS_REQUEST:
> > + case OFPTYPE_METER_CONFIG_STATS_REPLY:
> > + case OFPTYPE_METER_FEATURES_STATS_REQUEST:
> > + case OFPTYPE_METER_FEATURES_STATS_REPLY:
> > case OFPTYPE_ROLE_REQUEST:
> > case OFPTYPE_ROLE_REPLY:
> > case OFPTYPE_SET_FLOW_FORMAT:
> > diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
> > index d857902..83b3472 100644
> > --- a/ofproto/ofproto.c
> > +++ b/ofproto/ofproto.c
> > @@ -4458,7 +4458,7 @@ handle_meter_request(struct ofconn *ofconn, const
> > struct ofp_header *request,
> > if (!meter) {
> > continue; /* Skip non-existing meters. */
> > }
> > - if (type == OFPTYPE_METER_REQUEST) {
> > + if (type == OFPTYPE_METER_STATS_REQUEST) {
> > struct ofputil_meter_stats stats;
> >
> > stats.meter_id = meter_id;
> > @@ -4590,20 +4590,20 @@ handle_openflow__(struct ofconn *ofconn, const
> > struct ofpbuf *msg)
> > case OFPTYPE_FLOW_MONITOR_STATS_REQUEST:
> > return handle_flow_monitor_request(ofconn, oh);
> >
> > - case OFPTYPE_METER_REQUEST:
> > - case OFPTYPE_METER_CONFIG_REQUEST:
> > + case OFPTYPE_METER_STATS_REQUEST:
> > + case OFPTYPE_METER_CONFIG_STATS_REQUEST:
> > return handle_meter_request(ofconn, oh, type);
> >
> > - case OFPTYPE_METER_FEATURES_REQUEST:
> > + case OFPTYPE_METER_FEATURES_STATS_REQUEST:
> > return handle_meter_features_request(ofconn, oh);
> >
> > /* FIXME: Change the following once they are implemented: */
> > case OFPTYPE_QUEUE_GET_CONFIG_REQUEST:
> > case OFPTYPE_GET_ASYNC_REQUEST:
> > - case OFPTYPE_GROUP_REQUEST:
> > - case OFPTYPE_GROUP_DESC_REQUEST:
> > - case OFPTYPE_GROUP_FEATURES_REQUEST:
> > - case OFPTYPE_TABLE_FEATURES_REQUEST:
> > + case OFPTYPE_GROUP_STATS_REQUEST:
> > + case OFPTYPE_GROUP_DESC_STATS_REQUEST:
> > + case OFPTYPE_GROUP_FEATURES_STATS_REQUEST:
> > + case OFPTYPE_TABLE_FEATURES_STATS_REQUEST:
> > return OFPERR_OFPBRC_BAD_TYPE;
> >
> > case OFPTYPE_HELLO:
> > @@ -4627,13 +4627,13 @@ handle_openflow__(struct ofconn *ofconn, const
> > struct ofpbuf *msg)
> > case OFPTYPE_FLOW_MONITOR_RESUMED:
> > case OFPTYPE_FLOW_MONITOR_STATS_REPLY:
> > case OFPTYPE_GET_ASYNC_REPLY:
> > - case OFPTYPE_GROUP_REPLY:
> > - case OFPTYPE_GROUP_DESC_REPLY:
> > - case OFPTYPE_GROUP_FEATURES_REPLY:
> > - case OFPTYPE_METER_REPLY:
> > - case OFPTYPE_METER_CONFIG_REPLY:
> > - case OFPTYPE_METER_FEATURES_REPLY:
> > - case OFPTYPE_TABLE_FEATURES_REPLY:
> > + case OFPTYPE_GROUP_STATS_REPLY:
> > + case OFPTYPE_GROUP_DESC_STATS_REPLY:
> > + case OFPTYPE_GROUP_FEATURES_STATS_REPLY:
> > + case OFPTYPE_METER_STATS_REPLY:
> > + case OFPTYPE_METER_CONFIG_STATS_REPLY:
> > + case OFPTYPE_METER_FEATURES_STATS_REPLY:
> > + case OFPTYPE_TABLE_FEATURES_STATS_REPLY:
> > default:
> > return OFPERR_OFPBRC_BAD_TYPE;
> > }
> > --
> > 1.7.2.5
> >
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > http://openvswitch.org/mailman/listinfo/dev
> >
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
