diff options
| author | Marco Pfatschbacher <mpf@cvs.openbsd.org> | 2012-05-12 12:58:17 +0000 |
|---|---|---|
| committer | Marco Pfatschbacher <mpf@cvs.openbsd.org> | 2012-05-12 12:58:17 +0000 |
| commit | 4df681091f63c476cdd0ffb3d621f39480efbbe2 (patch) | |
| tree | 153112f3e567b200ce20eec3966201d7ea8ed9d9 /sys/net | |
| parent | b5faee3720d4892c5ef64751494a6e932e83ed42 (diff) | |
Fix tcpdump for etherip packets.
bpf_mtap() needs to be called without the etherip_header.
Idea to use a forward declaration for struct tdb by claudio.
OK claudio@
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_gif.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c index c638060c32e..5f49625041b 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gif.c,v 1.56 2012/04/14 09:39:46 yasuoka Exp $ */ +/* $OpenBSD: if_gif.c,v 1.57 2012/05/12 12:58:16 mpf Exp $ */ /* $KAME: if_gif.c,v 1.43 2001/02/20 08:51:07 itojun Exp $ */ /* @@ -49,6 +49,7 @@ #include <netinet/in_var.h> #include <netinet/in_gif.h> #include <netinet/ip.h> +#include <netinet/ip_ether.h> #include <netinet/ip_var.h> #endif /* INET */ @@ -237,6 +238,7 @@ gif_start(struct ifnet *ifp) break; case IPPROTO_ETHERIP: family = AF_LINK; + offset += sizeof(struct etherip_header); break; case IPPROTO_MPLS: family = AF_MPLS; |