diff options
author | Jesse Gross <jesse@nicira.com> | 2011-12-26 17:33:03 -0800 |
---|---|---|
committer | Jesse Gross <jesse@nicira.com> | 2011-12-27 10:42:30 -0800 |
commit | c4ccff78ec5bad2b602ae72e283960ec393661fe (patch) | |
tree | 4bbe2daf2544e187cedeeaced141c6d8d69a7e80 /lib | |
parent | deedf7e78b249383d6f7b385f9d04e08e33d0e3f (diff) |
packet: Match userspace and kernel definition of ICMP header.
Current userspace considers an ICMP header to be 4 bytes consisting
of the type, code, and checksum. The kernel considers it to be 8
bytes because it also counts the two data fields that contain
type-specific information (and are always present). Since flow
extract will zero out headers that are not completely present this
means that an ICMP packet that has a header of 5-7 bytes will be
interpreted differently by userspace and kernel. This fixes the
problem by adopting the kernel's version of the ICMP header in
userspace.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/packets.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/packets.h b/lib/packets.h index 19b7346b..16834a8b 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -333,11 +333,23 @@ struct ip_header { }; BUILD_ASSERT_DECL(IP_HEADER_LEN == sizeof(struct ip_header)); -#define ICMP_HEADER_LEN 4 +#define ICMP_HEADER_LEN 8 struct icmp_header { uint8_t icmp_type; uint8_t icmp_code; ovs_be16 icmp_csum; + union { + struct { + ovs_be16 id; + ovs_be16 seq; + } echo; + struct { + ovs_be16 empty; + ovs_be16 mtu; + } frag; + ovs_be32 gateway; + } icmp_fields; + uint8_t icmp_data[0]; }; BUILD_ASSERT_DECL(ICMP_HEADER_LEN == sizeof(struct icmp_header)); |