--- openflow-2011-10-11-2.h 2015-07-23 09:54:16.672479343 -0700 +++ openflow-2011-10-11-3.h 2015-07-23 09:54:16.676479343 -0700 @@ -642,53 +642,57 @@ #define OXM_MAKE_WILD_HEADER(HEADER) \ OXM_HEADER_W(OXM_CLASS(HEADER), OXM_FIELD(HEADER), OXM_LENGTH(HEADER)) -/* OXM Class IDs. All other classes reserved for future specifications. */ +/* OXM Class IDs. + * The high order bit differentiate ONF from member classes. + * Classes 0x0000 to 0x7FFF are member classes, allocated by ONF. + * Classes 0x8000 to 0xFFFE are ONF classes, reserved for ONF standardisation. + */ enum ofp_oxm_class { - OFPXMC_NICIRA_0 = 0x0000, /* Backward compatibility with NXM */ - OFPXMC_NICIRA_1 = 0x0001, /* Backward compatibility with NXM */ - OFPXMC_OPENFLOW = 0x0002, /* Basic class for OpenFlow */ - OFPXMC_EXPERIMENTER = 0xFFFF, /* Experimenter class */ + OFPXMC_NXM_0 = 0x0000, /* Backward compatibility with NXM */ + OFPXMC_NXM_1 = 0x0001, /* Backward compatibility with NXM */ + OFPXMC_OPENFLOW_BASIC = 0x8000, /* Basic class for OpenFlow */ + OFPXMC_EXPERIMENTER = 0xFFFF, /* Experimenter class */ }; /* OXM Flow match field types for OpenFlow basic class. */ -enum oxm_of_match_fields { - OFPXMT_OF_IN_PORT = 0, /* Switch input port. */ - OFPXMT_OF_METADATA = 1, /* Metadata passed between tables. */ - OFPXMT_OF_ETH_DST = 2, /* Ethernet destination address. */ - OFPXMT_OF_ETH_SRC = 3, /* Ethernet source address. */ - OFPXMT_OF_ETH_TYPE = 4, /* Ethernet frame type. */ - OFPXMT_OF_VLAN_VID = 5, /* VLAN id. */ - OFPXMT_OF_VLAN_PCP = 6, /* VLAN priority. */ - OFPXMT_OF_IP_TOS = 7, /* IP ToS (DSCP field, 6 bits). */ - OFPXMT_OF_IP_ECN = 8, /* IP ECN bits (2 bits). */ - OFPXMT_OF_IP_PROTO = 9, /* IP protocol. */ - OFPXMT_OF_IPV4_SRC = 10, /* IPv4 source address. */ - OFPXMT_OF_IPV4_DST = 11, /* IPv4 destination address. */ - OFPXMT_OF_TCP_SRC = 12, /* TCP source port. */ - OFPXMT_OF_TCP_DST = 13, /* TCP destination port. */ - OFPXMT_OF_UDP_SRC = 14, /* UDP source port. */ - OFPXMT_OF_UDP_DST = 15, /* UDP destination port. */ - OFPXMT_OF_SCTP_SRC = 16, /* SCTP source port. */ - OFPXMT_OF_SCTP_DST = 17, /* SCTP destination port. */ - OFPXMT_OF_ICMPV4_TYPE = 18, /* ICMP type. */ - OFPXMT_OF_ICMPV4_CODE = 19, /* ICMP code. */ - OFPXMT_OF_ARP_OP = 20, /* ARP opcode. */ - OFPXMT_OF_ARP_SPA = 21, /* ARP source IPv4 address. */ - OFPXMT_OF_ARP_TPA = 22, /* ARP target IPv4 address. */ - OFPXMT_OF_ARP_SHA = 23, /* ARP source hardware address. */ - OFPXMT_OF_ARP_THA = 24, /* ARP target hardware address. */ - OFPXMT_OF_IPV6_SRC = 25, /* IPv6 source address. */ - OFPXMT_OF_IPV6_DST = 26, /* IPv6 destination address. */ - OFPXMT_OF_ICMPV6_TYPE = 27, /* ICMP type. */ - OFPXMT_OF_ICMPV6_CODE = 28, /* ICMP code. */ - OFPXMT_OF_IPV6_ND_TARGET = 29, /* Target address for ND. */ - OFPXMT_OF_IPV6_ND_SLL = 30, /* Source link-layer for ND. */ - OFPXMT_OF_IPV6_ND_TLL = 31, /* Target link-layer for ND. */ - OFPXMT_OF_MPLS_LABEL = 32, /* MPLS label. */ - OFPXMT_OF_MPLS_TC = 33, /* MPLS TC. */ +enum oxm_ofb_match_fields { + OFPXMT_OFB_IN_PORT = 0, /* Switch input port. */ + OFPXMT_OFB_METADATA = 1, /* Metadata passed between tables. */ + OFPXMT_OFB_ETH_DST = 2, /* Ethernet destination address. */ + OFPXMT_OFB_ETH_SRC = 3, /* Ethernet source address. */ + OFPXMT_OFB_ETH_TYPE = 4, /* Ethernet frame type. */ + OFPXMT_OFB_VLAN_VID = 5, /* VLAN id. */ + OFPXMT_OFB_VLAN_PCP = 6, /* VLAN priority. */ + OFPXMT_OFB_IP_TOS = 7, /* IP ToS (DSCP field, 6 bits). */ + OFPXMT_OFB_IP_ECN = 8, /* IP ECN bits (2 bits). */ + OFPXMT_OFB_IP_PROTO = 9, /* IP protocol. */ + OFPXMT_OFB_IPV4_SRC = 10, /* IPv4 source address. */ + OFPXMT_OFB_IPV4_DST = 11, /* IPv4 destination address. */ + OFPXMT_OFB_TCP_SRC = 12, /* TCP source port. */ + OFPXMT_OFB_TCP_DST = 13, /* TCP destination port. */ + OFPXMT_OFB_UDP_SRC = 14, /* UDP source port. */ + OFPXMT_OFB_UDP_DST = 15, /* UDP destination port. */ + OFPXMT_OFB_SCTP_SRC = 16, /* SCTP source port. */ + OFPXMT_OFB_SCTP_DST = 17, /* SCTP destination port. */ + OFPXMT_OFB_ICMPV4_TYPE = 18, /* ICMP type. */ + OFPXMT_OFB_ICMPV4_CODE = 19, /* ICMP code. */ + OFPXMT_OFB_ARP_OP = 20, /* ARP opcode. */ + OFPXMT_OFB_ARP_SPA = 21, /* ARP source IPv4 address. */ + OFPXMT_OFB_ARP_TPA = 22, /* ARP target IPv4 address. */ + OFPXMT_OFB_ARP_SHA = 23, /* ARP source hardware address. */ + OFPXMT_OFB_ARP_THA = 24, /* ARP target hardware address. */ + OFPXMT_OFB_IPV6_SRC = 25, /* IPv6 source address. */ + OFPXMT_OFB_IPV6_DST = 26, /* IPv6 destination address. */ + OFPXMT_OFB_ICMPV6_TYPE = 27, /* ICMP type. */ + OFPXMT_OFB_ICMPV6_CODE = 28, /* ICMP code. */ + OFPXMT_OFB_IPV6_ND_TARGET = 29, /* Target address for ND. */ + OFPXMT_OFB_IPV6_ND_SLL = 30, /* Source link-layer for ND. */ + OFPXMT_OFB_IPV6_ND_TLL = 31, /* Target link-layer for ND. */ + OFPXMT_OFB_MPLS_LABEL = 32, /* MPLS label. */ + OFPXMT_OFB_MPLS_TC = 33, /* MPLS TC. */ }; -#define OFPXMT_OF_ALL ((UINT64_C(1) << 34) - 1) +#define OFPXMT_OFB_ALL ((UINT64_C(1) << 34) - 1) /* Physical or virtual port on which the packet was received. * @@ -697,7 +701,7 @@ * Format: 32-bit integer in network byte order. * * Masking: Not maskable. */ -#define OXM_OF_IN_PORT OXM_HEADER (0x0002, OFPXMT_OF_IN_PORT, 4) +#define OXM_OF_IN_PORT OXM_HEADER (0x8000, OFPXMT_OFB_IN_PORT, 4) /* Table metadata. * @@ -707,8 +711,8 @@ * * Masking: Arbitrary masks. */ -#define OXM_OF_METADATA OXM_HEADER (0x0002, OFPXMT_OF_METADATA, 8) -#define OXM_OF_METADATA_W OXM_HEADER_W(0x0002, OFPXMT_OF_METADATA, 8) +#define OXM_OF_METADATA OXM_HEADER (0x8000, OFPXMT_OFB_METADATA, 8) +#define OXM_OF_METADATA_W OXM_HEADER_W(0x8000, OFPXMT_OFB_METADATA, 8) /* Source or destination address in Ethernet header. * @@ -717,10 +721,10 @@ * Format: 48-bit Ethernet MAC address. * * Masking: Arbitrary masks. */ -#define OXM_OF_ETH_DST OXM_HEADER (0x0002, OFPXMT_OF_ETH_DST, 6) -#define OXM_OF_ETH_DST_W OXM_HEADER_W(0x0002, OFPXMT_OF_ETH_DST, 6) -#define OXM_OF_ETH_SRC OXM_HEADER (0x0002, OFPXMT_OF_ETH_SRC, 6) -#define OXM_OF_ETH_SRC_W OXM_HEADER_W(0x0002, OFPXMT_OF_ETH_SRC, 6) +#define OXM_OF_ETH_DST OXM_HEADER (0x8000, OFPXMT_OFB_ETH_DST, 6) +#define OXM_OF_ETH_DST_W OXM_HEADER_W(0x8000, OFPXMT_OFB_ETH_DST, 6) +#define OXM_OF_ETH_SRC OXM_HEADER (0x8000, OFPXMT_OFB_ETH_SRC, 6) +#define OXM_OF_ETH_SRC_W OXM_HEADER_W(0x8000, OFPXMT_OFB_ETH_SRC, 6) /* Packet's Ethernet type. * @@ -729,7 +733,7 @@ * Format: 16-bit integer in network byte order. * * Masking: Not maskable. */ -#define OXM_OF_ETH_TYPE OXM_HEADER (0x0002, OFPXMT_OF_ETH_TYPE, 2) +#define OXM_OF_ETH_TYPE OXM_HEADER (0x8000, OFPXMT_OFB_ETH_TYPE, 2) /* The VLAN id is 12-bits, so we can use the entire 16 bits to indicate * special conditions. @@ -775,8 +779,8 @@ * - Testing with nxm_value=0x1000, nxm_mask=0x1000 matches packets with * an 802.1Q header that has any VID value. */ -#define OXM_OF_VLAN_VID OXM_HEADER (0x0002, OFPXMT_OF_VLAN_VID, 2) -#define OXM_OF_VLAN_VID_W OXM_HEADER_W(0x0002, OFPXMT_OF_VLAN_VID, 2) +#define OXM_OF_VLAN_VID OXM_HEADER (0x8000, OFPXMT_OFB_VLAN_VID, 2) +#define OXM_OF_VLAN_VID_W OXM_HEADER_W(0x8000, OFPXMT_OFB_VLAN_VID, 2) /* 802.1Q PCP. * @@ -791,7 +795,7 @@ * * Masking: Not maskable. */ -#define OXM_OF_VLAN_PCP OXM_HEADER (0x0002, OFPXMT_OF_VLAN_PCP, 1) +#define OXM_OF_VLAN_PCP OXM_HEADER (0x8000, OFPXMT_OFB_VLAN_PCP, 1) /* The "type of service" byte of the IP header, with the ECN bits forced to 0. * @@ -801,7 +805,7 @@ * Only the higher 6 bits have meaning. * * Masking: Not maskable. */ -#define OXM_OF_IP_TOS OXM_HEADER (0x0002, OFPXMT_OF_IP_TOS, 1) +#define OXM_OF_IP_TOS OXM_HEADER (0x8000, OFPXMT_OFB_IP_TOS, 1) /* The ECN bits of the IP header. * @@ -811,7 +815,7 @@ * Only the lower 2 bits have meaning. * * Masking: Not maskable. */ -#define OXM_OF_IP_ECN OXM_HEADER (0x0002, OFPXMT_OF_IP_ECN, 1) +#define OXM_OF_IP_ECN OXM_HEADER (0x8000, OFPXMT_OFB_IP_ECN, 1) /* The "protocol" byte in the IP header. * @@ -820,7 +824,7 @@ * Format: 8-bit integer. * * Masking: Not maskable. */ -#define OXM_OF_IP_PROTO OXM_HEADER (0x0002, OFPXMT_OF_IP_PROTO, 1) +#define OXM_OF_IP_PROTO OXM_HEADER (0x8000, OFPXMT_OFB_IP_PROTO, 1) /* The source or destination address in the IP header. * @@ -830,10 +834,10 @@ * * Masking: Arbitrary masks. */ -#define OXM_OF_IPV4_SRC OXM_HEADER (0x0002, OFPXMT_OF_IPV4_SRC, 4) -#define OXM_OF_IPV4_SRC_W OXM_HEADER_W(0x0002, OFPXMT_OF_IPV4_SRC, 4) -#define OXM_OF_IPV4_DST OXM_HEADER (0x0002, OFPXMT_OF_IPV4_DST, 4) -#define OXM_OF_IPV4_DST_W OXM_HEADER_W(0x0002, OFPXMT_OF_IPV4_DST, 4) +#define OXM_OF_IPV4_SRC OXM_HEADER (0x8000, OFPXMT_OFB_IPV4_SRC, 4) +#define OXM_OF_IPV4_SRC_W OXM_HEADER_W(0x8000, OFPXMT_OFB_IPV4_SRC, 4) +#define OXM_OF_IPV4_DST OXM_HEADER (0x8000, OFPXMT_OFB_IPV4_DST, 4) +#define OXM_OF_IPV4_DST_W OXM_HEADER_W(0x8000, OFPXMT_OFB_IPV4_DST, 4) /* The source or destination port in the TCP header. * @@ -844,8 +848,8 @@ * Format: 16-bit integer in network byte order. * * Masking: Not maskable. */ -#define OXM_OF_TCP_SRC OXM_HEADER (0x0002, OFPXMT_OF_TCP_SRC, 2) -#define OXM_OF_TCP_DST OXM_HEADER (0x0002, OFPXMT_OF_TCP_DST, 2) +#define OXM_OF_TCP_SRC OXM_HEADER (0x8000, OFPXMT_OFB_TCP_SRC, 2) +#define OXM_OF_TCP_DST OXM_HEADER (0x8000, OFPXMT_OFB_TCP_DST, 2) /* The source or destination port in the UDP header. * @@ -856,8 +860,8 @@ * Format: 16-bit integer in network byte order. * * Masking: Not maskable. */ -#define OXM_OF_UDP_SRC OXM_HEADER (0x0002, OFPXMT_OF_UDP_SRC, 2) -#define OXM_OF_UDP_DST OXM_HEADER (0x0002, OFPXMT_OF_UDP_DST, 2) +#define OXM_OF_UDP_SRC OXM_HEADER (0x8000, OFPXMT_OFB_UDP_SRC, 2) +#define OXM_OF_UDP_DST OXM_HEADER (0x8000, OFPXMT_OFB_UDP_DST, 2) /* The source or destination port in the SCTP header. * @@ -868,8 +872,8 @@ * Format: 16-bit integer in network byte order. * * Masking: Not maskable. */ -#define OXM_OF_SCTP_SRC OXM_HEADER (0x0002, OFPXMT_OF_SCTP_SRC, 2) -#define OXM_OF_SCTP_DST OXM_HEADER (0x0002, OFPXMT_OF_SCTP_DST, 2) +#define OXM_OF_SCTP_SRC OXM_HEADER (0x8000, OFPXMT_OFB_SCTP_SRC, 2) +#define OXM_OF_SCTP_DST OXM_HEADER (0x8000, OFPXMT_OFB_SCTP_DST, 2) /* The type or code in the ICMP header. * @@ -880,8 +884,8 @@ * Format: 8-bit integer. * * Masking: Not maskable. */ -#define OXM_OF_ICMPV4_TYPE OXM_HEADER (0x0002, OFPXMT_OF_ICMPV4_TYPE, 1) -#define OXM_OF_ICMPV4_CODE OXM_HEADER (0x0002, OFPXMT_OF_ICMPV4_CODE, 1) +#define OXM_OF_ICMPV4_TYPE OXM_HEADER (0x8000, OFPXMT_OFB_ICMPV4_TYPE, 1) +#define OXM_OF_ICMPV4_CODE OXM_HEADER (0x8000, OFPXMT_OFB_ICMPV4_CODE, 1) /* ARP opcode. * @@ -893,7 +897,7 @@ * Format: 16-bit integer in network byte order. * * Masking: Not maskable. */ -#define OXM_OF_ARP_OP OXM_HEADER (0x0002, OFPXMT_OF_ARP_OP, 2) +#define OXM_OF_ARP_OP OXM_HEADER (0x8000, OFPXMT_OFB_ARP_OP, 2) /* For an Ethernet+IP ARP packet, the source or target protocol address * in the ARP header. Always 0 otherwise. @@ -904,10 +908,10 @@ * * Masking: Arbitrary masks. */ -#define OXM_OF_ARP_SPA OXM_HEADER (0x0002, OFPXMT_OF_ARP_SPA, 4) -#define OXM_OF_ARP_SPA_W OXM_HEADER_W(0x0002, OFPXMT_OF_ARP_SPA, 4) -#define OXM_OF_ARP_TPA OXM_HEADER (0x0002, OFPXMT_OF_ARP_TPA, 4) -#define OXM_OF_ARP_TPA_W OXM_HEADER_W(0x0002, OFPXMT_OF_ARP_TPA, 4) +#define OXM_OF_ARP_SPA OXM_HEADER (0x8000, OFPXMT_OFB_ARP_SPA, 4) +#define OXM_OF_ARP_SPA_W OXM_HEADER_W(0x8000, OFPXMT_OFB_ARP_SPA, 4) +#define OXM_OF_ARP_TPA OXM_HEADER (0x8000, OFPXMT_OFB_ARP_TPA, 4) +#define OXM_OF_ARP_TPA_W OXM_HEADER_W(0x8000, OFPXMT_OFB_ARP_TPA, 4) /* For an Ethernet+IP ARP packet, the source or target hardware address * in the ARP header. Always 0 otherwise. @@ -917,8 +921,8 @@ * Format: 48-bit Ethernet MAC address. * * Masking: Not maskable. */ -#define OXM_OF_ARP_SHA OXM_HEADER (0x0002, OFPXMT_OF_ARP_SHA, 6) -#define OXM_OF_ARP_THA OXM_HEADER (0x0002, OFPXMT_OF_ARP_THA, 6) +#define OXM_OF_ARP_SHA OXM_HEADER (0x8000, OFPXMT_OFB_ARP_SHA, 6) +#define OXM_OF_ARP_THA OXM_HEADER (0x8000, OFPXMT_OFB_ARP_THA, 6) /* The source or destination address in the IPv6 header. * @@ -928,10 +932,10 @@ * * Masking: Arbitrary masks. */ -#define OXM_OF_IPV6_SRC OXM_HEADER (0x0002, OFPXMT_OF_IPV6_SRC, 16) -#define OXM_OF_IPV6_SRC_W OXM_HEADER_W(0x0002, OFPXMT_OF_IPV6_SRC, 16) -#define OXM_OF_IPV6_DST OXM_HEADER (0x0002, OFPXMT_OF_IPV6_DST, 16) -#define OXM_OF_IPV6_DST_W OXM_HEADER_W(0x0002, OFPXMT_OF_IPV6_DST, 16) +#define OXM_OF_IPV6_SRC OXM_HEADER (0x8000, OFPXMT_OFB_IPV6_SRC, 16) +#define OXM_OF_IPV6_SRC_W OXM_HEADER_W(0x8000, OFPXMT_OFB_IPV6_SRC, 16) +#define OXM_OF_IPV6_DST OXM_HEADER (0x8000, OFPXMT_OFB_IPV6_DST, 16) +#define OXM_OF_IPV6_DST_W OXM_HEADER_W(0x8000, OFPXMT_OFB_IPV6_DST, 16) /* The type or code in the ICMPv6 header. * @@ -942,8 +946,8 @@ * Format: 8-bit integer. * * Masking: Not maskable. */ -#define OXM_OF_ICMPV6_TYPE OXM_HEADER (0x0002, OFPXMT_OF_ICMPV6_TYPE, 1) -#define OXM_OF_ICMPV6_CODE OXM_HEADER (0x0002, OFPXMT_OF_ICMPV6_CODE, 1) +#define OXM_OF_ICMPV6_TYPE OXM_HEADER (0x8000, OFPXMT_OFB_ICMPV6_TYPE, 1) +#define OXM_OF_ICMPV6_CODE OXM_HEADER (0x8000, OFPXMT_OFB_ICMPV6_CODE, 1) /* The target address in an IPv6 Neighbor Discovery message. * @@ -955,7 +959,7 @@ * Format: 128-bit IPv6 address. * * Masking: Not maskable. */ -#define OXM_OF_IPV6_ND_TARGET OXM_HEADER (0x0002, OFPXMT_OF_IPV6_ND_TARGET, 16) +#define OXM_OF_IPV6_ND_TARGET OXM_HEADER (0x8000, OFPXMT_OFB_IPV6_ND_TARGET, 16) /* The source link-layer address option in an IPv6 Neighbor Discovery * message. @@ -968,7 +972,7 @@ * Format: 48-bit Ethernet MAC address. * * Masking: Not maskable. */ -#define OXM_OF_IPV6_ND_SLL OXM_HEADER (0x0002, OFPXMT_OF_IPV6_ND_SLL, 6) +#define OXM_OF_IPV6_ND_SLL OXM_HEADER (0x8000, OFPXMT_OFB_IPV6_ND_SLL, 6) /* The target link-layer address option in an IPv6 Neighbor Discovery * message. @@ -981,7 +985,7 @@ * Format: 48-bit Ethernet MAC address. * * Masking: Not maskable. */ -#define OXM_OF_IPV6_ND_TLL OXM_HEADER (0x0002, OFPXMT_OF_IPV6_ND_TLL, 6) +#define OXM_OF_IPV6_ND_TLL OXM_HEADER (0x8000, OFPXMT_OFB_IPV6_ND_TLL, 6) /* The LABEL in the first MPLS shim header. * @@ -992,7 +996,7 @@ * bits forced to 0. Only the lower 20 bits have meaning. * * Masking: Not maskable. */ -#define OXM_OF_MPLS_LABEL OXM_HEADER (0x0002, OFPXMT_OF_MPLS_LABEL, 4) +#define OXM_OF_MPLS_LABEL OXM_HEADER (0x8000, OFPXMT_OFB_MPLS_LABEL, 4) /* The TC in the first MPLS shim header. * @@ -1003,7 +1007,7 @@ * Only the lower 3 bits have meaning. * * Masking: Not maskable. */ -#define OXM_OF_MPLS_TC OXM_HEADER (0x0002, OFPXMT_OF_MPLS_TC, 1) +#define OXM_OF_MPLS_TC OXM_HEADER (0x8000, OFPXMT_OFB_MPLS_TC, 1) /* Header for OXM experimenter match fields. */ struct ofp_oxm_experimenter_header {