X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fopenflow%2Fopenflow-1.2.h;h=1c3f01764172f5837b44f957f0f56b49bee90d3f;hb=e78b61f6e5068c959b7b2e0903f17f4e77a595f1;hp=58093a84b6beaacb0e3d2e489f8af65272ea9e93;hpb=f471bca43f311891823d930e29ad34d18e05e951;p=sliver-openvswitch.git diff --git a/include/openflow/openflow-1.2.h b/include/openflow/openflow-1.2.h index 58093a84b..1c3f01764 100644 --- a/include/openflow/openflow-1.2.h +++ b/include/openflow/openflow-1.2.h @@ -55,14 +55,6 @@ #include "openflow/openflow-1.1.h" -/* OpenFlow 1.2 specific message types, in addition to the common message - * types. */ -enum ofp12_type { - /* Controller role change request messages. */ - OFPT12_ROLE_REQUEST = 24, /* Controller/switch message */ - OFPT12_ROLE_REPLY, /* Controller/switch message */ -}; - /* * OXM Class IDs. * The high order bit differentiate reserved classes from member classes. @@ -114,8 +106,13 @@ enum oxm12_ofb_match_fields { OFPXMT12_OFB_IPV6_ND_TLL, /* Target link-layer for ND. */ OFPXMT12_OFB_MPLS_LABEL, /* MPLS label. */ OFPXMT12_OFB_MPLS_TC, /* MPLS TC. */ + + /* End Marker */ + OFPXMT12_OFB_MAX, }; +#define OFPXMT12_MASK ((1ULL << OFPXMT12_OFB_MAX) - 1) + /* OXM implementation makes use of NXM as they are the same format * with different field definitions */ @@ -193,23 +190,7 @@ struct ofp12_oxm_experimenter_header { OFP_ASSERT(sizeof(struct ofp12_oxm_experimenter_header) == 8); enum ofp12_action_type { - OFPAT12_OUTPUT = 0, /* Output to switch port. */ - OFPAT12_COPY_TTL_OUT = 11, /* Copy TTL "outwards" -- from next-to-outermost - to outermost */ - OFPAT12_COPY_TTL_IN, /* Copy TTL "inwards" -- from outermost to - next-to-outermost */ - OFPAT12_SET_MPLS_TTL = 15, /* MPLS TTL */ - OFPAT12_DEC_MPLS_TTL, /* Decrement MPLS TTL */ - OFPAT12_PUSH_VLAN, /* Push a new VLAN tag */ - OFPAT12_POP_VLAN, /* Pop the outer VLAN tag */ - OFPAT12_PUSH_MPLS, /* Push a new MPLS tag */ - OFPAT12_POP_MPLS, /* Pop the outer MPLS tag */ - OFPAT12_SET_QUEUE, /* Set queue id when outputting to a port */ - OFPAT12_GROUP, /* Apply group. */ - OFPAT12_SET_NW_TTL, /* IP TTL. */ - OFPAT12_DEC_NW_TTL, /* Decrement IP TTL. */ - OFPAT12_SET_FIELD, /* Set a header field using OXM TLV format. */ - OFPAT12_EXPERIMENTER = 0xffff + OFPAT12_SET_FIELD = 25, /* Set a header field using OXM TLV format. */ }; enum ofp12_controller_max_len { @@ -224,12 +205,11 @@ enum ofp12_controller_max_len { struct ofp12_action_set_field { ovs_be16 type; /* OFPAT12_SET_FIELD. */ ovs_be16 len; /* Length is padded to 64 bits. */ + ovs_be32 dst; /* OXM TLV header */ /* Followed by: - * - Exactly oxm_len bytes containing a single OXM TLV, then * - Exactly ((oxm_len + 4) + 7)/8*8 - (oxm_len + 4) (between 0 and 7) * bytes of all-zero bytes */ - uint8_t field[4]; /* OXM TLV - Make compiler happy */ }; OFP_ASSERT(sizeof(struct ofp12_action_set_field) == 8); @@ -264,7 +244,6 @@ enum ofp12_queue_properties { /* Body of reply to OFPST_TABLE request. */ struct ofp12_table_stats { - struct ofp11_stats_msg osm; uint8_t table_id; /* Identifier of table. Lower numbered tables are consulted first. */ uint8_t pad[7]; /* Align to 64-bits. */ @@ -290,17 +269,16 @@ struct ofp12_table_stats { ovs_be64 lookup_count; /* Number of packets looked up in table. */ ovs_be64 matched_count; /* Number of packets that hit table. */ }; -OFP_ASSERT(sizeof(struct ofp12_table_stats) == 144); +OFP_ASSERT(sizeof(struct ofp12_table_stats) == 128); /* Body of reply to OFPST12_GROUP_FEATURES request. Group features. */ struct ofp12_group_features_stats { - struct ofp11_stats_msg osm; ovs_be32 types; /* Bitmap of OFPGT_* values supported. */ ovs_be32 capabilities; /* Bitmap of OFPGFC12_* capability supported. */ ovs_be32 max_groups[4]; /* Maximum number of groups for each type. */ ovs_be32 actions[4]; /* Bitmaps of OFPAT_* that are supported. */ }; -OFP_ASSERT(sizeof(struct ofp12_group_features_stats) == 56); +OFP_ASSERT(sizeof(struct ofp12_group_features_stats) == 40); /* Group configuration flags */ enum ofp12_group_capabilities { @@ -321,12 +299,11 @@ OFP_ASSERT(sizeof(struct ofp12_experimenter_stats_header) == 8); /* Role request and reply message. */ struct ofp12_role_request { - struct ofp_header header; /* Type OFPT12_ROLE_REQUEST/OFPT12_ROLE_REPLY. */ ovs_be32 role; /* One of OFPCR12_ROLE_*. */ uint8_t pad[4]; /* Align to 64 bits. */ ovs_be64 generation_id; /* Master Election Generation Id */ }; -OFP_ASSERT(sizeof(struct ofp12_role_request) == 24); +OFP_ASSERT(sizeof(struct ofp12_role_request) == 16); /* Controller roles. */ enum ofp12_controller_role { @@ -338,7 +315,6 @@ enum ofp12_controller_role { /* Packet received on port (datapath -> controller). */ struct ofp12_packet_in { - struct ofp_header header; ovs_be32 buffer_id; /* ID assigned by datapath. */ ovs_be16 total_len; /* Full length of frame. */ uint8_t reason; /* Reason packet is being sent (one of OFPR_*) */ @@ -354,11 +330,10 @@ struct ofp12_packet_in { /* uint8_t pad[2]; Align to 64 bit + 16 bit */ /* uint8_t data[0]; Ethernet frame */ }; -OFP_ASSERT(sizeof(struct ofp12_packet_in) == 16); +OFP_ASSERT(sizeof(struct ofp12_packet_in) == 8); /* Flow removed (datapath -> controller). */ struct ofp12_flow_removed { - struct ofp_header header; ovs_be64 cookie; /* Opaque controller-issued identifier. */ ovs_be16 priority; /* Priority level of flow entry. */ @@ -374,6 +349,6 @@ struct ofp12_flow_removed { ovs_be64 byte_count; /* struct ofp12_match match; Description of fields. Variable size. */ }; -OFP_ASSERT(sizeof(struct ofp12_flow_removed) == 48); +OFP_ASSERT(sizeof(struct ofp12_flow_removed) == 40); #endif /* openflow/openflow-1.2.h */