Deleted Added
full compact
tcpdump.c (162021) tcpdump.c (172686)
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

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

25 * Seth Webster <swebster@sst.ll.mit.edu>
26 */
27
28#ifndef lint
29static const char copyright[] _U_ =
30 "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
31The Regents of the University of California. All rights reserved.\n";
32static const char rcsid[] _U_ =
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

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

25 * Seth Webster <swebster@sst.ll.mit.edu>
26 */
27
28#ifndef lint
29static const char copyright[] _U_ =
30 "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
31The Regents of the University of California. All rights reserved.\n";
32static const char rcsid[] _U_ =
33 "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.253.2.11 2005/08/23 10:29:41 hannes Exp $ (LBL)";
33 "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.253.2.13 2007/09/12 19:48:51 guy Exp $ (LBL)";
34#endif
35
34#endif
35
36/* $FreeBSD: head/contrib/tcpdump/tcpdump.c 162021 2006-09-04 20:25:04Z sam $ */
36/* $FreeBSD: head/contrib/tcpdump/tcpdump.c 172686 2007-10-16 02:31:48Z mlaier $ */
37
38/*
39 * tcpdump - monitor tcp/ip traffic on an ethernet.
40 *
41 * First written in 1987 by Van Jacobson, Lawrence Berkeley Laboratory.
42 * Mercilessly hacked and occasionally improved since then via the
43 * combined efforts of Van, Steve McCanne and Craig Leres of LBL.
44 */

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

187 { sll_if_print, DLT_LINUX_SLL },
188#endif
189#ifdef DLT_IEEE802_11
190 { ieee802_11_if_print, DLT_IEEE802_11},
191#endif
192#ifdef DLT_LTALK
193 { ltalk_if_print, DLT_LTALK },
194#endif
37
38/*
39 * tcpdump - monitor tcp/ip traffic on an ethernet.
40 *
41 * First written in 1987 by Van Jacobson, Lawrence Berkeley Laboratory.
42 * Mercilessly hacked and occasionally improved since then via the
43 * combined efforts of Van, Steve McCanne and Craig Leres of LBL.
44 */

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

187 { sll_if_print, DLT_LINUX_SLL },
188#endif
189#ifdef DLT_IEEE802_11
190 { ieee802_11_if_print, DLT_IEEE802_11},
191#endif
192#ifdef DLT_LTALK
193 { ltalk_if_print, DLT_LTALK },
194#endif
195#ifdef DLT_PFLOG
195#if defined(DLT_PFLOG) && defined(HAVE_NET_PFVAR_H)
196 { pflog_if_print, DLT_PFLOG },
197#endif
198#ifdef DLT_FR
199 { fr_if_print, DLT_FR },
200#endif
201#ifdef DLT_FRELAY
202 { fr_if_print, DLT_FRELAY },
203#endif

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

262 { juniper_ppp_print, DLT_JUNIPER_PPP },
263#endif
264#ifdef DLT_JUNIPER_FRELAY
265 { juniper_frelay_print, DLT_JUNIPER_FRELAY },
266#endif
267#ifdef DLT_JUNIPER_CHDLC
268 { juniper_chdlc_print, DLT_JUNIPER_CHDLC },
269#endif
196 { pflog_if_print, DLT_PFLOG },
197#endif
198#ifdef DLT_FR
199 { fr_if_print, DLT_FR },
200#endif
201#ifdef DLT_FRELAY
202 { fr_if_print, DLT_FRELAY },
203#endif

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

262 { juniper_ppp_print, DLT_JUNIPER_PPP },
263#endif
264#ifdef DLT_JUNIPER_FRELAY
265 { juniper_frelay_print, DLT_JUNIPER_FRELAY },
266#endif
267#ifdef DLT_JUNIPER_CHDLC
268 { juniper_chdlc_print, DLT_JUNIPER_CHDLC },
269#endif
270#ifdef DLT_MFR
271 { mfr_if_print, DLT_MFR },
272#endif
270 { NULL, 0 },
271};
272
273static if_printer
274lookup_printer(int type)
275{
276 struct printer *p;
277

--- 1183 unchanged lines hidden ---
273 { NULL, 0 },
274};
275
276static if_printer
277lookup_printer(int type)
278{
279 struct printer *p;
280

--- 1183 unchanged lines hidden ---