Deleted Added
sdiff udiff text old ( 111729 ) new ( 127675 )
full compact
print-ether.c (111729) print-ether.c (127675)
1/*
2 * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that: (1) source code distributions
7 * retain the above copyright notice and this paragraph in its entirety, (2)
8 * distributions including binary code include the above copyright notice and

--- 4 unchanged lines hidden (view full) ---

13 * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
14 * the University nor the names of its contributors may be used to endorse
15 * or promote products derived from this software without specific prior
16 * written permission.
17 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
19 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
20 *
1/*
2 * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that: (1) source code distributions
7 * retain the above copyright notice and this paragraph in its entirety, (2)
8 * distributions including binary code include the above copyright notice and

--- 4 unchanged lines hidden (view full) ---

13 * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
14 * the University nor the names of its contributors may be used to endorse
15 * or promote products derived from this software without specific prior
16 * written permission.
17 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
19 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
20 *
21 * $FreeBSD: head/contrib/tcpdump/print-ether.c 111729 2003-03-02 08:25:48Z fenner $
21 * $FreeBSD: head/contrib/tcpdump/print-ether.c 127675 2004-03-31 14:57:24Z bms $
22 */
23#ifndef lint
22 */
23#ifndef lint
24static const char rcsid[] =
25 "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.65.4.1 2002/06/01 23:51:12 guy Exp $ (LBL)";
24static const char rcsid[] _U_ =
25 "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.82.2.3 2003/12/29 22:42:21 hannes Exp $ (LBL)";
26#endif
27
28#ifdef HAVE_CONFIG_H
29#include "config.h"
30#endif
31
26#endif
27
28#ifdef HAVE_CONFIG_H
29#include "config.h"
30#endif
31
32#include <sys/param.h>
33#include <sys/time.h>
34#include <sys/socket.h>
32#include <tcpdump-stdinc.h>
35
33
36#include <netinet/in.h>
37
38#include <stdio.h>
39#include <pcap.h>
40
41#include "interface.h"
42#include "addrtoname.h"
43#include "ethertype.h"
44
45#include "ether.h"
46
34#include <stdio.h>
35#include <pcap.h>
36
37#include "interface.h"
38#include "addrtoname.h"
39#include "ethertype.h"
40
41#include "ether.h"
42
47const u_char *packetp;
48const u_char *snapend;
49
43const u_char *snapend;
44
45const struct tok ethertype_values[] = {
46 { ETHERTYPE_IP, "IPv4" },
47 { ETHERTYPE_MPLS, "MPLS unicast" },
48 { ETHERTYPE_MPLS_MULTI, "MPLS multicast" },
49 { ETHERTYPE_IPV6, "IPv6" },
50 { ETHERTYPE_8021Q, "802.1Q" },
51 { ETHERTYPE_VMAN, "VMAN" },
52 { ETHERTYPE_PUP, "PUP" },
53 { ETHERTYPE_ARP, "ARP"},
54 { ETHERTYPE_REVARP , "Reverse ARP"},
55 { ETHERTYPE_NS, "NS" },
56 { ETHERTYPE_SPRITE, "Sprite" },
57 { ETHERTYPE_TRAIL, "Trail" },
58 { ETHERTYPE_MOPDL, "MOP DL" },
59 { ETHERTYPE_MOPRC, "MOP RC" },
60 { ETHERTYPE_DN, "DN" },
61 { ETHERTYPE_LAT, "LAT" },
62 { ETHERTYPE_SCA, "SCA" },
63 { ETHERTYPE_LANBRIDGE, "Lanbridge" },
64 { ETHERTYPE_DECDNS, "DEC DNS" },
65 { ETHERTYPE_DECDTS, "DEC DTS" },
66 { ETHERTYPE_VEXP, "VEXP" },
67 { ETHERTYPE_VPROD, "VPROD" },
68 { ETHERTYPE_ATALK, "Appletalk" },
69 { ETHERTYPE_AARP, "Appletalk ARP" },
70 { ETHERTYPE_IPX, "IPX" },
71 { ETHERTYPE_PPP, "PPP" },
72 { ETHERTYPE_PPPOED, "PPPoE D" },
73 { ETHERTYPE_PPPOES, "PPPoE S" },
74 { ETHERTYPE_LOOPBACK, "Loopback" },
75 { 0, NULL}
76};
77
50static inline void
78static inline void
51ether_print(register const u_char *bp, u_int length)
79ether_hdr_print(register const u_char *bp, u_int length)
52{
53 register const struct ether_header *ep;
80{
81 register const struct ether_header *ep;
54
55 ep = (const struct ether_header *)bp;
82 ep = (const struct ether_header *)bp;
56 if (qflag)
57 (void)printf("%s %s %d: ",
58 etheraddr_string(ESRC(ep)),
59 etheraddr_string(EDST(ep)),
60 length);
61 else
62 (void)printf("%s %s %s %d: ",
63 etheraddr_string(ESRC(ep)),
64 etheraddr_string(EDST(ep)),
65 etherproto_string(ep->ether_type),
66 length);
83
84 (void)printf("%s > %s",
85 etheraddr_string(ESRC(ep)),
86 etheraddr_string(EDST(ep)));
87
88 if (!qflag) {
89 if (ntohs(ep->ether_type) <= ETHERMTU)
90 (void)printf(", 802.3");
91 else
92 (void)printf(", ethertype %s (0x%04x)",
93 tok2str(ethertype_values,"Unknown", ntohs(ep->ether_type)),
94 ntohs(ep->ether_type));
95 } else {
96 if (ntohs(ep->ether_type) <= ETHERMTU)
97 (void)printf(", 802.3");
98 else
99 (void)printf(", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", ntohs(ep->ether_type)));
100 }
101
102 (void)printf(", length %u: ", length);
67}
68
103}
104
69/*
70 * This is the top level routine of the printer. 'p' is the points
71 * to the ether header of the packet, 'h->tv' is the timestamp,
72 * 'h->length' is the length of the packet off the wire, and 'h->caplen'
73 * is the number of bytes actually captured.
74 */
75void
105void
76ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
106ether_print(const u_char *p, u_int length, u_int caplen)
77{
107{
78 u_int caplen = h->caplen;
79 u_int length = h->len;
80 struct ether_header *ep;
81 u_short ether_type;
108 struct ether_header *ep;
109 u_short ether_type;
82 u_short extracted_ethertype;
110 u_short extracted_ether_type;
83
111
84 ++infodelay;
85 ts_print(&h->ts);
86
87 if (caplen < ETHER_HDRLEN) {
88 printf("[|ether]");
112 if (caplen < ETHER_HDRLEN) {
113 printf("[|ether]");
89 goto out;
114 return;
90 }
91
92 if (eflag)
115 }
116
117 if (eflag)
93 ether_print(p, length);
118 ether_hdr_print(p, length);
94
119
95 /*
96 * Some printers want to get back at the ethernet addresses,
97 * and/or check that they're not walking off the end of the packet.
98 * Rather than pass them all the way down, we set these globals.
99 */
100 packetp = p;
101 snapend = p + caplen;
102
103 length -= ETHER_HDRLEN;
104 caplen -= ETHER_HDRLEN;
105 ep = (struct ether_header *)p;
106 p += ETHER_HDRLEN;
107
108 ether_type = ntohs(ep->ether_type);
109
110 /*
111 * Is it (gag) an 802.3 encapsulation?
112 */
120 length -= ETHER_HDRLEN;
121 caplen -= ETHER_HDRLEN;
122 ep = (struct ether_header *)p;
123 p += ETHER_HDRLEN;
124
125 ether_type = ntohs(ep->ether_type);
126
127 /*
128 * Is it (gag) an 802.3 encapsulation?
129 */
113 extracted_ethertype = 0;
130 extracted_ether_type = 0;
114 if (ether_type <= ETHERMTU) {
115 /* Try to print the LLC-layer header & higher layers */
116 if (llc_print(p, length, caplen, ESRC(ep), EDST(ep),
131 if (ether_type <= ETHERMTU) {
132 /* Try to print the LLC-layer header & higher layers */
133 if (llc_print(p, length, caplen, ESRC(ep), EDST(ep),
117 &extracted_ethertype) == 0) {
134 &extracted_ether_type) == 0) {
118 /* ether_type not known, print raw packet */
119 if (!eflag)
135 /* ether_type not known, print raw packet */
136 if (!eflag)
120 ether_print((u_char *)ep, length + ETHER_HDRLEN);
121 if (extracted_ethertype) {
122 printf("(LLC %s) ",
123 etherproto_string(htons(extracted_ethertype)));
124 }
137 ether_hdr_print((u_char *)ep, length + ETHER_HDRLEN);
138
125 if (!xflag && !qflag)
126 default_print(p, caplen);
127 }
128 } else if (ether_encap_print(ether_type, p, length, caplen,
139 if (!xflag && !qflag)
140 default_print(p, caplen);
141 }
142 } else if (ether_encap_print(ether_type, p, length, caplen,
129 &extracted_ethertype) == 0) {
143 &extracted_ether_type) == 0) {
130 /* ether_type not known, print raw packet */
131 if (!eflag)
144 /* ether_type not known, print raw packet */
145 if (!eflag)
132 ether_print((u_char *)ep, length + ETHER_HDRLEN);
146 ether_hdr_print((u_char *)ep, length + ETHER_HDRLEN);
147
133 if (!xflag && !qflag)
134 default_print(p, caplen);
148 if (!xflag && !qflag)
149 default_print(p, caplen);
135 }
136 if (xflag)
137 default_print(p, caplen);
138 out:
139 putchar('\n');
140 --infodelay;
141 if (infoprint)
142 info(0);
150 }
143}
144
145/*
151}
152
153/*
154 * This is the top level routine of the printer. 'p' points
155 * to the ether header of the packet, 'h->ts' is the timestamp,
156 * 'h->length' is the length of the packet off the wire, and 'h->caplen'
157 * is the number of bytes actually captured.
158 */
159u_int
160ether_if_print(const struct pcap_pkthdr *h, const u_char *p)
161{
162 ether_print(p, h->len, h->caplen);
163
164 return (ETHER_HDRLEN);
165}
166
167/*
146 * Prints the packet encapsulated in an Ethernet data segment
147 * (or an equivalent encapsulation), given the Ethernet type code.
148 *
149 * Returns non-zero if it can do so, zero if the ethertype is unknown.
150 *
151 * The Ethernet type code is passed through a pointer; if it was
152 * ETHERTYPE_8021Q, it gets updated to be the Ethernet type of
153 * the 802.1Q payload, for the benefit of lower layers that might
154 * want to know what it is.
155 */
156
157int
168 * Prints the packet encapsulated in an Ethernet data segment
169 * (or an equivalent encapsulation), given the Ethernet type code.
170 *
171 * Returns non-zero if it can do so, zero if the ethertype is unknown.
172 *
173 * The Ethernet type code is passed through a pointer; if it was
174 * ETHERTYPE_8021Q, it gets updated to be the Ethernet type of
175 * the 802.1Q payload, for the benefit of lower layers that might
176 * want to know what it is.
177 */
178
179int
158ether_encap_print(u_short ethertype, const u_char *p,
159 u_int length, u_int caplen, u_short *extracted_ethertype)
180ether_encap_print(u_short ether_type, const u_char *p,
181 u_int length, u_int caplen, u_short *extracted_ether_type)
160{
161 recurse:
182{
183 recurse:
162 *extracted_ethertype = ethertype;
184 *extracted_ether_type = ether_type;
163
185
164 switch (ethertype) {
186 switch (ether_type) {
165
166 case ETHERTYPE_IP:
167 ip_print(p, length);
168 return (1);
169
170#ifdef INET6
171 case ETHERTYPE_IPV6:
172 ip6_print(p, length);

--- 15 unchanged lines hidden (view full) ---

188 atalk_print(p, length);
189 return (1);
190
191 case ETHERTYPE_AARP:
192 aarp_print(p, length);
193 return (1);
194
195 case ETHERTYPE_IPX:
187
188 case ETHERTYPE_IP:
189 ip_print(p, length);
190 return (1);
191
192#ifdef INET6
193 case ETHERTYPE_IPV6:
194 ip6_print(p, length);

--- 15 unchanged lines hidden (view full) ---

210 atalk_print(p, length);
211 return (1);
212
213 case ETHERTYPE_AARP:
214 aarp_print(p, length);
215 return (1);
216
217 case ETHERTYPE_IPX:
218 printf("(NOV-ETHII) ");
196 ipx_print(p, length);
197 return (1);
198
199 case ETHERTYPE_8021Q:
219 ipx_print(p, length);
220 return (1);
221
222 case ETHERTYPE_8021Q:
200 printf("802.1Q vlan#%d P%d%s ",
201 ntohs(*(u_int16_t *)p) & 0xfff,
202 ntohs(*(u_int16_t *)p) >> 13,
203 (ntohs(*(u_int16_t *)p) & 0x1000) ? " CFI" : "");
204 ethertype = ntohs(*(u_int16_t *)(p + 2));
223 if (eflag)
224 printf("vlan %u, p %u%s, ",
225 ntohs(*(u_int16_t *)p) & 0xfff,
226 ntohs(*(u_int16_t *)p) >> 13,
227 (ntohs(*(u_int16_t *)p) & 0x1000) ? ", CFI" : "");
228
229 ether_type = ntohs(*(u_int16_t *)(p + 2));
205 p += 4;
206 length -= 4;
207 caplen -= 4;
230 p += 4;
231 length -= 4;
232 caplen -= 4;
208 if (ethertype > ETHERMTU)
233
234 if (ether_type > ETHERMTU) {
235 if (eflag)
236 printf("ethertype %s, ",
237 tok2str(ethertype_values,"0x%04x", ether_type));
209 goto recurse;
238 goto recurse;
239 }
210
240
211 *extracted_ethertype = 0;
241 *extracted_ether_type = 0;
212
213 if (llc_print(p, length, caplen, p - 18, p - 12,
242
243 if (llc_print(p, length, caplen, p - 18, p - 12,
214 extracted_ethertype) == 0) {
215 /* ether_type not known, print raw packet */
216 if (!eflag)
217 ether_print(p - 18, length + 4);
218 if (*extracted_ethertype) {
219 printf("(LLC %s) ",
220 etherproto_string(htons(*extracted_ethertype)));
221 }
222 if (!xflag && !qflag)
223 default_print(p - 18, caplen + 4);
244 extracted_ether_type) == 0) {
245 ether_hdr_print(p - 18, length + 4);
224 }
246 }
247
248 if (!xflag && !qflag)
249 default_print(p - 18, caplen + 4);
250
225 return (1);
226
227 case ETHERTYPE_PPPOED:
228 case ETHERTYPE_PPPOES:
229 case ETHERTYPE_PPPOED2:
230 case ETHERTYPE_PPPOES2:
231 pppoe_print(p, length);
251 return (1);
252
253 case ETHERTYPE_PPPOED:
254 case ETHERTYPE_PPPOES:
255 case ETHERTYPE_PPPOED2:
256 case ETHERTYPE_PPPOES2:
257 pppoe_print(p, length);
232 return (1);
233
258 return (1);
259
234 case ETHERTYPE_PPP:
260 case ETHERTYPE_PPP:
235 printf("ppp");
236 if (length) {
237 printf(": ");
238 ppp_print(p, length);
239 }
240 return (1);
241
261 if (length) {
262 printf(": ");
263 ppp_print(p, length);
264 }
265 return (1);
266
267 case ETHERTYPE_LOOPBACK:
268 return (0);
269
242 case ETHERTYPE_MPLS:
243 case ETHERTYPE_MPLS_MULTI:
244 mpls_print(p, length);
245 return (1);
246
247 case ETHERTYPE_LAT:
248 case ETHERTYPE_SCA:
249 case ETHERTYPE_MOPRC:
250 case ETHERTYPE_MOPDL:
251 /* default_print for now */
252 default:
253 return (0);
254 }
255}
270 case ETHERTYPE_MPLS:
271 case ETHERTYPE_MPLS_MULTI:
272 mpls_print(p, length);
273 return (1);
274
275 case ETHERTYPE_LAT:
276 case ETHERTYPE_SCA:
277 case ETHERTYPE_MOPRC:
278 case ETHERTYPE_MOPDL:
279 /* default_print for now */
280 default:
281 return (0);
282 }
283}