/*
- * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
+ * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*/
#include <config.h>
-#include "match.h"
+#include "openvswitch/match.h"
#include <stdlib.h>
+#include "flow.h"
#include "byte-order.h"
-#include "dynamic-string.h"
-#include "ofp-util.h"
+#include "colors.h"
+#include "openvswitch/dynamic-string.h"
+#include "openvswitch/ofp-util.h"
#include "packets.h"
+#include "tun-metadata.h"
/* Converts the flow in 'flow' into a match in 'match', with the given
* 'wildcards'. */
match->flow = *flow;
match->wc = *wc;
match_zero_wildcarded_fields(match);
+ memset(&match->tun_md, 0, sizeof match->tun_md);
}
/* Converts a flow into a match. It sets the wildcard masks based on
flow_wildcards_init_for_packet(&match->wc, flow);
WC_MASK_FIELD(&match->wc, regs);
WC_MASK_FIELD(&match->wc, metadata);
+
+ memset(&match->tun_md, 0, sizeof match->tun_md);
}
/* Initializes 'match' as a "catch-all" match that matches every packet. */
{
memset(&match->flow, 0, sizeof match->flow);
flow_wildcards_init_catchall(&match->wc);
+ memset(&match->tun_md, 0, sizeof match->tun_md);
}
/* For each bit or field wildcarded in 'match', sets the corresponding bit or
match->wc.masks.recirc_id = UINT32_MAX;
}
+void
+match_set_conj_id(struct match *match, uint32_t value)
+{
+ match->flow.conj_id = value;
+ match->wc.masks.conj_id = UINT32_MAX;
+}
+
void
match_set_reg(struct match *match, unsigned int reg_idx, uint32_t value)
{
flow_set_xreg(&match->flow, xreg_idx, value & mask);
}
+void
+match_set_actset_output(struct match *match, ofp_port_t actset_output)
+{
+ match->wc.masks.actset_output = u16_to_ofp(UINT16_MAX);
+ match->flow.actset_output = actset_output;
+}
+
void
match_set_metadata(struct match *match, ovs_be64 metadata)
{
match->flow.tunnel.ip_dst = dst & mask;
}
+void
+match_set_tun_ipv6_src(struct match *match, const struct in6_addr *src)
+{
+ match->flow.tunnel.ipv6_src = *src;
+ match->wc.masks.tunnel.ipv6_src = in6addr_exact;
+}
+
+void
+match_set_tun_ipv6_src_masked(struct match *match, const struct in6_addr *src,
+ const struct in6_addr *mask)
+{
+ match->flow.tunnel.ipv6_src = ipv6_addr_bitand(src, mask);
+ match->wc.masks.tunnel.ipv6_src = *mask;
+}
+
+void
+match_set_tun_ipv6_dst(struct match *match, const struct in6_addr *dst)
+{
+ match->flow.tunnel.ipv6_dst = *dst;
+ match->wc.masks.tunnel.ipv6_dst = in6addr_exact;
+}
+
+void
+match_set_tun_ipv6_dst_masked(struct match *match, const struct in6_addr *dst,
+ const struct in6_addr *mask)
+{
+ match->flow.tunnel.ipv6_dst = ipv6_addr_bitand(dst, mask);
+ match->wc.masks.tunnel.ipv6_dst = *mask;
+}
+
void
match_set_tun_ttl(struct match *match, uint8_t ttl)
{
void
match_set_tun_flags_masked(struct match *match, uint16_t flags, uint16_t mask)
{
+ mask &= FLOW_TNL_PUB_F_MASK;
+
match->wc.masks.tunnel.flags = mask;
match->flow.tunnel.flags = flags & mask;
}
+void
+match_set_tun_gbp_id_masked(struct match *match, ovs_be16 gbp_id, ovs_be16 mask)
+{
+ match->wc.masks.tunnel.gbp_id = mask;
+ match->flow.tunnel.gbp_id = gbp_id & mask;
+}
+
+void
+match_set_tun_gbp_id(struct match *match, ovs_be16 gbp_id)
+{
+ match_set_tun_gbp_id_masked(match, gbp_id, OVS_BE16_MAX);
+}
+
+void
+match_set_tun_gbp_flags_masked(struct match *match, uint8_t flags, uint8_t mask)
+{
+ match->wc.masks.tunnel.gbp_flags = mask;
+ match->flow.tunnel.gbp_flags = flags & mask;
+}
+
+void
+match_set_tun_gbp_flags(struct match *match, uint8_t flags)
+{
+ match_set_tun_gbp_flags_masked(match, flags, UINT8_MAX);
+}
+
void
match_set_in_port(struct match *match, ofp_port_t ofp_port)
{
match->wc.masks.pkt_mark = mask;
}
+void
+match_set_ct_state(struct match *match, uint32_t ct_state)
+{
+ match_set_ct_state_masked(match, ct_state, UINT32_MAX);
+}
+
+void
+match_set_ct_state_masked(struct match *match, uint32_t ct_state, uint32_t mask)
+{
+ match->flow.ct_state = ct_state & mask & UINT16_MAX;
+ match->wc.masks.ct_state = mask & UINT16_MAX;
+}
+
+void
+match_set_ct_zone(struct match *match, uint16_t ct_zone)
+{
+ match->flow.ct_zone = ct_zone;
+ match->wc.masks.ct_zone = UINT16_MAX;
+}
+
+void
+match_set_ct_mark(struct match *match, uint32_t ct_mark)
+{
+ match_set_ct_mark_masked(match, ct_mark, UINT32_MAX);
+}
+
+void
+match_set_ct_mark_masked(struct match *match, uint32_t ct_mark,
+ uint32_t mask)
+{
+ match->flow.ct_mark = ct_mark & mask;
+ match->wc.masks.ct_mark = mask;
+}
+
+void
+match_set_ct_label(struct match *match, ovs_u128 ct_label)
+{
+ ovs_u128 mask;
+
+ mask.u64.lo = UINT64_MAX;
+ mask.u64.hi = UINT64_MAX;
+ match_set_ct_label_masked(match, ct_label, mask);
+}
+
+void
+match_set_ct_label_masked(struct match *match, ovs_u128 value, ovs_u128 mask)
+{
+ match->flow.ct_label.u64.lo = value.u64.lo & mask.u64.lo;
+ match->flow.ct_label.u64.hi = value.u64.hi & mask.u64.hi;
+ match->wc.masks.ct_label = mask;
+}
+
void
match_set_dl_type(struct match *match, ovs_be16 dl_type)
{
/* Modifies 'value_src' so that the Ethernet address must match 'value_dst'
* exactly. 'mask_dst' is set to all 1s. */
static void
-set_eth(const uint8_t value_src[ETH_ADDR_LEN],
- uint8_t value_dst[ETH_ADDR_LEN],
- uint8_t mask_dst[ETH_ADDR_LEN])
+set_eth(const struct eth_addr value_src,
+ struct eth_addr *value_dst,
+ struct eth_addr *mask_dst)
{
- memcpy(value_dst, value_src, ETH_ADDR_LEN);
- memset(mask_dst, 0xff, ETH_ADDR_LEN);
+ *value_dst = value_src;
+ *mask_dst = eth_addr_exact;
}
/* Modifies 'value_src' so that the Ethernet address must match 'value_src'
* after each byte is ANDed with the appropriate byte in 'mask_src'.
* 'mask_dst' is set to 'mask_src' */
static void
-set_eth_masked(const uint8_t value_src[ETH_ADDR_LEN],
- const uint8_t mask_src[ETH_ADDR_LEN],
- uint8_t value_dst[ETH_ADDR_LEN],
- uint8_t mask_dst[ETH_ADDR_LEN])
+set_eth_masked(const struct eth_addr value_src,
+ const struct eth_addr mask_src,
+ struct eth_addr *value_dst, struct eth_addr *mask_dst)
{
size_t i;
- for (i = 0; i < ETH_ADDR_LEN; i++) {
- value_dst[i] = value_src[i] & mask_src[i];
- mask_dst[i] = mask_src[i];
+ for (i = 0; i < ARRAY_SIZE(value_dst->be16); i++) {
+ value_dst->be16[i] = value_src.be16[i] & mask_src.be16[i];
}
+ *mask_dst = mask_src;
}
/* Modifies 'rule' so that the source Ethernet address must match 'dl_src'
* exactly. */
void
-match_set_dl_src(struct match *match, const uint8_t dl_src[ETH_ADDR_LEN])
+match_set_dl_src(struct match *match, const struct eth_addr dl_src)
{
- set_eth(dl_src, match->flow.dl_src, match->wc.masks.dl_src);
+ set_eth(dl_src, &match->flow.dl_src, &match->wc.masks.dl_src);
}
/* Modifies 'rule' so that the source Ethernet address must match 'dl_src'
* after each byte is ANDed with the appropriate byte in 'mask'. */
void
match_set_dl_src_masked(struct match *match,
- const uint8_t dl_src[ETH_ADDR_LEN],
- const uint8_t mask[ETH_ADDR_LEN])
+ const struct eth_addr dl_src,
+ const struct eth_addr mask)
{
- set_eth_masked(dl_src, mask, match->flow.dl_src, match->wc.masks.dl_src);
+ set_eth_masked(dl_src, mask, &match->flow.dl_src, &match->wc.masks.dl_src);
}
/* Modifies 'match' so that the Ethernet address must match 'dl_dst'
* exactly. */
void
-match_set_dl_dst(struct match *match, const uint8_t dl_dst[ETH_ADDR_LEN])
+match_set_dl_dst(struct match *match, const struct eth_addr dl_dst)
{
- set_eth(dl_dst, match->flow.dl_dst, match->wc.masks.dl_dst);
+ set_eth(dl_dst, &match->flow.dl_dst, &match->wc.masks.dl_dst);
}
/* Modifies 'match' so that the Ethernet address must match 'dl_dst' after each
* accepted by flow_wildcards_is_dl_dst_mask_valid() are allowed. */
void
match_set_dl_dst_masked(struct match *match,
- const uint8_t dl_dst[ETH_ADDR_LEN],
- const uint8_t mask[ETH_ADDR_LEN])
+ const struct eth_addr dl_dst,
+ const struct eth_addr mask)
{
- set_eth_masked(dl_dst, mask, match->flow.dl_dst, match->wc.masks.dl_dst);
+ set_eth_masked(dl_dst, mask, &match->flow.dl_dst, &match->wc.masks.dl_dst);
}
void
flow_set_mpls_bos(&match->flow, idx, mpls_bos);
}
+/* Modifies 'match' so that the TTL of MPLS label 'idx' is wildcarded. */
+void
+match_set_any_mpls_ttl(struct match *match, int idx)
+{
+ match->wc.masks.mpls_lse[idx] &= ~htonl(MPLS_TTL_MASK);
+ flow_set_mpls_ttl(&match->flow, idx, 0);
+}
+
+/* Modifies 'match' so that it matches only packets in which the TTL of MPLS
+ * label 'idx' equals 'mpls_ttl'. */
+void
+match_set_mpls_ttl(struct match *match, int idx, uint8_t mpls_ttl)
+{
+ match->wc.masks.mpls_lse[idx] |= htonl(MPLS_TTL_MASK);
+ flow_set_mpls_ttl(&match->flow, idx, mpls_ttl);
+}
+
/* Modifies 'match' so that the MPLS LSE is wildcarded. */
void
match_set_any_mpls_lse(struct match *match, int idx)
}
void
-match_set_arp_sha(struct match *match, const uint8_t sha[ETH_ADDR_LEN])
+match_set_arp_sha(struct match *match, const struct eth_addr sha)
{
- memcpy(match->flow.arp_sha, sha, ETH_ADDR_LEN);
- memset(match->wc.masks.arp_sha, UINT8_MAX, ETH_ADDR_LEN);
+ match->flow.arp_sha = sha;
+ match->wc.masks.arp_sha = eth_addr_exact;
}
void
match_set_arp_sha_masked(struct match *match,
- const uint8_t arp_sha[ETH_ADDR_LEN],
- const uint8_t mask[ETH_ADDR_LEN])
+ const struct eth_addr arp_sha,
+ const struct eth_addr mask)
{
set_eth_masked(arp_sha, mask,
- match->flow.arp_sha, match->wc.masks.arp_sha);
+ &match->flow.arp_sha, &match->wc.masks.arp_sha);
}
void
-match_set_arp_tha(struct match *match, const uint8_t tha[ETH_ADDR_LEN])
+match_set_arp_tha(struct match *match, const struct eth_addr tha)
{
- memcpy(match->flow.arp_tha, tha, ETH_ADDR_LEN);
- memset(match->wc.masks.arp_tha, UINT8_MAX, ETH_ADDR_LEN);
+ match->flow.arp_tha = tha;
+ match->wc.masks.arp_tha = eth_addr_exact;
}
void
match_set_arp_tha_masked(struct match *match,
- const uint8_t arp_tha[ETH_ADDR_LEN],
- const uint8_t mask[ETH_ADDR_LEN])
+ const struct eth_addr arp_tha,
+ const struct eth_addr mask)
{
set_eth_masked(arp_tha, mask,
- match->flow.arp_tha, match->wc.masks.arp_tha);
+ &match->flow.arp_tha, &match->wc.masks.arp_tha);
}
void
static void
format_eth_masked(struct ds *s, const char *name,
- const uint8_t eth[ETH_ADDR_LEN],
- const uint8_t mask[ETH_ADDR_LEN])
+ const struct eth_addr eth, const struct eth_addr mask)
{
if (!eth_addr_is_zero(mask)) {
- ds_put_format(s, "%s=", name);
- eth_format_masked(eth, mask, s);
+ ds_put_format(s, "%s%s=%s", colors.param, name, colors.end);
+ eth_format_masked(eth, &mask, s);
ds_put_char(s, ',');
}
}
ovs_be32 netmask)
{
if (netmask) {
- ds_put_format(s, "%s=", name);
+ ds_put_format(s, "%s%s=%s", colors.param, name, colors.end);
ip_format_masked(ip, netmask, s);
ds_put_char(s, ',');
}
const struct in6_addr *netmask)
{
if (!ipv6_mask_is_any(netmask)) {
- ds_put_format(s, "%s=", name);
- print_ipv6_masked(s, addr, netmask);
+ ds_put_format(s, "%s%s=%s", colors.param, name, colors.end);
+ ipv6_format_masked(addr, netmask, s);
+ ds_put_char(s, ',');
+ }
+}
+
+static void
+format_uint16_masked(struct ds *s, const char *name,
+ uint16_t value, uint16_t mask)
+{
+ if (mask != 0) {
+ ds_put_format(s, "%s%s=%s", colors.param, name, colors.end);
+ if (mask == UINT16_MAX) {
+ ds_put_format(s, "%"PRIu16, value);
+ } else {
+ ds_put_format(s, "0x%"PRIx16"/0x%"PRIx16, value, mask);
+ }
ds_put_char(s, ',');
}
}
ovs_be16 value, ovs_be16 mask)
{
if (mask != htons(0)) {
- ds_put_format(s, "%s=", name);
+ ds_put_format(s, "%s%s=%s", colors.param, name, colors.end);
if (mask == OVS_BE16_MAX) {
ds_put_format(s, "%"PRIu16, ntohs(value));
} else {
ovs_be32 value, ovs_be32 mask)
{
if (mask != htonl(0)) {
- ds_put_format(s, "%s=", name);
+ ds_put_format(s, "%s%s=%s", colors.param, name, colors.end);
if (mask == OVS_BE32_MAX) {
ds_put_format(s, "%"PRIu32, ntohl(value));
} else {
uint32_t value, uint32_t mask)
{
if (mask) {
- ds_put_format(s, "%s=%#"PRIx32, name, value);
+ ds_put_format(s, "%s%s=%s%#"PRIx32,
+ colors.param, name, colors.end, value);
if (mask != UINT32_MAX) {
ds_put_format(s, "/%#"PRIx32, mask);
}
ovs_be64 value, ovs_be64 mask)
{
if (mask != htonll(0)) {
- ds_put_format(s, "%s=%#"PRIx64, name, ntohll(value));
+ ds_put_format(s, "%s%s=%s%#"PRIx64,
+ colors.param, name, colors.end, ntohll(value));
if (mask != OVS_BE64_MAX) {
ds_put_format(s, "/%#"PRIx64, ntohll(mask));
}
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);
+ format_ipv6_netmask(s, "tun_ipv6_src", &tnl->ipv6_src,
+ &wc->masks.tunnel.ipv6_src);
+ format_ipv6_netmask(s, "tun_ipv6_dst", &tnl->ipv6_dst,
+ &wc->masks.tunnel.ipv6_dst);
+
+ if (wc->masks.tunnel.gbp_id) {
+ format_be16_masked(s, "tun_gbp_id", tnl->gbp_id,
+ wc->masks.tunnel.gbp_id);
+ }
+
+ if (wc->masks.tunnel.gbp_flags) {
+ ds_put_format(s, "tun_gbp_flags=%#"PRIx8",", tnl->gbp_flags);
+ }
if (wc->masks.tunnel.ip_tos) {
ds_put_format(s, "tun_tos=%"PRIx8",", tnl->ip_tos);
ds_put_format(s, "tun_ttl=%"PRIu8",", tnl->ip_ttl);
}
if (wc->masks.tunnel.flags) {
- format_flags(s, flow_tun_flag_to_string, tnl->flags, '|');
+ format_flags_masked(s, "tun_flags", flow_tun_flag_to_string,
+ tnl->flags,
+ wc->masks.tunnel.flags & FLOW_TNL_F_MASK,
+ FLOW_TNL_F_MASK);
+ ds_put_char(s, ',');
+ }
+ tun_metadata_match_format(s, match);
+}
+
+static void
+format_ct_label_masked(struct ds *s, const ovs_u128 *key, const ovs_u128 *mask)
+{
+ if (!ovs_u128_is_zero(*mask)) {
+ ovs_be128 value = hton128(*key);
+ ds_put_format(s, "%sct_label=%s", colors.param, colors.end);
+ ds_put_hex(s, &value, sizeof value);
+ if (!is_all_ones(mask, sizeof(*mask))) {
+ value = hton128(*mask);
+ ds_put_char(s, '/');
+ ds_put_hex(s, &value, sizeof value);
+ }
ds_put_char(s, ',');
}
}
/* Appends a string representation of 'match' to 's'. If 'priority' is
* different from OFP_DEFAULT_PRIORITY, includes it in 's'. */
void
-match_format(const struct match *match, struct ds *s, unsigned int priority)
+match_format(const struct match *match, struct ds *s, int priority)
{
const struct flow_wildcards *wc = &match->wc;
size_t start_len = s->length;
const struct flow *f = &match->flow;
bool skip_type = false;
+
bool skip_proto = false;
int i;
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 27);
+ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 35);
if (priority != OFP_DEFAULT_PRIORITY) {
- ds_put_format(s, "priority=%u,", priority);
+ ds_put_format(s, "%spriority=%s%d,",
+ colors.special, colors.end, priority);
}
format_uint32_masked(s, "pkt_mark", f->pkt_mark, wc->masks.pkt_mark);
wc->masks.recirc_id);
}
- if (f->dp_hash && wc->masks.dp_hash) {
+ if (wc->masks.dp_hash) {
format_uint32_masked(s, "dp_hash", f->dp_hash,
wc->masks.dp_hash);
}
+ if (wc->masks.conj_id) {
+ ds_put_format(s, "%sconj_id%s=%"PRIu32",",
+ colors.param, colors.end, f->conj_id);
+ }
+
if (wc->masks.skb_priority) {
- ds_put_format(s, "skb_priority=%#"PRIx32",", f->skb_priority);
+ ds_put_format(s, "%sskb_priority=%s%#"PRIx32",",
+ colors.param, colors.end, f->skb_priority);
+ }
+
+ if (wc->masks.actset_output) {
+ ds_put_format(s, "%sactset_output=%s", colors.param, colors.end);
+ ofputil_format_port(f->actset_output, s);
+ ds_put_char(s, ',');
+ }
+
+ if (wc->masks.ct_state) {
+ if (wc->masks.ct_state == UINT16_MAX) {
+ ds_put_format(s, "%sct_state=%s", colors.param, colors.end);
+ if (f->ct_state) {
+ format_flags(s, ct_state_to_string, f->ct_state, '|');
+ } else {
+ ds_put_cstr(s, "0"); /* No state. */
+ }
+ } else {
+ format_flags_masked(s, "ct_state", ct_state_to_string,
+ f->ct_state, wc->masks.ct_state, UINT16_MAX);
+ }
+ ds_put_char(s, ',');
+ }
+
+ if (wc->masks.ct_zone) {
+ format_uint16_masked(s, "ct_zone", f->ct_zone, wc->masks.ct_zone);
+ }
+
+ if (wc->masks.ct_mark) {
+ format_uint32_masked(s, "ct_mark", f->ct_mark, wc->masks.ct_mark);
+ }
+
+ if (!ovs_u128_is_zero(wc->masks.ct_label)) {
+ format_ct_label_masked(s, &f->ct_label, &wc->masks.ct_label);
}
if (wc->masks.dl_type) {
if (wc->masks.nw_proto) {
skip_proto = true;
if (f->nw_proto == IPPROTO_ICMP) {
- ds_put_cstr(s, "icmp,");
+ ds_put_format(s, "%sicmp%s,", colors.value, colors.end);
} else if (f->nw_proto == IPPROTO_IGMP) {
- ds_put_cstr(s, "igmp,");
+ ds_put_format(s, "%sigmp%s,", colors.value, colors.end);
} else if (f->nw_proto == IPPROTO_TCP) {
- ds_put_cstr(s, "tcp,");
+ ds_put_format(s, "%stcp%s,", colors.value, colors.end);
} else if (f->nw_proto == IPPROTO_UDP) {
- ds_put_cstr(s, "udp,");
+ ds_put_format(s, "%sudp%s,", colors.value, colors.end);
} else if (f->nw_proto == IPPROTO_SCTP) {
- ds_put_cstr(s, "sctp,");
+ ds_put_format(s, "%ssctp%s,", colors.value, colors.end);
} else {
- ds_put_cstr(s, "ip,");
+ ds_put_format(s, "%sip%s,", colors.value, colors.end);
skip_proto = false;
}
} else {
- ds_put_cstr(s, "ip,");
+ ds_put_format(s, "%sip%s,", colors.value, colors.end);
}
} else if (f->dl_type == htons(ETH_TYPE_IPV6)) {
if (wc->masks.nw_proto) {
skip_proto = true;
if (f->nw_proto == IPPROTO_ICMPV6) {
- ds_put_cstr(s, "icmp6,");
+ ds_put_format(s, "%sicmp6%s,", colors.value, colors.end);
} else if (f->nw_proto == IPPROTO_TCP) {
- ds_put_cstr(s, "tcp6,");
+ ds_put_format(s, "%stcp6%s,", colors.value, colors.end);
} else if (f->nw_proto == IPPROTO_UDP) {
- ds_put_cstr(s, "udp6,");
+ ds_put_format(s, "%sudp6%s,", colors.value, colors.end);
} else if (f->nw_proto == IPPROTO_SCTP) {
- ds_put_cstr(s, "sctp6,");
+ ds_put_format(s, "%ssctp6%s,", colors.value, colors.end);
} else {
- ds_put_cstr(s, "ipv6,");
+ ds_put_format(s, "%sipv6%s,", colors.value, colors.end);
skip_proto = false;
}
} else {
- ds_put_cstr(s, "ipv6,");
+ ds_put_format(s, "%sipv6%s,", colors.value, colors.end);
}
} else if (f->dl_type == htons(ETH_TYPE_ARP)) {
- ds_put_cstr(s, "arp,");
+ ds_put_format(s, "%sarp%s,", colors.value, colors.end);
} else if (f->dl_type == htons(ETH_TYPE_RARP)) {
- ds_put_cstr(s, "rarp,");
+ ds_put_format(s, "%srarp%s,", colors.value, colors.end);
} else if (f->dl_type == htons(ETH_TYPE_MPLS)) {
- ds_put_cstr(s, "mpls,");
+ ds_put_format(s, "%smpls%s,", colors.value, colors.end);
} else if (f->dl_type == htons(ETH_TYPE_MPLS_MCAST)) {
- ds_put_cstr(s, "mplsm,");
+ ds_put_format(s, "%smplsm%s,", colors.value, colors.end);
} else {
skip_type = false;
}
format_be64_masked(s, "metadata", f->metadata, wc->masks.metadata);
if (wc->masks.in_port.ofp_port) {
- ds_put_cstr(s, "in_port=");
+ ds_put_format(s, "%sin_port=%s", colors.param, colors.end);
ofputil_format_port(f->in_port.ofp_port, s);
ds_put_char(s, ',');
}
&& (!pcp_mask || pcp_mask == htons(VLAN_PCP_MASK))
&& (vid_mask || pcp_mask)) {
if (vid_mask) {
- ds_put_format(s, "dl_vlan=%"PRIu16",",
- vlan_tci_to_vid(f->vlan_tci));
+ ds_put_format(s, "%sdl_vlan=%s%"PRIu16",", colors.param,
+ colors.end, vlan_tci_to_vid(f->vlan_tci));
}
if (pcp_mask) {
- ds_put_format(s, "dl_vlan_pcp=%d,",
- vlan_tci_to_pcp(f->vlan_tci));
+ ds_put_format(s, "%sdl_vlan_pcp=%s%d,", colors.param,
+ colors.end, vlan_tci_to_pcp(f->vlan_tci));
}
} else if (wc->masks.vlan_tci == htons(0xffff)) {
- ds_put_format(s, "vlan_tci=0x%04"PRIx16",", ntohs(f->vlan_tci));
+ ds_put_format(s, "%svlan_tci=%s0x%04"PRIx16",", colors.param,
+ colors.end, ntohs(f->vlan_tci));
} else {
- ds_put_format(s, "vlan_tci=0x%04"PRIx16"/0x%04"PRIx16",",
+ ds_put_format(s, "%svlan_tci=%s0x%04"PRIx16"/0x%04"PRIx16",",
+ colors.param, colors.end,
ntohs(f->vlan_tci), ntohs(wc->masks.vlan_tci));
}
}
format_eth_masked(s, "dl_src", f->dl_src, wc->masks.dl_src);
format_eth_masked(s, "dl_dst", f->dl_dst, wc->masks.dl_dst);
if (!skip_type && wc->masks.dl_type) {
- ds_put_format(s, "dl_type=0x%04"PRIx16",", ntohs(f->dl_type));
+ ds_put_format(s, "%sdl_type=%s0x%04"PRIx16",",
+ colors.param, colors.end, ntohs(f->dl_type));
}
if (f->dl_type == htons(ETH_TYPE_IPV6)) {
format_ipv6_netmask(s, "ipv6_src", &f->ipv6_src, &wc->masks.ipv6_src);
format_ipv6_netmask(s, "ipv6_dst", &f->ipv6_dst, &wc->masks.ipv6_dst);
if (wc->masks.ipv6_label) {
if (wc->masks.ipv6_label == OVS_BE32_MAX) {
- ds_put_format(s, "ipv6_label=0x%05"PRIx32",",
+ ds_put_format(s, "%sipv6_label=%s0x%05"PRIx32",",
+ colors.param, colors.end,
ntohl(f->ipv6_label));
} else {
- ds_put_format(s, "ipv6_label=0x%05"PRIx32"/0x%05"PRIx32",",
- ntohl(f->ipv6_label),
+ ds_put_format(s, "%sipv6_label=%s0x%05"PRIx32"/0x%05"PRIx32",",
+ colors.param, colors.end, ntohl(f->ipv6_label),
ntohl(wc->masks.ipv6_label));
}
}
if (!skip_proto && wc->masks.nw_proto) {
if (f->dl_type == htons(ETH_TYPE_ARP) ||
f->dl_type == htons(ETH_TYPE_RARP)) {
- ds_put_format(s, "arp_op=%"PRIu8",", f->nw_proto);
+ ds_put_format(s, "%sarp_op=%s%"PRIu8",",
+ colors.param, colors.end, f->nw_proto);
} else {
- ds_put_format(s, "nw_proto=%"PRIu8",", f->nw_proto);
+ ds_put_format(s, "%snw_proto=%s%"PRIu8",",
+ colors.param, colors.end, f->nw_proto);
}
}
if (f->dl_type == htons(ETH_TYPE_ARP) ||
format_eth_masked(s, "arp_tha", f->arp_tha, wc->masks.arp_tha);
}
if (wc->masks.nw_tos & IP_DSCP_MASK) {
- ds_put_format(s, "nw_tos=%"PRIu8",", f->nw_tos & IP_DSCP_MASK);
+ ds_put_format(s, "%snw_tos=%s%"PRIu8",",
+ colors.param, colors.end, f->nw_tos & IP_DSCP_MASK);
}
if (wc->masks.nw_tos & IP_ECN_MASK) {
- ds_put_format(s, "nw_ecn=%"PRIu8",", f->nw_tos & IP_ECN_MASK);
+ ds_put_format(s, "%snw_ecn=%s%"PRIu8",",
+ colors.param, colors.end, f->nw_tos & IP_ECN_MASK);
}
if (wc->masks.nw_ttl) {
- ds_put_format(s, "nw_ttl=%"PRIu8",", f->nw_ttl);
+ ds_put_format(s, "%snw_ttl=%s%"PRIu8",",
+ colors.param, colors.end, f->nw_ttl);
}
if (wc->masks.mpls_lse[0] & htonl(MPLS_LABEL_MASK)) {
- ds_put_format(s, "mpls_label=%"PRIu32",",
- mpls_lse_to_label(f->mpls_lse[0]));
+ ds_put_format(s, "%smpls_label=%s%"PRIu32",", colors.param,
+ colors.end, mpls_lse_to_label(f->mpls_lse[0]));
}
if (wc->masks.mpls_lse[0] & htonl(MPLS_TC_MASK)) {
- ds_put_format(s, "mpls_tc=%"PRIu8",",
+ ds_put_format(s, "%smpls_tc=%s%"PRIu8",", colors.param, colors.end,
mpls_lse_to_tc(f->mpls_lse[0]));
}
if (wc->masks.mpls_lse[0] & htonl(MPLS_TTL_MASK)) {
- ds_put_format(s, "mpls_ttl=%"PRIu8",",
+ ds_put_format(s, "%smpls_ttl=%s%"PRIu8",", colors.param, colors.end,
mpls_lse_to_ttl(f->mpls_lse[0]));
}
if (wc->masks.mpls_lse[0] & htonl(MPLS_BOS_MASK)) {
- ds_put_format(s, "mpls_bos=%"PRIu8",",
+ ds_put_format(s, "%smpls_bos=%s%"PRIu8",", colors.param, colors.end,
mpls_lse_to_bos(f->mpls_lse[0]));
}
format_be32_masked(s, "mpls_lse1", f->mpls_lse[1], wc->masks.mpls_lse[1]);
switch (wc->masks.nw_frag) {
case FLOW_NW_FRAG_ANY | FLOW_NW_FRAG_LATER:
- ds_put_format(s, "nw_frag=%s,",
+ ds_put_format(s, "%snw_frag=%s%s,", colors.param, colors.end,
f->nw_frag & FLOW_NW_FRAG_ANY
? (f->nw_frag & FLOW_NW_FRAG_LATER ? "later" : "first")
: (f->nw_frag & FLOW_NW_FRAG_LATER ? "<error>" : "no"));
break;
case FLOW_NW_FRAG_ANY:
- ds_put_format(s, "nw_frag=%s,",
+ ds_put_format(s, "%snw_frag=%s%s,", colors.param, colors.end,
f->nw_frag & FLOW_NW_FRAG_ANY ? "yes" : "no");
break;
case FLOW_NW_FRAG_LATER:
- ds_put_format(s, "nw_frag=%s,",
+ ds_put_format(s, "%snw_frag=%s%s,", colors.param, colors.end,
f->nw_frag & FLOW_NW_FRAG_LATER ? "later" : "not_later");
break;
}
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_cstr(s, "tcp_flags=");
- if (f->tcp_flags) {
- format_flags(s, packet_tcp_flag_to_string, ntohs(f->tcp_flags),
- '|');
- } else {
- ds_put_cstr(s, "0"); /* Zero flags. */
- }
- } else if (mask) {
- format_flags_masked(s, "tcp_flags", packet_tcp_flag_to_string,
- ntohs(f->tcp_flags), mask);
- }
+ format_flags_masked(s, "tcp_flags", packet_tcp_flag_to_string,
+ ntohs(f->tcp_flags), TCP_FLAGS(wc->masks.tcp_flags),
+ TCP_FLAGS(OVS_BE16_MAX));
}
- if (s->length > start_len && ds_last(s) == ',') {
- s->length--;
+ if (s->length > start_len) {
+ ds_chomp(s, ',');
}
}
* different from OFP_DEFAULT_PRIORITY, includes it in the string. The caller
* must free the string (with free()). */
char *
-match_to_string(const struct match *match, unsigned int priority)
+match_to_string(const struct match *match, int priority)
{
struct ds s = DS_EMPTY_INITIALIZER;
match_format(match, &s, priority);
void
minimatch_init(struct minimatch *dst, const struct match *src)
{
- minimask_init(&dst->mask, &src->wc);
- miniflow_init_with_minimask(&dst->flow, &src->flow, &dst->mask);
+ struct miniflow tmp;
+
+ miniflow_map_init(&tmp, &src->wc.masks);
+ /* Allocate two consecutive miniflows. */
+ miniflow_alloc(dst->flows, 2, &tmp);
+ miniflow_init(dst->flow, &src->flow);
+ minimask_init(dst->mask, &src->wc);
}
/* Initializes 'dst' as a copy of 'src'. The caller must eventually free 'dst'
void
minimatch_clone(struct minimatch *dst, const struct minimatch *src)
{
- miniflow_clone(&dst->flow, &src->flow);
- minimask_clone(&dst->mask, &src->mask);
+ /* Allocate two consecutive miniflows. */
+ size_t data_size = miniflow_alloc(dst->flows, 2, &src->mask->masks);
+
+ memcpy(miniflow_values(dst->flow),
+ miniflow_get_values(src->flow), data_size);
+ memcpy(miniflow_values(&dst->mask->masks),
+ miniflow_get_values(&src->mask->masks), data_size);
}
/* Initializes 'dst' with the data in 'src', destroying 'src'. The caller must
void
minimatch_move(struct minimatch *dst, struct minimatch *src)
{
- miniflow_move(&dst->flow, &src->flow);
- minimask_move(&dst->mask, &src->mask);
+ dst->flow = src->flow;
+ dst->mask = src->mask;
}
/* Frees any memory owned by 'match'. Does not free the storage in which
void
minimatch_destroy(struct minimatch *match)
{
- miniflow_destroy(&match->flow);
- minimask_destroy(&match->mask);
+ free(match->flow);
}
/* Initializes 'dst' as a copy of 'src'. */
void
minimatch_expand(const struct minimatch *src, struct match *dst)
{
- miniflow_expand(&src->flow, &dst->flow);
- minimask_expand(&src->mask, &dst->wc);
+ miniflow_expand(src->flow, &dst->flow);
+ minimask_expand(src->mask, &dst->wc);
+ memset(&dst->tun_md, 0, sizeof dst->tun_md);
}
/* Returns true if 'a' and 'b' match the same packets, false otherwise. */
bool
minimatch_equal(const struct minimatch *a, const struct minimatch *b)
{
- return (miniflow_equal(&a->flow, &b->flow)
- && minimask_equal(&a->mask, &b->mask));
+ return minimask_equal(a->mask, b->mask)
+ && miniflow_equal(a->flow, b->flow);
}
/* Returns true if 'target' satisifies 'match', that is, if each bit for which
minimatch_matches_flow(const struct minimatch *match,
const struct flow *target)
{
- const uint32_t *target_u32 = (const uint32_t *) target;
- const uint32_t *flowp = miniflow_get_u32_values(&match->flow);
- const uint32_t *maskp = miniflow_get_u32_values(&match->mask.masks);
- uint64_t map;
+ const uint64_t *flowp = miniflow_get_values(match->flow);
+ const uint64_t *maskp = miniflow_get_values(&match->mask->masks);
+ size_t idx;
- for (map = match->flow.map; map; map = zero_rightmost_1bit(map)) {
- if ((*flowp++ ^ target_u32[raw_ctz(map)]) & *maskp++) {
+ FLOWMAP_FOR_EACH_INDEX(idx, match->flow->map) {
+ if ((*flowp++ ^ flow_u64_value(target, idx)) & *maskp++) {
return false;
}
}
/* Appends a string representation of 'match' to 's'. If 'priority' is
* different from OFP_DEFAULT_PRIORITY, includes it in 's'. */
void
-minimatch_format(const struct minimatch *match, struct ds *s,
- unsigned int priority)
+minimatch_format(const struct minimatch *match, struct ds *s, int priority)
{
struct match megamatch;
* different from OFP_DEFAULT_PRIORITY, includes it in the string. The caller
* must free the string (with free()). */
char *
-minimatch_to_string(const struct minimatch *match, unsigned int priority)
+minimatch_to_string(const struct minimatch *match, int priority)
{
struct match megamatch;
projects / cascardo / ovs.git / blobdiff