14 Commits

Author SHA1 Message Date
mlaier
298dfd4f74 Resolve merge conflicts
Approved by:	re (kensmith)
Obtained from:	tcpdump.org
2007-10-16 02:07:55 +00:00
sam
8bcc947abc resolve merge conflicts
MFC after:	1 month
2006-09-04 19:54:21 +00:00
sam
b0948cc146 resolve merge conflicts
Approved by:	re (scottl)
2005-07-11 03:43:25 +00:00
sam
1907987c21 resolve merge conflicts
Reviewed by:	bms (earlier version)
2005-05-29 18:09:04 +00:00
bms
723e163490 Merge of libpcap 0.8.3 from tcpdump.org. 2004-03-31 09:15:09 +00:00
green
1bb1923e83 * 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
fenner
1982c98f74 Merge libpcap 0.7.1
MFC after:	2 weeks
2002-06-21 01:38:14 +00:00
fenner
d32fa93f24 Merge libpcap 0.6.2 2001-04-03 04:32:48 +00:00
archie
b1ae8b5a7c When pcap_compile() detects an error, it longjmp()'s out of the
scanner/parser. FreeBSD recently made 'flex' its default implementation
of 'lex'. One of the incompatibilities of 'flex' vs. 'lex' is that
if you longjmp() out of the scanner, you must call yyrestart()
before doing another scan (as documented in flex(1)). So add an
invocation to yyrestart() in lex_init(). This change should be
backwards compatible with the original 'lex'.

PR:	bin/24116
2001-01-07 00:26:32 +00:00
fenner
787eaee1ab Merge libpcap 0.5 2000-01-30 00:43:38 +00:00
fenner
eba95a7c80 Merge libpcap version 0.4
PR:		bin/7877
1998-09-15 19:31:43 +00:00
fenner
3e7c4bdb91 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
pst
624cf51a56 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
pst
f0fdf33ff6 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