Commit Graph

59 Commits

Author SHA1 Message Date
Sam Leffler
34c97c7db9 sigh, put back buffer overflow fix of 1.1.11 that seems to have
not gone into the 0.9.4 release; don't put it on the vendor branch
so we won't lose it on the next import if they continue to lose it
2006-09-04 20:12:45 +00:00
Sam Leffler
73c9abba78 update instructions 2006-09-04 19:54:49 +00:00
Sam Leffler
ff252dbedb resolve merge conflicts
MFC after:	1 month
2006-09-04 19:54:21 +00:00
Sam Leffler
47aafbd8f9 This commit was generated by cvs2svn to compensate for changes in r162012,
which included commits to RCS files with non-trunk default branches.
2006-09-04 19:43:23 +00:00
Sam Leffler
5d18909f05 Import of libpcap v0.9.4 2006-09-04 19:43:23 +00:00
Sam Leffler
04679efc46 correct dlt buffer alloc; this goes on the vendor branch as it
will be committed there shortly

MFC after:	3 days
2006-01-16 20:33:23 +00:00
Sam Leffler
d5807d9482 This commit was generated by cvs2svn to compensate for changes in r154439,
which included commits to RCS files with non-trunk default branches.
2006-01-16 20:33:23 +00:00
Sam Leffler
4238c2cd94 resolve merge conflicts
Approved by:	re (scottl)
2005-07-11 03:43:25 +00:00
Sam Leffler
ee2dd488bf Virgin import of libpcap v0.9.1 (release) from tcpdump.org
Approved by:	re (scottl)
2005-07-11 03:24:53 +00:00
Sam Leffler
8930d062b6 This commit was generated by cvs2svn to compensate for changes in r147894,
which included commits to RCS files with non-trunk default branches.
2005-07-11 03:24:53 +00:00
Sam Leffler
c761ebcb2c resolve merge conflicts
Reviewed by:	bms (earlier version)
2005-05-29 18:09:04 +00:00
Sam Leffler
04fb274578 Virgin import of libpcap v0.9.1 (alpha 096) from tcpdump.org 2005-05-29 17:46:52 +00:00
Sam Leffler
0a71d148de This commit was generated by cvs2svn to compensate for changes in r146768,
which included commits to RCS files with non-trunk default branches.
2005-05-29 17:46:52 +00:00
Bruce M Simpson
21f48b73b0 pcap clients should use strlcpy() from the base system libc by default also. 2004-03-31 18:15:37 +00:00
Bruce M Simpson
2a5eb7e1d4 snprintf() and vsnprintf() are part of our base system libc, therefore
pcap should not fall back to its own implementations in the absence of
HAVE_SNPRINTF and HAVE_VSNPRINTF defines when compiled and installed
as part of the world. This should fix builds of pflogd and packages
depending on the base system libpcap.

