X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fmatch.h;h=1246b2029d6faae3e8af979d47c779b2a6ba3b2d;hb=3d91d9094dcf49c210bd4ebae4bd1e0cea9defce;hp=e3563d272ed7f081fe89ce9531562cd97a91db6c;hpb=81a76618be9ea195a1e4a881ba9591728891d10b;p=sliver-openvswitch.git diff --git a/lib/match.h b/lib/match.h index e3563d272..1246b2029 100644 --- a/lib/match.h +++ b/lib/match.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc. + * Copyright (c) 2009, 2010, 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. @@ -19,6 +19,8 @@ #include "flow.h" +struct ds; + /* A flow classification match. * * Use one of the match_*() functions to initialize a "struct match". @@ -34,11 +36,17 @@ struct match { void match_init(struct match *, const struct flow *, const struct flow_wildcards *); +void match_wc_init(struct match *match, const struct flow *flow); void match_init_catchall(struct match *); -void match_init_exact(struct match *, const struct flow *); void match_zero_wildcarded_fields(struct match *); +void match_set_dp_hash(struct match *, uint32_t value); +void match_set_dp_hash_masked(struct match *, uint32_t value, uint32_t mask); + +void match_set_recirc_id(struct match *, uint32_t value); +void match_set_recirc_id_masked(struct match *, uint32_t value, uint32_t mask); + void match_set_reg(struct match *, unsigned int reg_idx, uint32_t value); void match_set_reg_masked(struct match *, unsigned int reg_idx, uint32_t value, uint32_t mask); @@ -47,7 +55,20 @@ void match_set_metadata_masked(struct match *, ovs_be64 metadata, ovs_be64 mask); void match_set_tun_id(struct match *, ovs_be64 tun_id); void match_set_tun_id_masked(struct match *, ovs_be64 tun_id, ovs_be64 mask); -void match_set_in_port(struct match *, uint16_t ofp_port); +void match_set_tun_src(struct match *match, ovs_be32 src); +void match_set_tun_src_masked(struct match *match, ovs_be32 src, ovs_be32 mask); +void match_set_tun_dst(struct match *match, ovs_be32 dst); +void match_set_tun_dst_masked(struct match *match, ovs_be32 dst, ovs_be32 mask); +void match_set_tun_ttl(struct match *match, uint8_t ttl); +void match_set_tun_ttl_masked(struct match *match, uint8_t ttl, uint8_t mask); +void match_set_tun_tos(struct match *match, uint8_t tos); +void match_set_tun_tos_masked(struct match *match, uint8_t tos, uint8_t mask); +void match_set_tun_flags(struct match *match, uint16_t flags); +void match_set_tun_flags_masked(struct match *match, uint16_t flags, uint16_t mask); +void match_set_in_port(struct match *, ofp_port_t ofp_port); +void match_set_pkt_mark(struct match *, uint32_t pkt_mark); +void match_set_pkt_mark_masked(struct match *, uint32_t pkt_mark, uint32_t mask); +void match_set_skb_priority(struct match *, uint32_t skb_priority); void match_set_dl_type(struct match *, ovs_be16); void match_set_dl_src(struct match *, const uint8_t[6]); void match_set_dl_src_masked(struct match *, const uint8_t dl_src[6], @@ -63,10 +84,21 @@ void match_set_vlan_vid(struct match *, ovs_be16); void match_set_vlan_vid_masked(struct match *, ovs_be16 vid, ovs_be16 mask); void match_set_any_pcp(struct match *); void match_set_dl_vlan_pcp(struct match *, uint8_t); +void match_set_any_mpls_lse(struct match *, int idx); +void match_set_mpls_lse(struct match *, int idx, ovs_be32); +void match_set_any_mpls_label(struct match *, int idx); +void match_set_mpls_label(struct match *, int idx, ovs_be32); +void match_set_any_mpls_tc(struct match *, int idx); +void match_set_mpls_tc(struct match *, int idx, uint8_t); +void match_set_any_mpls_bos(struct match *, int idx); +void match_set_mpls_bos(struct match *, int idx, uint8_t); void match_set_tp_src(struct match *, ovs_be16); +void match_set_mpls_lse(struct match *, int idx, ovs_be32 lse); void match_set_tp_src_masked(struct match *, ovs_be16 port, ovs_be16 mask); void match_set_tp_dst(struct match *, ovs_be16); void match_set_tp_dst_masked(struct match *, ovs_be16 port, ovs_be16 mask); +void match_set_tcp_flags(struct match *, ovs_be16); +void match_set_tcp_flags_masked(struct match *, ovs_be16 flags, ovs_be16 mask); void match_set_nw_proto(struct match *, uint8_t); void match_set_nw_src(struct match *, ovs_be32); void match_set_nw_src_masked(struct match *, ovs_be32 ip, ovs_be32 mask); @@ -102,8 +134,44 @@ void match_set_nd_target_masked(struct match *, const struct in6_addr *, bool match_equal(const struct match *, const struct match *); uint32_t match_hash(const struct match *, uint32_t basis); +void match_init_hidden_fields(struct match *); +bool match_has_default_hidden_fields(const struct match *); + void match_format(const struct match *, struct ds *, unsigned int priority); char *match_to_string(const struct match *, unsigned int priority); void match_print(const struct match *); + +/* Compressed match. */ + +/* A sparse representation of a "struct match". + * + * There are two invariants: + * + * - The same invariant as "struct match", that is, a 1-bit in the 'flow' + * must correspond to a 1-bit in 'mask'. + * + * - 'flow' and 'mask' have the same 'map'. This implies that 'flow' and + * 'mask' have the same part of "struct flow" at the same offset into + * 'values', which makes minimatch_matches_flow() faster. + */ +struct minimatch { + struct miniflow flow; + struct minimask mask; +}; + +void minimatch_init(struct minimatch *, const struct match *); +void minimatch_clone(struct minimatch *, const struct minimatch *); +void minimatch_move(struct minimatch *dst, struct minimatch *src); +void minimatch_destroy(struct minimatch *); + +void minimatch_expand(const struct minimatch *, struct match *); + +bool minimatch_equal(const struct minimatch *a, const struct minimatch *b); + +bool minimatch_matches_flow(const struct minimatch *, const struct flow *); + +void minimatch_format(const struct minimatch *, struct ds *, + unsigned int priority); +char *minimatch_to_string(const struct minimatch *, unsigned int priority); #endif /* match.h */