diff options
| author | mlaier <mlaier@FreeBSD.org> | 2007-10-16 02:31:48 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2007-10-16 02:31:48 +0000 |
| commit | 7407d685ab0d1977958bae143bdcc3b53dacea31 (patch) | |
| tree | 8c8221dcf086879544da49d1342bacd303933fa6 /contrib/tcpdump/print-ether.c | |
| parent | f0e5d335e38c264eb2fca7e15e417b70c8908f54 (diff) | |
| download | FreeBSD-src-7407d685ab0d1977958bae143bdcc3b53dacea31.zip FreeBSD-src-7407d685ab0d1977958bae143bdcc3b53dacea31.tar.gz | |
Resolve merge conflicts
Approved by: re (kensmith)
Obtained from: tcpdump.org
Diffstat (limited to 'contrib/tcpdump/print-ether.c')
| -rw-r--r-- | contrib/tcpdump/print-ether.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/contrib/tcpdump/print-ether.c b/contrib/tcpdump/print-ether.c index 57a3d8e..d8911d3 100644 --- a/contrib/tcpdump/print-ether.c +++ b/contrib/tcpdump/print-ether.c @@ -22,7 +22,7 @@ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.95.2.4 2005/07/10 14:47:57 hannes Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.95.2.6 2006/02/20 18:15:03 hannes Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -49,7 +49,7 @@ const struct tok ethertype_values[] = { { ETHERTYPE_VMAN, "VMAN" }, { ETHERTYPE_PUP, "PUP" }, { ETHERTYPE_ARP, "ARP"}, - { ETHERTYPE_REVARP , "Reverse ARP"}, + { ETHERTYPE_REVARP, "Reverse ARP"}, { ETHERTYPE_NS, "NS" }, { ETHERTYPE_SPRITE, "Sprite" }, { ETHERTYPE_TRAIL, "Trail" }, @@ -130,7 +130,6 @@ ether_print(const u_char *p, u_int length, u_int caplen) /* * Is it (gag) an 802.3 encapsulation? */ - extracted_ether_type = 0; if (ether_type <= ETHERMTU) { /* Try to print the LLC-layer header & higher layers */ if (llc_print(p, length, caplen, ESRC(ep), EDST(ep), @@ -245,11 +244,13 @@ ether_encap_print(u_short ether_type, const u_char *p, if (llc_print(p, length, caplen, p - 18, p - 12, extracted_ether_type) == 0) { - ether_hdr_print(p - 18, length + 4); + ether_hdr_print(p - 18, length + 4); + + if (!suppress_default_print) { + default_print(p - 18, caplen + 4); + } } - if (!suppress_default_print) - default_print(p - 18, caplen + 4); return (1); @@ -271,10 +272,11 @@ ether_encap_print(u_short ether_type, const u_char *p, if (llc_print(p, length, caplen, p - 16, p - 10, extracted_ether_type) == 0) { ether_hdr_print(p - 16, length + 2); - } - if (!suppress_default_print) - default_print(p - 16, caplen + 2); + if (!suppress_default_print) { + default_print(p - 16, caplen + 2); + } + } return (1); |
