diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-10-22 13:11:48 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-11-21 14:45:53 -0800 |
| commit | 268a95e009c4cc57e967e88f916932fac89fdf1c (patch) | |
| tree | 007d0cb50633434384313e660dae16af314032ab /lib/meta-flow.h | |
| parent | 5bf93d67825502e1bd636de7f1ca9b1b949ca16a (diff) | |
meta-flow: Split ICMP into ICMPv4 and ICMPv6.
NXM breaks ICMP into v4 and v6. An upcoming commit will drop all of the
NXM specific data in favor of mf_field, and so at that point we need to
have a separate mf_field for each NXM field. So, this commit splits
ICMP into v4 and v6 for meta-flow also.
Diffstat (limited to 'lib/meta-flow.h')
| -rw-r--r-- | lib/meta-flow.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/meta-flow.h b/lib/meta-flow.h index e2079359..79907132 100644 --- a/lib/meta-flow.h +++ b/lib/meta-flow.h @@ -88,8 +88,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 */ @@ -116,8 +119,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, |