/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
};
OFP_ASSERT(sizeof(struct ofp10_port_mod) == 32);
-/* Why is this packet being sent to the controller? */
-enum ofp_packet_in_reason {
- OFPR_NO_MATCH, /* No matching flow. */
- OFPR_ACTION, /* Action explicitly output to controller. */
- OFPR_INVALID_TTL /* Packet has invalid TTL. */,
- OFPR_N_REASONS
+/* Query for port queue configuration. */
+struct ofp10_queue_get_config_request {
+ struct ofp_header header;
+ ovs_be16 port; /* Port to be queried. Should refer
+ to a valid physical port (i.e. < OFPP_MAX) */
+ uint8_t pad[2];
+ /* 32-bit alignment. */
+};
+OFP_ASSERT(sizeof(struct ofp10_queue_get_config_request) == 12);
+
+/* Queue configuration for a given port. */
+struct ofp10_queue_get_config_reply {
+ struct ofp_header header;
+ ovs_be16 port;
+ uint8_t pad[6];
+ /* struct ofp10_packet_queue queues[0]; List of configured queues. */
};
+OFP_ASSERT(sizeof(struct ofp10_queue_get_config_reply) == 16);
/* Packet received on port (datapath -> controller). */
struct ofp_packet_in {
/* Flow wildcards. */
enum ofp_flow_wildcards {
- OFPFW_IN_PORT = 1 << 0, /* Switch input port. */
- OFPFW_DL_VLAN = 1 << 1, /* VLAN vid. */
- OFPFW_DL_SRC = 1 << 2, /* Ethernet source address. */
- OFPFW_DL_DST = 1 << 3, /* Ethernet destination address. */
- OFPFW_DL_TYPE = 1 << 4, /* Ethernet frame type. */
- OFPFW_NW_PROTO = 1 << 5, /* IP protocol. */
- OFPFW_TP_SRC = 1 << 6, /* TCP/UDP source port. */
- OFPFW_TP_DST = 1 << 7, /* TCP/UDP destination port. */
+ OFPFW10_IN_PORT = 1 << 0, /* Switch input port. */
+ OFPFW10_DL_VLAN = 1 << 1, /* VLAN vid. */
+ OFPFW10_DL_SRC = 1 << 2, /* Ethernet source address. */
+ OFPFW10_DL_DST = 1 << 3, /* Ethernet destination address. */
+ OFPFW10_DL_TYPE = 1 << 4, /* Ethernet frame type. */
+ OFPFW10_NW_PROTO = 1 << 5, /* IP protocol. */
+ OFPFW10_TP_SRC = 1 << 6, /* TCP/UDP source port. */
+ OFPFW10_TP_DST = 1 << 7, /* TCP/UDP destination port. */
/* IP source address wildcard bit count. 0 is exact match, 1 ignores the
* LSB, 2 ignores the 2 least-significant bits, ..., 32 and higher wildcard
* the entire field. This is the *opposite* of the usual convention where
* e.g. /24 indicates that 8 bits (not 24 bits) are wildcarded. */
- OFPFW_NW_SRC_SHIFT = 8,
- OFPFW_NW_SRC_BITS = 6,
- OFPFW_NW_SRC_MASK = ((1 << OFPFW_NW_SRC_BITS) - 1) << OFPFW_NW_SRC_SHIFT,
- OFPFW_NW_SRC_ALL = 32 << OFPFW_NW_SRC_SHIFT,
+ OFPFW10_NW_SRC_SHIFT = 8,
+ OFPFW10_NW_SRC_BITS = 6,
+ OFPFW10_NW_SRC_MASK = (((1 << OFPFW10_NW_SRC_BITS) - 1)
+ << OFPFW10_NW_SRC_SHIFT),
+ OFPFW10_NW_SRC_ALL = 32 << OFPFW10_NW_SRC_SHIFT,
/* IP destination address wildcard bit count. Same format as source. */
- OFPFW_NW_DST_SHIFT = 14,
- OFPFW_NW_DST_BITS = 6,
- OFPFW_NW_DST_MASK = ((1 << OFPFW_NW_DST_BITS) - 1) << OFPFW_NW_DST_SHIFT,
- OFPFW_NW_DST_ALL = 32 << OFPFW_NW_DST_SHIFT,
+ OFPFW10_NW_DST_SHIFT = 14,
+ OFPFW10_NW_DST_BITS = 6,
+ OFPFW10_NW_DST_MASK = (((1 << OFPFW10_NW_DST_BITS) - 1)
+ << OFPFW10_NW_DST_SHIFT),
+ OFPFW10_NW_DST_ALL = 32 << OFPFW10_NW_DST_SHIFT,
- OFPFW_DL_VLAN_PCP = 1 << 20, /* VLAN priority. */
- OFPFW_NW_TOS = 1 << 21, /* IP ToS (DSCP field, 6 bits). */
+ OFPFW10_DL_VLAN_PCP = 1 << 20, /* VLAN priority. */
+ OFPFW10_NW_TOS = 1 << 21, /* IP ToS (DSCP field, 6 bits). */
/* Wildcard all fields. */
- OFPFW_ALL = ((1 << 22) - 1)
+ OFPFW10_ALL = ((1 << 22) - 1)
};
/* The wildcards for ICMP type and code fields use the transport source
* and destination port fields, respectively. */
-#define OFPFW_ICMP_TYPE OFPFW_TP_SRC
-#define OFPFW_ICMP_CODE OFPFW_TP_DST
+#define OFPFW10_ICMP_TYPE OFPFW10_TP_SRC
+#define OFPFW10_ICMP_CODE OFPFW10_TP_DST
/* Values below this cutoff are 802.3 packets and the two bytes
* following MAC addresses are used as a frame length. Otherwise, the
#define OFP_VLAN_NONE 0xffff
/* Fields to match against flows */
-struct ofp_match {
+struct ofp10_match {
ovs_be32 wildcards; /* Wildcard fields. */
ovs_be16 in_port; /* Input switch port. */
uint8_t dl_src[OFP_ETH_ALEN]; /* Ethernet source address. */
ovs_be16 tp_src; /* TCP/UDP source port. */
ovs_be16 tp_dst; /* TCP/UDP destination port. */
};
-OFP_ASSERT(sizeof(struct ofp_match) == 40);
+OFP_ASSERT(sizeof(struct ofp10_match) == 40);
/* Value used in "idle_timeout" and "hard_timeout" to indicate that the entry
* is permanent. */
/* Flow setup and teardown (controller -> datapath). */
struct ofp_flow_mod {
struct ofp_header header;
- struct ofp_match match; /* Fields to match */
+ struct ofp10_match match; /* Fields to match */
ovs_be64 cookie; /* Opaque controller-issued identifier. */
/* Flow actions. */
};
OFP_ASSERT(sizeof(struct ofp_flow_mod) == 72);
-/* Why was this flow removed? */
-enum ofp_flow_removed_reason {
- OFPRR_IDLE_TIMEOUT, /* Flow idle time exceeded idle_timeout. */
- OFPRR_HARD_TIMEOUT, /* Time exceeded hard_timeout. */
- OFPRR_DELETE /* Evicted by a DELETE flow mod. */
-};
-
/* Flow removed (datapath -> controller). */
struct ofp_flow_removed {
struct ofp_header header;
- struct ofp_match match; /* Description of fields. */
+ struct ofp10_match match; /* Description of fields. */
ovs_be64 cookie; /* Opaque controller-issued identifier. */
ovs_be16 priority; /* Priority level of flow entry. */
};
OFP_ASSERT(sizeof(struct ofp_error_msg) == 12);
-enum ofp_stats_types {
- /* Description of this OpenFlow switch.
- * The request is struct ofp_stats_msg.
- * The reply is struct ofp_desc_stats. */
- OFPST_DESC,
-
- /* Individual flow statistics.
- * The request is struct ofp_flow_stats_request.
- * The reply body is an array of struct ofp_flow_stats. */
- OFPST_FLOW,
-
- /* Aggregate flow statistics.
- * The request is struct ofp_flow_stats_request.
- * The reply is struct ofp_aggregate_stats_reply. */
- OFPST_AGGREGATE,
-
- /* Flow table statistics.
- * The request is struct ofp_stats_msg.
- * The reply body is an array of struct ofp_table_stats. */
- OFPST_TABLE,
-
- /* Physical port statistics.
- * The request is struct ofp_port_stats_request.
- * The reply body is an array of struct ofp_port_stats. */
- OFPST_PORT,
-
- /* Queue statistics for a port.
- * The request body is struct ofp_queue_stats_request.
- * The reply body is an array of struct ofp_queue_stats. */
- OFPST_QUEUE,
-
- /* Vendor extension.
- * The request and reply begin with "struct ofp_vendor_stats". */
- OFPST_VENDOR = 0xffff
-};
-
/* Statistics request or reply message. */
struct ofp_stats_msg {
struct ofp_header header;
/* Stats request of type OFPST_AGGREGATE or OFPST_FLOW. */
struct ofp_flow_stats_request {
struct ofp_stats_msg osm;
- struct ofp_match match; /* Fields to match. */
+ struct ofp10_match match; /* Fields to match. */
uint8_t table_id; /* ID of table to read (from ofp_table_stats)
or 0xff for all tables. */
uint8_t pad; /* Align to 32 bits. */
ovs_be16 length; /* Length of this entry. */
uint8_t table_id; /* ID of table flow came from. */
uint8_t pad;
- struct ofp_match match; /* Description of fields. */
+ struct ofp10_match match; /* Description of fields. */
ovs_be32 duration_sec; /* Time flow has been alive in seconds. */
ovs_be32 duration_nsec; /* Time flow has been alive in nanoseconds
beyond duration_sec. */
are consulted first. */
uint8_t pad[3]; /* Align to 32-bits. */
char name[OFP_MAX_TABLE_NAME_LEN];
- ovs_be32 wildcards; /* Bitmap of OFPFW_* wildcards that are
+ ovs_be32 wildcards; /* Bitmap of OFPFW10_* wildcards that are
supported by the table. */
ovs_be32 max_entries; /* Max number of entries supported. */
ovs_be32 active_count; /* Number of active entries. */
git://git.onelab.eu / sliver-openvswitch.git / blobdiff