Commit Graph

53 Commits

Author SHA1 Message Date
sam
b0948cc146 resolve merge conflicts
Approved by:	re (scottl)
2005-07-11 03:43:25 +00:00
sam
17d5b030de 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
d1c1ca625a Virgin import of libpcap v0.9.1 (release) from tcpdump.org
Approved by:	re (scottl)
2005-07-11 03:24:53 +00:00
sam
1907987c21 resolve merge conflicts
Reviewed by:	bms (earlier version)
2005-05-29 18:09:04 +00:00
sam
70f7ae46f5 Virgin import of libpcap v0.9.1 (alpha 096) from tcpdump.org 2005-05-29 17:46:52 +00:00
sam
3fcae53268 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
bms
6de0b418b8 pcap clients should use strlcpy() from the base system libc by default also. 2004-03-31 18:15:37 +00:00
bms
444a7b2549 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
bms
a362cdba47 Correct imported pcap.h for FreeBSD builds. 2004-03-31 10:21:28 +00:00
bms
723e163490 Merge of libpcap 0.8.3 from tcpdump.org. 2004-03-31 09:15:09 +00:00
bms
da13a5a9d7 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
bms
5e21f2192e 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
green
4e6189970a Remove a reference to part of the pcap API not yet merged. 2003-11-04 06:16:55 +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
84873f87ee Merge multi-DLT support. 2003-01-26 01:21:53 +00:00
fenner
34111fdf72 Commit tcpdump.org's multi-DLT support to vendor branch. 2003-01-26 01:16:33 +00:00
fenner
e3b499182e 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
fenner
1982c98f74 Merge libpcap 0.7.1
MFC after:	2 weeks
2002-06-21 01:38:14 +00:00
fenner
1e8ea46779 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
fenner
b8f074bf7d 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
obrien
f697ae8b94 Correct email address for bug reports and patch submissions.
Submitted by:	Marco Molteni <molter@tin.it>
2002-02-08 19:45:58 +00:00
fenner
d32fa93f24 Merge libpcap 0.6.2 2001-04-03 04:32:48 +00:00
fenner
a6bce8883c Virgin import of tcpdump.org libpcap v0.6.2 2001-04-03 04:18:09 +00:00
fenner
5ccd472c68 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
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
6f08532b51 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
fenner
1c6873b931 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
a66f7a68d6 Fix make world breakage.
Broken by:	me
2000-07-19 16:03:34 +00:00
fenner
520bac883e 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
fenner
1cee940914 Import of updated file for 0.5 release 2000-03-04 23:54:27 +00:00
fenner
787eaee1ab Merge libpcap 0.5 2000-01-30 00:43:38 +00:00
fenner
aae9bd2bcc Virgin import of tcpdump.org libpcap v0.5 2000-01-30 00:32:56 +00:00
fenner
cd005a9569 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
fenner
eba95a7c80 Merge libpcap version 0.4
PR:		bin/7877
1998-09-15 19:31:43 +00:00
fenner
ca0d84cb8b Virgin import of LBL libpcap v0.4 1998-09-15 19:28:10 +00:00
fenner
487207a9c4 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
phk
8c372cf522 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
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
fenner
737558aa98 Virgin import of libpcap 0.3 1997-05-27 00:01:12 +00:00
fenner
41cb646cc0 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
89d8d139e1 Back out an easy $FreeBSD$ (file already left vendor branch) 1997-02-22 10:53:59 +00:00
jkh
808a36ef65 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
wollman
46c0a6d72c Kill another bogus inclusion of <netinet/if_ether.h>. 1997-01-05 18:14:12 +00:00
wollman
fb79103251 Update to reflect changes in net/if.h. 1997-01-03 20:10:04 +00:00
fenner
d3bf3fa350 Fix generated code for DLT_NULL encapsulation.
This fixes PR#bin/2212.
1996-12-18 17:08:13 +00:00
wollman
d3ecee07b3 Fix up programs which expect <net/if.h> to include <sys/time.h> to instead
do it themselves.  (Some of these programs actually depended on this
beyond compiling the definition of struct ifinfo!)  Also fix up some
other #include messes while we're at it.
1996-12-10 17:11:53 +00:00
wosch
000fb64288 delete doubled words, e.g.: "the the" -> "the" 1996-10-05 22:27:30 +00:00
pst
23b2a82332 Fix some typos 1996-10-01 01:08:47 +00:00
cvs2svn
498933506f This commit was manufactured by cvs2svn to create branch
'VENDOR-libpcap'.
1996-08-21 20:01:09 +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