diff options
| author | rpaulo <rpaulo@FreeBSD.org> | 2010-10-28 19:06:17 +0000 |
|---|---|---|
| committer | rpaulo <rpaulo@FreeBSD.org> | 2010-10-28 19:06:17 +0000 |
| commit | 1e8ad3bd802d66bed71b4c6405ff5d801a913e4a (patch) | |
| tree | df5e0d876c3ec2ff0e3d9c6795cb5c1e20b7d5c4 /contrib/tcpdump/print-enc.c | |
| parent | 7ab661360c2131496bd3c111b5b3b2462fe3d2be (diff) | |
| parent | 5f4de8e61a87fc21b6ffecf7ef9444827c09ee69 (diff) | |
| download | FreeBSD-src-1e8ad3bd802d66bed71b4c6405ff5d801a913e4a.zip FreeBSD-src-1e8ad3bd802d66bed71b4c6405ff5d801a913e4a.tar.gz | |
Merge tcpdump-4.1.1.
Diffstat (limited to 'contrib/tcpdump/print-enc.c')
| -rw-r--r-- | contrib/tcpdump/print-enc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/tcpdump/print-enc.c b/contrib/tcpdump/print-enc.c index 9876d6d..e98f7f7 100644 --- a/contrib/tcpdump/print-enc.c +++ b/contrib/tcpdump/print-enc.c @@ -23,7 +23,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-enc.c,v 1.4.4.1 2008-02-06 10:34:15 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-enc.c,v 1.6 2008-11-18 07:35:32 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -35,6 +35,7 @@ static const char rcsid[] _U_ = #include <pcap.h> #include "interface.h" +#include "extract.h" #include "addrtoname.h" #include "enc.h" @@ -67,7 +68,7 @@ enc_if_print(const struct pcap_pkthdr *h, register const u_char *p) ENC_PRINT_TYPE(flags, M_AUTH, "authentic"); ENC_PRINT_TYPE(flags, M_CONF, "confidential"); /* ENC_PRINT_TYPE(flags, M_TUNNEL, "tunnel"); */ - printf("SPI 0x%08x: ", (u_int32_t)ntohl(hdr->spi)); + printf("SPI 0x%08x: ", EXTRACT_32BITS(&hdr->spi)); length -= ENC_HDRLEN; caplen -= ENC_HDRLEN; @@ -81,7 +82,7 @@ enc_if_print(const struct pcap_pkthdr *h, register const u_char *p) case AF_INET6: ip6_print(p, length); break; -#endif +#endif /*INET6*/ } out: |
