#include "dynamic-string.h"
#include "ofp-util.h"
#include "packets.h"
-#include "vlog.h"
-
-VLOG_DEFINE_THIS_MODULE(match);
-
/* Converts the flow in 'flow' into a match in 'match', with the given
* 'wildcards'. */
if (flow->nw_frag) {
memset(&wc->masks.nw_frag, 0xff, sizeof wc->masks.nw_frag);
+ if (flow->nw_frag & FLOW_NW_FRAG_LATER) {
+ /* No transport layer header in later fragments. */
+ return;
+ }
}
if (flow->nw_proto == IPPROTO_ICMP ||
memset(&wc->masks.tp_src, 0xff, sizeof wc->masks.tp_src);
memset(&wc->masks.tp_dst, 0xff, sizeof wc->masks.tp_dst);
}
+ if (flow->nw_proto == IPPROTO_TCP) {
+ memset(&wc->masks.tcp_flags, 0xff, sizeof wc->masks.tcp_flags);
+ }
if (flow->nw_proto == IPPROTO_ICMPV6) {
memset(&wc->masks.arp_sha, 0xff, sizeof wc->masks.arp_sha);
return;
}
-/* Converts the flow in 'flow' into an exact-match match in 'match'. */
-void
-match_init_exact(struct match *match, const struct flow *flow)
-{
- match->flow = *flow;
- match->flow.skb_priority = 0;
- flow_wildcards_init_exact(&match->wc);
-}
-
/* Initializes 'match' as a "catch-all" match that matches every packet. */
void
match_init_catchall(struct match *match)
match->wc.masks.tp_dst = mask;
}
+void
+match_set_tcp_flags(struct match *match, ovs_be16 flags)
+{
+ match_set_tcp_flags_masked(match, flags, OVS_BE16_MAX);
+}
+
+void
+match_set_tcp_flags_masked(struct match *match, ovs_be16 flags, ovs_be16 mask)
+{
+ match->flow.tcp_flags = flags & mask;
+ match->wc.masks.tcp_flags = mask;
+}
+
void
match_set_nw_proto(struct match *match, uint8_t nw_proto)
{
}
}
-
static void
format_be16_masked(struct ds *s, const char *name,
ovs_be16 value, ovs_be16 mask)
}
}
+static void
+format_uint32_masked(struct ds *s, const char *name,
+ uint32_t value, uint32_t mask)
+{
+ if (mask) {
+ ds_put_format(s, "%s=%#"PRIx32, name, value);
+ if (mask != UINT32_MAX) {
+ ds_put_format(s, "/%#"PRIx32, mask);
+ }
+ ds_put_char(s, ',');
+ }
+}
+
+static void
+format_be64_masked(struct ds *s, const char *name,
+ ovs_be64 value, ovs_be64 mask)
+{
+ if (mask != htonll(0)) {
+ ds_put_format(s, "%s=%#"PRIx64, name, ntohll(value));
+ if (mask != OVS_BE64_MAX) {
+ ds_put_format(s, "/%#"PRIx64, ntohll(mask));
+ }
+ ds_put_char(s, ',');
+ }
+}
+
static void
format_flow_tunnel(struct ds *s, const struct match *match)
{
const struct flow_wildcards *wc = &match->wc;
const struct flow_tnl *tnl = &match->flow.tunnel;
- switch (wc->masks.tunnel.tun_id) {
- case 0:
- break;
- case OVS_BE64_MAX:
- ds_put_format(s, "tun_id=%#"PRIx64",", ntohll(tnl->tun_id));
- break;
- default:
- ds_put_format(s, "tun_id=%#"PRIx64"/%#"PRIx64",",
- ntohll(tnl->tun_id),
- ntohll(wc->masks.tunnel.tun_id));
- break;
- }
+ format_be64_masked(s, "tun_id", tnl->tun_id, wc->masks.tunnel.tun_id);
format_ip_netmask(s, "tun_src", tnl->ip_src, wc->masks.tunnel.ip_src);
format_ip_netmask(s, "tun_dst", tnl->ip_dst, wc->masks.tunnel.ip_dst);
int i;
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 21);
+ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 23);
if (priority != OFP_DEFAULT_PRIORITY) {
ds_put_format(s, "priority=%u,", priority);
}
- switch (wc->masks.pkt_mark) {
- case 0:
- break;
- case UINT32_MAX:
- ds_put_format(s, "pkt_mark=%#"PRIx32",", f->pkt_mark);
- break;
- default:
- ds_put_format(s, "pkt_mark=%#"PRIx32"/%#"PRIx32",",
- f->pkt_mark, wc->masks.pkt_mark);
- break;
- }
+ format_uint32_masked(s, "pkt_mark", f->pkt_mark, wc->masks.pkt_mark);
if (wc->masks.skb_priority) {
ds_put_format(s, "skb_priority=%#"PRIx32",", f->skb_priority);
}
}
for (i = 0; i < FLOW_N_REGS; i++) {
- switch (wc->masks.regs[i]) {
- case 0:
- break;
- case UINT32_MAX:
- ds_put_format(s, "reg%d=0x%"PRIx32",", i, f->regs[i]);
- break;
- default:
- ds_put_format(s, "reg%d=0x%"PRIx32"/0x%"PRIx32",",
- i, f->regs[i], wc->masks.regs[i]);
- break;
+ #define REGNAME_LEN 20
+ char regname[REGNAME_LEN];
+ if (snprintf(regname, REGNAME_LEN, "reg%d", i) >= REGNAME_LEN) {
+ strcpy(regname, "reg?");
}
+ format_uint32_masked(s, regname, f->regs[i], wc->masks.regs[i]);
}
format_flow_tunnel(s, match);
- switch (wc->masks.metadata) {
- case 0:
- break;
- case OVS_BE64_MAX:
- ds_put_format(s, "metadata=%#"PRIx64",", ntohll(f->metadata));
- break;
- default:
- ds_put_format(s, "metadata=%#"PRIx64"/%#"PRIx64",",
- ntohll(f->metadata), ntohll(wc->masks.metadata));
- break;
- }
+ format_be64_masked(s, "metadata", f->metadata, wc->masks.metadata);
+
if (wc->masks.in_port.ofp_port) {
ds_put_cstr(s, "in_port=");
ofputil_format_port(f->in_port.ofp_port, s);
format_be16_masked(s, "tp_src", f->tp_src, wc->masks.tp_src);
format_be16_masked(s, "tp_dst", f->tp_dst, wc->masks.tp_dst);
}
+ if (is_ip_any(f) && f->nw_proto == IPPROTO_TCP && wc->masks.tcp_flags) {
+ uint16_t mask = TCP_FLAGS(wc->masks.tcp_flags);
+ if (mask == TCP_FLAGS(OVS_BE16_MAX)) {
+ ds_put_format(s, "tcp_flags=0x%03"PRIx16",", ntohs(f->tcp_flags));
+ } else {
+ format_flags_masked(s, "tcp_flags", packet_tcp_flag_to_string,
+ ntohs(f->tcp_flags), mask);
+ }
+ }
if (s->length > start_len && ds_last(s) == ',') {
s->length--;
const uint32_t *target_u32 = (const uint32_t *) target;
const uint32_t *flowp = match->flow.values;
const uint32_t *maskp = match->mask.masks.values;
- int i;
+ uint64_t map;
- for (i = 0; i < MINI_N_MAPS; i++) {
- uint32_t map;
-
- for (map = match->flow.map[i]; map; map = zero_rightmost_1bit(map)) {
- if ((*flowp++ ^ target_u32[raw_ctz(map)]) & *maskp++) {
- return false;
- }
+ for (map = match->flow.map; map; map = zero_rightmost_1bit(map)) {
+ if ((*flowp++ ^ target_u32[raw_ctz(map)]) & *maskp++) {
+ return false;
}
- target_u32 += 32;
}
return true;
}
+/* Returns a hash value for the bits of range [start, end) in 'minimatch',
+ * given 'basis'.
+ *
+ * The hash values returned by this function are the same as those returned by
+ * flow_hash_in_minimask_range(), only the form of the arguments differ. */
+uint32_t
+minimatch_hash_range(const struct minimatch *match, uint8_t start, uint8_t end,
+ uint32_t *basis)
+{
+ unsigned int offset;
+ const uint32_t *p, *q;
+ uint32_t hash = *basis;
+ int n, i;
+
+ n = count_1bits(miniflow_get_map_in_range(&match->mask.masks, start, end,
+ &offset));
+ q = match->mask.masks.values + offset;
+ p = match->flow.values + offset;
+
+ for (i = 0; i < n; i++) {
+ hash = mhash_add(hash, p[i] & q[i]);
+ }
+ *basis = hash; /* Allow continuation from the unfinished value. */
+ return mhash_finish(hash, (offset + n) * 4);
+}
+
/* Appends a string representation of 'match' to 's'. If 'priority' is
* different from OFP_DEFAULT_PRIORITY, includes it in 's'. */
void