X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fmeta-flow.h;h=bc402dc0abc2b8193ea92f2943c1e3470937d3e9;hb=7aaeab4df24b7e9460705b1dad1010eef0354c50;hp=12a4baa26868f41e11f4802c6346f3e7f0db0647;hpb=8706009e555bb9fa04a5679e4be2c7c67506802b;p=sliver-openvswitch.git diff --git a/lib/meta-flow.h b/lib/meta-flow.h index 12a4baa26..bc402dc0a 100644 --- a/lib/meta-flow.h +++ b/lib/meta-flow.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012 Nicira, Inc. + * Copyright (c) 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,16 +24,24 @@ #include "ofp-errors.h" #include "packets.h" -struct cls_rule; struct ds; +struct match; /* The comment on each of these indicates the member in "union mf_value" used * to represent its value. */ enum mf_field_id { /* Metadata. */ MFF_TUN_ID, /* be64 */ + MFF_TUN_SRC, /* be32 */ + MFF_TUN_DST, /* be32 */ + MFF_TUN_FLAGS, /* be16 */ + MFF_TUN_TTL, /* u8 */ + MFF_TUN_TOS, /* u8 */ MFF_METADATA, /* be64 */ MFF_IN_PORT, /* be16 */ + MFF_IN_PORT_OXM, /* be32 */ + MFF_SKB_PRIORITY, /* be32 */ + MFF_SKB_MARK, /* be32 */ #if FLOW_N_REGS > 0 MFF_REG0, /* be32 */ @@ -71,6 +79,11 @@ enum mf_field_id { MFF_DL_VLAN_PCP, /* u8 (OpenFlow 1.0 compatibility) */ MFF_VLAN_PCP, /* be16 (OpenFlow 1.2 compatibility) */ + /* L2.5 */ + MFF_MPLS_LABEL, /* be32 */ + MFF_MPLS_TC, /* u8 */ + MFF_MPLS_BOS, /* u8 */ + /* L3. */ MFF_IPV4_SRC, /* be32 */ MFF_IPV4_DST, /* be32 */ @@ -79,8 +92,18 @@ enum mf_field_id { MFF_IPV6_DST, /* ipv6 */ MFF_IPV6_LABEL, /* be32 */ + /* The IPv4/IPv6 DSCP field has two different views: + * + * - MFF_IP_DSCP has the DSCP in bits 2-7, their bit positions in the + * IPv4 and IPv6 "traffic class" field, as used in OpenFlow 1.0 and 1.1 + * flow format and in NXM's NXM_OF_IP_TOS + * + * - MFF_IP_DSCP has the DSCP in bits 0-5, shifted right two bits from + * their positions in the IPv4 and IPv6 "traffic class" field, as used + * in OpenFlow 1.2+ OXM's OXM_OF_IP_DSCP. */ MFF_IP_PROTO, /* u8 (used for IPv4 or IPv6) */ MFF_IP_DSCP, /* u8 (used for IPv4 or IPv6) */ + MFF_IP_DSCP_SHIFTED, /* u8 (used for IPv4 or IPv6) (OF1.2 compat) */ MFF_IP_ECN, /* u8 (used for IPv4 or IPv6) */ MFF_IP_TTL, /* u8 (used for IPv4 or IPv6) */ MFF_IP_FRAG, /* u8 (used for IPv4 or IPv6) */ @@ -161,6 +184,9 @@ enum mf_prereqs { MFP_IPV6, MFP_IP_ANY, + /* L2.5 requirements. */ + MFP_MPLS, + /* L2+L3 requirements. */ MFP_TCP, /* On IPv4 or IPv6. */ MFP_UDP, /* On IPv4 or IPv6. */ @@ -195,7 +221,9 @@ enum mf_string { MFS_IPV4, MFS_IPV6, MFS_OFP_PORT, /* An OpenFlow port number or name. */ - MFS_FRAG /* no, yes, first, later, not_later */ + MFS_OFP_PORT_OXM, /* An OpenFlow port number or name (32-bit). */ + MFS_FRAG, /* no, yes, first, later, not_later */ + MFS_TNL_FLAGS, /* FLOW_TNL_F_* flags */ }; struct mf_field { @@ -212,13 +240,15 @@ struct mf_field { * - "dl_vlan_pcp" is 1 byte but only 3 bits. * - "is_frag" is 1 byte but only 2 bits. * - "ipv6_label" is 4 bytes but only 20 bits. + * - "mpls_label" is 4 bytes but only 20 bits. + * - "mpls_tc" is 1 byte but only 3 bits. + * - "mpls_bos" is 1 byte but only 1 bit. */ unsigned int n_bytes; /* Width of the field in bytes. */ unsigned int n_bits; /* Number of significant bits in field. */ /* Properties. */ enum mf_maskable maskable; - flow_wildcards_t fww_bit; /* Either 0 or exactly one FWW_* bit. */ enum mf_string string; enum mf_prereqs prereqs; bool writable; /* May be written by actions? */ @@ -295,7 +325,7 @@ void mf_get_mask(const struct mf_field *, const struct flow_wildcards *, /* Prerequisites. */ bool mf_are_prereqs_ok(const struct mf_field *, const struct flow *); -void mf_force_prereqs(const struct mf_field *, struct cls_rule *); +void mf_force_prereqs(const struct mf_field *, struct match *); /* Field values. */ bool mf_is_value_valid(const struct mf_field *, const union mf_value *value); @@ -303,24 +333,26 @@ bool mf_is_value_valid(const struct mf_field *, const union mf_value *value); void mf_get_value(const struct mf_field *, const struct flow *, union mf_value *value); void mf_set_value(const struct mf_field *, const union mf_value *value, - struct cls_rule *); + struct match *); void mf_set_flow_value(const struct mf_field *, const union mf_value *value, struct flow *); bool mf_is_zero(const struct mf_field *, const struct flow *); -void mf_get(const struct mf_field *, const struct cls_rule *, +void mf_get(const struct mf_field *, const struct match *, union mf_value *value, union mf_value *mask); void mf_set(const struct mf_field *, const union mf_value *value, const union mf_value *mask, - struct cls_rule *); + struct match *); -void mf_set_wild(const struct mf_field *, struct cls_rule *); +void mf_set_wild(const struct mf_field *, struct match *); void mf_random_value(const struct mf_field *, union mf_value *value); /* Subfields. */ +void mf_write_subfield_flow(const struct mf_subfield *, + const union mf_subvalue *, struct flow *); void mf_write_subfield(const struct mf_subfield *, const union mf_subvalue *, - struct cls_rule *); + struct match *); void mf_read_subfield(const struct mf_subfield *, const struct flow *, union mf_subvalue *); @@ -328,8 +360,10 @@ uint64_t mf_get_subfield(const struct mf_subfield *, const struct flow *); void mf_format_subfield(const struct mf_subfield *, struct ds *); -char *mf_parse_subfield__(struct mf_subfield *sf, const char **s); -const char *mf_parse_subfield(struct mf_subfield *, const char *); +char *mf_parse_subfield__(struct mf_subfield *sf, const char **s) + WARN_UNUSED_RESULT; +char *mf_parse_subfield(struct mf_subfield *, const char *s) + WARN_UNUSED_RESULT; enum ofperr mf_check_src(const struct mf_subfield *, const struct flow *); enum ofperr mf_check_dst(const struct mf_subfield *, const struct flow *); @@ -341,5 +375,6 @@ char *mf_parse_value(const struct mf_field *, const char *, union mf_value *); void mf_format(const struct mf_field *, const union mf_value *value, const union mf_value *mask, struct ds *); +void mf_format_subvalue(const union mf_subvalue *subvalue, struct ds *s); #endif /* meta-flow.h */