git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OpenFlow-level flow-based tunneling support.
[sliver-openvswitch.git]
/
lib
/
meta-flow.c
diff --git
a/lib/meta-flow.c
b/lib/meta-flow.c
index
a75e526
..
c3f198c
100644
(file)
--- a/
lib/meta-flow.c
+++ b/
lib/meta-flow.c
@@
-57,21
+57,21
@@
static const struct mf_field mf_fields[MFF_N_IDS] = {
}, {
MFF_TUN_SRC, "tun_src", NULL,
MF_FIELD_SIZES(be32),
}, {
MFF_TUN_SRC, "tun_src", NULL,
MF_FIELD_SIZES(be32),
- MFM_
NONE
,
+ MFM_
FULLY
,
MFS_IPV4,
MFP_NONE,
MFS_IPV4,
MFP_NONE,
-
fals
e,
-
0, NULL
,
-
0, NULL
,
+
tru
e,
+
NXM_NX_TUN_IPV4_SRC, "NXM_NX_TUN_IPV4_SRC"
,
+
NXM_NX_TUN_IPV4_SRC, "NXM_NX_TUN_IPV4_SRC"
,
}, {
MFF_TUN_DST, "tun_dst", NULL,
MF_FIELD_SIZES(be32),
}, {
MFF_TUN_DST, "tun_dst", NULL,
MF_FIELD_SIZES(be32),
- MFM_
NONE
,
+ MFM_
FULLY
,
MFS_IPV4,
MFP_NONE,
MFS_IPV4,
MFP_NONE,
-
fals
e,
-
0, NULL
,
-
0, NULL
,
+
tru
e,
+
NXM_NX_TUN_IPV4_DST, "NXM_NX_TUN_IPV4_DST"
,
+
NXM_NX_TUN_IPV4_DST, "NXM_NX_TUN_IPV4_DST"
,
}, {
MFF_TUN_FLAGS, "tun_flags", NULL,
MF_FIELD_SIZES(be16),
}, {
MFF_TUN_FLAGS, "tun_flags", NULL,
MF_FIELD_SIZES(be16),
@@
-676,9
+676,11
@@
bool
mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc)
{
switch (mf->id) {
mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc)
{
switch (mf->id) {
- case MFF_TUN_ID:
case MFF_TUN_SRC:
case MFF_TUN_SRC:
+ return !wc->masks.tunnel.ip_src;
case MFF_TUN_DST:
case MFF_TUN_DST:
+ return !wc->masks.tunnel.ip_dst;
+ case MFF_TUN_ID:
case MFF_TUN_TOS:
case MFF_TUN_TTL:
case MFF_TUN_FLAGS:
case MFF_TUN_TOS:
case MFF_TUN_TTL:
case MFF_TUN_FLAGS: