X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fmeta-flow.h;h=632cb46dc080fd8f50ae49ee09064247d1dd7706;hb=ccbe50f8f61ac944eb965f67c570d79b6724c9cf;hp=eddc549570457d07758381375395056b8605f498;hpb=530180fd5a99e2c55107831f99fee84d6780f38c;p=sliver-openvswitch.git diff --git a/lib/meta-flow.h b/lib/meta-flow.h index eddc54957..632cb46dc 100644 --- a/lib/meta-flow.h +++ b/lib/meta-flow.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Nicira Networks. + * Copyright (c) 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. @@ -21,6 +21,7 @@ #include #include #include "flow.h" +#include "ofp-errors.h" #include "packets.h" struct cls_rule; @@ -49,6 +50,15 @@ enum mf_field_id { MFF_REG4, /* be32 */ #endif #if FLOW_N_REGS > 5 + MFF_REG5, /* be32 */ +#endif +#if FLOW_N_REGS > 6 + MFF_REG6, /* be32 */ +#endif +#if FLOW_N_REGS > 7 + MFF_REG7, /* be32 */ +#endif +#if FLOW_N_REGS > 8 #error #endif @@ -72,6 +82,7 @@ enum mf_field_id { MFF_IP_PROTO, /* u8 (used for IPv4 or IPv6) */ MFF_IP_DSCP, /* u8 (used for IPv4 or IPv6) */ 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) */ MFF_ARP_OP, /* be16 */ @@ -87,8 +98,11 @@ enum mf_field_id { MFF_UDP_SRC, /* be16 (used for IPv4 or IPv6) */ MFF_UDP_DST, /* be16 (used for IPv4 or IPv6) */ - MFF_ICMP_TYPE, /* u8 (used for IPv4 or IPv6) */ - MFF_ICMP_CODE, /* u8 (used for IPv4 or IPv6) */ + MFF_ICMPV4_TYPE, /* u8 */ + MFF_ICMPV4_CODE, /* u8 */ + + MFF_ICMPV6_TYPE, /* u8 */ + MFF_ICMPV6_CODE, /* u8 */ /* ICMPv6 Neighbor Discovery. */ MFF_ND_TARGET, /* ipv6 */ @@ -115,8 +129,8 @@ enum mf_prereqs { /* L2+L3 requirements. */ MFP_TCP, /* On IPv4 or IPv6. */ MFP_UDP, /* On IPv4 or IPv6. */ + MFP_ICMPV4, MFP_ICMPV6, - MFP_ICMP_ANY, /* L2+L3+L4 requirements. */ MFP_ND, @@ -174,7 +188,23 @@ struct mf_field { 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? */ + + /* NXM properties. + * + * A few "mf_field"s don't correspond to NXM fields. Those have 0 and + * NULL for the following members, respectively. */ uint32_t nxm_header; /* An NXM_* constant (a few fields have 0). */ + const char *nxm_name; /* The "NXM_*" constant's name. */ + + /* OXM properties */ + uint32_t oxm_header; /* Field id in the OXM basic class, + * an OXM_* constant. + * Ignored if oxm_name is NULL */ + const char *oxm_name; /* The OXM_* constant's name, + * NULL if the field is not present + * in the OXM basic class */ + }; /* The representation of a field's value. */ @@ -186,10 +216,33 @@ union mf_value { uint8_t mac[ETH_ADDR_LEN]; struct in6_addr ipv6; }; +BUILD_ASSERT_DECL(sizeof(union mf_value) == 16); + +/* Part of a field. */ +struct mf_subfield { + const struct mf_field *field; + unsigned int ofs; /* Bit offset. */ + unsigned int n_bits; /* Number of bits. */ +}; + +/* Data for some part of an mf_field. + * + * The data is stored "right-justified". For example, if "union mf_subvalue + * value" contains NXM_OF_VLAN_TCI[0..11], then one could access the + * corresponding data in value.be16[7] as the bits in the mask htons(0xfff). */ +union mf_subvalue { + uint8_t u8[16]; + ovs_be16 be16[8]; + ovs_be32 be32[4]; + ovs_be64 be64[2]; +}; +BUILD_ASSERT_DECL(sizeof(union mf_value) == sizeof (union mf_subvalue)); /* Finding mf_fields. */ const struct mf_field *mf_from_id(enum mf_field_id); const struct mf_field *mf_from_name(const char *name); +const struct mf_field *mf_from_nxm_header(uint32_t nxm_header); +const struct mf_field *mf_from_nxm_name(const char *nxm_name); /* Inspecting wildcarded bits. */ bool mf_is_all_wild(const struct mf_field *, const struct flow_wildcards *); @@ -209,19 +262,40 @@ 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 *); +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 *, 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 *); -void mf_set_subfield(const struct mf_field *, uint64_t value, unsigned int ofs, - unsigned int n_bits, struct cls_rule *); void mf_set_wild(const struct mf_field *, struct cls_rule *); void mf_random_value(const struct mf_field *, union mf_value *value); +/* Subfields. */ +void mf_write_subfield(const struct mf_subfield *, const union mf_subvalue *, + struct cls_rule *); +void mf_set_subfield(const struct mf_subfield *, uint64_t value, + struct cls_rule *); +void mf_set_subfield_value(const struct mf_subfield *, uint64_t value, + struct flow *); + +void mf_read_subfield(const struct mf_subfield *, const struct flow *, + union mf_subvalue *); +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 *); + +enum ofperr mf_check_src(const struct mf_subfield *, const struct flow *); +enum ofperr mf_check_dst(const struct mf_subfield *, const struct flow *); + /* Parsing and formatting. */ char *mf_parse(const struct mf_field *, const char *, union mf_value *value, union mf_value *mask);