X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fopenflow%2Fopenflow-1.3.h;h=8e9f6f74679d201f48bb4dbee22451f370c057e9;hb=HEAD;hp=61c4598c0988f833f35c768996c608340cc49e2f;hpb=2e1ae2005ed347d2dfebd23fff40c54a1a2a6716;p=sliver-openvswitch.git diff --git a/include/openflow/openflow-1.3.h b/include/openflow/openflow-1.3.h index 61c4598c0..8e9f6f746 100644 --- a/include/openflow/openflow-1.3.h +++ b/include/openflow/openflow-1.3.h @@ -104,8 +104,24 @@ struct ofp13_instruction_meter { OFP_ASSERT(sizeof(struct ofp13_instruction_meter) == 8); enum ofp13_action_type { - OFPAT13_PUSH_PBB = 26, /* Push a new PBB service tag (I-TAG) */ - OFPAT13_PPO_PBB = 27 /* Pop the outer PBB service tag (I-TAG) */ + OFPAT13_OUTPUT = 0, /* Output to switch port. */ + OFPAT13_COPY_TTL_OUT = 11, /* Copy TTL "outwards" -- from next-to-outermost + to outermost */ + OFPAT13_COPY_TTL_IN = 12, /* Copy TTL "inwards" -- from outermost to + next-to-outermost */ + OFPAT13_SET_MPLS_TTL = 15, /* MPLS TTL */ + OFPAT13_DEC_MPLS_TTL = 16, /* Decrement MPLS TTL */ + OFPAT13_PUSH_VLAN = 17, /* Push a new VLAN tag */ + OFPAT13_POP_VLAN = 18, /* Pop the outer VLAN tag */ + OFPAT13_PUSH_MPLS = 19, /* Push a new MPLS Label Stack Entry */ + OFPAT13_POP_MPLS = 20, /* Pop the outer MPLS Label Stack Entry */ + OFPAT13_SET_QUEUE = 21, /* Set queue id when outputting to a port */ + OFPAT13_GROUP = 22, /* Apply group. */ + OFPAT13_SET_NW_TTL = 23, /* IP TTL. */ + OFPAT13_DEC_NW_TTL = 24, /* Decrement IP TTL. */ + OFPAT13_SET_FIELD = 25, /* Set a header field using OXM TLV format. */ + OFPAT13_PUSH_PBB = 26, /* Push a new PBB service tag (I-TAG) */ + OFPAT13_POP_PBB = 27 /* Pop the outer PBB service tag (I-TAG) */ }; /* enum ofp_config_flags value OFPC_INVALID_TTL_TO_CONTROLLER @@ -116,11 +132,10 @@ enum ofp13_table_config { OFPTC13_DEPRECATED_MASK = 3 /* Deprecated bits */ }; -/* OpenFlow 1.3 specific flags - * (struct ofp12_flow_mod, member flags). */ +/* OpenFlow 1.3 specific flags for flow_mod messages. */ enum ofp13_flow_mod_flags { - OFPFF13_NO_PKT_COUNTS = 1 << 3, /* Don’t keep track of packet count. */ - OFPFF13_NO_BYT_COUNTS = 1 << 4 /* Don’t keep track of byte count. */ + OFPFF13_NO_PKT_COUNTS = 1 << 3, /* Don't keep track of packet count. */ + OFPFF13_NO_BYT_COUNTS = 1 << 4 /* Don't keep track of byte count. */ }; /* Common header for all meter bands */ @@ -137,7 +152,7 @@ struct ofp13_meter_mod { ovs_be16 command; /* One of OFPMC_*. */ ovs_be16 flags; /* Set of OFPMF_*. */ ovs_be32 meter_id; /* Meter instance. */ - struct ofp13_meter_band_header bands[0]; /* The bands length is inferred + /* struct ofp13_meter_band_header bands[0]; The bands length is inferred from the length field in the header. */ }; @@ -246,7 +261,7 @@ struct ofp13_table_features { ovs_be32 max_entries; /* Max number of entries supported. */ /* Table Feature Property list */ - struct ofp13_table_feature_prop_header properties[0]; + /* struct ofp13_table_feature_prop_header properties[0]; */ }; OFP_ASSERT(sizeof(struct ofp13_table_features) == 64); @@ -281,8 +296,8 @@ struct ofp13_table_feature_prop_instructions { * - Exactly (length - 4) bytes containing the instruction ids, then * - Exactly (length + 7)/8*8 - (length) (between 0 and 7) * bytes of all-zero bytes */ - struct ofp11_instruction instruction_ids[0]; /* List of instructions - without any data */ + /* struct ofp11_instruction instruction_ids[0]; List of instructions + without any data */ }; OFP_ASSERT(sizeof(struct ofp13_table_feature_prop_instructions) == 4); @@ -295,7 +310,7 @@ struct ofp13_table_feature_prop_next_tables { * - Exactly (length - 4) bytes containing the table_ids, then * - Exactly (length + 7)/8*8 - (length) (between 0 and 7) * bytes of all-zero bytes */ - uint8_t next_table_ids[0]; + /* uint8_t next_table_ids[0]; */ }; OFP_ASSERT(sizeof(struct ofp13_table_feature_prop_next_tables) == 4); @@ -310,7 +325,7 @@ struct ofp13_table_feature_prop_actions { * - Exactly (length - 4) bytes containing the action_ids, then * - Exactly (length + 7)/8*8 - (length) (between 0 and 7) * bytes of all-zero bytes */ - struct ofp_action_header action_ids[0]; /* List of actions + /* struct ofp_action_header action_ids[0]; List of actions without any data */ }; OFP_ASSERT(sizeof(struct ofp13_table_feature_prop_actions) == 4); @@ -328,7 +343,7 @@ struct ofp13_table_feature_prop_oxm { * - Exactly (length - 4) bytes containing the oxm_ids, then * - Exactly (length + 7)/8*8 - (length) (between 0 and 7) * bytes of all-zero bytes */ - ovs_be32 oxm_ids[0]; /* Array of OXM headers */ + /* ovs_be32 oxm_ids[0]; Array of OXM headers */ }; OFP_ASSERT(sizeof(struct ofp13_table_feature_prop_oxm) == 4); @@ -344,7 +359,7 @@ struct ofp13_table_feature_prop_experimenter { * - Exactly (length - 12) bytes containing the experimenter data, then * - Exactly (length + 7)/8*8 - (length) (between 0 and 7) * bytes of all-zero bytes */ - ovs_be32 experimenter_data[0]; + /* ovs_be32 experimenter_data[0]; */ }; OFP_ASSERT(sizeof(struct ofp13_table_feature_prop_experimenter) == 12); @@ -370,10 +385,10 @@ OFP_ASSERT(sizeof(struct ofp13_queue_stats) == 40); /* Body of reply to OFPMP13_GROUP request */ struct ofp13_group_stats { struct ofp11_group_stats gs; - ovs_be32 duration_sec; /* NEW: Time group has been alive in seconds. */ - ovs_be32 duration_nsec; /* NEW: Time group has been alive in nanoseconds + ovs_be32 duration_sec; /* Time group has been alive in seconds. */ + ovs_be32 duration_nsec; /* Time group has been alive in nanoseconds beyond duration_sec. */ - /* struct ofp11_bucket_counter bucket_stats[0]; */ + struct ofp11_bucket_counter bucket_stats[0]; }; OFP_ASSERT(sizeof(struct ofp13_group_stats) == 40); @@ -402,7 +417,7 @@ struct ofp13_meter_stats { ovs_be32 duration_sec; /* Time meter has been alive in seconds. */ ovs_be32 duration_nsec; /* Time meter has been alive in nanoseconds beyond duration_sec. */ - struct ofp13_meter_band_stats band_stats[0]; /* The band_stats length is + struct ofp13_meter_band_stats band_stats[0]; /* The band_stats length is inferred from the length field. */ }; OFP_ASSERT(sizeof(struct ofp13_meter_stats) == 40); @@ -412,7 +427,7 @@ struct ofp13_meter_config { ovs_be16 length; /* Length of this entry. */ ovs_be16 flags; /* Set of OFPMC_* that apply. */ ovs_be32 meter_id; /* Meter instance. */ - struct ofp13_meter_band_header bands[0]; /* The bands length is inferred + /* struct ofp13_meter_band_header bands[0]; The bands length is inferred from the length field. */ }; OFP_ASSERT(sizeof(struct ofp13_meter_config) == 8);