Commit Graph

17 Commits

Author SHA1 Message Date
Max Laier
5357e0fedb Resolve merge conflicts
Approved by:	re (kensmith)
Obtained from:	tcpdump.org
2007-10-16 02:07:55 +00:00
Sam Leffler
ff252dbedb resolve merge conflicts
MFC after:	1 month
2006-09-04 19:54:21 +00:00
Sam Leffler
4238c2cd94 resolve merge conflicts
Approved by:	re (scottl)
2005-07-11 03:43:25 +00:00
Sam Leffler
c761ebcb2c resolve merge conflicts
Reviewed by:	bms (earlier version)
2005-05-29 18:09:04 +00:00
Bruce M Simpson
eb9f0330c0 Merge of libpcap 0.8.3 from tcpdump.org. 2004-03-31 09:15:09 +00:00
Brian Feldman
3267cc18e1 * Modify libpcap to work a bit better with our 802.11 code. This means
tcpdump -y ieee802_11 will work in the basic senses, including the
  code compilation for filters (where you may specify "link[]" to refer
  to parts of the 802.11 header, as well as treat it like a normal
  Ethernet header).  Previously, it was just too far off to do anything
  useful for us.
* While I'm here, fix some compile problems that will result from lex
  and yacc namespace polution when linking with -lpcap.  The namespace
  is now "pcapyy*" instead of "yy*", and it tests fine with world and
  some external applications that may or may not use "yy*".
2003-11-04 06:12:21 +00:00
Bill Fenner
6121e7f0d2 Merge multi-DLT support. 2003-01-26 01:21:53 +00:00
Bill Fenner
c0653930da Merge libpcap 0.7.1
MFC after:	2 weeks
2002-06-21 01:38:14 +00:00
Bill Fenner
8e1481d144 Merge libpcap 0.6.2 2001-04-03 04:32:48 +00:00
Bill Fenner
a107e2bc7a Merge updated file for 0.5 release: handle "ip host foo" and
"ip6 host foo" when foo has both IP and IP6 addresses.

PR:		bin/17083
Approved by:	jkh
2000-03-04 23:57:39 +00:00
Bill Fenner
fae05455f6 Merge libpcap 0.5 2000-01-30 00:43:38 +00:00
Bill Fenner
dfd1ee14ff Merge libpcap version 0.4
PR:		bin/7877
1998-09-15 19:31:43 +00:00
Bill Fenner
4c6f72b0be Merge libpcap 0.3
Update FREEBSD-upgrade to mention bumping library version number.

Suggested-by:	Chris Timmons <skynyrd@opus.cts.cwu.edu>
1997-05-27 00:05:23 +00:00
Garrett Wollman
ee3e763371 Update to reflect changes in net/if.h. 1997-01-03 20:10:04 +00:00
Bill Fenner
1cdf4fbe44 Fix generated code for DLT_NULL encapsulation.
This fixes PR#bin/2212.
1996-12-18 17:08:13 +00:00
Paul Traina
0d086d2934 Add support for ISO CLNP/ES-IS/IS-IS.
These changes have been also sent back to LBL for inclusion in next release.

Submitted by:	Tony Li <tli@jnx.com>
1996-08-21 20:01:08 +00:00
Paul Traina
8cf6c252e7 Virgin import of LBL libpcap version 0.2.1.
Obtained from: ftp://ftp.ee.lbl.gov/libpcap.tar.Z on 19-Aug-1996.
1996-08-19 20:36:34 +00:00