From: Jarno Rajahalme <jarno.rajahalme@nsn.com>
Date: Fri, 7 Dec 2012 13:48:21 +0000 (+0200)
Subject: Openflow 1.1 queue set/get config placeholders.
X-Git-Tag: sliver-openvswitch-1.9.90-3~10^2~96
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c545d38da7574831fec264716d626c82d90a8494;p=sliver-openvswitch.git

Openflow 1.1 queue set/get config placeholders.

Signed-off-by: Jarno Rajahalme <jarno.rajahalme@nsn.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/lib/learning-switch.c b/lib/learning-switch.c
index 0e0d779b2..e572a34ca 100644
--- a/lib/learning-switch.c
+++ b/lib/learning-switch.c
@@ -346,6 +346,8 @@ lswitch_process_packet(struct lswitch *sw, const struct ofpbuf *msg)
     case OFPTYPE_PORT_MOD:
     case OFPTYPE_BARRIER_REQUEST:
     case OFPTYPE_BARRIER_REPLY:
+    case OFPTYPE_QUEUE_GET_CONFIG_REQUEST:
+    case OFPTYPE_QUEUE_GET_CONFIG_REPLY:
     case OFPTYPE_DESC_STATS_REQUEST:
     case OFPTYPE_DESC_STATS_REPLY:
     case OFPTYPE_FLOW_STATS_REQUEST:
diff --git a/lib/ofp-msgs.h b/lib/ofp-msgs.h
index 8d28ce368..808f2957c 100644
--- a/lib/ofp-msgs.h
+++ b/lib/ofp-msgs.h
@@ -192,6 +192,12 @@ enum ofpraw {
     /* OFPT 1.1+ (21): void. */
     OFPRAW_OFPT11_BARRIER_REPLY,
 
+    /* OFPT 1.1+ (22): struct ofp11_queue_get_config_request. */
+    OFPRAW_OFPT11_QUEUE_GET_CONFIG_REQUEST,
+
+    /* OFPT 1.1+ (23): struct ofp11_queue_get_config_reply, struct ofp_packet_queue[]. */
+    OFPRAW_OFPT11_QUEUE_GET_CONFIG_REPLY,
+
     /* OFPT 1.3+ (26): void. */
     OFPRAW_OFPT13_GET_ASYNC_REQUEST,
     /* OFPT 1.3+ (27): struct ofp13_async_config. */
@@ -458,6 +464,10 @@ enum ofptype {
     OFPTYPE_BARRIER_REPLY,       /* OFPRAW_OFPT10_BARRIER_REPLY.
                                   * OFPRAW_OFPT11_BARRIER_REPLY. */
 
+    /* Queue Configuration messages. */
+    OFPTYPE_QUEUE_GET_CONFIG_REQUEST, /* OFPRAW_OFPT11_QUEUE_GET_CONFIG_REQUEST. */
+    OFPTYPE_QUEUE_GET_CONFIG_REPLY, /* OFPRAW_OFPT11_QUEUE_GET_CONFIG_REPLY. */
+
     /* Asynchronous message configuration. */
     OFPTYPE_GET_ASYNC_REQUEST,    /* OFPRAW_OFPT13_GET_ASYNC_REQUEST. */
     OFPTYPE_GET_ASYNC_REPLY,      /* OFPRAW_OFPT13_GET_ASYNC_REPLY. */
diff --git a/lib/ofp-print.c b/lib/ofp-print.c
index fcc6d254a..84c37cff9 100644
--- a/lib/ofp-print.c
+++ b/lib/ofp-print.c
@@ -1817,6 +1817,8 @@ ofp_to_string__(const struct ofp_header *oh, enum ofpraw raw,
     switch (ofptype_from_ofpraw(raw)) {
 
         /* FIXME: Change the following once they are implemented: */
+    case OFPTYPE_QUEUE_GET_CONFIG_REQUEST:
+    case OFPTYPE_QUEUE_GET_CONFIG_REPLY:
     case OFPTYPE_GET_ASYNC_REQUEST:
     case OFPTYPE_GET_ASYNC_REPLY:
     case OFPTYPE_METER_MOD:
diff --git a/lib/rconn.c b/lib/rconn.c
index 2396e44a5..c9163c5ce 100644
--- a/lib/rconn.c
+++ b/lib/rconn.c
@@ -1122,6 +1122,8 @@ is_admitted_msg(const struct ofpbuf *b)
     case OFPTYPE_GET_CONFIG_REPLY:
     case OFPTYPE_SET_CONFIG:
         /* FIXME: Change the following once they are implemented: */
+    case OFPTYPE_QUEUE_GET_CONFIG_REQUEST:
+    case OFPTYPE_QUEUE_GET_CONFIG_REPLY:
     case OFPTYPE_GET_ASYNC_REQUEST:
     case OFPTYPE_GET_ASYNC_REPLY:
     case OFPTYPE_METER_MOD:
diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 504b422b2..f95d6efc9 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -4105,6 +4105,7 @@ handle_openflow__(struct ofconn *ofconn, const struct ofpbuf *msg)
         return handle_flow_monitor_request(ofconn, oh);
 
         /* FIXME: Change the following once they are implemented: */
+    case OFPTYPE_QUEUE_GET_CONFIG_REQUEST:
     case OFPTYPE_GET_ASYNC_REQUEST:
     case OFPTYPE_METER_MOD:
     case OFPTYPE_GROUP_REQUEST:
@@ -4124,6 +4125,7 @@ handle_openflow__(struct ofconn *ofconn, const struct ofpbuf *msg)
     case OFPTYPE_FLOW_REMOVED:
     case OFPTYPE_PORT_STATUS:
     case OFPTYPE_BARRIER_REPLY:
+    case OFPTYPE_QUEUE_GET_CONFIG_REPLY:
     case OFPTYPE_DESC_STATS_REPLY:
     case OFPTYPE_FLOW_STATS_REPLY:
     case OFPTYPE_QUEUE_STATS_REPLY: