X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fopenflow%2Fopenflow-1.0.h;h=d71b007e809610af0cd61f28e553eff43802226e;hb=626186c3bea6b07442632684eacf4d02545fa05f;hp=7cc53831e1619f10fb9cea75023d9ca7c44a4506;hpb=87ea5e5e26c97598cd66ef64c8386afac2b77fff;p=openvswitch diff --git a/include/openflow/openflow-1.0.h b/include/openflow/openflow-1.0.h index 7cc53831..d71b007e 100644 --- a/include/openflow/openflow-1.0.h +++ b/include/openflow/openflow-1.0.h @@ -1,5 +1,5 @@ /* - * 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. @@ -43,54 +43,24 @@ enum ofp_port { OFPP_NONE = 0xffff /* Not associated with a physical port. */ }; -enum ofp_type { - /* Immutable messages. */ - OFPT_HELLO, /* Symmetric message */ - OFPT_ERROR, /* Symmetric message */ - OFPT_ECHO_REQUEST, /* Symmetric message */ - OFPT_ECHO_REPLY, /* Symmetric message */ - OFPT_VENDOR, /* Symmetric message */ - - /* Switch configuration messages. */ - OFPT_FEATURES_REQUEST, /* Controller/switch message */ - OFPT_FEATURES_REPLY, /* Controller/switch message */ - OFPT_GET_CONFIG_REQUEST, /* Controller/switch message */ - OFPT_GET_CONFIG_REPLY, /* Controller/switch message */ - OFPT_SET_CONFIG, /* Controller/switch message */ - - /* Asynchronous messages. */ - OFPT_PACKET_IN, /* Async message */ - OFPT_FLOW_REMOVED, /* Async message */ - OFPT_PORT_STATUS, /* Async message */ - +/* OpenFlow 1.0 specific message types, in addition to the common message + * types. */ +enum ofp10_type { /* Controller command messages. */ - OFPT_PACKET_OUT, /* Controller/switch message */ - OFPT_FLOW_MOD, /* Controller/switch message */ - OFPT_PORT_MOD, /* Controller/switch message */ + OFPT10_PORT_MOD = 15, /* Controller/switch message */ /* Statistics messages. */ - OFPT_STATS_REQUEST, /* Controller/switch message */ - OFPT_STATS_REPLY, /* Controller/switch message */ + OFPT10_STATS_REQUEST, /* Controller/switch message */ + OFPT10_STATS_REPLY, /* Controller/switch message */ /* Barrier messages. */ - OFPT_BARRIER_REQUEST, /* Controller/switch message */ - OFPT_BARRIER_REPLY, /* Controller/switch message */ + OFPT10_BARRIER_REQUEST, /* Controller/switch message */ + OFPT10_BARRIER_REPLY, /* Controller/switch message */ /* Queue Configuration messages. */ - OFPT_QUEUE_GET_CONFIG_REQUEST, /* Controller/switch message */ - OFPT_QUEUE_GET_CONFIG_REPLY /* Controller/switch message */ -}; - -/* Header on all OpenFlow packets. */ -struct ofp_header { - uint8_t version; /* An OpenFlow version number, e.g. OFP10_VERSION. */ - uint8_t type; /* One of the OFPT_ constants. */ - ovs_be16 length; /* Length including this ofp_header. */ - ovs_be32 xid; /* Transaction id associated with this packet. - Replies use the same id as was in the request - to facilitate pairing. */ + OFPT10_QUEUE_GET_CONFIG_REQUEST, /* Controller/switch message */ + OFPT10_QUEUE_GET_CONFIG_REPLY /* Controller/switch message */ }; -OFP_ASSERT(sizeof(struct ofp_header) == 8); /* OFPT_HELLO. This message has an empty body, but implementations must * ignore any data included in the body, to allow for future extensions. */ @@ -122,134 +92,80 @@ struct ofp_switch_config { }; OFP_ASSERT(sizeof(struct ofp_switch_config) == 12); -/* Capabilities supported by the datapath. */ -enum ofp_capabilities { - OFPC_FLOW_STATS = 1 << 0, /* Flow statistics. */ - OFPC_TABLE_STATS = 1 << 1, /* Table statistics. */ - OFPC_PORT_STATS = 1 << 2, /* Port statistics. */ - OFPC_STP = 1 << 3, /* 802.1d spanning tree. */ - OFPC_RESERVED = 1 << 4, /* Reserved, must not be set. */ - OFPC_IP_REASM = 1 << 5, /* Can reassemble IP fragments. */ - OFPC_QUEUE_STATS = 1 << 6, /* Queue statistics. */ - OFPC_ARP_MATCH_IP = 1 << 7 /* Match IP addresses in ARP - pkts. */ -}; - -/* Flags to indicate behavior of the physical port. These flags are - * used in ofp_phy_port to describe the current configuration. They are - * used in the ofp_port_mod message to configure the port's behavior. - */ -enum ofp_port_config { - OFPPC_PORT_DOWN = 1 << 0, /* Port is administratively down. */ - - OFPPC_NO_STP = 1 << 1, /* Disable 802.1D spanning tree on port. */ - OFPPC_NO_RECV = 1 << 2, /* Drop all packets except 802.1D - spanning tree packets. */ - OFPPC_NO_RECV_STP = 1 << 3, /* Drop received 802.1D STP packets. */ - OFPPC_NO_FLOOD = 1 << 4, /* Do not include this port when flooding. */ - OFPPC_NO_FWD = 1 << 5, /* Drop packets forwarded to port. */ - OFPPC_NO_PACKET_IN = 1 << 6 /* Do not send packet-in msgs for port. */ +/* OpenFlow 1.0 specific capabilities supported by the datapath (struct + * ofp_switch_features, member capabilities). */ +enum ofp10_capabilities { + OFPC10_STP = 1 << 3, /* 802.1d spanning tree. */ + OFPC10_RESERVED = 1 << 4, /* Reserved, must not be set. */ }; -/* Current state of the physical port. These are not configurable from - * the controller. +/* OpenFlow 1.0 specific flags to indicate behavior of the physical port. + * These flags are used in ofp10_phy_port to describe the current + * configuration. They are used in the ofp10_port_mod message to configure the + * port's behavior. */ -enum ofp_port_state { - OFPPS_LINK_DOWN = 1 << 0, /* No physical link present. */ +enum ofp10_port_config { + OFPPC10_NO_STP = 1 << 1, /* Disable 802.1D spanning tree on port. */ + OFPPC10_NO_RECV_STP = 1 << 3, /* Drop received 802.1D STP packets. */ + OFPPC10_NO_FLOOD = 1 << 4, /* Do not include port when flooding. */ +#define OFPPC10_ALL (OFPPC_PORT_DOWN | OFPPC10_NO_STP | OFPPC_NO_RECV | \ + OFPPC10_NO_RECV_STP | OFPPC10_NO_FLOOD | OFPPC_NO_FWD | \ + OFPPC_NO_PACKET_IN) +}; - /* The OFPPS_STP_* bits have no effect on switch operation. The +/* OpenFlow 1.0 specific current state of the physical port. These are not + * configurable from the controller. + */ +enum ofp10_port_state { + /* The OFPPS10_STP_* bits have no effect on switch operation. The * controller must adjust OFPPC_NO_RECV, OFPPC_NO_FWD, and * OFPPC_NO_PACKET_IN appropriately to fully implement an 802.1D spanning * tree. */ - OFPPS_STP_LISTEN = 0 << 8, /* Not learning or relaying frames. */ - OFPPS_STP_LEARN = 1 << 8, /* Learning but not relaying frames. */ - OFPPS_STP_FORWARD = 2 << 8, /* Learning and relaying frames. */ - OFPPS_STP_BLOCK = 3 << 8, /* Not part of spanning tree. */ - OFPPS_STP_MASK = 3 << 8 /* Bit mask for OFPPS_STP_* values. */ -}; - -/* Features of physical ports available in a datapath. */ -enum ofp_port_features { - OFPPF_10MB_HD = 1 << 0, /* 10 Mb half-duplex rate support. */ - OFPPF_10MB_FD = 1 << 1, /* 10 Mb full-duplex rate support. */ - OFPPF_100MB_HD = 1 << 2, /* 100 Mb half-duplex rate support. */ - OFPPF_100MB_FD = 1 << 3, /* 100 Mb full-duplex rate support. */ - OFPPF_1GB_HD = 1 << 4, /* 1 Gb half-duplex rate support. */ - OFPPF_1GB_FD = 1 << 5, /* 1 Gb full-duplex rate support. */ - OFPPF_10GB_FD = 1 << 6, /* 10 Gb full-duplex rate support. */ - OFPPF_COPPER = 1 << 7, /* Copper medium. */ - OFPPF_FIBER = 1 << 8, /* Fiber medium. */ - OFPPF_AUTONEG = 1 << 9, /* Auto-negotiation. */ - OFPPF_PAUSE = 1 << 10, /* Pause. */ - OFPPF_PAUSE_ASYM = 1 << 11 /* Asymmetric pause. */ + OFPPS10_STP_LISTEN = 0 << 8, /* Not learning or relaying frames. */ + OFPPS10_STP_LEARN = 1 << 8, /* Learning but not relaying frames. */ + OFPPS10_STP_FORWARD = 2 << 8, /* Learning and relaying frames. */ + OFPPS10_STP_BLOCK = 3 << 8, /* Not part of spanning tree. */ + OFPPS10_STP_MASK = 3 << 8 /* Bit mask for OFPPS10_STP_* values. */ + +#define OFPPS10_ALL (OFPPS_LINK_DOWN | OFPPS10_STP_MASK) +}; + +/* OpenFlow 1.0 specific features of physical ports available in a datapath. */ +enum ofp10_port_features { + OFPPF10_COPPER = 1 << 7, /* Copper medium. */ + OFPPF10_FIBER = 1 << 8, /* Fiber medium. */ + OFPPF10_AUTONEG = 1 << 9, /* Auto-negotiation. */ + OFPPF10_PAUSE = 1 << 10, /* Pause. */ + OFPPF10_PAUSE_ASYM = 1 << 11 /* Asymmetric pause. */ }; /* Description of a physical port */ -struct ofp_phy_port { +struct ofp10_phy_port { ovs_be16 port_no; uint8_t hw_addr[OFP_ETH_ALEN]; char name[OFP_MAX_PORT_NAME_LEN]; /* Null-terminated */ - ovs_be32 config; /* Bitmap of OFPPC_* flags. */ - ovs_be32 state; /* Bitmap of OFPPS_* flags. */ + ovs_be32 config; /* Bitmap of OFPPC_* and OFPPC10_* flags. */ + ovs_be32 state; /* Bitmap of OFPPS_* and OFPPS10_* flags. */ - /* Bitmaps of OFPPF_* that describe features. All bits zeroed if - * unsupported or unavailable. */ + /* Bitmaps of OFPPF_* and OFPPF10_* that describe features. All bits + * zeroed if unsupported or unavailable. */ ovs_be32 curr; /* Current features. */ ovs_be32 advertised; /* Features being advertised by the port. */ ovs_be32 supported; /* Features supported by the port. */ ovs_be32 peer; /* Features advertised by peer. */ }; -OFP_ASSERT(sizeof(struct ofp_phy_port) == 48); - -/* Switch features. */ -struct ofp_switch_features { - struct ofp_header header; - ovs_be64 datapath_id; /* Datapath unique ID. The lower 48-bits are for - a MAC address, while the upper 16-bits are - implementer-defined. */ - - ovs_be32 n_buffers; /* Max packets buffered at once. */ - - uint8_t n_tables; /* Number of tables supported by datapath. */ - uint8_t pad[3]; /* Align to 64-bits. */ - - /* Features. */ - ovs_be32 capabilities; /* Bitmap of support "ofp_capabilities". */ - ovs_be32 actions; /* Bitmap of supported "ofp_action_type"s. */ - - /* Port info.*/ - struct ofp_phy_port ports[0]; /* Port definitions. The number of ports - is inferred from the length field in - the header. */ -}; -OFP_ASSERT(sizeof(struct ofp_switch_features) == 32); - -/* What changed about the physical port */ -enum ofp_port_reason { - OFPPR_ADD, /* The port was added. */ - OFPPR_DELETE, /* The port was removed. */ - OFPPR_MODIFY /* Some attribute of the port has changed. */ -}; - -/* A physical port has changed in the datapath */ -struct ofp_port_status { - struct ofp_header header; - uint8_t reason; /* One of OFPPR_*. */ - uint8_t pad[7]; /* Align to 64-bits. */ - struct ofp_phy_port desc; -}; -OFP_ASSERT(sizeof(struct ofp_port_status) == 64); +OFP_ASSERT(sizeof(struct ofp10_phy_port) == 48); /* Modify behavior of the physical port */ -struct ofp_port_mod { +struct ofp10_port_mod { struct ofp_header header; ovs_be16 port_no; uint8_t hw_addr[OFP_ETH_ALEN]; /* The hardware address is not configurable. This is used to sanity-check the request, so it must be the same as returned in an - ofp_phy_port struct. */ + ofp10_phy_port struct. */ ovs_be32 config; /* Bitmap of OFPPC_* flags. */ ovs_be32 mask; /* Bitmap of OFPPC_* flags to be changed. */ @@ -258,15 +174,26 @@ struct ofp_port_mod { bits to prevent any action taking place. */ uint8_t pad[4]; /* Pad to 64-bits. */ }; -OFP_ASSERT(sizeof(struct ofp_port_mod) == 32); +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 { @@ -285,95 +212,37 @@ struct ofp_packet_in { }; OFP_ASSERT(sizeof(struct ofp_packet_in) == 20); -enum ofp_action_type { - OFPAT_OUTPUT, /* Output to switch port. */ - OFPAT_SET_VLAN_VID, /* Set the 802.1q VLAN id. */ - OFPAT_SET_VLAN_PCP, /* Set the 802.1q priority. */ - OFPAT_STRIP_VLAN, /* Strip the 802.1q header. */ - OFPAT_SET_DL_SRC, /* Ethernet source address. */ - OFPAT_SET_DL_DST, /* Ethernet destination address. */ - OFPAT_SET_NW_SRC, /* IP source address. */ - OFPAT_SET_NW_DST, /* IP destination address. */ - OFPAT_SET_NW_TOS, /* IP ToS (DSCP field, 6 bits). */ - OFPAT_SET_TP_SRC, /* TCP/UDP source port. */ - OFPAT_SET_TP_DST, /* TCP/UDP destination port. */ - OFPAT_ENQUEUE, /* Output to queue. */ - OFPAT_VENDOR = 0xffff -}; - -/* Action structure for OFPAT_OUTPUT, which sends packets out 'port'. +enum ofp10_action_type { + OFPAT10_OUTPUT, /* Output to switch port. */ + OFPAT10_SET_VLAN_VID, /* Set the 802.1q VLAN id. */ + OFPAT10_SET_VLAN_PCP, /* Set the 802.1q priority. */ + OFPAT10_STRIP_VLAN, /* Strip the 802.1q header. */ + OFPAT10_SET_DL_SRC, /* Ethernet source address. */ + OFPAT10_SET_DL_DST, /* Ethernet destination address. */ + OFPAT10_SET_NW_SRC, /* IP source address. */ + OFPAT10_SET_NW_DST, /* IP destination address. */ + OFPAT10_SET_NW_TOS, /* IP ToS (DSCP field, 6 bits). */ + OFPAT10_SET_TP_SRC, /* TCP/UDP source port. */ + OFPAT10_SET_TP_DST, /* TCP/UDP destination port. */ + OFPAT10_ENQUEUE, /* Output to queue. */ + OFPAT10_VENDOR = 0xffff +}; + +/* Action structure for OFPAT10_OUTPUT, which sends packets out 'port'. * When the 'port' is the OFPP_CONTROLLER, 'max_len' indicates the max * number of bytes to send. A 'max_len' of zero means no bytes of the * packet should be sent. */ -struct ofp_action_output { - ovs_be16 type; /* OFPAT_OUTPUT. */ +struct ofp10_action_output { + ovs_be16 type; /* OFPAT10_OUTPUT. */ ovs_be16 len; /* Length is 8. */ ovs_be16 port; /* Output port. */ ovs_be16 max_len; /* Max length to send to controller. */ }; -OFP_ASSERT(sizeof(struct ofp_action_output) == 8); +OFP_ASSERT(sizeof(struct ofp10_action_output) == 8); -/* The VLAN id is 12 bits, so we can use the entire 16 bits to indicate - * special conditions. All ones is used to match that no VLAN id was - * set. */ -#define OFP_VLAN_NONE 0xffff - -/* Action structure for OFPAT_SET_VLAN_VID. */ -struct ofp_action_vlan_vid { - ovs_be16 type; /* OFPAT_SET_VLAN_VID. */ - ovs_be16 len; /* Length is 8. */ - ovs_be16 vlan_vid; /* VLAN id. */ - uint8_t pad[2]; -}; -OFP_ASSERT(sizeof(struct ofp_action_vlan_vid) == 8); - -/* Action structure for OFPAT_SET_VLAN_PCP. */ -struct ofp_action_vlan_pcp { - ovs_be16 type; /* OFPAT_SET_VLAN_PCP. */ - ovs_be16 len; /* Length is 8. */ - uint8_t vlan_pcp; /* VLAN priority. */ - uint8_t pad[3]; -}; -OFP_ASSERT(sizeof(struct ofp_action_vlan_pcp) == 8); - -/* Action structure for OFPAT_SET_DL_SRC/DST. */ -struct ofp_action_dl_addr { - ovs_be16 type; /* OFPAT_SET_DL_SRC/DST. */ - ovs_be16 len; /* Length is 16. */ - uint8_t dl_addr[OFP_ETH_ALEN]; /* Ethernet address. */ - uint8_t pad[6]; -}; -OFP_ASSERT(sizeof(struct ofp_action_dl_addr) == 16); - -/* Action structure for OFPAT_SET_NW_SRC/DST. */ -struct ofp_action_nw_addr { - ovs_be16 type; /* OFPAT_SET_TW_SRC/DST. */ - ovs_be16 len; /* Length is 8. */ - ovs_be32 nw_addr; /* IP address. */ -}; -OFP_ASSERT(sizeof(struct ofp_action_nw_addr) == 8); - -/* Action structure for OFPAT_SET_NW_TOS. */ -struct ofp_action_nw_tos { - ovs_be16 type; /* OFPAT_SET_TW_TOS. */ - ovs_be16 len; /* Length is 8. */ - uint8_t nw_tos; /* IP TOS (DSCP field, 6 bits). */ - uint8_t pad[3]; -}; -OFP_ASSERT(sizeof(struct ofp_action_nw_tos) == 8); - -/* Action structure for OFPAT_SET_TP_SRC/DST. */ -struct ofp_action_tp_port { - ovs_be16 type; /* OFPAT_SET_TP_SRC/DST. */ - ovs_be16 len; /* Length is 8. */ - ovs_be16 tp_port; /* TCP/UDP port. */ - uint8_t pad[2]; -}; -OFP_ASSERT(sizeof(struct ofp_action_tp_port) == 8); - -/* Action header for OFPAT_VENDOR. The rest of the body is vendor-defined. */ +/* Action header for OFPAT10_VENDOR. The rest of the body is vendor-defined. */ struct ofp_action_vendor_header { - ovs_be16 type; /* OFPAT_VENDOR. */ + ovs_be16 type; /* OFPAT10_VENDOR. */ ovs_be16 len; /* Length is a multiple of 8. */ ovs_be32 vendor; /* Vendor ID, which takes the same form as in "struct ofp_vendor_header". */ @@ -384,7 +253,7 @@ OFP_ASSERT(sizeof(struct ofp_action_vendor_header) == 8); * header and any padding used to make the action 64-bit aligned. * NB: The length of an action *must* always be a multiple of eight. */ struct ofp_action_header { - ovs_be16 type; /* One of OFPAT_*. */ + ovs_be16 type; /* One of OFPAT10_*. */ ovs_be16 len; /* Length of action, including this header. This is the length of action, including any padding to make it @@ -393,9 +262,9 @@ struct ofp_action_header { }; OFP_ASSERT(sizeof(struct ofp_action_header) == 8); -/* OFPAT_ENQUEUE action struct: send packets to given queue on port. */ +/* OFPAT10_ENQUEUE action struct: send packets to given queue on port. */ struct ofp_action_enqueue { - ovs_be16 type; /* OFPAT_ENQUEUE. */ + ovs_be16 type; /* OFPAT10_ENQUEUE. */ ovs_be16 len; /* Len is 16. */ ovs_be16 port; /* Port that queue belongs. Should refer to a valid physical port @@ -409,7 +278,7 @@ union ofp_action { ovs_be16 type; struct ofp_action_header header; struct ofp_action_vendor_header vendor; - struct ofp_action_output output; + struct ofp10_action_output output10; struct ofp_action_vlan_vid vlan_vid; struct ofp_action_vlan_pcp vlan_pcp; struct ofp_action_nw_addr nw_addr; @@ -443,41 +312,43 @@ enum ofp_flow_mod_command { /* 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 @@ -493,10 +364,10 @@ enum ofp_flow_wildcards { /* The VLAN id is 12-bits, so we can use the entire 16 bits to indicate * special conditions. All ones indicates that no VLAN id was set. */ -#define OFP_VLAN_NONE 0xffff +#define OFP10_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. */ @@ -514,7 +385,7 @@ struct ofp_match { 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. */ @@ -533,7 +404,7 @@ enum ofp_flow_mod_flags { /* 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. */ @@ -554,17 +425,10 @@ struct ofp_flow_mod { }; 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. */ @@ -592,42 +456,6 @@ struct ofp_error_msg { }; 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; @@ -659,7 +487,7 @@ OFP_ASSERT(sizeof(struct ofp_desc_stats) == 1068); /* 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. */ @@ -674,7 +502,7 @@ struct ofp_flow_stats { 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. */ @@ -706,7 +534,7 @@ struct ofp_table_stats { 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. */