Reported by:	Andrzej Tobola
2004-03-31 18:14:27 +00:00
Bruce M Simpson
d87e118db2 Correct imported pcap.h for FreeBSD builds. 2004-03-31 10:21:28 +00:00
Bruce M Simpson
eb9f0330c0 Merge of libpcap 0.8.3 from tcpdump.org. 2004-03-31 09:15:09 +00:00
Bruce M Simpson
feb4ecdbac Import libpcap 0.8.3, from http://www.tcpdump.org/releases/libpcap-0.8.3.tar.gz 2004-03-31 09:07:39 +00:00
Bruce M Simpson
2f9208fff6 This commit was generated by cvs2svn to compensate for changes in r127664,
which included commits to RCS files with non-trunk default branches.
2004-03-31 09:07:39 +00:00
Brian Feldman
fe1e903532 Remove a reference to part of the pcap API not yet merged. 2003-11-04 06:16:55 +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
09f33d614a Commit tcpdump.org's multi-DLT support to vendor branch. 2003-01-26 01:16:33 +00:00
Bill Fenner
a63efadcf1 This commit was generated by cvs2svn to compensate for changes in r109839,
which included commits to RCS files with non-trunk default branches.
2003-01-26 01:16:33 +00:00
Bill Fenner
c0653930da Merge libpcap 0.7.1
MFC after:	2 weeks
2002-06-21 01:38:14 +00:00
Bill Fenner
0a94d38f05 Import libpcap 0.7.1, from
http://www.tcpdump.org/release/libpcap-0.7.1.tar.gz
2002-06-21 01:36:27 +00:00
Bill Fenner
8e10e3e69d This commit was generated by cvs2svn to compensate for changes in r98530,
which included commits to RCS files with non-trunk default branches.
2002-06-21 01:36:27 +00:00
David E. O'Brien
8519d4e5fc Correct email address for bug reports and patch submissions.
Submitted by:	Marco Molteni <molter@tin.it>
2002-02-08 19:45:58 +00:00
Bill Fenner
8e1481d144 Merge libpcap 0.6.2 2001-04-03 04:32:48 +00:00
Bill Fenner
dc2c730546 Virgin import of tcpdump.org libpcap v0.6.2 2001-04-03 04:18:09 +00:00
Bill Fenner
bd053aaff0 This commit was generated by cvs2svn to compensate for changes in r75107,
which included commits to RCS files with non-trunk default branches.
2001-04-03 04:18:09 +00:00
Archie Cobbs
dceab8ea63 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
Bill Fenner
bb63323352 Import rev 1.26 of tcpdump.org's inet.c -- don't free
the buffer before it's used.
2000-07-20 21:26:45 +00:00
Bill Fenner
c231f6de29 This commit was generated by cvs2svn to compensate for changes in r63696,
which included commits to RCS files with non-trunk default branches.
2000-07-20 21:26:45 +00:00
Archie Cobbs
07da1e52ec Fix make world breakage.
Broken by:	me
2000-07-19 16:03:34 +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
5a92964037 Import of updated file for 0.5 release 2000-03-04 23:54:27 +00:00
Bill Fenner
fae05455f6 Merge libpcap 0.5 2000-01-30 00:43:38 +00:00
Bill Fenner
8751327cb4 Virgin import of tcpdump.org libpcap v0.5 2000-01-30 00:32:56 +00:00
Bill Fenner
d52656061b This commit was generated by cvs2svn to compensate for changes in r56889,
which included commits to RCS files with non-trunk default branches.
2000-01-30 00:32:56 +00:00
Bill Fenner
dfd1ee14ff Merge libpcap version 0.4
PR:		bin/7877
1998-09-15 19:31:43 +00:00
Bill Fenner
a4b5b39fce Virgin import of LBL libpcap v0.4 1998-09-15 19:28:10 +00:00
Bill Fenner
4e4869f856 This commit was generated by cvs2svn to compensate for changes in r39291,
which included commits to RCS files with non-trunk default branches.
1998-09-15 19:28:10 +00:00
Poul-Henning Kamp
54ae3aa75b None of the header files for the packet capture library
are suitable to include in a C++ file.

PR:		7229
Reviewed by:	phk
Submitted by:	Craig Spannring <cts@internetcds.com>
1998-08-07 06:20:58 +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
Bill Fenner
3052b2361a Virgin import of libpcap 0.3 1997-05-27 00:01:12 +00:00
Bill Fenner
a9d3bb1aa3 This commit was generated by cvs2svn to compensate for changes in r26175,
which included commits to RCS files with non-trunk default branches.
1997-05-27 00:01:12 +00:00
Peter Wemm
99a60da8f1 Back out an easy $FreeBSD$ (file already left vendor branch) 1997-02-22 10:53:59 +00:00
Jordan K. Hubbard
1130b656e5 Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
1997-01-14 07:20:47 +00:00
Garrett Wollman
ca6642fc76 Kill another bogus inclusion of <netinet/if_ether.h>. 1997-01-05 18:14:12 +00:00