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=5844a96c6186b67f9f0bb4540122ecc8c72a2fa0;hpb=9e1fd49b0cf494315c82f27c651486ef82e83446;p=openvswitch diff --git a/include/openflow/openflow-1.0.h b/include/openflow/openflow-1.0.h index 5844a96c..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. @@ -47,9 +47,7 @@ enum ofp_port { * types. */ enum ofp10_type { /* Controller command messages. */ - OFPT10_PACKET_OUT = 13, /* Controller/switch message */ - OFPT10_FLOW_MOD, /* Controller/switch message */ - OFPT10_PORT_MOD, /* Controller/switch message */ + OFPT10_PORT_MOD = 15, /* Controller/switch message */ /* Statistics messages. */ OFPT10_STATS_REQUEST, /* Controller/switch message */ @@ -178,13 +176,24 @@ struct ofp10_port_mod { }; 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 { @@ -223,71 +232,13 @@ enum ofp10_action_type { * 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 { +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); - -/* 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 OFPAT10_SET_VLAN_VID. */ -struct ofp_action_vlan_vid { - ovs_be16 type; /* OFPAT10_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 OFPAT10_SET_VLAN_PCP. */ -struct ofp_action_vlan_pcp { - ovs_be16 type; /* OFPAT10_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 OFPAT10_SET_DL_SRC/DST. */ -struct ofp_action_dl_addr { - ovs_be16 type; /* OFPAT10_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 OFPAT10_SET_NW_SRC/DST. */ -struct ofp_action_nw_addr { - ovs_be16 type; /* OFPAT10_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 OFPAT10_SET_NW_TOS. */ -struct ofp_action_nw_tos { - ovs_be16 type; /* OFPAT10_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 OFPAT10_SET_TP_SRC/DST. */ -struct ofp_action_tp_port { - ovs_be16 type; /* OFPAT10_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); +OFP_ASSERT(sizeof(struct ofp10_action_output) == 8); /* Action header for OFPAT10_VENDOR. The rest of the body is vendor-defined. */ struct ofp_action_vendor_header { @@ -327,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; @@ -361,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 @@ -411,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. */ @@ -432,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. */ @@ -451,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. */ @@ -472,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. */ @@ -510,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; @@ -577,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. */ @@ -592,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. */ @@ -624,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. */