summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2009-05-24 11:38:34 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2009-05-24 11:38:34 (GMT)
commitfa77efbc3d680dd0ae4de3ae68cd42cad1340ba3 (patch) (side-by-side diff)
treefd9624cba06b36fb8f7069be194d845665784096
parent2828fa3560780af1e4f0bad427bed5a82a8679c7 (diff)
downloadipacct-fa77efbc3d680dd0ae4de3ae68cd42cad1340ba3.tar.gz
ipacct-fa77efbc3d680dd0ae4de3ae68cd42cad1340ba3.tar.bz2
Remove left-over libpcap sources
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libpcap/.cvsignore3
-rw-r--r--libpcap/CHANGES267
-rw-r--r--libpcap/COPYING32
-rw-r--r--libpcap/FILES50
-rw-r--r--libpcap/INSTALL328
-rw-r--r--libpcap/Makefile.am31
-rw-r--r--libpcap/README49
-rw-r--r--libpcap/VERSION1
-rw-r--r--libpcap/bpf_filter.c532
-rw-r--r--libpcap/bpf_image.c292
-rw-r--r--libpcap/etherent.c163
-rw-r--r--libpcap/ethertype.h76
-rw-r--r--libpcap/gencode.c1948
-rw-r--r--libpcap/gencode.h179
-rw-r--r--libpcap/grammar.c1113
-rw-r--r--libpcap/grammar.y275
-rw-r--r--libpcap/inet.c223
-rw-r--r--libpcap/lbl/gnuc.h43
-rw-r--r--libpcap/lbl/os-solaris2.h54
-rw-r--r--libpcap/lbl/os-sunos4.h215
-rw-r--r--libpcap/lbl/os-ultrix4.h39
-rw-r--r--libpcap/linux-include/netinet/if_ether.h88
-rw-r--r--libpcap/linux-include/netinet/ip_var.h178
-rw-r--r--libpcap/nametoaddr.c376
-rw-r--r--libpcap/net/bpf.h264
-rw-r--r--libpcap/optimize.c2008
-rw-r--r--libpcap/pcap-bpf.c267
-rw-r--r--libpcap/pcap-dlpi.c852
-rw-r--r--libpcap/pcap-enet.c231
-rw-r--r--libpcap/pcap-int.h117
-rw-r--r--libpcap/pcap-linux.c335
-rw-r--r--libpcap/pcap-namedb.h76
-rw-r--r--libpcap/pcap-nit.c248
-rw-r--r--libpcap/pcap-nit.h19
-rw-r--r--libpcap/pcap-null.c77
-rw-r--r--libpcap/pcap-pf.c355
-rw-r--r--libpcap/pcap-pf.h19
-rw-r--r--libpcap/pcap-snit.c304
-rw-r--r--libpcap/pcap-snoop.c220
-rw-r--r--libpcap/pcap.3340
-rw-r--r--libpcap/pcap.c199
-rw-r--r--libpcap/pcap.h137
-rw-r--r--libpcap/ppp.h50
-rw-r--r--libpcap/savefile.c356
-rw-r--r--libpcap/scanner.c2048
-rw-r--r--libpcap/scanner.l204
-rw-r--r--libpcap/tokdefs.h57
47 files changed, 0 insertions, 15338 deletions
diff --git a/libpcap/.cvsignore b/libpcap/.cvsignore
deleted file mode 100644
index 36a2ee1..0000000
--- a/libpcap/.cvsignore
+++ b/dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-.deps \ No newline at end of file
diff --git a/libpcap/CHANGES b/libpcap/CHANGES
deleted file mode 100644
index 0dedf6c..0000000
--- a/libpcap/CHANGES
+++ b/dev/null
@@ -1,267 +0,0 @@
-@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/CHANGES,v 1.1 2001/05/31 13:40:52 gray Exp $ (LBL)
-
-v0.4 Sat Jul 25 12:40:09 PDT 1998
-
-- Fix endian problem with DLT_NULL devices. From FreeBSD via Bill
- Fenner (fenner@parc.xerox.com)
-
-- Fix alignment problem with FDDI under DLPI. This was causing core
- dumps under Solaris.
-
-- Added configure options to disable flex and bison. Resulted from a
- bug report by barnett@grymoire.crd.ge.com (Bruce Barnett). Also added
- options to disable gcc and to force a particular packet capture type.
-
-- Added support for Fore ATM interfaces (qaa and fa) under IRIX. Thanks
- to John Hawkinson (jhawk@mit.edu)
-
-- Change Linux PPP and SLIP to use DLT_RAW since the kernel does not
- supply any "link layer" data.
-
-- Change Linux to use SIOCGIFHWADDR ioctl to determine link layer type.
- Thanks to Thomas Sailer (sailer@ife.ee.ethz.ch)
-
-- Change IRIX PPP to use DLT_RAW since the kernel does not supply any
- "link layer" data.
-
-- Modified to support the new BSD/OS 2.1 PPP and SLIP link layer header
- formats.
-
-- Added some new SGI snoop interface types. Thanks to Steve Alexander
- (sca@refugee.engr.sgi.com)
-
-- Fixes for HP-UX 10.20 (which is similar to HP-UX 9). Thanks to
- Richard Allen (ra@hp.is) and Steinar Haug (sthaug@nethelp.no)
-
-- Fddi supports broadcast as reported by Jeff Macdonald
- (jeff@iacnet.com). Also correct ieee802 and arcnet.
-
-- Determine Linux pcap buffer size at run time or else it might not be
- big enough for some interface types (e.g. FDDI). Thanks to Jes
- Sorensen (Jes.Sorensen@cern.ch)
-
-- Fix some linux alignment problems.
-
-- Document promisc argument to pcap_open_live(). Reported by Ian Marsh
- (ianm@sics.se)
-
-- Support Metricom radio packets under Linux. Thanks to Kevin Lai
- (laik@gunpowder.stanford.edu)
-
-- Bind to interface name under Linux to avoid packets from multiple
- interfaces on multi-homed hosts. Thanks to Kevin Lai
- (laik@gunpowder.stanford.edu)
-
-- Change L_SET to SEEK_SET for HP-UX. Thanks to Roland Roberts
- (rroberts@muller.com)
-
-- Fixed an uninitialized memory reference found by Kent Vander Velden
- (graphix@iastate.edu)
-
-- Fixed lex pattern for IDs to allow leading digits. As reported by
- Theo de Raadt (deraadt@cvs.openbsd.org)
-
-- Fixed Linux include file problems when using GNU libc.
-
-- Ifdef ARPHRD_FDDI since not all versions of the Linux kernel have it.
- Reported reported by Eric Jacksch (jacksch@tenebris.ca)
-
-- Fixed bug in pcap_dispatch() that kept it from returning on packet
- timeouts.
-
-- Changed ISLOOPBACK() macro when IFF_LOOPBACK isn't available to check
- for "lo" followed by an eos or digit (newer versions of Linux
- apparently call the loopback "lo" instead of "lo0").
-
-- Fixed Linux networking include files to use ints instead of longs to
- avoid problems with 64 bit longs on the alpha. Thanks to Cristian
- Gafton (gafton@redhat.com)
-
-v0.3 Sat Nov 30 20:56:27 PST 1996
-
-- Added Linux support.
-
-- Fixed savefile bugs.
-
-- Solaris x86 fix from Tim Rylance (t.rylance@elsevier.nl)
-
-- Add support for bpf kernel port filters.
-
-- Remove duplicate atalk protocol table entry. Thanks to Christian
- Hopps (chopps@water.emich.edu)
-
-- Fixed pcap_lookupdev() to ignore nonexistent devices. This was
- reported to happen under BSD/OS by David Vincenzetti
- (vince@cryptonet.it)
-
-- Avoid solaris compiler warnings. Thanks to Bruce Barnett
- (barnett@grymoire.crd.ge.com)
-
-v0.2.1 Sun Jul 14 03:02:26 PDT 1996
-
-- Fixes for HP-UX 10. Thanks in part to to Thomas Wolfram
- (wolf@prz.tu-berlin.de) and Rick Jones (raj@hpisrdq.cup.hp.com)
-
-- Added support for SINIX. Thanks to Andrej Borsenkow
- (borsenkow.msk@sni.de)
-
-- Fixes for AIX (although this system is not yet supported). Thanks to
- John Hawkinson (jhawk@mit.edu)
-
-- Use autoconf's idea of the top level directory in install targets.
- Thanks to John Hawkinson.
-
-- Add missing autoconf packet capture result message. Thanks to Bill
- Fenner (fenner@parc.xerox.com)
-
-- Fixed padding problems in the pf module.
-
-- Fixed some more alignment problems on the alpha.
-
-- Added explicit netmask support. Thanks to Steve Nuchia
- (steve@research.oknet.com)
-
-- Fixed to handle raw ip addresses such as 0.0.0.1 without "left
- justifing"
-
-- Add "sca" keyword (for DEC cluster services) as suggested by Terry
- Kennedy (terry@spcvxa.spc.edu)
-
-- Add "atalk" keyword as suggested by John Hawkinson.
-
-- Add "igrp" keyword.
-
-- Fixed HID definition in grammar.y to be a string, not a value.
-
-- Use $CC when checking gcc version. Thanks to Carl Lindberg
- (carl_lindberg@blacksmith.com)
-
-- Removed obsolete reference to pcap_immediate() from the man page.
- Michael Stolarchuk (mts@terminator.rs.itd.umich.edu)
-
-- DLT_NULL has a 4 byte family header. Thanks to Jeffrey Honig
- (jch@bsdi.com)
-
-v0.2 Sun Jun 23 02:28:42 PDT 1996
-
-- Add support for HP-UX. Resulted from code contributed by Tom Murray
- (tmurray@hpindck.cup.hp.com) and Philippe-Andri Prindeville
- (philipp@res.enst.fr)
-
-- Update INSTALL with a reminder to install include files. Thanks to
- Mark Andrews (mandrews@aw.sgi.com)
-
-- Fix bpf compiler alignment bug on the alpha.
-
-- Use autoconf to detect architectures that can't handle misaligned
- accesses.
-
-- Added loopback support for snoop. Resulted from report Steve
- Alexander (sca@engr.sgi.com)
-
-v0.1 Fri Apr 28 18:11:03 PDT 1995
-
-- Fixed compiler and optimizer bugs. The BPF filter engine uses unsigned
- comparison operators, while the code generator and optimizer assumed
- signed semantics in several places. Thanks to Charlie Slater
- (cslater@imatek.com) for pointing this out.
-
-- Removed FDDI ifdef's, they aren't really needed. Resulted from report
- by Gary Veum (veum@boa.gsfc.nasa.gov).
-
-- Add pcap-null.c which allows offline use of libpcap on systems that
- don't support live package capture. This feature resulting from a
- request from Jan van Oorschot (j.p.m.voorschot@et.tudelft.nl).
-
-- Make bpf_compile() reentrant. Fix thanks to Pascal Hennequin
- (Pascal.Hennequin@hugo.int-evry.fr).
-
-- Port to GNU autoconf.
-
-- Fix pcap-dlpi.c to work with isdn. Resulted from report by Flemming
- Johansen (fsj@csd.cri.dk).
-
-- Handle multi-digit interface unit numbers (aka ppa's) under dlpi.
- Resulted from report by Daniel Ehrlich (ehrlich@cse.psu.edu).
-
-- Fix pcap-dlpi.c to work in non-promiscuous mode. Resulted from report
- by Jeff Murphy (jcmurphy@acsu.buffalo.edu).
-
-- Add support for "long jumps". Thanks to Jeffrey Mogul
- (mogul@pa.dec.com).
-
-- Fix minor problems when compiling with BDEBUG as noticed by Scott
- Bertilson (scott@unet.umn.edu).
-
-- Declare sys_errlist "const char *const" to avoid problems under
- FreeBSD. Resulted from report by jher@eden.com.
-
-v0.0.6 Fri Apr 28 04:07:13 PDT 1995
-
-- Add missing variable declaration missing from 0.0.6
-
-v0.0.5 Fri Apr 28 00:22:21 PDT 1995
-
-- Workaround for problems when pcap_read() returns 0 due to the timeout
- expiring.
-
-v0.0.4 Thu Apr 20 20:41:48 PDT 1995
-
-- Change configuration to not use gcc v2 flags with gcc v1.
-
-- Fixed a bug in pcap_next(); if pcap_dispatch() returns 0, pcap_next()
- should also return 0. Thanks to Richard Stevens (rstevens@noao.edu).
-
-- Fixed configure to test for snoop before dlpi to avoid problems under
- IRIX 5. Thanks to J. Eric Townsend (jet@abulafia.genmagic.com).
-
-- Hack around deficiency in Ultrix's make.
-
-- Fix two bugs related to the Solaris pre-5.3.2 bufmod bug; handle
- savefiles that have more than snapshot bytes of data in them (so we
- can read old savefiles) and avoid writing such files.
-
-- Added checkioctl which is used with gcc to check that the
- "fixincludes" script has been run.
-
-v0.0.3 Tue Oct 18 18:13:46 PDT 1994
-
-- Fixed configure to test for snoop before dlpi to avoid problems under
- IRIX 5. Thanks to J. Eric Townsend (jet@abulafia.genmagic.com).
-
-v0.0.2 Wed Oct 12 20:56:37 PDT 1994
-
-- Implement timeout in the dlpi pcap_open_live(). Thanks to Richard
- Stevens.
-
-- Determine pcap link type from dlpi media type. Resulted from report
- by Mahesh Jethanandani (mahesh@npix.com).
-
-v0.0.1 Fri Jun 24 14:50:57 PDT 1994
-
-- Fixed bug in nit_setflags() in pcap-snit.c. The streams ioctl timeout
- wasn't being initialized sometimes resulting in an "NIOCSFLAGS:
- Invalid argument" error under OSF/1. Reported by Matt Day
- (mday@artisoft.com) and Danny Mitzel (dmitzel@whitney.hitc.com).
-
-- Turn on FDDI support by default.
-
-v0.0 Mon Jun 20 19:20:16 PDT 1994
-
-- Initial release.
-
-- Fixed bug with greater/less keywords, reported by Mark Andrews
- (mandrews@alias.com).
-
-- Fix bug where '|' was defined as BPF_AND instead of BPF_OR, reported
- by Elan Amir (elan@leeb.cs.berkeley.edu).
-
-- Machines with little-endian byte ordering are supported thanks to
- Jeff Mogul.
-
-- Add hack for version 2.3 savefiles which don't have caplen and len
- swapped thanks to Vern Paxson.
-
-- Added "&&" and "||" aliases for "and" and "or" thanks to Vern Paxson.
-
-- Added length, inbound and outbound keywords.
diff --git a/libpcap/COPYING b/libpcap/COPYING
deleted file mode 100644
index 2d45ade..0000000
--- a/libpcap/COPYING
+++ b/dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 1994, 1995, 1996, 1997, 1998
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the Computer Systems
- * Engineering Group at Lawrence Berkeley Laboratory.
- * 4. Neither the name of the University nor of the Laboratory may be used
- * to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
diff --git a/libpcap/FILES b/libpcap/FILES
deleted file mode 100644
index daad279..0000000
--- a/libpcap/FILES
+++ b/dev/null
@@ -1,50 +0,0 @@
-CHANGES
-FILES
-INSTALL
-Makefile.in
-README
-SUNOS4
-VERSION
-aclocal.m4
-bpf/net/bpf.h
-bpf/net/bpf_filter.c
-bpf_image.c
-config.guess
-config.sub
-configure
-configure.in
-etherent.c
-ethertype.h
-gencode.c
-gencode.h
-grammar.y
-inet.c
-install-sh
-lbl/gnuc.h
-lbl/os-solaris2.h
-lbl/os-sunos4.h
-lbl/os-ultrix4.h
-linux-include/netinet/if_ether.h
-linux-include/netinet/ip_var.h
-mkdep
-nametoaddr.c
-optimize.c
-pcap-bpf.c
-pcap-dlpi.c
-pcap-enet.c
-pcap-int.h
-pcap-linux.c
-pcap-namedb.h
-pcap-nit.c
-pcap-nit.h
-pcap-null.c
-pcap-pf.c
-pcap-pf.h
-pcap-snit.c
-pcap-snoop.c
-pcap.3
-pcap.c
-pcap.h
-ppp.h
-savefile.c
-scanner.l
diff --git a/libpcap/INSTALL b/libpcap/INSTALL
deleted file mode 100644
index ba9a32a..0000000
--- a/libpcap/INSTALL
+++ b/dev/null
@@ -1,328 +0,0 @@
-@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/INSTALL,v 1.1 2001/05/31 13:40:52 gray Exp $ (LBL)
-
-To build libpcap, first customize any paths in Makefile.in, then run
-"./configure" (a shell script). The configure script will determine
-your system attributes and generate an appropriate Makefile from
-Makefile.in. Next run "make". If everything goes well you can su to
-root and run "make install", "make install-incl" and "make
-install-man". However, you need not install libpcap if you just want to
-build tcpdump; just make sure the tcpdump and libpcap directory trees
-have the same parent directory.
-
-If configure says:
-
- configure: warning: cannot determine packet capture interface
- configure: warning: (see INSTALL for more info)
-
-then your system either does not support packet capture or your system
-does support packet capture but libpcap does not support that
-particular type. (If you have HP-UX, see below.) If your system uses a
-packet capture not supported by libpcap, please send us patches; don't
-forget to include an autoconf fragment suitable for use in
-configure.in.
-
-It is possible to override the default packet capture type, although
-the circumstance where this works are limited. For example if you have
-installed bpf under SunOS 4 and wish to build a snit libpcap:
-
- ./configure --with-pcap=snit
-
-Another example is to force a supported packet capture type in the case
-where the configure scripts fails to detect it.
-
-You will need an ANSI C compiler to build libpcap. The configure script
-will abort if your compiler is not ANSI compliant. If this happens, use
-the GNU C compiler, available via anonymous ftp:
-
- ftp://prep.ai.mit.edu/pub/gnu/gcc-*.tar.gz
-
-Note well: If you use gcc, you may need to run its "fixincludes"
-script. Running fixincludes is not required with later versions of gcc
-and in some cases (e.g. Solaris 2.5) causes problems when run. The
-configure script will abort with:
-
- checking for ANSI ioctl definitions... yes
- configure: error: see the INSTALL for more info
-
-if it detects if the fixincludes needs to be run. If the fixincludes
-test in configure passes, you're probably ok.
-
-If you use flex, you must use version 2.4.6 or higher. The configure
-script automatically detects the version of flex and will not use it
-unless it is new enough. You can use "flex -V" to see what version you
-have (unless it's really old). The current version of flex is available
-via anonymous ftp:
-
- ftp://ftp.ee.lbl.gov/flex-*.tar.Z
-
-As of this writing, the current version is 2.5.4.
-
-If you use bison, you must use flex (and visa versa). The configure
-script automatically falls back to lex and yacc if both flex and bison
-are not found.
-
-Sometimes the stock C compiler does not interact well with flex and
-bison. The list of problems includes undefined references for alloca.
-You can get around this by installing gcc or manually disabling flex
-and bison with:
-
- ./configure --without-flex --without-bison
-
-If your system only has AT&T lex, this is okay unless your libpcap
-program uses other lex/yacc generated code. (Although it's possible to
-map the yy* identifiers with a script, we use flex and bison so we
-don't feel this is necessary.)
-
-Some systems support the Berkeley Packet Filter natively; for example
-out of the box OSF and BSD/OS have bpf. If your system does not support
-bpf, you will need to pick up:
-
- ftp://ftp.ee.lbl.gov/bpf-*.tar.Z
-
-Note well: you MUST have kernel source for your operating system in
-order to install bpf. An exception is SunOS 4; the bpf distribution
-includes replacement kernel objects for some of the standard SunOS 4
-network device drivers. See the bpf INSTALL document for more
-information.
-
-If you use Solaris, there is a bug with bufmod(7) that is fixed in
-Solaris 2.3.2 (aka SunOS 5.3.2). Setting a snapshot length with the
-broken bufmod(7) results in data be truncated from the FRONT of the
-packet instead of the end. The work around is to not set a snapshot
-length but this results in performance problems since the entire packet
-is copied to user space. If you must run an older version of Solaris,
-there is a patch available from Sun; ask for bugid 1149065. After
-installing the patch, use "setenv BUFMOD_FIXED" to enable use of
-bufmod(7). However, we recommend you run a more current release of
-Solaris.
-
-If you use the SPARCompiler, you must be careful to not use the
-/usr/ucb/cc interface. If you do, you will get bogus warnings and
-perhaps errors. Either make sure your path has /opt/SUNWspro/bin
-before /usr/ucb or else:
-
- setenv CC /opt/SUNWspro/bin/cc
-
-before running configure. (You might have to do a "make distclean"
-if you already ran configure once).
-
-Also note that "make depend" won't work; while all of the known
-universe uses -M, the SPARCompiler uses -xM to generate makefile
-dependencies.
-
-If you are trying to do packet capture with a FORE ATM card, you may or
-may not be able to. They usually only release their driver in object
-code so unless their driver supports packet capture, there's not much
-libpcap can do.
-
-If you get an error like:
-
- tcpdump: recv_ack: bind error 0x???
-
-when using DLPI, look for the DL_ERROR_ACK error return values, usually
-in /usr/include/sys/dlpi.h, and find the corresponding value.
-
-Under OSF, packet capture must be enabled before it can be used. For
-instructions on how to enable packet filter support, see:
-
- ftp://ftp.digital.com/pub/Digital/dec-faq/Digital-UNIX
-
-Once you enable packet filter support, your OSF system will support bpf
-natively.
-
-Under Ultrix, packet capture must be enabled before it can be used. For
-instructions on how to enable packet filter support, see:
-
- ftp://ftp.digital.com/pub/Digital/dec-faq/ultrix
-
-If you use HP-UX, you must have at least version 9 and either the
-version of cc that supports ANSI C (cc -Aa) or else use the GNU C
-compiler. You must also buy the optional streams package. If you don't
-have:
-
- /usr/include/sys/dlpi.h
- /usr/include/sys/dlpi_ext.h
-
-then you don't have the streams package. In addition, we believe you
-need to install the "9.X LAN and DLPI drivers cumulative" patch
-(PHNE_6855) to make the version 9 DLPI work with libpcap.
-
-It's been reported that the DLPI streams package is standard starting
-with HP-UX 10.
-
-The HP implementation of DLPI is a little bit eccentric. Unlike
-Solaris, you must attach /dev/dlpi instead of the specific /dev/*
-network pseudo device entry in order to capture packets. The ppa is
-based on the ifnet "index" number. Under HP-UX 9, it is necessary to
-read /dev/kmem and the kernel symbol file (/hp-ux). Under HP-UX 10,
-dlpi can provide information for determining the ppa. It does not seem
-to be possible to trace the loopback interface. Unlike other DLPI
-implementations, PHYS implies MULTI and SAP and you get an error if you
-try to enable more than one promiscous more than one promiscuous mode
-at a time. Finally, testing shows that there can't be more than one
-simultaneous dlpi user per network interface and you cannot capture
-outbound packets.
-
-If you use Linux, this version of libpcap is known to compile and run
-under Red Hat 4.0 with the 2.0.25 kernel. It may work with earlier 2.X
-versions but is guaranteed not to work with 1.X kernels. Running more
-than one libpcap program at a time can cause problems since promiscuous
-mode is implemented by twiddlin the interface flags from the libpcap
-application. Also, packet timestamps aren't very good. This appears to
-be due to haphazard handling of the timestamp in the kernel.
-
-Note well: there is rumoured to be a version of tcpdump floating around
-called 3.0.3 that includes libpcap and is supposed to support Linux.
-You should be advised that the Network Research Group at LBNL never
-generated a release with this version number. We note with interest
-that a standard cracker trick to get people to install trojans is to
-distribute bogus packages that have a version number higher than the
-current release. We also note with annoyance that 90% of the Linux
-related bug reports we get are due to changes made to unofficial
-versions of our page. If you are having trouble but aren't using a
-version that came from ftp.ee.lbl.gov, please try that before
-submitting a bug report!
-
-If you use AIX, you may not be able to build libpcap from this release.
-Although AIX 4 ships with tcpdump, it is an old version that predates
-libpcap. We do not have an AIX system in house so it's impossible for
-us to test AIX patches submitted to us. We are told that you must link
-against /lib/pse.exp, that you must use AIX cc or a GNU C compiler
-newer than 2.7.2 and that you may need to run strload before running a
-libpcap application. Also, it may be necessary to run the configure
-script as root in order for it to detect that bpf is available. Another
-workaround is to use:
-
- ./configure --with-pcap=bpf
-
-If you use NeXTSTEP, you will not be able to build libpcap from this
-release. We hope to support this operating system in some future
-release of libpcap.
-
-If you use SINIX, you should be able to build libpcap from this
-release. It is known to compile and run on SINIX-Y/N 5.42 with the C-DS
-V1.0 or V1.1 compiler. But note that in some releases of SINIX, yacc
-emits incorrect code; if grammar.y fails to compile, change every
-occurence of:
-
- #ifdef YYDEBUG
-
-to:
- #if YYDEBUG
-
-Another workaround is to use flex and bison.
-
-If you use SCO, you might have trouble building libpcap from this
-release. We do not have a machine running SCO and have not had reports
-of anyone successfully building on it. Since SCO apparently supports
-dlpi, it's possible the current version works. Meanwhile, sco provides
-a tcpdump binary as part of their "Network/Security Tools" package:
-
- http://www.sco.com/technology/internet/goodies/#SECURITY
-
-There is also a README that explains how to enable packet capture.
-
-If you use UnixWare, you will not be able to build libpcap from this
-release. We hope to support this operating system in some future
-release of libpcap. Meanwhile, there appears to be an UnixWare port of
-libpcap 0.0 (and tcpdump 3.0) in:
-
- ftp://ftp1.freebird.org/pub/mirror/freebird/internet/systools/
-
-UnixWare appears to use a hacked version of DLPI.
-
-If linking tcpdump fails with "Undefined: _alloca" when using bison on
-a Sun4, your version of bison is broken. In any case version 1.16 or
-higher is recommended (1.14 is known to cause problems 1.16 is known to
-work). Either pick up a current version from:
-
- ftp://prep.ai.mit.edu/pub/gnu/bison.tar.gz
-
-or hack around it by inserting the lines:
-
- #ifdef __GNUC__
- #define alloca __builtin_alloca
- #else
- #ifdef sparc
- #include <alloca.h>
- #else
- char *alloca ();
- #endif
- #endif
-
-right after the (100 line!) GNU license comment in bison.simple, remove
-grammar.[co] and fire up make again.
-
-If you use SunOS 4, your kernel must support streams NIT. If you run a
-libpcap program and it dies with:
-
- /dev/nit: No such device
-
-You must add streams NIT support to your kernel configuration, run
-config and boot the new kernel.
-
-If you are running a version of SunOS earlier than 4.1, you will need
-to replace the Sun supplied /sys/sun{3,4,4c}/OBJ/nit_if.o with the
-appropriate version from this distribution's SUNOS4 subdirectory and
-build a new kernel:
-
- nit_if.o.sun3-sunos4 (any flavor of sun3)
- nit_if.o.sun4c-sunos4.0.3c (SS1, SS1+, IPC, SLC, etc.)
- nit_if.o.sun4-sunos4 (Sun4's not covered by
- nit_if.o.sun4c-sunos4.0.3c)
-
-These nit replacements fix a bug that makes nit essentially unusable in
-pre-SunOS 4.1. In addition, our sun4c-sunos4.0.3c nit gives you
-timestamps to the resolution of the SS-1 clock (1 us) rather than the
-lousy 20ms timestamps Sun gives you (tcpdump will print out the full
-timestamp resolution if it finds it's running on a SS-1).
-
-FILES
------
-CHANGES - description of differences between releases
-FILES - list of files exported as part of the distribution
-INSTALL - this file
-Makefile.in - compilation rules (input to the configure script)
-README - description of distribution
-SUNOS4 - pre-SunOS 4.1 replacement kernel nit modules
-VERSION - version of this release
-aclocal.m4 - autoconf macros
-bpf/net - copies of bpf_filter.c and bpf.h
-bpf_filter.c - symlink to bpf/net/bpf_filter.c
-bpf_image.c - bpf disassembly routine
-config.guess - autoconf support
-config.sub - autoconf support
-configure - configure script (run this first)
-configure.in - configure script source
-etherent.c - /etc/ethers support routines
-ethertype.h - ethernet protocol types and names definitions
-gencode.c - bpf code generation routines
-gencode.h - bpf code generation definitions
-grammar.y - filter string grammar
-inet.c - network routines
-install-sh - BSD style install script
-lbl/gnuc.h - gcc macros and defines
-lbl/os-*.h - os dependent defines and prototypes
-linux-include/* - network include files missing on Linux
-mkdep - construct Makefile dependency list
-nametoaddr.c - hostname to address routines
-net - symlink to bpf/net
-optimize.c - bpf optimization routines
-pcap-bpf.c - BSD Packet Filter support
-pcap-dlpi.c - Data Link Provider Interface support
-pcap-enet.c - enet support
-pcap-int.h - internal libpcap definitions
-pcap-namedb.h - public libpcap name database definitions
-pcap-nit.c - Network Interface Tap support
-pcap-nit.h - Network Interface Tap definitions
-pcap-null.c - dummy monitor support (allows offline use of libpcap)
-pcap-pf.c - Packet Filter support
-pcap-pf.h - Packet Filter definitions
-pcap-snit.c - Streams based Network Interface Tap support
-pcap-snoop.c - Snoop network monitoring support
-pcap.3 - manual entry
-pcap.c - pcap utility routines
-pcap.h - public libpcap definitions
-ppp.h - Point to Point Protocol definitions
-savefile.c - offline support
-scanner.l - filter string scanner
diff --git a/libpcap/Makefile.am b/libpcap/Makefile.am
deleted file mode 100644
index e3c60d5..0000000
--- a/libpcap/Makefile.am
+++ b/dev/null
@@ -1,31 +0,0 @@
-noinst_LIBRARIES=libpcap.a
-libpcap_a_SOURCES=pcap.c inet.c gencode.c optimize.c nametoaddr.c \
- etherent.c savefile.c bpf_filter.c bpf_image.c \
- grammar.c scanner.c \
- pcap-@V_PCAP@.c
-noinst_HEADERS=pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \
- ethertype.h gencode.h ppp.h tokdefs.h
-INCLUDES = -I$(srcdir)/lbl @INCLUDES@
-man_MANS=pcap.3
-
-PCAP_SRC= pcap-bpf.c pcap-dlpi.c pcap-enet.c pcap-linux.c \
- pcap-nit.c pcap-null.c pcap-pf.c pcap-snit.c pcap-snoop.c
-
-BUILT_SOURCES=grammar.c scanner.c
-EXTRA_DIST=grammar.y scanner.l $(BUILT_SOURCES) tokdefs.h \
- linux-include CHANGES FILES \
- README VERSION $(PCAP_SRC) lbl net $(man_MANS) \
- COPYING
-
-YLWRAP=$(SHELL) $(top_srcdir)/ylwrap
-CLEANFILES=lex.yy.c y.tab.c y.tab.h
-
-grammar.c tokdefs.h: $(srcdir)/grammar.y
- $(YLWRAP) "$(YACC)" $(srcdir)/grammar.y \
- y.tab.c grammar.c y.tab.h tokdefs.h \
- -- -yy pcap_ -vd
-
-scanner.c: $(srcdir)/scanner.l
- $(YLWRAP) "$(LEX)" $(srcdir)/scanner.l \
- lex.yy.c scanner.c -- -yy pcap_
-
diff --git a/libpcap/README b/libpcap/README
deleted file mode 100644
index 1d9b503..0000000
--- a/libpcap/README
+++ b/dev/null
@@ -1,49 +0,0 @@
-@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/README,v 1.1 2001/05/31 13:40:52 gray Exp $ (LBL)
-
-LIBPCAP 0.4
-Lawrence Berkeley National Laboratory
-Network Research Group
-libpcap@ee.lbl.gov
-ftp://ftp.ee.lbl.gov/libpcap.tar.Z
-
-This directory contains source code for libpcap, a system-independent
-interface for user-level packet capture. libpcap provides a portable
-framework for low-level network monitoring. Applications include
-network statistics collection, security monitoring, network debugging,
-etc. Since almost every system vendor provides a different interface
-for packet capture, and since we've developed several tools that
-require this functionality, we've created this system-independent API
-to ease in porting and to alleviate the need for several
-system-dependent packet capture modules in each application.
-
-Note well: this interface is new and is likely to change.
-
-The libpcap interface supports a filtering mechanism based on the
-architecture in the BSD packet filter. BPF is described in the 1993
-Winter Usenix paper ``The BSD Packet Filter: A New Architecture for
-User-level Packet Capture''. A compressed postscript version is in:
-
- ftp://ftp.ee.lbl.gov/papers/bpf-usenix93.ps.Z.
-
-Although most packet capture interfaces support in-kernel filtering,
-libpcap utilizes in-kernel filtering only for the BPF interface.
-On systems that don't have BPF, all packets are read into user-space
-and the BPF filters are evaluated in the libpcap library, incurring
-added overhead (especially, for selective filters). Ideally, libpcap
-would translate BPF filters into a filter program that is compatible
-with the underlying kernel subsystem, but this is not yet implemented.
-
-BPF is standard in 4.4BSD, BSD/386, NetBSD, and FreeBSD. DEC OSF/1
-uses the packetfilter interface but has been extended to accept BPF
-filters (which libpcap utilizes). Also, you can add BPF filter support
-to Ultrix using the kernel source and/or object patches available in:
-
- ftp://gatekeeper.dec.com/pub/DEC/net/bpfext42.tar.Z.
-
-Problems, bugs, questions, desirable enhancements, source code
-contributions, etc., should be sent to the email address
-"libpcap@ee.lbl.gov".
-
- - Steve McCanne
- Craig Leres
- Van Jacobson
diff --git a/libpcap/VERSION b/libpcap/VERSION
deleted file mode 100644
index bd73f47..0000000
--- a/libpcap/VERSION
+++ b/dev/null
@@ -1 +0,0 @@
-0.4
diff --git a/libpcap/bpf_filter.c b/libpcap/bpf_filter.c
deleted file mode 100644
index ea93b23..0000000
--- a/libpcap/bpf_filter.c
+++ b/dev/null
@@ -1,532 +0,0 @@
-/*-
- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
- * The Regents of the University of California. All rights reserved.
- *
- * This code is derived from the Stanford/CMU enet packet filter,
- * (net/enet.c) distributed as part of 4.3BSD, and code contributed
- * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
- * Berkeley Laboratory.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)bpf.c 7.5 (Berkeley) 7/15/91
- */
-
-#if !(defined(lint) || defined(KERNEL))
-static const char rcsid[] =
- "@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/bpf_filter.c,v 1.1 2001/05/31 13:40:52 gray Exp $ (LBL)";
-#endif
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <net/bpf.h>
-
-#ifndef KERNEL
-#include <stdlib.h>
-#endif
-
-#define int32 bpf_int32
-#define u_int32 bpf_u_int32
-
-#ifndef LBL_ALIGN
-#if defined(sparc) || defined(mips) || defined(ibm032) || \
- defined(__alpha) || defined(__hpux)
-#define LBL_ALIGN
-#endif
-#endif
-
-#ifndef LBL_ALIGN
-#include <netinet/in.h>
-
-#define EXTRACT_SHORT(p) ((u_short)ntohs(*(u_short *)p))
-#define EXTRACT_LONG(p) (ntohl(*(u_int32 *)p))
-#else
-#define EXTRACT_SHORT(p)\
- ((u_short)\
- ((u_short)*((u_char *)p+0)<<8|\
- (u_short)*((u_char *)p+1)<<0))
-#define EXTRACT_LONG(p)\
- ((u_int32)*((u_char *)p+0)<<24|\
- (u_int32)*((u_char *)p+1)<<16|\
- (u_int32)*((u_char *)p+2)<<8|\
- (u_int32)*((u_char *)p+3)<<0)
-#endif
-
-#ifdef KERNEL
-#include <sys/mbuf.h>
-#define MINDEX(len, m, k) \
-{ \
- len = m->m_len; \
- while (k >= len) { \
- k -= len; \
- m = m->m_next; \
- if (m == 0) \
- return 0; \
- len = m->m_len; \
- } \
-}
-
-static int
-m_xword(m, k, err)
- register struct mbuf *m;
- register int k, *err;
-{
- register int len;
- register u_char *cp, *np;
- register struct mbuf *m0;
-
- MINDEX(len, m, k);
- cp = mtod(m, u_char *) + k;
- if (len - k >= 4) {
- *err = 0;
- return EXTRACT_LONG(cp);
- }
- m0 = m->m_next;
- if (m0 == 0 || m0->m_len + len - k < 4)
- goto bad;
- *err = 0;
- np = mtod(m0, u_char *);
- switch (len - k) {
-
- case 1:
- return (cp[0] << 24) | (np[0] << 16) | (np[1] << 8) | np[2];
-
- case 2:
- return (cp[0] << 24) | (cp[1] << 16) | (np[0] << 8) | np[1];
-
- default:
- return (cp[0] << 24) | (cp[1] << 16) | (cp[2] << 8) | np[0];
- }
- bad:
- *err = 1;
- return 0;
-}
-
-static int
-m_xhalf(m, k, err)
- register struct mbuf *m;
- register int k, *err;
-{
- register int len;
- register u_char *cp;
- register struct mbuf *m0;
-
- MINDEX(len, m, k);
- cp = mtod(m, u_char *) + k;
- if (len - k >= 2) {
- *err = 0;
- return EXTRACT_SHORT(cp);
- }
- m0 = m->m_next;
- if (m0 == 0)
- goto bad;
- *err = 0;
- return (cp[0] << 8) | mtod(m0, u_char *)[0];
- bad:
- *err = 1;
- return 0;
-}
-#endif
-
-/*
- * Execute the filter program starting at pc on the packet p
- * wirelen is the length of the original packet
- * buflen is the amount of data present
- */
-u_int
-bpf_filter(pc, p, wirelen, buflen)
- register struct bpf_insn *pc;
- register u_char *p;
- u_int wirelen;
- register u_int buflen;
-{
- register u_int32 A, X;
- register int k;
- int32 mem[BPF_MEMWORDS];
-
- if (pc == 0)
- /*
- * No filter means accept all.
- */
- return (u_int)-1;
- A = 0;
- X = 0;
- --pc;
- while (1) {
- ++pc;
- switch (pc->code) {
-
- default:
-#ifdef KERNEL
- return 0;
-#else
- abort();
-#endif
- case BPF_RET|BPF_K:
- return (u_int)pc->k;
-
- case BPF_RET|BPF_A:
- return (u_int)A;
-
- case BPF_LD|BPF_W|BPF_ABS:
- k = pc->k;
- if (k + sizeof(int32) > buflen) {
-#ifdef KERNEL
- int merr;
-
- if (buflen != 0)
- return 0;
- A = m_xword((struct mbuf *)p, k, &merr);
- if (merr != 0)
- return 0;
- continue;
-#else
- return 0;
-#endif
- }
- A = EXTRACT_LONG(&p[k]);
- continue;
-
- case BPF_LD|BPF_H|BPF_ABS:
- k = pc->k;
- if (k + sizeof(short) > buflen) {
-#ifdef KERNEL
- int merr;
-
- if (buflen != 0)
- return 0;
- A = m_xhalf((struct mbuf *)p, k, &merr);
- continue;
-#else
- return 0;
-#endif
- }
- A = EXTRACT_SHORT(&p[k]);
- continue;
-
- case BPF_LD|BPF_B|BPF_ABS:
- k = pc->k;
- if (k >= buflen) {
-#ifdef KERNEL
- register struct mbuf *m;
- register int len;
-
- if (buflen != 0)
- return 0;
- m = (struct mbuf *)p;
- MINDEX(len, m, k);
- A = mtod(m, u_char *)[k];
- continue;
-#else
- return 0;
-#endif
- }
- A = p[k];
- continue;
-
- case BPF_LD|BPF_W|BPF_LEN:
- A = wirelen;
- continue;
-
- case BPF_LDX|BPF_W|BPF_LEN:
- X = wirelen;
- continue;
-
- case BPF_LD|BPF_W|BPF_IND:
- k = X + pc->k;
- if (k + sizeof(int32) > buflen) {
-#ifdef KERNEL
- int merr;
-
- if (buflen != 0)
- return 0;
- A = m_xword((struct mbuf *)p, k, &merr);
- if (merr != 0)
- return 0;
- continue;
-#else
- return 0;
-#endif
- }
- A = EXTRACT_LONG(&p[k]);
- continue;
-
- case BPF_LD|BPF_H|BPF_IND:
- k = X + pc->k;
- if (k + sizeof(short) > buflen) {
-#ifdef KERNEL
- int merr;
-
- if (buflen != 0)
- return 0;
- A = m_xhalf((struct mbuf *)p, k, &merr);
- if (merr != 0)
- return 0;
- continue;
-#else
- return 0;
-#endif
- }
- A = EXTRACT_SHORT(&p[k]);
- continue;
-
- case BPF_LD|BPF_B|BPF_IND:
- k = X + pc->k;
- if (k >= buflen) {
-#ifdef KERNEL
- register struct mbuf *m;
- register int len;
-
- if (buflen != 0)
- return 0;
- m = (struct mbuf *)p;
- MINDEX(len, m, k);
- A = mtod(m, u_char *)[k];
- continue;
-#else
- return 0;
-#endif
- }
- A = p[k];
- continue;
-
- case BPF_LDX|BPF_MSH|BPF_B:
- k = pc->k;
- if (k >= buflen) {
-#ifdef KERNEL
- register struct mbuf *m;
- register int len;
-
- if (buflen != 0)
- return 0;
- m = (struct mbuf *)p;
- MINDEX(len, m, k);
- X = (mtod(m, char *)[k] & 0xf) << 2;
- continue;
-#else
- return 0;
-#endif
- }
- X = (p[pc->k] & 0xf) << 2;
- continue;
-
- case BPF_LD|BPF_IMM:
- A = pc->k;
- continue;
-
- case BPF_LDX|BPF_IMM:
- X = pc->k;
- continue;
-
- case BPF_LD|BPF_MEM:
- A = mem[pc->k];
- continue;
-
- case BPF_LDX|BPF_MEM:
- X = mem[pc->k];
- continue;
-
- case BPF_ST:
- mem[pc->k] = A;
- continue;
-
- case BPF_STX:
- mem[pc->k] = X;
- continue;
-
- case BPF_JMP|BPF_JA:
- pc += pc->k;
- continue;
-
- case BPF_JMP|BPF_JGT|BPF_K:
- pc += (A > pc->k) ? pc->jt : pc->jf;
- continue;
-
- case BPF_JMP|BPF_JGE|BPF_K:
- pc += (A >= pc->k) ? pc->jt : pc->jf;
- continue;
-
- case BPF_JMP|BPF_JEQ|BPF_K:
- pc += (A == pc->k) ? pc->jt : pc->jf;
- continue;
-
- case BPF_JMP|BPF_JSET|BPF_K:
- pc += (A & pc->k) ? pc->jt : pc->jf;
- continue;
-
- case BPF_JMP|BPF_JGT|BPF_X:
- pc += (A > X) ? pc->jt : pc->jf;
- continue;
-
- case BPF_JMP|BPF_JGE|BPF_X:
- pc += (A >= X) ? pc->jt : pc->jf;
- continue;
-
- case BPF_JMP|BPF_JEQ|BPF_X:
- pc += (A == X) ? pc->jt : pc->jf;
- continue;
-
- case BPF_JMP|BPF_JSET|BPF_X:
- pc += (A & X) ? pc->jt : pc->jf;
- continue;
-
- case BPF_ALU|BPF_ADD|BPF_X:
- A += X;
- continue;
-
- case BPF_ALU|BPF_SUB|BPF_X:
- A -= X;
- continue;
-
- case BPF_ALU|BPF_MUL|BPF_X:
- A *= X;
- continue;
-
- case BPF_ALU|BPF_DIV|BPF_X:
- if (X == 0)
- return 0;
- A /= X;
- continue;
-
- case BPF_ALU|BPF_AND|BPF_X:
- A &= X;
- continue;
-
- case BPF_ALU|BPF_OR|BPF_X:
- A |= X;
- continue;
-
- case BPF_ALU|BPF_LSH|BPF_X:
- A <<= X;
- continue;
-
- case BPF_ALU|BPF_RSH|BPF_X:
- A >>= X;
- continue;
-
- case BPF_ALU|BPF_ADD|BPF_K:
- A += pc->k;
- continue;
-
- case BPF_ALU|BPF_SUB|BPF_K:
- A -= pc->k;
- continue;
-
- case BPF_ALU|BPF_MUL|BPF_K:
- A *= pc->k;
- continue;
-
- case BPF_ALU|BPF_DIV|BPF_K:
- A /= pc->k;
- continue;
-
- case BPF_ALU|BPF_AND|BPF_K:
- A &= pc->k;
- continue;
-
- case BPF_ALU|BPF_OR|BPF_K:
- A |= pc->k;
- continue;
-
- case BPF_ALU|BPF_LSH|BPF_K:
- A <<= pc->k;
- continue;
-
- case BPF_ALU|BPF_RSH|BPF_K:
- A >>= pc->k;
- continue;
-
- case BPF_ALU|BPF_NEG:
- A = -A;
- continue;
-
- case BPF_MISC|BPF_TAX:
- X = A;
- continue;
-
- case BPF_MISC|BPF_TXA:
- A = X;
- continue;
- }
- }
-}
-
-#ifdef KERNEL
-/*
- * Return true if the 'fcode' is a valid filter program.
- * The constraints are that each jump be forward and to a valid
- * code. The code must terminate with either an accept or reject.
- * 'valid' is an array for use by the routine (it must be at least
- * 'len' bytes long).
- *
- * The kernel needs to be able to verify an application's filter code.
- * Otherwise, a bogus program could easily crash the system.
- */
-int
-bpf_validate(f, len)
- struct bpf_insn *f;
- int len;
-{
- register int i;
- register struct bpf_insn *p;
-
- for (i = 0; i < len; ++i) {
- /*
- * Check that that jumps are forward, and within
- * the code block.
- */
- p = &f[i];
- if (BPF_CLASS(p->code) == BPF_JMP) {
- register int from = i + 1;
-
- if (BPF_OP(p->code) == BPF_JA) {
- if (from + p->k >= (unsigned)len)
- return 0;
- }
- else if (from + p->jt >= len || from + p->jf >= len)
- return 0;
- }
- /*
- * Check that memory operations use valid addresses.
- */
- if ((BPF_CLASS(p->code) == BPF_ST ||
- (BPF_CLASS(p->code) == BPF_LD &&
- (p->code & 0xe0) == BPF_MEM)) &&
- (p->k >= BPF_MEMWORDS || p->k < 0))
- return 0;
- /*
- * Check for constant division by 0.
- */
- if (p->code == (BPF_ALU|BPF_DIV|BPF_K) && p->k == 0)
- return 0;
- }
- return BPF_CLASS(f[len - 1].code) == BPF_RET;
-}
-#endif
diff --git a/libpcap/bpf_image.c b/libpcap/bpf_image.c
deleted file mode 100644
index c3f51ac..0000000
--- a/libpcap/bpf_image.c
+++ b/dev/null
@@ -1,292 +0,0 @@
-/*
- * Copyright (c) 1990, 1991, 1992, 1994, 1995, 1996
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/bpf_image.c,v 1.1 2001/05/31 13:40:52 gray Exp $ (LBL)";
-#endif
-
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/time.h>
-
-#include <stdio.h>
-#include <string.h>
-
-#include <pcap-int.h>
-
-#include <gnuc.h>
-#ifdef HAVE_OS_PROTO_H
-#include <os-proto.h>
-#endif
-
-char *
-bpf_image(p, n)
- struct bpf_insn *p;
- int n;
-{
- int v;
- char *fmt, *op;
- static char image[256];
- char operand[64];
-
- v = p->k;
- switch (p->code) {
-
- default:
- op = "unimp";
- fmt = "0x%x";
- v = p->code;
- break;
-
- case BPF_RET|BPF_K:
- op = "ret";
- fmt = "#%d";
- break;
-
- case BPF_RET|BPF_A:
- op = "ret";
- fmt = "";
- break;
-
- case BPF_LD|BPF_W|BPF_ABS:
- op = "ld";
- fmt = "[%d]";
- break;
-
- case BPF_LD|BPF_H|BPF_ABS:
- op = "ldh";
- fmt = "[%d]";
- break;
-
- case BPF_LD|BPF_B|BPF_ABS:
- op = "ldb";
- fmt = "[%d]";
- break;
-
- case BPF_LD|BPF_W|BPF_LEN:
- op = "ld";
- fmt = "#pktlen";
- break;
-
- case BPF_LD|BPF_W|BPF_IND:
- op = "ld";
- fmt = "[x + %d]";
- break;
-
- case BPF_LD|BPF_H|BPF_IND:
- op = "ldh";
- fmt = "[x + %d]";
- break;
-
- case BPF_LD|BPF_B|BPF_IND:
- op = "ldb";
- fmt = "[x + %d]";
- break;
-
- case BPF_LD|BPF_IMM:
- op = "ld";
- fmt = "#0x%x";
- break;
-
- case BPF_LDX|BPF_IMM:
- op = "ldx";
- fmt = "#0x%x";
- break;
-
- case BPF_LDX|BPF_MSH|BPF_B:
- op = "ldxb";
- fmt = "4*([%d]&0xf)";
- break;
-
- case BPF_LD|BPF_MEM:
- op = "ld";
- fmt = "M[%d]";
- break;
-
- case BPF_LDX|BPF_MEM:
- op = "ldx";
- fmt = "M[%d]";
- break;
-
- case BPF_ST:
- op = "st";
- fmt = "M[%d]";
- break;
-
- case BPF_STX:
- op = "stx";
- fmt = "M[%d]";
- break;
-
- case BPF_JMP|BPF_JA:
- op = "ja";
- fmt = "%d";
- v = n + 1 + p->k;
- break;
-
- case BPF_JMP|BPF_JGT|BPF_K:
- op = "jgt";
- fmt = "#0x%x";
- break;
-
- case BPF_JMP|BPF_JGE|BPF_K:
- op = "jge";
- fmt = "#0x%x";
- break;
-
- case BPF_JMP|BPF_JEQ|BPF_K:
- op = "jeq";
- fmt = "#0x%x";
- break;
-
- case BPF_JMP|BPF_JSET|BPF_K:
- op = "jset";
- fmt = "#0x%x";
- break;
-
- case BPF_JMP|BPF_JGT|BPF_X:
- op = "jgt";
- fmt = "x";
- break;
-
- case BPF_JMP|BPF_JGE|BPF_X:
- op = "jge";
- fmt = "x";
- break;
-
- case BPF_JMP|BPF_JEQ|BPF_X:
- op = "jeq";
- fmt = "x";
- break;
-
- case BPF_JMP|BPF_JSET|BPF_X:
- op = "jset";
- fmt = "x";
- break;
-
- case BPF_ALU|BPF_ADD|BPF_X:
- op = "add";
- fmt = "x";
- break;
-
- case BPF_ALU|BPF_SUB|BPF_X:
- op = "sub";
- fmt = "x";
- break;
-
- case BPF_ALU|BPF_MUL|BPF_X:
- op = "mul";
- fmt = "x";
- break;
-
- case BPF_ALU|BPF_DIV|BPF_X:
- op = "div";
- fmt = "x";
- break;
-
- case BPF_ALU|BPF_AND|BPF_X:
- op = "and";
- fmt = "x";
- break;
-
- case BPF_ALU|BPF_OR|BPF_X:
- op = "or";
- fmt = "x";
- break;
-
- case BPF_ALU|BPF_LSH|BPF_X:
- op = "lsh";
- fmt = "x";
- break;
-
- case BPF_ALU|BPF_RSH|BPF_X:
- op = "rsh";
- fmt = "x";
- break;
-
- case BPF_ALU|BPF_ADD|BPF_K:
- op = "add";
- fmt = "#%d";
- break;
-
- case BPF_ALU|BPF_SUB|BPF_K:
- op = "sub";
- fmt = "#%d";
- break;
-
- case BPF_ALU|BPF_MUL|BPF_K:
- op = "mul";
- fmt = "#%d";
- break;
-
- case BPF_ALU|BPF_DIV|BPF_K:
- op = "div";
- fmt = "#%d";
- break;
-
- case BPF_ALU|BPF_AND|BPF_K:
- op = "and";
- fmt = "#0x%x";
- break;
-
- case BPF_ALU|BPF_OR|BPF_K:
- op = "or";
- fmt = "#0x%x";
- break;
-
- case BPF_ALU|BPF_LSH|BPF_K:
- op = "lsh";
- fmt = "#%d";
- break;
-
- case BPF_ALU|BPF_RSH|BPF_K:
- op = "rsh";
- fmt = "#%d";
- break;
-
- case BPF_ALU|BPF_NEG:
- op = "neg";
- fmt = "";
- break;
-
- case BPF_MISC|BPF_TAX:
- op = "tax";
- fmt = "";
- break;
-
- case BPF_MISC|BPF_TXA:
- op = "txa";
- fmt = "";
- break;
- }
- (void)sprintf(operand, fmt, v);
- (void)sprintf(image,
- (BPF_CLASS(p->code) == BPF_JMP &&
- BPF_OP(p->code) != BPF_JA) ?
- "(%03d) %-8s %-16s jt %d\tjf %d"
- : "(%03d) %-8s %s",
- n, op, operand, n + 1 + p->jt, n + 1 + p->jf);
- return image;
-}
diff --git a/libpcap/etherent.c b/libpcap/etherent.c
deleted file mode 100644
index 422cb6e..0000000
--- a/libpcap/etherent.c
+++ b/dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 1990, 1993, 1994, 1995, 1996
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/etherent.c,v 1.1 2001/05/31 13:40:52 gray Exp $ (LBL)";
-#endif
-
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-
-#include <ctype.h>
-#include <memory.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <pcap-int.h>
-
-#include <pcap-namedb.h>
-
-#include <gnuc.h>
-#ifdef HAVE_OS_PROTO_H
-#include <os-proto.h>
-#endif
-
-static inline int xdtoi(int);
-static inline int skip_space(FILE *);
-static inline int skip_line(FILE *);
-
-/* Hex digit to integer. */
-static inline int
-xdtoi(c)
- register int c;
-{
- if (isdigit(c))
- return c - '0';
- else if (islower(c))
- return c - 'a' + 10;
- else
- return c - 'A' + 10;
-}
-
-static inline int
-skip_space(f)
- FILE *f;
-{
- int c;
-
- do {
- c = getc(f);
- } while (isspace(c) && c != '\n');
-
- return c;
-}
-
-static inline int
-skip_line(f)
- FILE *f;
-{
- int c;
-
- do
- c = getc(f);
- while (c != '\n' && c != EOF);
-
- return c;
-}
-
-struct pcap_etherent *
-pcap_next_etherent(FILE *fp)
-{
- register int c, d, i;
- char *bp;
- static struct pcap_etherent e;
-
- memset((char *)&e, 0, sizeof(e));
- do {
- /* Find addr */
- c = skip_space(fp);
- if (c == '\n')
- continue;
-
- /* If this is a comment, or first thing on line
- cannot be etehrnet address, skip the line. */
- if (!isxdigit(c)) {
- c = skip_line(fp);
- continue;
- }
-
- /* must be the start of an address */
- for (i = 0; i < 6; i += 1) {
- d = xdtoi(c);
- c = getc(fp);
- if (isxdigit(c)) {
- d <<= 4;
- d |= xdtoi(c);
- c = getc(fp);
- }
- e.addr[i] = d;
- if (c != ':')
- break;
- c = getc(fp);
- }
- if (c == EOF)
- break;
-
- /* Must be whitespace */
- if (!isspace(c)) {
- c = skip_line(fp);
- continue;
- }
- c = skip_space(fp);
-
- /* hit end of line... */
- if (c == '\n')
- continue;
-
- if (c == '#') {
- c = skip_line(fp);
- continue;
- }
-
- /* pick up name */
- bp = e.name;
- /* Use 'd' to prevent buffer overflow. */
- d = sizeof(e.name) - 1;
- do {
- *bp++ = c;
- c = getc(fp);
- } while (!isspace(c) && c != EOF && --d > 0);
- *bp = '\0';
-
- /* Eat trailing junk */
- if (c != '\n')
- (void)skip_line(fp);
-
- return &e;
-
- } while (c != EOF);
-
- return (NULL);
-}
diff --git a/libpcap/ethertype.h b/libpcap/ethertype.h
deleted file mode 100644
index 785c5fe..0000000
--- a/libpcap/ethertype.h
+++ b/dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 1993, 1994, 1996
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/ethertype.h,v 1.1 2001/05/31 13:40:52 gray Exp $ (LBL)
- */
-
-/* Types missing from some systems */
-
-#ifndef ETHERTYPE_NS
-#define ETHERTYPE_NS 0x0600
-#endif
-#ifndef ETHERTYPE_SPRITE
-#define ETHERTYPE_SPRITE 0x0500
-#endif
-#ifndef ETHERTYPE_TRAIL
-#define ETHERTYPE_TRAIL 0x1000
-#endif
-#ifndef ETHERTYPE_MOPDL
-#define ETHERTYPE_MOPDL 0x6001
-#endif
-#ifndef ETHERTYPE_MOPRC
-#define ETHERTYPE_MOPRC 0x6002
-#endif
-#ifndef ETHERTYPE_DN
-#define ETHERTYPE_DN 0x6003
-#endif
-#ifndef ETHERTYPE_LAT
-#define ETHERTYPE_LAT 0x6004
-#endif
-#ifndef ETHERTYPE_SCA
-#define ETHERTYPE_SCA 0x6007
-#endif
-#ifndef ETHERTYPE_REVARP
-#define ETHERTYPE_REVARP 0x8035
-#endif
-#ifndef ETHERTYPE_LANBRIDGE
-#define ETHERTYPE_LANBRIDGE 0x8038
-#endif
-#ifndef ETHERTYPE_DECDNS
-#define ETHERTYPE_DECDNS 0x803c
-#endif
-#ifndef ETHERTYPE_DECDTS
-#define ETHERTYPE_DECDTS 0x803e
-#endif
-#ifndef ETHERTYPE_VEXP
-#define ETHERTYPE_VEXP 0x805b
-#endif
-#ifndef ETHERTYPE_VPROD
-#define ETHERTYPE_VPROD 0x805c
-#endif
-#ifndef ETHERTYPE_ATALK
-#define ETHERTYPE_ATALK 0x809b
-#endif
-#ifndef ETHERTYPE_AARP
-#define ETHERTYPE_AARP 0x80f3
-#endif
-#ifndef ETHERTYPE_LOOPBACK
-#define ETHERTYPE_LOOPBACK 0x9000
-#endif
diff --git a/libpcap/gencode.c b/libpcap/gencode.c
deleted file mode 100644
index 8febdcb..0000000
--- a/libpcap/gencode.c
+++ b/dev/null
@@ -1,1948 +0,0 @@
-/*
- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/gencode.c,v 1.1 2001/05/31 13:40:52 gray Exp $ (LBL)";
-#endif
-
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-
-#if __STDC__
-struct mbuf;
-struct rtentry;
-#endif
-
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-
-#include <stdlib.h>
-#include <memory.h>
-#include <setjmp.h>
-#if __STDC__
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-#include <pcap-int.h>
-
-#include <ethertype.h>
-#include <gencode.h>
-#include <ppp.h>
-#include <pcap-namedb.h>
-
-#include <gnuc.h>
-#ifdef HAVE_OS_PROTO_H
-#include <os-proto.h>
-#endif
-
-#define JMP(c) ((c)|BPF_JMP|BPF_K)
-
-/* Locals */
-static jmp_buf top_ctx;
-static pcap_t *bpf_pcap;
-
-/* XXX */
-#ifdef PCAP_FDDIPAD
-int pcap_fddipad = PCAP_FDDIPAD;
-#else
-int pcap_fddipad;
-#endif
-
-/* VARARGS */
-__dead void
-#if __STDC__
-bpf_error(const char *fmt, ...)
-#else
-bpf_error(fmt, va_alist)
- const char *fmt;
- va_dcl
-#endif
-{
- va_list ap;
-
-#if __STDC__
- va_start(ap, fmt);
-#else
- va_start(ap);
-#endif
- if (bpf_pcap != NULL)
- (void)vsprintf(pcap_geterr(bpf_pcap), fmt, ap);
- va_end(ap);
- longjmp(top_ctx, 1);
- /* NOTREACHED */
-}
-
-static void init_linktype(int);
-
-static int alloc_reg(void);
-static void free_reg(int);
-
-static struct block *root;
-
-/*
- * We divy out chunks of memory rather than call malloc each time so
- * we don't have to worry about leaking memory. It's probably
- * not a big deal if all this memory was wasted but it this ever
- * goes into a library that would probably not be a good idea.
- */
-#define NCHUNKS 16
-#define CHUNK0SIZE 1024
-struct chunk {
- u_int n_left;
- void *m;
-};
-
-static struct chunk chunks[NCHUNKS];
-static int cur_chunk;
-
-static void *newchunk(u_int);
-static void freechunks(void);
-static inline struct block *new_block(int);
-static inline struct slist *new_stmt(int);
-static struct block *gen_retblk(int);
-static inline void syntax(void);
-
-static void backpatch(struct block *, struct block *);
-static void merge(struct block *, struct block *);
-static struct block *gen_cmp(u_int, u_int, bpf_int32);
-static struct block *gen_mcmp(u_int, u_int, bpf_int32, bpf_u_int32);
-static struct block *gen_bcmp(u_int, u_int, const u_char *);
-static struct block *gen_uncond(int);
-static inline struct block *gen_true(void);
-static inline struct block *gen_false(void);
-static struct block *gen_linktype(int);
-static struct block *gen_hostop(bpf_u_int32, bpf_u_int32, int, int, u_int, u_int);
-static struct block *gen_ehostop(const u_char *, int);
-static struct block *gen_fhostop(const u_char *, int);
-static struct block *gen_dnhostop(bpf_u_int32, int, u_int);
-static struct block *gen_host(bpf_u_int32, bpf_u_int32, int, int);
-static struct block *gen_gateway(const u_char *, bpf_u_int32 **, int, int);
-static struct block *gen_ipfrag(void);
-static struct block *gen_portatom(int, bpf_int32);
-struct block *gen_portop(int, int, int);
-static struct block *gen_port(int, int, int);
-static int lookup_proto(const char *, int);
-static struct block *gen_proto(int, int, int);
-static struct slist *xfer_to_x(struct arth *);
-static struct slist *xfer_to_a(struct arth *);
-static struct block *gen_len(int, int);
-
-static void *
-newchunk(n)
- u_int n;
-{
- struct chunk *cp;
- int k, size;
-
- /* XXX Round up to nearest long. */
- n = (n + sizeof(long) - 1) & ~(sizeof(long) - 1);
-
- cp = &chunks[cur_chunk];
- if (n > cp->n_left) {
- ++cp, k = ++cur_chunk;
- if (k >= NCHUNKS)
- bpf_error("out of memory");
- size = CHUNK0SIZE << k;
- cp->m = (void *)malloc(size);
- memset((char *)cp->m, 0, size);
- cp->n_left = size;
- if (n > size)
- bpf_error("out of memory");
- }
- cp->n_left -= n;
- return (void *)((char *)cp->m + cp->n_left);
-}
-
-static void
-freechunks()
-{
- int i;
-
- cur_chunk = 0;
- for (i = 0; i < NCHUNKS; ++i)
- if (chunks[i].m != NULL) {
- free(chunks[i].m);
- chunks[i].m = NULL;
- }
-}
-
-/*
- * A strdup whose allocations are freed after code generation is over.
- */
-char *
-sdup(s)
- register const char *s;
-{
- int n = strlen(s) + 1;
- char *cp = newchunk(n);
-
- strcpy(cp, s);
- return (cp);
-}
-
-static inline struct block *
-new_block(code)
- int code;
-{
- struct block *p;
-
- p = (struct block *)newchunk(sizeof(*p));
- p->s.code = code;
- p->head = p;
-
- return p;
-}
-
-static inline struct slist *
-new_stmt(code)
- int code;
-{
- struct slist *p;
-
- p = (struct slist *)newchunk(sizeof(*p));
- p->s.code = code;
-
- return p;
-}
-
-static struct block *
-gen_retblk(v)
- int v;
-{
- struct block *b = new_block(BPF_RET|BPF_K);
-
- b->s.k = v;
- return b;
-}
-
-static inline void
-syntax()
-{
- bpf_error("syntax error in filter expression");
-}
-
-static bpf_u_int32 netmask;
-static int snaplen;
-
-int
-pcap_compile(pcap_t *p, struct bpf_program *program,
- char *buf, int optimize, bpf_u_int32 mask)
-{
- extern int n_errors;
- int len;
-
- n_errors = 0;
- root = NULL;
- bpf_pcap = p;
- if (setjmp(top_ctx)) {
- freechunks();
- return (-1);
- }
-
- netmask = mask;
- snaplen = pcap_snapshot(p);
-
- lex_init(buf ? buf : "");
- init_linktype(pcap_datalink(p));
- (void)pcap_parse();
-
- if (n_errors)
- syntax();
-
- if (root == NULL)
- root = gen_retblk(snaplen);
-
- if (optimize) {
- bpf_optimize(&root);
- if (root == NULL ||
- (root->s.code == (BPF_RET|BPF_K) && root->s.k == 0))
- bpf_error("expression rejects all packets");
- }
- program->bf_insns = icode_to_fcode(root, &len);
- program->bf_len = len;
-
- freechunks();
- return (0);
-}
-
-/*
- * Backpatch the blocks in 'list' to 'target'. The 'sense' field indicates
- * which of the jt and jf fields has been resolved and which is a pointer
- * back to another unresolved block (or nil). At least one of the fields
- * in each block is already resolved.
- */
-static void
-backpatch(list, target)
- struct block *list, *target;
-{
- struct block *next;
-
- while (list) {
- if (!list->sense) {
- next = JT(list);
- JT(list) = target;
- } else {
- next = JF(list);
- JF(list) = target;
- }
- list = next;
- }
-}
-
-/*
- * Merge the lists in b0 and b1, using the 'sense' field to indicate
- * which of jt and jf is the link.
- */
-static void
-merge(b0, b1)
- struct block *b0, *b1;
-{
- register struct block **p = &b0;
-
- /* Find end of list. */
- while (*p)
- p = !((*p)->sense) ? &JT(*p) : &JF(*p);
-
- /* Concatenate the lists. */
- *p = b1;
-}
-
-void
-finish_parse(p)
- struct block *p;
-{
- backpatch(p, gen_retblk(snaplen));
- p->sense = !p->sense;
- backpatch(p, gen_retblk(0));
- root = p->head;
-}
-
-void
-gen_and(b0, b1)
- struct block *b0, *b1;
-{
- backpatch(b0, b1->head);
- b0->sense = !b0->sense;
- b1->sense = !b1->sense;
- merge(b1, b0);
- b1->sense = !b1->sense;
- b1->head = b0->head;
-}
-
-void
-gen_or(b0, b1)
- struct block *b0, *b1;
-{
- b0->sense = !b0->sense;
- backpatch(b0, b1->head);
- b0->sense = !b0->sense;
- merge(b1, b0);
- b1->head = b0->head;
-}
-
-void
-gen_not(b)
- struct block *b;
-{
- b->sense = !b->sense;
-}
-
-static struct block *
-gen_cmp(offset, size, v)
- u_int offset, size;
- bpf_int32 v;
-{
- struct slist *s;
- struct block *b;
-
- s = new_stmt(BPF_LD|BPF_ABS|size);
- s->s.k = offset;
-
- b = new_block(JMP(BPF_JEQ));
- b->stmts = s;
- b->s.k = v;
-
- return b;
-}
-
-static struct block *
-gen_mcmp(offset, size, v, mask)
- u_int offset, size;
- bpf_int32 v;
- bpf_u_int32 mask;
-{
- struct block *b = gen_cmp(offset, size, v);
- struct slist *s;
-
- if (mask != 0xffffffff) {
- s = new_stmt(BPF_ALU|BPF_AND|BPF_K);
- s->s.k = mask;
- b->stmts->next = s;
- }
- return b;
-}
-
-static struct block *
-gen_bcmp(offset, size, v)
- register u_int offset, size;
- register const u_char *v;
-{
- register struct block *b, *tmp;
-
- b = NULL;
- while (size >= 4) {
- register const u_char *p = &v[size - 4];
- bpf_int32 w = ((bpf_int32)p[0] << 24) |
- ((bpf_int32)p[1] << 16) | ((bpf_int32)p[2] << 8) | p[3];
-
- tmp = gen_cmp(offset + size - 4, BPF_W, w);
- if (b != NULL)
- gen_and(b, tmp);
- b = tmp;
- size -= 4;
- }
- while (size >= 2) {
- register const u_char *p = &v[size - 2];
- bpf_int32 w = ((bpf_int32)p[0] << 8) | p[1];
-
- tmp = gen_cmp(offset + size - 2, BPF_H, w);
- if (b != NULL)
- gen_and(b, tmp);
- b = tmp;
- size -= 2;
- }
- if (size > 0) {
- tmp = gen_cmp(offset, BPF_B, (bpf_int32)v[0]);
- if (b != NULL)
- gen_and(b, tmp);
- b = tmp;
- }
- return b;
-}
-
-/*
- * Various code constructs need to know the layout of the data link
- * layer. These variables give the necessary offsets. off_linktype
- * is set to -1 for no encapsulation, in which case, IP is assumed.
- */
-static u_int off_linktype;
-static u_int off_nl;
-static int linktype;
-
-static void
-init_linktype(type)
- int type;
-{
- linktype = type;
-
- switch (type) {
-
- case DLT_EN10MB:
- off_linktype = 12;
- off_nl = 14;
- return;
-
- case DLT_SLIP:
- /*
- * SLIP doesn't have a link level type. The 16 byte
- * header is hacked into our SLIP driver.
- */
- off_linktype = -1;
- off_nl = 16;
- return;
-
- case DLT_SLIP_BSDOS:
- /* XXX this may be the same as the DLT_PPP_BSDOS case */
- off_linktype = -1;
- /* XXX end */
- off_nl = 24;
- return;
-
- case DLT_NULL:
- off_linktype = 0;
- off_nl = 4;
- return;
-
- case DLT_PPP:
- off_linktype = 2;
- off_nl = 4;
- return;
-
- case DLT_PPP_BSDOS:
- off_linktype = 5;
- off_nl = 24;
- return;
-
- case DLT_FDDI:
- /*
- * FDDI doesn't really have a link-level type field.
- * We assume that SSAP = SNAP is being used and pick
- * out the encapsulated Ethernet type.
- */
- off_linktype = 19;
-#ifdef PCAP_FDDIPAD
- off_linktype += pcap_fddipad;
-#endif
- off_nl = 21;
-#ifdef PCAP_FDDIPAD
- off_nl += pcap_fddipad;
-#endif
- return;
-
- case DLT_IEEE802:
- off_linktype = 20;
- off_nl = 22;
- return;
-
- case DLT_ATM_RFC1483:
- /*
- * assume routed, non-ISO PDUs
- * (i.e., LLC = 0xAA-AA-03, OUT = 0x00-00-00)
- */
- off_linktype = 6;
- off_nl = 8;
- return;
-
- case DLT_RAW:
- off_linktype = -1;
- off_nl = 0;
- return;
- }
- bpf_error("unknown data link type 0x%x", linktype);
- /* NOTREACHED */
-}
-
-static struct block *
-gen_uncond(rsense)
- int rsense;
-{
- struct block *b;
- struct slist *s;
-
- s = new_stmt(BPF_LD|BPF_IMM);
- s->s.k = !rsense;
- b = new_block(JMP(BPF_JEQ));
- b->stmts = s;
-
- return b;
-}
-
-static inline struct block *
-gen_true()
-{
- return gen_uncond(1);
-}
-
-static inline struct block *
-gen_false()
-{
- return gen_uncond(0);
-}
-
-static struct block *
-gen_linktype(proto)
- register int proto;
-{
- struct block *b0, *b1;
-
- /* If we're not using encapsulation and checking for IP, we're done */
- if (off_linktype == -1 && proto == ETHERTYPE_IP)
- return gen_true();
-
- switch (linktype) {
-
- case DLT_SLIP:
- return gen_false();
-
- case DLT_PPP:
- if (proto == ETHERTYPE_IP)
- proto = PPP_IP; /* XXX was 0x21 */
- break;
-
- case DLT_PPP_BSDOS:
- switch (proto) {
-
- case ETHERTYPE_IP:
- b0 = gen_cmp(off_linktype, BPF_H, PPP_IP);
- b1 = gen_cmp(off_linktype, BPF_H, PPP_VJC);
- gen_or(b0, b1);
- b0 = gen_cmp(off_linktype, BPF_H, PPP_VJNC);
- gen_or(b1, b0);
- return b0;
-
- case ETHERTYPE_DN:
- proto = PPP_DECNET;
- break;
-
- case ETHERTYPE_ATALK:
- proto = PPP_APPLE;
- break;
-
- case ETHERTYPE_NS:
- proto = PPP_NS;
- break;
- }
- break;
-
- case DLT_NULL:
- /* XXX */
- if (proto == ETHERTYPE_IP)
- return (gen_cmp(0, BPF_W, (bpf_int32)htonl(AF_INET)));
- else
- return gen_false();
- }
- return gen_cmp(off_linktype, BPF_H, (bpf_int32)proto);
-}
-
-static struct block *
-gen_hostop(addr, mask, dir, proto, src_off, dst_off)
- bpf_u_int32 addr;
- bpf_u_int32 mask;
- int dir, proto;
- u_int src_off, dst_off;
-{
- struct block *b0, *b1;
- u_int offset;
-
- switch (dir) {
-
- case Q_SRC:
- offset = src_off;
- break;
-
- case Q_DST:
- offset = dst_off;
- break;
-
- case Q_AND:
- b0 = gen_hostop(addr, mask, Q_SRC, proto, src_off, dst_off);
- b1 = gen_hostop(addr, mask, Q_DST, proto, src_off, dst_off);
- gen_and(b0, b1);
- return b1;
-
- case Q_OR:
- case Q_DEFAULT:
- b0 = gen_hostop(addr, mask, Q_SRC, proto, src_off, dst_off);
- b1 = gen_hostop(addr, mask, Q_DST, proto, src_off, dst_off);
- gen_or(b0, b1);
- return b1;
-
- default:
- abort();
- }
- b0 = gen_linktype(proto);
- b1 = gen_mcmp(offset, BPF_W, (bpf_int32)addr, mask);
- gen_and(b0, b1);
- return b1;
-}
-
-static struct block *
-gen_ehostop(eaddr, dir)
- register const u_char *eaddr;
- register int dir;
-{
- register struct block *b0, *b1;
-
- switch (dir) {
- case Q_SRC:
- return gen_bcmp(6, 6, eaddr);
-
- case Q_DST:
- return gen_bcmp(0, 6, eaddr);
-
- case Q_AND:
- b0 = gen_ehostop(eaddr, Q_SRC);
- b1 = gen_ehostop(eaddr, Q_DST);
- gen_and(b0, b1);
- return b1;
-
- case Q_DEFAULT:
- case Q_OR:
- b0 = gen_ehostop(eaddr, Q_SRC);
- b1 = gen_ehostop(eaddr, Q_DST);
- gen_or(b0, b1);
- return b1;
- }
- abort();
- /* NOTREACHED */
-}
-
-/*
- * Like gen_ehostop, but for DLT_FDDI
- */
-static struct block *
-gen_fhostop(eaddr, dir)
- register const u_char *eaddr;
- register int dir;
-{
- struct block *b0, *b1;
-
- switch (dir) {
- case Q_SRC:
-#ifdef PCAP_FDDIPAD
- return gen_bcmp(6 + 1 + pcap_fddipad, 6, eaddr);
-#else
- return gen_bcmp(6 + 1, 6, eaddr);
-#endif
-
- case Q_DST:
-#ifdef PCAP_FDDIPAD
- return gen_bcmp(0 + 1 + pcap_fddipad, 6, eaddr);
-#else
- return gen_bcmp(0 + 1, 6, eaddr);
-#endif
-
- case Q_AND:
- b0 = gen_fhostop(eaddr, Q_SRC);
- b1 = gen_fhostop(eaddr, Q_DST);
- gen_and(b0, b1);
- return b1;
-
- case Q_DEFAULT:
- case Q_OR:
- b0 = gen_fhostop(eaddr, Q_SRC);
- b1 = gen_fhostop(eaddr, Q_DST);
- gen_or(b0, b1);
- return b1;
- }
- abort();
- /* NOTREACHED */
-}
-
-/*
- * This is quite tricky because there may be pad bytes in front of the
- * DECNET header, and then there are two possible data packet formats that
- * carry both src and dst addresses, plus 5 packet types in a format that
- * carries only the src node, plus 2 types that use a different format and
- * also carry just the src node.
- *
- * Yuck.
- *
- * Instead of doing those all right, we just look for data packets with
- * 0 or 1 bytes of padding. If you want to look at other packets, that
- * will require a lot more hacking.
- *
- * To add support for filtering on DECNET "areas" (network numbers)
- * one would want to add a "mask" argument to this routine. That would
- * make the filter even more inefficient, although one could be clever
- * and not generate masking instructions if the mask is 0xFFFF.
- */
-static struct block *
-gen_dnhostop(addr, dir, base_off)
- bpf_u_int32 addr;
- int dir;
- u_int base_off;
-{
- struct block *b0, *b1, *b2, *tmp;
- u_int offset_lh; /* offset if long header is received */
- u_int offset_sh; /* offset if short header is received */
-
- switch (dir) {
-
- case Q_DST:
- offset_sh = 1; /* follows flags */
- offset_lh = 7; /* flgs,darea,dsubarea,HIORD */
- break;
-
- case Q_SRC:
- offset_sh = 3; /* follows flags, dstnode */
- offset_lh = 15; /* flgs,darea,dsubarea,did,sarea,ssub,HIORD */
- break;
-
- case Q_AND:
- /* Inefficient because we do our Calvinball dance twice */
- b0 = gen_dnhostop(addr, Q_SRC, base_off);
- b1 = gen_dnhostop(addr, Q_DST, base_off);
- gen_and(b0, b1);
- return b1;
-
- case Q_OR:
- case Q_DEFAULT:
- /* Inefficient because we do our Calvinball dance twice */
- b0 = gen_dnhostop(addr, Q_SRC, base_off);
- b1 = gen_dnhostop(addr, Q_DST, base_off);
- gen_or(b0, b1);
- return b1;
-
- default:
- abort();
- }
- b0 = gen_linktype(ETHERTYPE_DN);
- /* Check for pad = 1, long header case */
- tmp = gen_mcmp(base_off + 2, BPF_H,
- (bpf_int32)ntohs(0x0681), (bpf_int32)ntohs(0x07FF));
- b1 = gen_cmp(base_off + 2 + 1 + offset_lh,
- BPF_H, (bpf_int32)ntohs(addr));
- gen_and(tmp, b1);
- /* Check for pad = 0, long header case */
- tmp = gen_mcmp(base_off + 2, BPF_B, (bpf_int32)0x06, (bpf_int32)0x7);
- b2 = gen_cmp(base_off + 2 + offset_lh, BPF_H, (bpf_int32)ntohs(addr));
- gen_and(tmp, b2);
- gen_or(b2, b1);
- /* Check for pad = 1, short header case */
- tmp = gen_mcmp(base_off + 2, BPF_H,
- (bpf_int32)ntohs(0x0281), (bpf_int32)ntohs(0x07FF));
- b2 = gen_cmp(base_off + 2 + 1 + offset_sh,
- BPF_H, (bpf_int32)ntohs(addr));
- gen_and(tmp, b2);
- gen_or(b2, b1);
- /* Check for pad = 0, short header case */
- tmp = gen_mcmp(base_off + 2, BPF_B, (bpf_int32)0x02, (bpf_int32)0x7);
- b2 = gen_cmp(base_off + 2 + offset_sh, BPF_H, (bpf_int32)ntohs(addr));
- gen_and(tmp, b2);
- gen_or(b2, b1);
-
- /* Combine with test for linktype */
- gen_and(b0, b1);
- return b1;
-}
-
-static struct block *
-gen_host(addr, mask, proto, dir)
- bpf_u_int32 addr;
- bpf_u_int32 mask;
- int proto;
- int dir;
-{
- struct block *b0, *b1;
-
- switch (proto) {
-
- case Q_DEFAULT:
- b0 = gen_host(addr, mask, Q_IP, dir);
- b1 = gen_host(addr, mask, Q_ARP, dir);
- gen_or(b0, b1);
- b0 = gen_host(addr, mask, Q_RARP, dir);
- gen_or(b1, b0);
- return b0;
-
- case Q_IP:
- return gen_hostop(addr, mask, dir, ETHERTYPE_IP,
- off_nl + 12, off_nl + 16);
-
- case Q_RARP:
- return gen_hostop(addr, mask, dir, ETHERTYPE_REVARP,
- off_nl + 14, off_nl + 24);
-
- case Q_ARP:
- return gen_hostop(addr, mask, dir, ETHERTYPE_ARP,
- off_nl + 14, off_nl + 24);
-
- case Q_TCP:
- bpf_error("'tcp' modifier applied to host");
-
- case Q_UDP:
- bpf_error("'udp' modifier applied to host");
-
- case Q_ICMP:
- bpf_error("'icmp' modifier applied to host");
-
- case Q_IGMP:
- bpf_error("'igmp' modifier applied to host");
-
- case Q_IGRP:
- bpf_error("'igrp' modifier applied to host");
-
- case Q_ATALK:
- bpf_error("ATALK host filtering not implemented");
-
- case Q_DECNET:
- return gen_dnhostop(addr, dir, off_nl);
-
- case Q_SCA:
- bpf_error("SCA host filtering not implemented");
-
- case Q_LAT:
- bpf_error("LAT host filtering not implemented");
-
- case Q_MOPDL:
- bpf_error("MOPDL host filtering not implemented");
-
- case Q_MOPRC:
- bpf_error("MOPRC host filtering not implemented");
-
- default:
- abort();
- }
- /* NOTREACHED */
-}
-
-static struct block *
-gen_gateway(eaddr, alist, proto, dir)
- const u_char *eaddr;
- bpf_u_int32 **alist;
- int proto;
- int dir;
-{
- struct block *b0, *b1, *tmp;
-
- if (dir != 0)
- bpf_error("direction applied to 'gateway'");
-
- switch (proto) {
- case Q_DEFAULT:
- case Q_IP:
- case Q_ARP:
- case Q_RARP:
- if (linktype == DLT_EN10MB)
- b0 = gen_ehostop(eaddr, Q_OR);
- else if (linktype == DLT_FDDI)
- b0 = gen_fhostop(eaddr, Q_OR);
- else
- bpf_error(
- "'gateway' supported only on ethernet or FDDI");
-
- b1 = gen_host(**alist++, 0xffffffff, proto, Q_OR);
- while (*alist) {
- tmp = gen_host(**alist++, 0xffffffff, proto, Q_OR);
- gen_or(b1, tmp);
- b1 = tmp;
- }
- gen_not(b1);
- gen_and(b0, b1);
- return b1;
- }
- bpf_error("illegal modifier of 'gateway'");
- /* NOTREACHED */
-}
-
-struct block *
-gen_proto_abbrev(proto)
- int proto;
-{
- struct block *b0, *b1;
-
- switch (proto) {
-
- case Q_TCP:
- b0 = gen_linktype(ETHERTYPE_IP);
- b1 = gen_cmp(off_nl + 9, BPF_B, (bpf_int32)IPPROTO_TCP);
- gen_and(b0, b1);
- break;
-
- case Q_UDP:
- b0 = gen_linktype(ETHERTYPE_IP);
- b1 = gen_cmp(off_nl + 9, BPF_B, (bpf_int32)IPPROTO_UDP);
- gen_and(b0, b1);
- break;
-
- case Q_ICMP:
- b0 = gen_linktype(ETHERTYPE_IP);
- b1 = gen_cmp(off_nl + 9, BPF_B, (bpf_int32)IPPROTO_ICMP);
- gen_and(b0, b1);
- break;
-
- case Q_IGMP:
- b0 = gen_linktype(ETHERTYPE_IP);
- b1 = gen_cmp(off_nl + 9, BPF_B, (bpf_int32)2);
- gen_and(b0, b1);
- break;
-
-#ifndef IPPROTO_IGRP
-#define IPPROTO_IGRP 9
-#endif
- case Q_IGRP:
- b0 = gen_linktype(ETHERTYPE_IP);
- b1 = gen_cmp(off_nl + 9, BPF_B, (long)IPPROTO_IGRP);
- gen_and(b0, b1);
- break;
-
- case Q_IP:
- b1 = gen_linktype(ETHERTYPE_IP);
- break;
-
- case Q_ARP:
- b1 = gen_linktype(ETHERTYPE_ARP);
- break;
-
- case Q_RARP:
- b1 = gen_linktype(ETHERTYPE_REVARP);
- break;
-
- case Q_LINK:
- bpf_error("link layer applied in wrong context");
-
- case Q_ATALK:
- b1 = gen_linktype(ETHERTYPE_ATALK);
- break;
-
- case Q_DECNET:
- b1 = gen_linktype(ETHERTYPE_DN);
- break;
-
- case Q_SCA:
- b1 = gen_linktype(ETHERTYPE_SCA);
- break;
-
- case Q_LAT:
- b1 = gen_linktype(ETHERTYPE_LAT);
- break;
-
- case Q_MOPDL:
- b1 = gen_linktype(ETHERTYPE_MOPDL);
- break;
-
- case Q_MOPRC:
- b1 = gen_linktype(ETHERTYPE_MOPRC);
- break;
-
- default:
- abort();
- }
- return b1;
-}
-
-static struct block *
-gen_ipfrag()
-{
- struct slist *s;
- struct block *b;
-
- /* not ip frag */
- s = new_stmt(BPF_LD|BPF_H|BPF_ABS);
- s->s.k = off_nl + 6;
- b = new_block(JMP(BPF_JSET));
- b->s.k = 0x1fff;
- b->stmts = s;
- gen_not(b);
-
- return b;
-}
-
-static struct block *
-gen_portatom(off, v)
- int off;
- bpf_int32 v;
-{
- struct slist *s;
- struct block *b;
-
- s = new_stmt(BPF_LDX|BPF_MSH|BPF_B);
- s->s.k = off_nl;
-
- s->next = new_stmt(BPF_LD|BPF_IND|BPF_H);
- s->next->s.k = off_nl + off;
-
- b = new_block(JMP(BPF_JEQ));
- b->stmts = s;
- b->s.k = v;
-
- return b;
-}
-
-struct block *
-gen_portop(port, proto, dir)
- int port, proto, dir;
-{
- struct block *b0, *b1, *tmp;
-
- /* ip proto 'proto' */
- tmp = gen_cmp(off_nl + 9, BPF_B, (bpf_int32)proto);
- b0 = gen_ipfrag();
- gen_and(tmp, b0);
-
- switch (dir) {
- case Q_SRC:
- b1 = gen_portatom(0, (bpf_int32)port);
- break;
-
- case Q_DST:
- b1 = gen_portatom(2, (bpf_int32)port);
- break;
-
- case Q_OR:
- case Q_DEFAULT:
- tmp = gen_portatom(0, (bpf_int32)port);
- b1 = gen_portatom(2, (bpf_int32)port);
- gen_or(tmp, b1);
- break;
-
- case Q_AND:
- tmp = gen_portatom(0, (bpf_int32)port);
- b1 = gen_portatom(2, (bpf_int32)port);
- gen_and(tmp, b1);
- break;
-
- default:
- abort();
- }
- gen_and(b0, b1);
-
- return b1;
-}
-
-static struct block *
-gen_port(port, ip_proto, dir)
- int port;
- int ip_proto;
- int dir;
-{
- struct block *b0, *b1, *tmp;
-
- /* ether proto ip */
- b0 = gen_linktype(ETHERTYPE_IP);
-
- switch (ip_proto) {
- case IPPROTO_UDP:
- case IPPROTO_TCP:
- b1 = gen_portop(port, ip_proto, dir);
- break;
-
- case PROTO_UNDEF:
- tmp = gen_portop(port, IPPROTO_TCP, dir);
- b1 = gen_portop(port, IPPROTO_UDP, dir);
- gen_or(tmp, b1);
- break;
-
- default:
- abort();
- }
- gen_and(b0, b1);
- return b1;
-}
-
-static int
-lookup_proto(name, proto)
- register const char *name;
- register int proto;
-{
- register int v;
-
- switch (proto) {
-
- case Q_DEFAULT:
- case Q_IP:
- v = pcap_nametoproto(name);
- if (v == PROTO_UNDEF)
- bpf_error("unknown ip proto '%s'", name);
- break;
-
- case Q_LINK:
- /* XXX should look up h/w protocol type based on linktype */
- v = pcap_nametoeproto(name);
- if (v == PROTO_UNDEF)
- bpf_error("unknown ether proto '%s'", name);
- break;
-
- default:
- v = PROTO_UNDEF;
- break;
- }
- return v;
-}
-
-static struct block *
-gen_proto(v, proto, dir)
- int v;
- int proto;
- int dir;
-{
- struct block *b0, *b1;
-
- if (dir != Q_DEFAULT)
- bpf_error("direction applied to 'proto'");
-
- switch (proto) {
- case Q_DEFAULT:
- case Q_IP:
- b0 = gen_linktype(ETHERTYPE_IP);
- b1 = gen_cmp(off_nl + 9, BPF_B, (bpf_int32)v);
- gen_and(b0, b1);
- return b1;
-
- case Q_ARP:
- bpf_error("arp does not encapsulate another protocol");
- /* NOTREACHED */
-
- case Q_RARP:
- bpf_error("rarp does not encapsulate another protocol");
- /* NOTREACHED */
-
- case Q_ATALK:
- bpf_error("atalk encapsulation is not specifiable");
- /* NOTREACHED */
-
- case Q_DECNET:
- bpf_error("decnet encapsulation is not specifiable");
- /* NOTREACHED */
-
- case Q_SCA:
- bpf_error("sca does not encapsulate another protocol");
- /* NOTREACHED */
-
- case Q_LAT:
- bpf_error("lat does not encapsulate another protocol");
- /* NOTREACHED */
-
- case Q_MOPRC:
- bpf_error("moprc does not encapsulate another protocol");
- /* NOTREACHED */
-
- case Q_MOPDL:
- bpf_error("mopdl does not encapsulate another protocol");
- /* NOTREACHED */
-
- case Q_LINK:
- return gen_linktype(v);
-
- case Q_UDP:
- bpf_error("'udp proto' is bogus");
- /* NOTREACHED */
-
- case Q_TCP:
- bpf_error("'tcp proto' is bogus");
- /* NOTREACHED */
-
- case Q_ICMP:
- bpf_error("'icmp proto' is bogus");
- /* NOTREACHED */
-
- case Q_IGMP:
- bpf_error("'igmp proto' is bogus");
- /* NOTREACHED */
-
- case Q_IGRP:
- bpf_error("'igrp proto' is bogus");
- /* NOTREACHED */
-
- default:
- abort();
- /* NOTREACHED */
- }
- /* NOTREACHED */
-}
-
-struct block *
-gen_scode(name, q)
- register const char *name;
- struct qual q;
-{
- int proto = q.proto;
- int dir = q.dir;
- int tproto;
- u_char *eaddr;
- bpf_u_int32 mask, addr, **alist;
- struct block *b, *tmp;
- int port, real_proto;
-
- switch (q.addr) {
-
- case Q_NET:
- addr = pcap_nametonetaddr(name);
- if (addr == 0)
- bpf_error("unknown network '%s'", name);
- /* Left justify network addr and calculate its network mask */
- mask = 0xffffffff;
- while (addr && (addr & 0xff000000) == 0) {
- addr <<= 8;
- mask <<= 8;
- }
- return gen_host(addr, mask, proto, dir);
-
- case Q_DEFAULT:
- case Q_HOST:
- if (proto == Q_LINK) {
- switch (linktype) {
-
- case DLT_EN10MB:
- eaddr = pcap_ether_hostton(name);
- if (eaddr == NULL)
- bpf_error(
- "unknown ether host '%s'", name);
- return gen_ehostop(eaddr, dir);
-
- case DLT_FDDI:
- eaddr = pcap_ether_hostton(name);
- if (eaddr == NULL)
- bpf_error(
- "unknown FDDI host '%s'", name);
- return gen_fhostop(eaddr, dir);
-
- default:
- bpf_error(
- "only ethernet/FDDI supports link-level host name");
- break;
- }
- } else if (proto == Q_DECNET) {
- unsigned short dn_addr = __pcap_nametodnaddr(name);
- /*
- * I don't think DECNET hosts can be multihomed, so
- * there is no need to build up a list of addresses
- */
- return (gen_host(dn_addr, 0, proto, dir));
- } else {
- alist = pcap_nametoaddr(name);
- if (alist == NULL || *alist == NULL)
- bpf_error("unknown host '%s'", name);
- tproto = proto;
- if (off_linktype == -1 && tproto == Q_DEFAULT)
- tproto = Q_IP;
- b = gen_host(**alist++, 0xffffffff, tproto, dir);
- while (*alist) {
- tmp = gen_host(**alist++, 0xffffffff,
- tproto, dir);
- gen_or(b, tmp);
- b = tmp;
- }
- return b;
- }
-
- case Q_PORT:
- if (proto != Q_DEFAULT && proto != Q_UDP && proto != Q_TCP)
- bpf_error("illegal qualifier of 'port'");
- if (pcap_nametoport(name, &port, &real_proto) == 0)
- bpf_error("unknown port '%s'", name);
- if (proto == Q_UDP) {
- if (real_proto == IPPROTO_TCP)
- bpf_error("port '%s' is tcp", name);
- else
- /* override PROTO_UNDEF */
- real_proto = IPPROTO_UDP;
- }
- if (proto == Q_TCP) {
- if (real_proto == IPPROTO_UDP)
- bpf_error("port '%s' is udp", name);
- else
- /* override PROTO_UNDEF */
- real_proto = IPPROTO_TCP;
- }
- return gen_port(port, real_proto, dir);
-
- case Q_GATEWAY:
- eaddr = pcap_ether_hostton(name);
- if (eaddr == NULL)
- bpf_error("unknown ether host: %s", name);
-
- alist = pcap_nametoaddr(name);
- if (alist == NULL || *alist == NULL)
- bpf_error("unknown host '%s'", name);
- return gen_gateway(eaddr, alist, proto, dir);
-
- case Q_PROTO:
- real_proto = lookup_proto(name, proto);
- if (real_proto >= 0)
- return gen_proto(real_proto, proto, dir);
- else
- bpf_error("unknown protocol: %s", name);
-
- case Q_UNDEF:
- syntax();
- /* NOTREACHED */
- }
- abort();
- /* NOTREACHED */
-}
-
-struct block *
-gen_mcode(s1, s2, masklen, q)
- register const char *s1, *s2;
- register int masklen;
- struct qual q;
-{
- register int nlen, mlen;
- bpf_u_int32 n, m;
-
- nlen = __pcap_atoin(s1, &n);
- /* Promote short ipaddr */
- n <<= 32 - nlen;
-
- if (s2 != NULL) {
- mlen = __pcap_atoin(s2, &m);
- /* Promote short ipaddr */
- m <<= 32 - mlen;
- if ((n & ~m) != 0)
- bpf_error("non-network bits set in \"%s mask %s\"",
- s1, s2);
- } else {
- /* Convert mask len to mask */
- if (masklen > 32)
- bpf_error("mask length must be <= 32");
- m = 0xffffffff << (32 - masklen);
- if ((n & ~m) != 0)
- bpf_error("non-network bits set in \"%s/%d\"",
- s1, masklen);
- }
-
- switch (q.addr) {
-
- case Q_NET:
- return gen_host(n, m, q.proto, q.dir);
-
- default:
- bpf_error("Mask syntax for networks only");
- /* NOTREACHED */
- }
-}
-
-struct block *
-gen_ncode(s, v, q)
- register const char *s;
- bpf_u_int32 v;
- struct qual q;
-{
- bpf_u_int32 mask;
- int proto = q.proto;
- int dir = q.dir;
- register int vlen;
-
- if (s == NULL)
- vlen = 32;
- else if (q.proto == Q_DECNET)
- vlen = __pcap_atodn(s, &v);
- else
- vlen = __pcap_atoin(s, &v);
-
- switch (q.addr) {
-
- case Q_DEFAULT:
- case Q_HOST:
- case Q_NET:
- if (proto == Q_DECNET)
- return gen_host(v, 0, proto, dir);
- else if (proto == Q_LINK) {
- bpf_error("illegal link layer address");
- } else {
- mask = 0xffffffff;
- if (s == NULL && q.addr == Q_NET) {
- /* Promote short net number */
- while (v && (v & 0xff000000) == 0) {
- v <<= 8;
- mask <<= 8;
- }
- } else {
- /* Promote short ipaddr */
- v <<= 32 - vlen;
- mask <<= 32 - vlen;
- }
- return gen_host(v, mask, proto, dir);
- }
-
- case Q_PORT:
- if (proto == Q_UDP)
- proto = IPPROTO_UDP;
- else if (proto == Q_TCP)
- proto = IPPROTO_TCP;
- else if (proto == Q_DEFAULT)
- proto = PROTO_UNDEF;
- else
- bpf_error("illegal qualifier of 'port'");
-
- return gen_port((int)v, proto, dir);
-
- case Q_GATEWAY:
- bpf_error("'gateway' requires a name");
- /* NOTREACHED */
-
- case Q_PROTO:
- return gen_proto((int)v, proto, dir);
-
- case Q_UNDEF:
- syntax();
- /* NOTREACHED */
-
- default:
- abort();
- /* NOTREACHED */
- }
- /* NOTREACHED */
-}
-
-struct block *
-gen_ecode(eaddr, q)
- register const u_char *eaddr;
- struct qual q;
-{
- if ((q.addr == Q_HOST || q.addr == Q_DEFAULT) && q.proto == Q_LINK) {
- if (linktype == DLT_EN10MB)
- return gen_ehostop(eaddr, (int)q.dir);
- if (linktype == DLT_FDDI)
- return gen_fhostop(eaddr, (int)q.dir);
- }
- bpf_error("ethernet address used in non-ether expression");
- /* NOTREACHED */
-}
-
-void
-sappend(s0, s1)
- struct slist *s0, *s1;
-{
- /*
- * This is definitely not the best way to do this, but the
- * lists will rarely get long.
- */
- while (s0->next)
- s0 = s0->next;
- s0->next = s1;
-}
-
-static struct slist *
-xfer_to_x(a)
- struct arth *a;
-{
- struct slist *s;
-
- s = new_stmt(BPF_LDX|BPF_MEM);
- s->s.k = a->regno;
- return s;
-}
-
-static struct slist *
-xfer_to_a(a)
- struct arth *a;
-{
- struct slist *s;
-
- s = new_stmt(BPF_LD|BPF_MEM);
- s->s.k = a->regno;
- return s;
-}
-
-struct arth *
-gen_load(proto, index, size)
- int proto;
- struct arth *index;
- int size;
-{
- struct slist *s, *tmp;
- struct block *b;
- int regno = alloc_reg();
-
- free_reg(index->regno);
- switch (size) {
-
- default:
- bpf_error("data size must be 1, 2, or 4");
-
- case 1:
- size = BPF_B;
- break;
-
- case 2:
- size = BPF_H;
- break;
-
- case 4:
- size = BPF_W;
- break;
- }
- switch (proto) {
- default:
- bpf_error("unsupported index operation");
-
- case Q_LINK:
- s = xfer_to_x(index);
- tmp = new_stmt(BPF_LD|BPF_IND|size);
- sappend(s, tmp);
- sappend(index->s, s);
- break;
-
- case Q_IP:
- case Q_ARP:
- case Q_RARP:
- case Q_ATALK:
- case Q_DECNET:
- case Q_SCA:
- case Q_LAT:
- case Q_MOPRC:
- case Q_MOPDL:
- /* XXX Note that we assume a fixed link link header here. */
- s = xfer_to_x(index);
- tmp = new_stmt(BPF_LD|BPF_IND|size);
- tmp->s.k = off_nl;
- sappend(s, tmp);
- sappend(index->s, s);
-
- b = gen_proto_abbrev(proto);
- if (index->b)
- gen_and(index->b, b);
- index->b = b;
- break;
-
- case Q_TCP:
- case Q_UDP:
- case Q_ICMP:
- case Q_IGMP:
- case Q_IGRP:
- s = new_stmt(BPF_LDX|BPF_MSH|BPF_B);
- s->s.k = off_nl;
- sappend(s, xfer_to_a(index));
- sappend(s, new_stmt(BPF_ALU|BPF_ADD|BPF_X));
- sappend(s, new_stmt(BPF_MISC|BPF_TAX));
- sappend(s, tmp = new_stmt(BPF_LD|BPF_IND|size));
- tmp->s.k = off_nl;
- sappend(index->s, s);
-
- gen_and(gen_proto_abbrev(proto), b = gen_ipfrag());
- if (index->b)
- gen_and(index->b, b);
- index->b = b;
- break;
- }
- index->regno = regno;
- s = new_stmt(BPF_ST);
- s->s.k = regno;
- sappend(index->s, s);
-
- return index;
-}
-
-struct block *
-gen_relation(code, a0, a1, reversed)
- int code;
- struct arth *a0, *a1;
- int reversed;
-{
- struct slist *s0, *s1, *s2;
- struct block *b, *tmp;
-
- s0 = xfer_to_x(a1);
- s1 = xfer_to_a(a0);
- s2 = new_stmt(BPF_ALU|BPF_SUB|BPF_X);
- b = new_block(JMP(code));
- if (code == BPF_JGT || code == BPF_JGE) {
- reversed = !reversed;
- b->s.k = 0x80000000;
- }
- if (reversed)
- gen_not(b);
-
- sappend(s1, s2);
- sappend(s0, s1);
- sappend(a1->s, s0);
- sappend(a0->s, a1->s);
-
- b->stmts = a0->s;
-
- free_reg(a0->regno);
- free_reg(a1->regno);
-
- /* 'and' together protocol checks */
- if (a0->b) {
- if (a1->b) {
- gen_and(a0->b, tmp = a1->b);
- }
- else
- tmp = a0->b;
- } else
- tmp = a1->b;
-
- if (tmp)
- gen_and(tmp, b);
-
- return b;
-}
-
-struct arth *
-gen_loadlen()
-{
- int regno = alloc_reg();
- struct arth *a = (struct arth *)newchunk(sizeof(*a));
- struct slist *s;
-
- s = new_stmt(BPF_LD|BPF_LEN);
- s->next = new_stmt(BPF_ST);
- s->next->s.k = regno;
- a->s = s;
- a->regno = regno;
-
- return a;
-}
-
-struct arth *
-gen_loadi(val)
- int val;
-{
- struct arth *a;
- struct slist *s;
- int reg;
-
- a = (struct arth *)newchunk(sizeof(*a));
-
- reg = alloc_reg();
-
- s = new_stmt(BPF_LD|BPF_IMM);
- s->s.k = val;
- s->next = new_stmt(BPF_ST);
- s->next->s.k = reg;
- a->s = s;
- a->regno = reg;
-
- return a;
-}
-
-struct arth *
-gen_neg(a)
- struct arth *a;
-{
- struct slist *s;
-
- s = xfer_to_a(a);
- sappend(a->s, s);
- s = new_stmt(BPF_ALU|BPF_NEG);
- s->s.k = 0;
- sappend(a->s, s);
- s = new_stmt(BPF_ST);
- s->s.k = a->regno;
- sappend(a->s, s);
-
- return a;
-}
-
-struct arth *
-gen_arth(code, a0, a1)
- int code;
- struct arth *a0, *a1;
-{
- struct slist *s0, *s1, *s2;
-
- s0 = xfer_to_x(a1);
- s1 = xfer_to_a(a0);
- s2 = new_stmt(BPF_ALU|BPF_X|code);
-
- sappend(s1, s2);
- sappend(s0, s1);
- sappend(a1->s, s0);
- sappend(a0->s, a1->s);
-
- free_reg(a1->regno);
-
- s0 = new_stmt(BPF_ST);
- a0->regno = s0->s.k = alloc_reg();
- sappend(a0->s, s0);
-
- return a0;
-}
-
-/*
- * Here we handle simple allocation of the scratch registers.
- * If too many registers are alloc'd, the allocator punts.
- */
-static int regused[BPF_MEMWORDS];
-static int curreg;
-
-/*
- * Return the next free register.
- */
-static int
-alloc_reg()
-{
- int n = BPF_MEMWORDS;
-
- while (--n >= 0) {
- if (regused[curreg])
- curreg = (curreg + 1) % BPF_MEMWORDS;
- else {
- regused[curreg] = 1;
- return curreg;
- }
- }
- bpf_error("too many registers needed to evaluate expression");
- /* NOTREACHED */
-}
-
-/*
- * Return a register to the table so it can
- * be used later.
- */
-static void
-free_reg(n)
- int n;
-{
- regused[n] = 0;
-}
-
-static struct block *
-gen_len(jmp, n)
- int jmp, n;
-{
- struct slist *s;
- struct block *b;
-
- s = new_stmt(BPF_LD|BPF_LEN);
- b = new_block(JMP(jmp));
- b->stmts = s;
- b->s.k = n;
-
- return b;
-}
-
-struct block *
-gen_greater(n)
- int n;
-{
- return gen_len(BPF_JGE, n);
-}
-
-struct block *
-gen_less(n)
- int n;
-{
- struct block *b;
-
- b = gen_len(BPF_JGT, n);
- gen_not(b);
-
- return b;
-}
-
-struct block *
-gen_byteop(op, idx, val)
- int op, idx, val;
-{
- struct block *b;
- struct slist *s;
-
- switch (op) {
- default:
- abort();
-
- case '=':
- return gen_cmp((u_int)idx, BPF_B, (bpf_int32)val);
-
- case '<':
- b = gen_cmp((u_int)idx, BPF_B, (bpf_int32)val);
- b->s.code = JMP(BPF_JGE);
- gen_not(b);
- return b;
-
- case '>':
- b = gen_cmp((u_int)idx, BPF_B, (bpf_int32)val);
- b->s.code = JMP(BPF_JGT);
- return b;
-
- case '|':
- s = new_stmt(BPF_ALU|BPF_OR|BPF_K);
- break;
-
- case '&':
- s = new_stmt(BPF_ALU|BPF_AND|BPF_K);
- break;
- }
- s->s.k = val;
- b = new_block(JMP(BPF_JEQ));
- b->stmts = s;
- gen_not(b);
-
- return b;
-}
-
-struct block *
-gen_broadcast(proto)
- int proto;
-{
- bpf_u_int32 hostmask;
- struct block *b0, *b1, *b2;
- static u_char ebroadcast[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-
- switch (proto) {
-
- case Q_DEFAULT:
- case Q_LINK:
- if (linktype == DLT_EN10MB)
- return gen_ehostop(ebroadcast, Q_DST);
- if (linktype == DLT_FDDI)
- return gen_fhostop(ebroadcast, Q_DST);
- bpf_error("not a broadcast link");
- break;
-
- case Q_IP:
- b0 = gen_linktype(ETHERTYPE_IP);
- hostmask = ~netmask;
- b1 = gen_mcmp(off_nl + 16, BPF_W, (bpf_int32)0, hostmask);
- b2 = gen_mcmp(off_nl + 16, BPF_W,
- (bpf_int32)(~0 & hostmask), hostmask);
- gen_or(b1, b2);
- gen_and(b0, b2);
- return b2;
- }
- bpf_error("only ether/ip broadcast filters supported");
-}
-
-struct block *
-gen_multicast(proto)
- int proto;
-{
- register struct block *b0, *b1;
- register struct slist *s;
-
- switch (proto) {
-
- case Q_DEFAULT:
- case Q_LINK:
- if (linktype == DLT_EN10MB) {
- /* ether[0] & 1 != 0 */
- s = new_stmt(BPF_LD|BPF_B|BPF_ABS);
- s->s.k = 0;
- b0 = new_block(JMP(BPF_JSET));
- b0->s.k = 1;
- b0->stmts = s;
- return b0;
- }
-
- if (linktype == DLT_FDDI) {
- /* XXX TEST THIS: MIGHT NOT PORT PROPERLY XXX */
- /* fddi[1] & 1 != 0 */
- s = new_stmt(BPF_LD|BPF_B|BPF_ABS);
- s->s.k = 1;
- b0 = new_block(JMP(BPF_JSET));
- b0->s.k = 1;
- b0->stmts = s;
- return b0;
- }
- /* Link not known to support multicasts */
- break;
-
- case Q_IP:
- b0 = gen_linktype(ETHERTYPE_IP);
- b1 = gen_cmp(off_nl + 16, BPF_B, (bpf_int32)224);
- b1->s.code = JMP(BPF_JGE);
- gen_and(b0, b1);
- return b1;
- }
- bpf_error("only IP multicast filters supported on ethernet/FDDI");
-}
-
-/*
- * generate command for inbound/outbound. It's here so we can
- * make it link-type specific. 'dir' = 0 implies "inbound",
- * = 1 implies "outbound".
- */
-struct block *
-gen_inbound(dir)
- int dir;
-{
- register struct block *b0;
-
- b0 = gen_relation(BPF_JEQ,
- gen_load(Q_LINK, gen_loadi(0), 1),
- gen_loadi(0),
- dir);
- return (b0);
-}
diff --git a/libpcap/gencode.h b/libpcap/gencode.h
deleted file mode 100644
index 12e39fe..0000000
--- a/libpcap/gencode.h
+++ b/dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/gencode.h,v 1.1 2001/05/31 13:40:52 gray Exp $ (LBL)
- */
-
-/*XXX*/
-#include "gnuc.h"
-
-/* Address qualifiers. */
-
-#define Q_HOST 1
-#define Q_NET 2
-#define Q_PORT 3
-#define Q_GATEWAY 4
-#define Q_PROTO 5
-
-/* Protocol qualifiers. */
-
-#define Q_LINK 1
-#define Q_IP 2
-#define Q_ARP 3
-#define Q_RARP 4
-#define Q_TCP 5
-#define Q_UDP 6
-#define Q_ICMP 7
-#define Q_IGMP 8
-#define Q_IGRP 9
-
-
-#define Q_ATALK 10
-#define Q_DECNET 11
-#define Q_LAT 12
-#define Q_SCA 13
-#define Q_MOPRC 14
-#define Q_MOPDL 15
-
-/* Directional qualifiers. */
-
-#define Q_SRC 1
-#define Q_DST 2
-#define Q_OR 3
-#define Q_AND 4
-
-#define Q_DEFAULT 0
-#define Q_UNDEF 255
-
-struct stmt {
- int code;
- bpf_int32 k;
-};
-
-struct slist {
- struct stmt s;
- struct slist *next;
-};
-
-/*
- * A bit vector to represent definition sets. We assume TOT_REGISTERS
- * is smaller than 8*sizeof(atomset).
- */
-typedef bpf_u_int32 atomset;
-#define ATOMMASK(n) (1 << (n))
-#define ATOMELEM(d, n) (d & ATOMMASK(n))
-
-/*
- * An unbounded set.
- */
-typedef bpf_u_int32 *uset;
-
-/*
- * Total number of atomic entities, including accumulator (A) and index (X).
- * We treat all these guys similarly during flow analysis.
- */
-#define N_ATOMS (BPF_MEMWORDS+2)
-
-struct edge {
- int id;
- int code;
- uset edom;
- struct block *succ;
- struct block *pred;
- struct edge *next; /* link list of incoming edges for a node */
-};
-
-struct block {
- int id;
- struct slist *stmts; /* side effect stmts */
- struct stmt s; /* branch stmt */
- int mark;
- int longjt; /* jt branch requires long jump */
- int longjf; /* jf branch requires long jump */
- int level;
- int offset;
- int sense;
- struct edge et;
- struct edge ef;
- struct block *head;
- struct block *link; /* link field used by optimizer */
- uset dom;
- uset closure;
- struct edge *in_edges;
- atomset def, kill;
- atomset in_use;
- atomset out_use;
- int oval;
- int val[N_ATOMS];
-};
-
-struct arth {
- struct block *b; /* protocol checks */
- struct slist *s; /* stmt list */
- int regno; /* virtual register number of result */
-};
-
-struct qual {
- unsigned char addr;
- unsigned char proto;
- unsigned char dir;
- unsigned char pad;
-};
-
-struct arth *gen_loadi(int);
-struct arth *gen_load(int, struct arth *, int);
-struct arth *gen_loadlen(void);
-struct arth *gen_neg(struct arth *);
-struct arth *gen_arth(int, struct arth *, struct arth *);
-
-void gen_and(struct block *, struct block *);
-void gen_or(struct block *, struct block *);
-void gen_not(struct block *);
-
-struct block *gen_scode(const char *, struct qual);
-struct block *gen_ecode(const u_char *, struct qual);
-struct block *gen_mcode(const char *, const char *, int, struct qual);
-struct block *gen_ncode(const char *, bpf_u_int32, struct qual);
-struct block *gen_proto_abbrev(int);
-struct block *gen_relation(int, struct arth *, struct arth *, int);
-struct block *gen_less(int);
-struct block *gen_greater(int);
-struct block *gen_byteop(int, int, int);
-struct block *gen_broadcast(int);
-struct block *gen_multicast(int);
-struct block *gen_inbound(int);
-
-void bpf_optimize(struct block **);
-#if __STDC__
-__dead void bpf_error(const char *, ...)
- __attribute__((volatile, format (printf, 1, 2)));
-#endif
-
-void finish_parse(struct block *);
-char *sdup(const char *);
-
-struct bpf_insn *icode_to_fcode(struct block *, int *);
-int pcap_parse(void);
-void lex_init(char *);
-void sappend(struct slist *, struct slist *);
-
-/* XXX */
-#define JT(b) ((b)->et.succ)
-#define JF(b) ((b)->ef.succ)
diff --git a/libpcap/grammar.c b/libpcap/grammar.c
deleted file mode 100644
index c83f23f..0000000
--- a/libpcap/grammar.c
+++ b/dev/null
@@ -1,1113 +0,0 @@
-#ifndef lint
-static char pcap_sccsid[] = "@(#)yaccpar 1.8 (Berkeley) 01/20/90";
-#endif
-#define YYBYACC 1
-#line 2 "/export/home/gray/ipacct/libpcap/./grammar.y"
-/*
- * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/grammar.c,v 1.1 2001/05/31 13:40:53 gray Exp $ (LBL)";
-#endif
-
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-
-#if __STDC__
-struct mbuf;
-struct rtentry;
-#endif
-
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-
-#include <stdio.h>
-
-#include <pcap-int.h>
-
-#include <gencode.h>
-#include <pcap-namedb.h>
-
-#include <gnuc.h>
-#ifdef HAVE_OS_PROTO_H
-#include <os-proto.h>
-#endif
-
-#define QSET(q, p, d, a) (q).proto = (p),\
- (q).dir = (d),\
- (q).addr = (a)
-
-int n_errors = 0;
-
-static struct qual qerr = { Q_UNDEF, Q_UNDEF, Q_UNDEF, Q_UNDEF };
-
-static void
-pcap_error(char *msg)
-{
- ++n_errors;
- bpf_error("%s", msg);
- /* NOTREACHED */
-}
-
-#line 76 "/export/home/gray/ipacct/libpcap/./grammar.y"
-typedef union {
- int i;
- bpf_u_int32 h;
- u_char *e;
- char *s;
- struct stmt *stmt;
- struct arth *a;
- struct {
- struct qual q;
- struct block *b;
- } blk;
- struct block *rblk;
-} YYSTYPE;
-#line 93 "grammar.c"
-#define DST 257
-#define SRC 258
-#define HOST 259
-#define GATEWAY 260
-#define NET 261
-#define MASK 262
-#define PORT 263
-#define LESS 264
-#define GREATER 265
-#define PROTO 266
-#define BYTE 267
-#define ARP 268
-#define RARP 269
-#define IP 270
-#define TCP 271
-#define UDP 272
-#define ICMP 273
-#define IGMP 274
-#define IGRP 275
-#define ATALK 276
-#define DECNET 277
-#define LAT 278
-#define SCA 279
-#define MOPRC 280
-#define MOPDL 281
-#define TK_BROADCAST 282
-#define TK_MULTICAST 283
-#define NUM 284
-#define INBOUND 285
-#define OUTBOUND 286
-#define LINK 287
-#define GEQ 288
-#define LEQ 289
-#define NEQ 290
-#define ID 291
-#define EID 292
-#define HID 293
-#define LSH 294
-#define RSH 295
-#define LEN 296
-#define OR 297
-#define AND 298
-#define UMINUS 299
-#define YYERRCODE 256
-short pcap_lhs[] = { -1,
- 0, 0, 24, 1, 1, 1, 1, 1, 20, 21,
- 2, 2, 2, 3, 3, 3, 3, 3, 3, 23,
- 22, 4, 4, 4, 7, 7, 5, 5, 8, 8,
- 8, 8, 8, 6, 6, 6, 6, 6, 6, 9,
- 9, 10, 10, 10, 10, 10, 10, 11, 11, 11,
- 12, 16, 16, 16, 16, 16, 16, 16, 16, 16,
- 16, 16, 16, 16, 16, 16, 25, 25, 25, 25,
- 25, 25, 25, 18, 18, 18, 19, 19, 19, 13,
- 13, 14, 14, 14, 14, 14, 14, 14, 14, 14,
- 14, 14, 14, 14, 15, 15, 15, 15, 15, 17,
- 17,
-};
-short pcap_len[] = { 2,
- 2, 1, 0, 1, 3, 3, 3, 3, 1, 1,
- 1, 1, 3, 1, 3, 3, 1, 1, 2, 1,
- 1, 1, 3, 3, 1, 1, 1, 2, 3, 2,
- 2, 2, 2, 2, 3, 1, 3, 3, 1, 1,
- 0, 1, 1, 3, 3, 3, 3, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 2, 2, 2, 2,
- 4, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 4, 6, 3, 3, 3, 3, 3, 3, 3,
- 3, 2, 3, 1, 1, 1, 1, 1, 1, 1,
- 3,
-};
-short pcap_defred[] = { 3,
- 0, 0, 0, 0, 0, 54, 55, 53, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 66, 65, 100,
- 72, 73, 52, 94, 20, 0, 21, 0, 4, 27,
- 0, 0, 0, 81, 0, 80, 0, 0, 39, 69,
- 70, 0, 92, 0, 0, 10, 9, 0, 0, 14,
- 18, 0, 34, 11, 12, 0, 0, 0, 0, 48,
- 51, 49, 50, 32, 67, 68, 0, 31, 33, 75,
- 77, 79, 0, 0, 0, 0, 0, 0, 0, 0,
- 74, 76, 78, 0, 0, 0, 0, 0, 0, 28,
- 96, 95, 98, 99, 97, 0, 0, 6, 5, 0,
- 0, 0, 8, 7, 0, 0, 22, 0, 0, 0,
- 0, 19, 0, 0, 0, 0, 29, 0, 0, 0,
- 0, 0, 0, 86, 87, 0, 0, 0, 35, 93,
- 101, 71, 0, 16, 15, 13, 0, 0, 0, 45,
- 47, 44, 46, 82, 0, 23, 24, 0, 83,
-};
-short pcap_dgoto[] = { 1,
- 87, 112, 54, 108, 29, 30, 109, 31, 32, 67,
- 68, 69, 33, 34, 96, 44, 36, 84, 85, 48,
- 49, 45, 57, 2, 39,
-};
-short pcap_sindex[] = { 0,
- 0, -29, -261, -249, -243, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 288, 0, -290, 0, 0,
- -12, 270, 335, 0, -42, 0, -29, -29, 0, 0,
- 0, -2, 0, -42, 288, 0, 0, 143, 143, 0,
- 0, -44, 0, 0, 0, -12, -12, -264, -221, 0,
- 0, 0, 0, 0, 0, 0, -145, 0, 0, 0,
- 0, 0, 288, 288, 288, 288, 288, 288, 288, 288,
- 0, 0, 0, 288, 288, 288, -22, 11, 13, 0,
- 0, 0, 0, 0, 0, -219, 459, 0, 0, 0,
- 143, 143, 0, 0, -225, -199, 0, 49, -290, 13,
- -31, 0, -155, -148, -142, -140, 0, -18, -18, -25,
- 137, -37, -37, 0, 0, 459, 459, 453, 0, 0,
- 0, 0, 13, 0, 0, 0, -12, -12, 13, 0,
- 0, 0, 0, 0, -161, 0, 0, 36, 0,
-};
-short pcap_rindex[] = { 0,
- 0, 2, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 132, 0, 0,
- 0, 0, 0, 0, 108, 0, 401, 401, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 401, 401, 0,
- 0, 6, 0, 0, 0, 0, 0, 193, 231, 0,
- 0, 0, 0, 0, 0, 0, 60, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 419, 427, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
- 401, 401, 0, 0, 0, 0, 0, -218, 0, -215,
- 0, 0, 0, 0, 0, 0, 0, 37, 51, 96,
- 66, 12, 26, 0, 0, 15, 40, 0, 0, 0,
- 0, 0, 153, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-short pcap_gindex[] = { 0,
- 131, -17, -56, 0, 53, 0, 0, 0, 0, 0,
- 67, 0, 561, -7, 0, 104, 555, 0, 0, 29,
- 30, 542, 129, 0, 0,
-};
-#define YYTABLESIZE 754
-short pcap_table[] = { 107,
- 12, 2, 106, 25, 79, 17, 46, 47, 27, 80,
- 27, 84, 76, 53, 37, 26, 79, 77, 129, 78,
- 25, 80, 40, 79, 77, 85, 78, 27, 80, 88,
- 98, 103, 113, 114, 41, 92, 90, 88, 80, 38,
- 42, 12, 80, 80, 107, 80, 17, 80, 86, 84,
- 91, 130, 84, 131, 84, 37, 84, 95, 94, 93,
- 80, 80, 80, 85, 132, 88, 85, 134, 85, 84,
- 85, 84, 84, 84, 90, 115, 116, 90, 26, 26,
- 38, 25, 25, 85, 135, 85, 85, 85, 91, 136,
- 90, 91, 30, 88, 90, 89, 90, 90, 90, 30,
- 99, 104, 140, 88, 84, 35, 88, 36, 91, 141,
- 91, 91, 91, 60, 142, 62, 143, 63, 85, 146,
- 147, 91, 148, 88, 80, 88, 88, 88, 149, 90,
- 38, 1, 28, 117, 0, 84, 89, 137, 138, 0,
- 35, 35, 0, 91, 0, 0, 0, 0, 36, 85,
- 0, 35, 35, 89, 90, 89, 89, 89, 88, 0,
- 90, 0, 0, 0, 0, 38, 38, 0, 0, 0,
- 0, 0, 0, 0, 91, 25, 102, 102, 79, 77,
- 0, 78, 27, 80, 0, 0, 0, 26, 89, 88,
- 80, 0, 0, 0, 80, 80, 0, 80, 0, 80,
- 0, 0, 0, 0, 35, 35, 0, 0, 0, 0,
- 0, 0, 80, 80, 80, 0, 0, 105, 0, 89,
- 0, 0, 0, 0, 0, 43, 0, 0, 0, 102,
- 102, 0, 43, 0, 3, 4, 0, 5, 6, 7,
- 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
- 18, 19, 20, 0, 20, 21, 22, 23, 41, 41,
- 41, 41, 41, 42, 41, 0, 24, 41, 73, 74,
- 42, 20, 0, 0, 46, 47, 80, 0, 50, 51,
- 52, 0, 0, 41, 41, 0, 0, 0, 80, 80,
- 80, 0, 0, 0, 80, 80, 0, 12, 12, 84,
- 84, 84, 17, 17, 0, 84, 84, 0, 84, 84,
- 0, 37, 37, 85, 85, 85, 0, 0, 0, 85,
- 85, 0, 85, 85, 90, 90, 90, 27, 0, 0,
- 90, 90, 26, 90, 90, 0, 38, 38, 91, 91,
- 91, 0, 0, 30, 91, 91, 0, 91, 91, 0,
- 30, 30, 30, 88, 88, 88, 0, 0, 0, 0,
- 0, 0, 88, 88, 40, 40, 40, 40, 40, 0,
- 40, 0, 76, 40, 0, 0, 79, 77, 0, 78,
- 0, 80, 0, 89, 89, 89, 0, 0, 0, 40,
- 40, 0, 89, 89, 83, 82, 81, 0, 0, 0,
- 0, 0, 0, 0, 36, 36, 3, 4, 0, 5,
- 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 0, 0, 20, 21, 22, 23,
- 73, 74, 0, 50, 51, 52, 0, 0, 24, 0,
- 80, 80, 80, 0, 0, 0, 80, 80, 0, 25,
- 25, 43, 0, 43, 0, 43, 81, 0, 75, 0,
- 81, 81, 0, 81, 80, 81, 0, 0, 80, 80,
- 0, 80, 0, 80, 0, 0, 43, 0, 81, 81,
- 81, 0, 0, 43, 43, 43, 80, 80, 80, 42,
- 76, 42, 0, 42, 79, 77, 76, 78, 0, 80,
- 79, 77, 0, 78, 0, 80, 0, 0, 0, 0,
- 145, 0, 0, 0, 42, 0, 0, 0, 0, 0,
- 0, 42, 42, 42, 0, 0, 58, 59, 60, 61,
- 62, 0, 63, 0, 0, 64, 0, 0, 0, 0,
- 0, 0, 81, 37, 0, 144, 0, 0, 0, 0,
- 80, 65, 66, 0, 0, 6, 7, 8, 9, 10,
- 11, 12, 13, 14, 15, 16, 17, 18, 19, 0,
- 0, 20, 56, 0, 23, 0, 75, 0, 37, 37,
- 0, 0, 75, 24, 0, 55, 43, 0, 0, 101,
- 101, 89, 0, 0, 0, 0, 0, 111, 56, 89,
- 0, 0, 100, 100, 0, 97, 0, 0, 0, 0,
- 110, 55, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 70, 71, 72, 0, 0, 0, 73, 74,
- 0, 0, 0, 118, 119, 120, 121, 122, 123, 124,
- 125, 0, 37, 101, 126, 127, 128, 0, 0, 0,
- 0, 0, 111, 0, 0, 133, 100, 41, 41, 41,
- 41, 41, 0, 41, 0, 139, 41, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 56, 56,
- 0, 0, 41, 41, 0, 0, 0, 0, 0, 0,
- 0, 55, 55, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 81, 81, 81, 0,
- 0, 0, 81, 81, 80, 80, 80, 0, 0, 0,
- 80, 80, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 73, 74, 0, 0,
- 0, 0, 73, 74,
-};
-short pcap_check[] = { 56,
- 0, 0, 47, 33, 42, 0, 297, 298, 40, 47,
- 40, 0, 38, 31, 0, 45, 42, 43, 41, 45,
- 33, 47, 284, 42, 43, 0, 45, 40, 47, 37,
- 48, 49, 297, 298, 284, 38, 0, 45, 38, 0,
- 284, 41, 42, 43, 101, 45, 41, 47, 91, 38,
- 0, 41, 41, 41, 43, 41, 45, 60, 61, 62,
- 60, 61, 62, 38, 284, 0, 41, 293, 43, 58,
- 45, 60, 61, 62, 38, 297, 298, 41, 297, 298,
- 41, 297, 298, 58, 284, 60, 61, 62, 38, 41,
- 38, 41, 33, 101, 58, 0, 60, 61, 62, 40,
- 48, 49, 258, 38, 93, 2, 41, 0, 58, 258,
- 60, 61, 62, 259, 257, 261, 257, 263, 93, 137,
- 138, 124, 284, 58, 124, 60, 61, 62, 93, 93,
- 2, 0, 2, 67, -1, 124, 41, 109, 109, -1,
- 37, 38, -1, 93, -1, -1, -1, -1, 41, 124,
- -1, 48, 49, 58, 102, 60, 61, 62, 93, -1,
- 124, -1, -1, -1, -1, 37, 38, -1, -1, -1,
- -1, -1, -1, -1, 124, 33, 48, 49, 42, 43,
- -1, 45, 40, 47, -1, -1, -1, 45, 93, 124,
- 38, -1, -1, -1, 42, 43, -1, 45, -1, 47,
- -1, -1, -1, -1, 101, 102, -1, -1, -1, -1,
- -1, -1, 60, 61, 62, -1, -1, 262, -1, 124,
- -1, -1, -1, -1, -1, 33, -1, -1, -1, 101,
- 102, -1, 40, -1, 264, 265, -1, 267, 268, 269,
- 270, 271, 272, 273, 274, 275, 276, 277, 278, 279,
- 280, 281, 284, -1, 284, 285, 286, 287, 257, 258,
- 259, 260, 261, 33, 263, -1, 296, 266, 294, 295,
- 40, 284, -1, -1, 297, 298, 124, -1, 291, 292,
- 293, -1, -1, 282, 283, -1, -1, -1, 288, 289,
- 290, -1, -1, -1, 294, 295, -1, 297, 298, 288,
- 289, 290, 297, 298, -1, 294, 295, -1, 297, 298,
- -1, 297, 298, 288, 289, 290, -1, -1, -1, 294,
- 295, -1, 297, 298, 288, 289, 290, 40, -1, -1,
- 294, 295, 45, 297, 298, -1, 297, 298, 288, 289,
- 290, -1, -1, 284, 294, 295, -1, 297, 298, -1,
- 291, 292, 293, 288, 289, 290, -1, -1, -1, -1,
- -1, -1, 297, 298, 257, 258, 259, 260, 261, -1,
- 263, -1, 38, 266, -1, -1, 42, 43, -1, 45,
- -1, 47, -1, 288, 289, 290, -1, -1, -1, 282,
- 283, -1, 297, 298, 60, 61, 62, -1, -1, -1,
- -1, -1, -1, -1, 297, 298, 264, 265, -1, 267,
- 268, 269, 270, 271, 272, 273, 274, 275, 276, 277,
- 278, 279, 280, 281, -1, -1, 284, 285, 286, 287,
- 294, 295, -1, 291, 292, 293, -1, -1, 296, -1,
- 288, 289, 290, -1, -1, -1, 294, 295, -1, 297,
- 298, 259, -1, 261, -1, 263, 38, -1, 124, -1,
- 42, 43, -1, 45, 38, 47, -1, -1, 42, 43,
- -1, 45, -1, 47, -1, -1, 284, -1, 60, 61,
- 62, -1, -1, 291, 292, 293, 60, 61, 62, 259,
- 38, 261, -1, 263, 42, 43, 38, 45, -1, 47,
- 42, 43, -1, 45, -1, 47, -1, -1, -1, -1,
- 58, -1, -1, -1, 284, -1, -1, -1, -1, -1,
- -1, 291, 292, 293, -1, -1, 257, 258, 259, 260,
- 261, -1, 263, -1, -1, 266, -1, -1, -1, -1,
- -1, -1, 124, 2, -1, 93, -1, -1, -1, -1,
- 124, 282, 283, -1, -1, 268, 269, 270, 271, 272,
- 273, 274, 275, 276, 277, 278, 279, 280, 281, -1,
- -1, 284, 31, -1, 287, -1, 124, -1, 37, 38,
- -1, -1, 124, 296, -1, 31, 26, -1, -1, 48,
- 49, 37, -1, -1, -1, -1, -1, 56, 57, 45,
- -1, -1, 48, 49, -1, 45, -1, -1, -1, -1,
- 56, 57, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 288, 289, 290, -1, -1, -1, 294, 295,
- -1, -1, -1, 73, 74, 75, 76, 77, 78, 79,
- 80, -1, 101, 102, 84, 85, 86, -1, -1, -1,
- -1, -1, 111, -1, -1, 101, 102, 257, 258, 259,
- 260, 261, -1, 263, -1, 111, 266, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 137, 138,
- -1, -1, 282, 283, -1, -1, -1, -1, -1, -1,
- -1, 137, 138, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 288, 289, 290, -1,
- -1, -1, 294, 295, 288, 289, 290, -1, -1, -1,
- 294, 295, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 294, 295, -1, -1,
- -1, -1, 294, 295,
-};
-#define YYFINAL 1
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 299
-#if YYDEBUG
-char *pcap_name[] = {
-"end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-"'!'",0,0,0,0,"'&'",0,"'('","')'","'*'","'+'",0,"'-'",0,"'/'",0,0,0,0,0,0,0,0,0,
-0,"':'",0,"'<'","'='","'>'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,"'['",0,"']'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-"'|'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"DST","SRC","HOST","GATEWAY","NET","MASK","PORT",
-"LESS","GREATER","PROTO","BYTE","ARP","RARP","IP","TCP","UDP","ICMP","IGMP",
-"IGRP","ATALK","DECNET","LAT","SCA","MOPRC","MOPDL","TK_BROADCAST",
-"TK_MULTICAST","NUM","INBOUND","OUTBOUND","LINK","GEQ","LEQ","NEQ","ID","EID",
-"HID","LSH","RSH","LEN","OR","AND","UMINUS",
-};
-char *pcap_rule[] = {
-"$accept : prog",
-"prog : null expr",
-"prog : null",
-"null :",
-"expr : term",
-"expr : expr and term",
-"expr : expr and id",
-"expr : expr or term",
-"expr : expr or id",
-"and : AND",
-"or : OR",
-"id : nid",
-"id : pnum",
-"id : paren pid ')'",
-"nid : ID",
-"nid : HID '/' NUM",
-"nid : HID MASK HID",
-"nid : HID",
-"nid : EID",
-"nid : not id",
-"not : '!'",
-"paren : '('",
-"pid : nid",
-"pid : qid and id",
-"pid : qid or id",
-"qid : pnum",
-"qid : pid",
-"term : rterm",
-"term : not term",
-"head : pqual dqual aqual",
-"head : pqual dqual",
-"head : pqual aqual",
-"head : pqual PROTO",
-"head : pqual ndaqual",
-"rterm : head id",
-"rterm : paren expr ')'",
-"rterm : pname",
-"rterm : arth relop arth",
-"rterm : arth irelop arth",
-"rterm : other",
-"pqual : pname",
-"pqual :",
-"dqual : SRC",
-"dqual : DST",
-"dqual : SRC OR DST",
-"dqual : DST OR SRC",
-"dqual : SRC AND DST",
-"dqual : DST AND SRC",
-"aqual : HOST",
-"aqual : NET",
-"aqual : PORT",
-"ndaqual : GATEWAY",
-"pname : LINK",
-"pname : IP",
-"pname : ARP",
-"pname : RARP",
-"pname : TCP",
-"pname : UDP",
-"pname : ICMP",
-"pname : IGMP",
-"pname : IGRP",
-"pname : ATALK",
-"pname : DECNET",
-"pname : LAT",
-"pname : SCA",
-"pname : MOPDL",
-"pname : MOPRC",
-"other : pqual TK_BROADCAST",
-"other : pqual TK_MULTICAST",
-"other : LESS NUM",
-"other : GREATER NUM",
-"other : BYTE NUM byteop NUM",
-"other : INBOUND",
-"other : OUTBOUND",
-"relop : '>'",
-"relop : GEQ",
-"relop : '='",
-"irelop : LEQ",
-"irelop : '<'",
-"irelop : NEQ",
-"arth : pnum",
-"arth : narth",
-"narth : pname '[' arth ']'",
-"narth : pname '[' arth ':' NUM ']'",
-"narth : arth '+' arth",
-"narth : arth '-' arth",
-"narth : arth '*' arth",
-"narth : arth '/' arth",
-"narth : arth '&' arth",
-"narth : arth '|' arth",
-"narth : arth LSH arth",
-"narth : arth RSH arth",
-"narth : '-' arth",
-"narth : paren narth ')'",
-"narth : LEN",
-"byteop : '&'",
-"byteop : '|'",
-"byteop : '<'",
-"byteop : '>'",
-"byteop : '='",
-"pnum : NUM",
-"pnum : paren pnum ')'",
-};
-#endif
-#define pcap_clearin (pcap_char=(-1))
-#define pcap_errok (pcap_errflag=0)
-#ifdef YYSTACKSIZE
-#ifndef YYMAXDEPTH
-#define YYMAXDEPTH YYSTACKSIZE
-#endif
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH 500
-#endif
-#endif
-int pcap_debug;
-int pcap_nerrs;
-int pcap_errflag;
-int pcap_char;
-short *pcap_ssp;
-YYSTYPE *pcap_vsp;
-YYSTYPE pcap_val;
-YYSTYPE pcap_lval;
-short pcap_ss[YYSTACKSIZE];
-YYSTYPE pcap_vs[YYSTACKSIZE];
-#define pcap_stacksize YYSTACKSIZE
-#define YYABORT goto pcap_abort
-#define YYACCEPT goto pcap_accept
-#define YYERROR goto pcap_errlab
-int
-pcap_parse()
-{
- register int pcap_m, pcap_n, pcap_state;
-#if YYDEBUG
- register char *pcap_s;
- extern char *getenv();
-
- if (pcap_s = getenv("YYDEBUG"))
- {
- pcap_n = *pcap_s;
- if (pcap_n >= '0' && pcap_n <= '9')
- pcap_debug = pcap_n - '0';
- }
-#endif
-
- pcap_nerrs = 0;
- pcap_errflag = 0;
- pcap_char = (-1);
-
- pcap_ssp = pcap_ss;
- pcap_vsp = pcap_vs;
- *pcap_ssp = pcap_state = 0;
-
-pcap_loop:
- if (pcap_n = pcap_defred[pcap_state]) goto pcap_reduce;
- if (pcap_char < 0)
- {
- if ((pcap_char = pcap_lex()) < 0) pcap_char = 0;
-#if YYDEBUG
- if (pcap_debug)
- {
- pcap_s = 0;
- if (pcap_char <= YYMAXTOKEN) pcap_s = pcap_name[pcap_char];
- if (!pcap_s) pcap_s = "illegal-symbol";
- printf("pcap_debug: state %d, reading %d (%s)\n", pcap_state,
- pcap_char, pcap_s);
- }
-#endif
- }
- if ((pcap_n = pcap_sindex[pcap_state]) && (pcap_n += pcap_char) >= 0 &&
- pcap_n <= YYTABLESIZE && pcap_check[pcap_n] == pcap_char)
- {
-#if YYDEBUG
- if (pcap_debug)
- printf("pcap_debug: state %d, shifting to state %d\n",
- pcap_state, pcap_table[pcap_n]);
-#endif
- if (pcap_ssp >= pcap_ss + pcap_stacksize - 1)
- {
- goto pcap_overflow;
- }
- *++pcap_ssp = pcap_state = pcap_table[pcap_n];
- *++pcap_vsp = pcap_lval;
- pcap_char = (-1);
- if (pcap_errflag > 0) --pcap_errflag;
- goto pcap_loop;
- }
- if ((pcap_n = pcap_rindex[pcap_state]) && (pcap_n += pcap_char) >= 0 &&
- pcap_n <= YYTABLESIZE && pcap_check[pcap_n] == pcap_char)
- {
- pcap_n = pcap_table[pcap_n];
- goto pcap_reduce;
- }
- if (pcap_errflag) goto pcap_inrecovery;
-#ifdef lint
- goto pcap_newerror;
-#endif
-pcap_newerror:
- pcap_error("syntax error");
-#ifdef lint
- goto pcap_errlab;
-#endif
-pcap_errlab:
- ++pcap_nerrs;
-pcap_inrecovery:
- if (pcap_errflag < 3)
- {
- pcap_errflag = 3;
- for (;;)
- {
- if ((pcap_n = pcap_sindex[*pcap_ssp]) && (pcap_n += YYERRCODE) >= 0 &&
- pcap_n <= YYTABLESIZE && pcap_check[pcap_n] == YYERRCODE)
- {
-#if YYDEBUG
- if (pcap_debug)
- printf("pcap_debug: state %d, error recovery shifting\
- to state %d\n", *pcap_ssp, pcap_table[pcap_n]);
-#endif
- if (pcap_ssp >= pcap_ss + pcap_stacksize - 1)
- {
- goto pcap_overflow;
- }
- *++pcap_ssp = pcap_state = pcap_table[pcap_n];
- *++pcap_vsp = pcap_lval;
- goto pcap_loop;
- }
- else
- {
-#if YYDEBUG
- if (pcap_debug)
- printf("pcap_debug: error recovery discarding state %d\n",
- *pcap_ssp);
-#endif
- if (pcap_ssp <= pcap_ss) goto pcap_abort;
- --pcap_ssp;
- --pcap_vsp;
- }
- }
- }
- else
- {
- if (pcap_char == 0) goto pcap_abort;
-#if YYDEBUG
- if (pcap_debug)
- {
- pcap_s = 0;
- if (pcap_char <= YYMAXTOKEN) pcap_s = pcap_name[pcap_char];
- if (!pcap_s) pcap_s = "illegal-symbol";
- printf("pcap_debug: state %d, error recovery discards token %d (%s)\n",
- pcap_state, pcap_char, pcap_s);
- }
-#endif
- pcap_char = (-1);
- goto pcap_loop;
- }
-pcap_reduce:
-#if YYDEBUG
- if (pcap_debug)
- printf("pcap_debug: state %d, reducing by rule %d (%s)\n",
- pcap_state, pcap_n, pcap_rule[pcap_n]);
-#endif
- pcap_m = pcap_len[pcap_n];
- pcap_val = pcap_vsp[1-pcap_m];
- switch (pcap_n)
- {
-case 1:
-#line 125 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{
- finish_parse(pcap_vsp[0].blk.b);
-}
-break;
-case 3:
-#line 130 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.blk.q = qerr; }
-break;
-case 5:
-#line 133 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ gen_and(pcap_vsp[-2].blk.b, pcap_vsp[0].blk.b); pcap_val.blk = pcap_vsp[0].blk; }
-break;
-case 6:
-#line 134 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ gen_and(pcap_vsp[-2].blk.b, pcap_vsp[0].blk.b); pcap_val.blk = pcap_vsp[0].blk; }
-break;
-case 7:
-#line 135 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ gen_or(pcap_vsp[-2].blk.b, pcap_vsp[0].blk.b); pcap_val.blk = pcap_vsp[0].blk; }
-break;
-case 8:
-#line 136 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ gen_or(pcap_vsp[-2].blk.b, pcap_vsp[0].blk.b); pcap_val.blk = pcap_vsp[0].blk; }
-break;
-case 9:
-#line 138 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.blk = pcap_vsp[-1].blk; }
-break;
-case 10:
-#line 140 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.blk = pcap_vsp[-1].blk; }
-break;
-case 12:
-#line 143 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.blk.b = gen_ncode(NULL, (bpf_u_int32)pcap_vsp[0].i,
- pcap_val.blk.q = pcap_vsp[-1].blk.q); }
-break;
-case 13:
-#line 145 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.blk = pcap_vsp[-1].blk; }
-break;
-case 14:
-#line 147 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.blk.b = gen_scode(pcap_vsp[0].s, pcap_val.blk.q = pcap_vsp[-1].blk.q); }
-break;
-case 15:
-#line 148 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.blk.b = gen_mcode(pcap_vsp[-2].s, NULL, pcap_vsp[0].i,
- pcap_val.blk.q = pcap_vsp[-3].blk.q); }
-break;
-case 16:
-#line 150 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.blk.b = gen_mcode(pcap_vsp[-2].s, pcap_vsp[0].s, 0,
- pcap_val.blk.q = pcap_vsp[-3].blk.q); }
-break;
-case 17:
-#line 152 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{
- /* Decide how to parse HID based on proto */
- pcap_val.blk.q = pcap_vsp[-1].blk.q;
- switch (pcap_val.blk.q.proto) {
- case Q_DECNET:
- pcap_val.blk.b = gen_ncode(pcap_vsp[0].s, 0, pcap_val.blk.q);
- break;
- default:
- pcap_val.blk.b = gen_ncode(pcap_vsp[0].s, 0, pcap_val.blk.q);
- break;
- }
- }
-break;
-case 18:
-#line 164 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.blk.b = gen_ecode(pcap_vsp[0].e, pcap_val.blk.q = pcap_vsp[-1].blk.q); }
-break;
-case 19:
-#line 165 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ gen_not(pcap_vsp[0].blk.b); pcap_val.blk = pcap_vsp[0].blk; }
-break;
-case 20:
-#line 167 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.blk = pcap_vsp[-1].blk; }
-break;
-case 21:
-#line 169 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.blk = pcap_vsp[-1].blk; }
-break;
-case 23:
-#line 172 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ gen_and(pcap_vsp[-2].blk.b, pcap_vsp[0].blk.b); pcap_val.blk = pcap_vsp[0].blk; }
-break;
-case 24:
-#line 173 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ gen_or(pcap_vsp[-2].blk.b, pcap_vsp[0].blk.b); pcap_val.blk = pcap_vsp[0].blk; }
-break;
-case 25:
-#line 175 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.blk.b = gen_ncode(NULL, (bpf_u_int32)pcap_vsp[0].i,
- pcap_val.blk.q = pcap_vsp[-1].blk.q); }
-break;
-case 28:
-#line 180 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ gen_not(pcap_vsp[0].blk.b); pcap_val.blk = pcap_vsp[0].blk; }
-break;
-case 29:
-#line 182 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ QSET(pcap_val.blk.q, pcap_vsp[-2].i, pcap_vsp[-1].i, pcap_vsp[0].i); }
-break;
-case 30:
-#line 183 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ QSET(pcap_val.blk.q, pcap_vsp[-1].i, pcap_vsp[0].i, Q_DEFAULT); }
-break;
-case 31:
-#line 184 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ QSET(pcap_val.blk.q, pcap_vsp[-1].i, Q_DEFAULT, pcap_vsp[0].i); }
-break;
-case 32:
-#line 185 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ QSET(pcap_val.blk.q, pcap_vsp[-1].i, Q_DEFAULT, Q_PROTO); }
-break;
-case 33:
-#line 186 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ QSET(pcap_val.blk.q, pcap_vsp[-1].i, Q_DEFAULT, pcap_vsp[0].i); }
-break;
-case 34:
-#line 188 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.blk = pcap_vsp[0].blk; }
-break;
-case 35:
-#line 189 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.blk.b = pcap_vsp[-1].blk.b; pcap_val.blk.q = pcap_vsp[-2].blk.q; }
-break;
-case 36:
-#line 190 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.blk.b = gen_proto_abbrev(pcap_vsp[0].i); pcap_val.blk.q = qerr; }
-break;
-case 37:
-#line 191 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.blk.b = gen_relation(pcap_vsp[-1].i, pcap_vsp[-2].a, pcap_vsp[0].a, 0);
- pcap_val.blk.q = qerr; }
-break;
-case 38:
-#line 193 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.blk.b = gen_relation(pcap_vsp[-1].i, pcap_vsp[-2].a, pcap_vsp[0].a, 1);
- pcap_val.blk.q = qerr; }
-break;
-case 39:
-#line 195 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.blk.b = pcap_vsp[0].rblk; pcap_val.blk.q = qerr; }
-break;
-case 41:
-#line 199 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_DEFAULT; }
-break;
-case 42:
-#line 202 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_SRC; }
-break;
-case 43:
-#line 203 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_DST; }
-break;
-case 44:
-#line 204 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_OR; }
-break;
-case 45:
-#line 205 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_OR; }
-break;
-case 46:
-#line 206 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_AND; }
-break;
-case 47:
-#line 207 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_AND; }
-break;
-case 48:
-#line 210 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_HOST; }
-break;
-case 49:
-#line 211 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_NET; }
-break;
-case 50:
-#line 212 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_PORT; }
-break;
-case 51:
-#line 215 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_GATEWAY; }
-break;
-case 52:
-#line 217 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_LINK; }
-break;
-case 53:
-#line 218 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_IP; }
-break;
-case 54:
-#line 219 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_ARP; }
-break;
-case 55:
-#line 220 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_RARP; }
-break;
-case 56:
-#line 221 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_TCP; }
-break;
-case 57:
-#line 222 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_UDP; }
-break;
-case 58:
-#line 223 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_ICMP; }
-break;
-case 59:
-#line 224 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_IGMP; }
-break;
-case 60:
-#line 225 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_IGRP; }
-break;
-case 61:
-#line 226 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_ATALK; }
-break;
-case 62:
-#line 227 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_DECNET; }
-break;
-case 63:
-#line 228 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_LAT; }
-break;
-case 64:
-#line 229 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_SCA; }
-break;
-case 65:
-#line 230 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_MOPDL; }
-break;
-case 66:
-#line 231 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = Q_MOPRC; }
-break;
-case 67:
-#line 233 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.rblk = gen_broadcast(pcap_vsp[-1].i); }
-break;
-case 68:
-#line 234 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.rblk = gen_multicast(pcap_vsp[-1].i); }
-break;
-case 69:
-#line 235 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.rblk = gen_less(pcap_vsp[0].i); }
-break;
-case 70:
-#line 236 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.rblk = gen_greater(pcap_vsp[0].i); }
-break;
-case 71:
-#line 237 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.rblk = gen_byteop(pcap_vsp[-1].i, pcap_vsp[-2].i, pcap_vsp[0].i); }
-break;
-case 72:
-#line 238 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.rblk = gen_inbound(0); }
-break;
-case 73:
-#line 239 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.rblk = gen_inbound(1); }
-break;
-case 74:
-#line 241 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = BPF_JGT; }
-break;
-case 75:
-#line 242 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = BPF_JGE; }
-break;
-case 76:
-#line 243 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = BPF_JEQ; }
-break;
-case 77:
-#line 245 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = BPF_JGT; }
-break;
-case 78:
-#line 246 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = BPF_JGE; }
-break;
-case 79:
-#line 247 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = BPF_JEQ; }
-break;
-case 80:
-#line 249 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.a = gen_loadi(pcap_vsp[0].i); }
-break;
-case 82:
-#line 252 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.a = gen_load(pcap_vsp[-3].i, pcap_vsp[-1].a, 1); }
-break;
-case 83:
-#line 253 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.a = gen_load(pcap_vsp[-5].i, pcap_vsp[-3].a, pcap_vsp[-1].i); }
-break;
-case 84:
-#line 254 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.a = gen_arth(BPF_ADD, pcap_vsp[-2].a, pcap_vsp[0].a); }
-break;
-case 85:
-#line 255 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.a = gen_arth(BPF_SUB, pcap_vsp[-2].a, pcap_vsp[0].a); }
-break;
-case 86:
-#line 256 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.a = gen_arth(BPF_MUL, pcap_vsp[-2].a, pcap_vsp[0].a); }
-break;
-case 87:
-#line 257 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.a = gen_arth(BPF_DIV, pcap_vsp[-2].a, pcap_vsp[0].a); }
-break;
-case 88:
-#line 258 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.a = gen_arth(BPF_AND, pcap_vsp[-2].a, pcap_vsp[0].a); }
-break;
-case 89:
-#line 259 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.a = gen_arth(BPF_OR, pcap_vsp[-2].a, pcap_vsp[0].a); }
-break;
-case 90:
-#line 260 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.a = gen_arth(BPF_LSH, pcap_vsp[-2].a, pcap_vsp[0].a); }
-break;
-case 91:
-#line 261 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.a = gen_arth(BPF_RSH, pcap_vsp[-2].a, pcap_vsp[0].a); }
-break;
-case 92:
-#line 262 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.a = gen_neg(pcap_vsp[0].a); }
-break;
-case 93:
-#line 263 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.a = pcap_vsp[-1].a; }
-break;
-case 94:
-#line 264 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.a = gen_loadlen(); }
-break;
-case 95:
-#line 266 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = '&'; }
-break;
-case 96:
-#line 267 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = '|'; }
-break;
-case 97:
-#line 268 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = '<'; }
-break;
-case 98:
-#line 269 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = '>'; }
-break;
-case 99:
-#line 270 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = '='; }
-break;
-case 101:
-#line 273 "/export/home/gray/ipacct/libpcap/./grammar.y"
-{ pcap_val.i = pcap_vsp[-1].i; }
-break;
-#line 1058 "grammar.c"
- }
- pcap_ssp -= pcap_m;
- pcap_state = *pcap_ssp;
- pcap_vsp -= pcap_m;
- pcap_m = pcap_lhs[pcap_n];
- if (pcap_state == 0 && pcap_m == 0)
- {
-#if YYDEBUG
- if (pcap_debug)
- printf("pcap_debug: after reduction, shifting from state 0 to\
- state %d\n", YYFINAL);
-#endif
- pcap_state = YYFINAL;
- *++pcap_ssp = YYFINAL;
- *++pcap_vsp = pcap_val;
- if (pcap_char < 0)
- {
- if ((pcap_char = pcap_lex()) < 0) pcap_char = 0;
-#if YYDEBUG
- if (pcap_debug)
- {
- pcap_s = 0;
- if (pcap_char <= YYMAXTOKEN) pcap_s = pcap_name[pcap_char];
- if (!pcap_s) pcap_s = "illegal-symbol";
- printf("pcap_debug: state %d, reading %d (%s)\n",
- YYFINAL, pcap_char, pcap_s);
- }
-#endif
- }
- if (pcap_char == 0) goto pcap_accept;
- goto pcap_loop;
- }
- if ((pcap_n = pcap_gindex[pcap_m]) && (pcap_n += pcap_state) >= 0 &&
- pcap_n <= YYTABLESIZE && pcap_check[pcap_n] == pcap_state)
- pcap_state = pcap_table[pcap_n];
- else
- pcap_state = pcap_dgoto[pcap_m];
-#if YYDEBUG
- if (pcap_debug)
- printf("pcap_debug: after reduction, shifting from state %d \
-to state %d\n", *pcap_ssp, pcap_state);
-#endif
- if (pcap_ssp >= pcap_ss + pcap_stacksize - 1)
- {
- goto pcap_overflow;
- }
- *++pcap_ssp = pcap_state;
- *++pcap_vsp = pcap_val;
- goto pcap_loop;
-pcap_overflow:
- pcap_error("yacc stack overflow");
-pcap_abort:
- return (1);
-pcap_accept:
- return (0);
-}
diff --git a/libpcap/grammar.y b/libpcap/grammar.y
deleted file mode 100644
index 257fd66..0000000
--- a/libpcap/grammar.y
+++ b/dev/null
@@ -1,275 +0,0 @@
-%{
-/*
- * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- */
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/grammar.y,v 1.1 2001/05/31 13:40:52 gray Exp $ (LBL)";
-#endif
-
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-
-#if __STDC__
-struct mbuf;
-struct rtentry;
-#endif
-
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-
-#include <stdio.h>
-
-#include <pcap-int.h>
-
-#include <gencode.h>
-#include <pcap-namedb.h>
-
-#include <gnuc.h>
-#ifdef HAVE_OS_PROTO_H
-#include <os-proto.h>
-#endif
-
-#define QSET(q, p, d, a) (q).proto = (p),\
- (q).dir = (d),\
- (q).addr = (a)
-
-int n_errors = 0;
-
-static struct qual qerr = { Q_UNDEF, Q_UNDEF, Q_UNDEF, Q_UNDEF };
-
-static void
-yyerror(char *msg)
-{
- ++n_errors;
- bpf_error("%s", msg);
- /* NOTREACHED */
-}
-
-%}
-
-%union {
- int i;
- bpf_u_int32 h;
- u_char *e;
- char *s;
- struct stmt *stmt;
- struct arth *a;
- struct {
- struct qual q;
- struct block *b;
- } blk;
- struct block *rblk;
-}
-
-%type <blk> expr id nid pid term rterm qid
-%type <blk> head
-%type <i> pqual dqual aqual ndaqual
-%type <a> arth narth
-%type <i> byteop pname pnum relop irelop
-%type <blk> and or paren not null prog
-%type <rblk> other
-
-%token DST SRC HOST GATEWAY
-%token NET MASK PORT LESS GREATER PROTO BYTE
-%token ARP RARP IP TCP UDP ICMP IGMP IGRP
-%token ATALK DECNET LAT SCA MOPRC MOPDL
-%token TK_BROADCAST TK_MULTICAST
-%token NUM INBOUND OUTBOUND
-%token LINK
-%token GEQ LEQ NEQ
-%token ID EID HID
-%token LSH RSH
-%token LEN
-
-%type <s> ID
-%type <e> EID
-%type <s> HID
-%type <i> NUM
-
-%left OR AND
-%nonassoc '!'
-%left '|'
-%left '&'
-%left LSH RSH
-%left '+' '-'
-%left '*' '/'
-%nonassoc UMINUS
-%%
-prog: null expr
-{
- finish_parse($2.b);
-}
- | null
- ;
-null: /* null */ { $$.q = qerr; }
- ;
-expr: term
- | expr and term { gen_and($1.b, $3.b); $$ = $3; }
- | expr and id { gen_and($1.b, $3.b); $$ = $3; }
- | expr or term { gen_or($1.b, $3.b); $$ = $3; }
- | expr or id { gen_or($1.b, $3.b); $$ = $3; }
- ;
-and: AND { $$ = $<blk>0; }
- ;
-or: OR { $$ = $<blk>0; }
- ;
-id: nid
- | pnum { $$.b = gen_ncode(NULL, (bpf_u_int32)$1,
- $$.q = $<blk>0.q); }
- | paren pid ')' { $$ = $2; }
- ;
-nid: ID { $$.b = gen_scode($1, $$.q = $<blk>0.q); }
- | HID '/' NUM { $$.b = gen_mcode($1, NULL, $3,
- $$.q = $<blk>0.q); }
- | HID MASK HID { $$.b = gen_mcode($1, $3, 0,
- $$.q = $<blk>0.q); }
- | HID {
- /* Decide how to parse HID based on proto */
- $$.q = $<blk>0.q;
- switch ($$.q.proto) {
- case Q_DECNET:
- $$.b = gen_ncode($1, 0, $$.q);
- break;
- default:
- $$.b = gen_ncode($1, 0, $$.q);
- break;
- }
- }
- | EID { $$.b = gen_ecode($1, $$.q = $<blk>0.q); }
- | not id { gen_not($2.b); $$ = $2; }
- ;
-not: '!' { $$ = $<blk>0; }
- ;
-paren: '(' { $$ = $<blk>0; }
- ;
-pid: nid
- | qid and id { gen_and($1.b, $3.b); $$ = $3; }
- | qid or id { gen_or($1.b, $3.b); $$ = $3; }
- ;
-qid: pnum { $$.b = gen_ncode(NULL, (bpf_u_int32)$1,
- $$.q = $<blk>0.q); }
- | pid
- ;
-term: rterm
- | not term { gen_not($2.b); $$ = $2; }
- ;
-head: pqual dqual aqual { QSET($$.q, $1, $2, $3); }
- | pqual dqual { QSET($$.q, $1, $2, Q_DEFAULT); }
- | pqual aqual { QSET($$.q, $1, Q_DEFAULT, $2); }
- | pqual PROTO { QSET($$.q, $1, Q_DEFAULT, Q_PROTO); }
- | pqual ndaqual { QSET($$.q, $1, Q_DEFAULT, $2); }
- ;
-rterm: head id { $$ = $2; }
- | paren expr ')' { $$.b = $2.b; $$.q = $1.q; }
- | pname { $$.b = gen_proto_abbrev($1); $$.q = qerr; }
- | arth relop arth { $$.b = gen_relation($2, $1, $3, 0);
- $$.q = qerr; }
- | arth irelop arth { $$.b = gen_relation($2, $1, $3, 1);
- $$.q = qerr; }
- | other { $$.b = $1; $$.q = qerr; }
- ;
-/* protocol level qualifiers */
-pqual: pname
- | { $$ = Q_DEFAULT; }
- ;
-/* 'direction' qualifiers */
-dqual: SRC { $$ = Q_SRC; }
- | DST { $$ = Q_DST; }
- | SRC OR DST { $$ = Q_OR; }
- | DST OR SRC { $$ = Q_OR; }
- | SRC AND DST { $$ = Q_AND; }
- | DST AND SRC { $$ = Q_AND; }
- ;
-/* address type qualifiers */
-aqual: HOST { $$ = Q_HOST; }
- | NET { $$ = Q_NET; }
- | PORT { $$ = Q_PORT; }
- ;
-/* non-directional address type qualifiers */
-ndaqual: GATEWAY { $$ = Q_GATEWAY; }
- ;
-pname: LINK { $$ = Q_LINK; }
- | IP { $$ = Q_IP; }
- | ARP { $$ = Q_ARP; }
- | RARP { $$ = Q_RARP; }
- | TCP { $$ = Q_TCP; }
- | UDP { $$ = Q_UDP; }
- | ICMP { $$ = Q_ICMP; }
- | IGMP { $$ = Q_IGMP; }
- | IGRP { $$ = Q_IGRP; }
- | ATALK { $$ = Q_ATALK; }
- | DECNET { $$ = Q_DECNET; }
- | LAT { $$ = Q_LAT; }
- | SCA { $$ = Q_SCA; }
- | MOPDL { $$ = Q_MOPDL; }
- | MOPRC { $$ = Q_MOPRC; }
- ;
-other: pqual TK_BROADCAST { $$ = gen_broadcast($1); }
- | pqual TK_MULTICAST { $$ = gen_multicast($1); }
- | LESS NUM { $$ = gen_less($2); }
- | GREATER NUM { $$ = gen_greater($2); }
- | BYTE NUM byteop NUM { $$ = gen_byteop($3, $2, $4); }
- | INBOUND { $$ = gen_inbound(0); }
- | OUTBOUND { $$ = gen_inbound(1); }
- ;
-relop: '>' { $$ = BPF_JGT; }
- | GEQ { $$ = BPF_JGE; }
- | '=' { $$ = BPF_JEQ; }
- ;
-irelop: LEQ { $$ = BPF_JGT; }
- | '<' { $$ = BPF_JGE; }
- | NEQ { $$ = BPF_JEQ; }
- ;
-arth: pnum { $$ = gen_loadi($1); }
- | narth
- ;
-narth: pname '[' arth ']' { $$ = gen_load($1, $3, 1); }
- | pname '[' arth ':' NUM ']' { $$ = gen_load($1, $3, $5); }
- | arth '+' arth { $$ = gen_arth(BPF_ADD, $1, $3); }
- | arth '-' arth { $$ = gen_arth(BPF_SUB, $1, $3); }
- | arth '*' arth { $$ = gen_arth(BPF_MUL, $1, $3); }
- | arth '/' arth { $$ = gen_arth(BPF_DIV, $1, $3); }
- | arth '&' arth { $$ = gen_arth(BPF_AND, $1, $3); }
- | arth '|' arth { $$ = gen_arth(BPF_OR, $1, $3); }
- | arth LSH arth { $$ = gen_arth(BPF_LSH, $1, $3); }
- | arth RSH arth { $$ = gen_arth(BPF_RSH, $1, $3); }
- | '-' arth %prec UMINUS { $$ = gen_neg($2); }
- | paren narth ')' { $$ = $2; }
- | LEN { $$ = gen_loadlen(); }
- ;
-byteop: '&' { $$ = '&'; }
- | '|' { $$ = '|'; }
- | '<' { $$ = '<'; }
- | '>' { $$ = '>'; }
- | '=' { $$ = '='; }
- ;
-pnum: NUM
- | paren pnum ')' { $$ = $2; }
- ;
-%%
diff --git a/libpcap/inet.c b/libpcap/inet.c
deleted file mode 100644
index e354627..0000000
--- a/libpcap/inet.c
+++ b/dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (c) 1994, 1995, 1996, 1997, 1998
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the Computer Systems
- * Engineering Group at Lawrence Berkeley Laboratory.
- * 4. Neither the name of the University nor of the Laboratory may be used
- * to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/inet.c,v 1.1 2001/05/31 13:40:52 gray Exp $ (LBL)";
-#endif
-
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-
-#include <sys/param.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#ifdef HAVE_SYS_SOCKIO_H
-#include <sys/sockio.h>
-#endif
-#include <sys/time.h> /* concession to AIX */
-
-#if __STDC__
-struct mbuf;
-struct rtentry;
-#endif
-
-#include <net/if.h>
-#include <netinet/in.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <memory.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <pcap-int.h>
-
-#include <gnuc.h>
-#ifdef HAVE_OS_PROTO_H
-#include <os-proto.h>
-#endif
-
-/* Not all systems have IFF_LOOPBACK */
-#ifdef IFF_LOOPBACK
-#define ISLOOPBACK(p) ((p)->ifr_flags & IFF_LOOPBACK)
-#else
-#define ISLOOPBACK(p) ((p)->ifr_name[0] == 'l' && (p)->ifr_name[1] == 'o' && \
- (isdigit((p)->ifr_name[2]) || (p)->ifr_name[2] == '\0'))
-#endif
-
-/*
- * Return the name of a network interface attached to the system, or NULL
- * if none can be found. The interface must be configured up; the
- * lowest unit number is preferred; loopback is ignored.
- */
-char *
-pcap_lookupdev(errbuf)
- register char *errbuf;
-{
- register int fd, minunit, n;
- register char *cp;
- register struct ifreq *ifrp, *ifend, *ifnext, *mp;
- struct ifconf ifc;
- struct ifreq ibuf[16], ifr;
- static char device[sizeof(ifrp->ifr_name) + 1];
-
- fd = socket(AF_INET, SOCK_DGRAM, 0);
- if (fd < 0) {
- (void)sprintf(errbuf, "socket: %s", pcap_strerror(errno));
- return (NULL);
- }
- ifc.ifc_len = sizeof ibuf;
- ifc.ifc_buf = (caddr_t)ibuf;
-
- memset((char *)ibuf, 0, sizeof(ibuf));
- if (ioctl(fd, SIOCGIFCONF, (char *)&ifc) < 0 ||
- ifc.ifc_len < sizeof(struct ifreq)) {
- (void)sprintf(errbuf, "SIOCGIFCONF: %s", pcap_strerror(errno));
- (void)close(fd);
- return (NULL);
- }
- ifrp = ibuf;
- ifend = (struct ifreq *)((char *)ibuf + ifc.ifc_len);
-
- mp = NULL;
- minunit = 666;
- for (; ifrp < ifend; ifrp = ifnext) {
-#ifdef HAVE_SOCKADDR_SA_LEN
- n = ifrp->ifr_addr.sa_len + sizeof(ifrp->ifr_name);
- if (n < sizeof(*ifrp))
- ifnext = ifrp + 1;
- else
- ifnext = (struct ifreq *)((char *)ifrp + n);
- if (ifrp->ifr_addr.sa_family != AF_INET)
- continue;
-#else
- ifnext = ifrp + 1;
-#endif
- /*
- * Need a template to preserve address info that is
- * used below to locate the next entry. (Otherwise,
- * SIOCGIFFLAGS stomps over it because the requests
- * are returned in a union.)
- */
- strncpy(ifr.ifr_name, ifrp->ifr_name, sizeof(ifr.ifr_name));
- if (ioctl(fd, SIOCGIFFLAGS, (char *)&ifr) < 0) {
- if (errno == ENXIO)
- continue;
- (void)sprintf(errbuf, "SIOCGIFFLAGS: %.*s: %s",
- (int)sizeof(ifr.ifr_name), ifr.ifr_name,
- pcap_strerror(errno));
- (void)close(fd);
- return (NULL);
- }
-
- /* Must be up and not the loopback */
- if ((ifr.ifr_flags & IFF_UP) == 0 || ISLOOPBACK(&ifr))
- continue;
-
- for (cp = ifrp->ifr_name; !isdigit(*cp); ++cp)
- continue;
- n = atoi(cp);
- if (n < minunit) {
- minunit = n;
- mp = ifrp;
- }
- }
- (void)close(fd);
- if (mp == NULL) {
- (void)strcpy(errbuf, "no suitable device found");
- return (NULL);
- }
-
- (void)strncpy(device, mp->ifr_name, sizeof(device) - 1);
- device[sizeof(device) - 1] = '\0';
- return (device);
-}
-
-int
-pcap_lookupnet(device, netp, maskp, errbuf)
- register char *device;
- register bpf_u_int32 *netp, *maskp;
- register char *errbuf;
-{
- register int fd;
- register struct sockaddr_in *sin;
- struct ifreq ifr;
-
- fd = socket(AF_INET, SOCK_DGRAM, 0);
- if (fd < 0) {
- (void)sprintf(errbuf, "socket: %s", pcap_strerror(errno));
- return (-1);
- }
- memset(&ifr, 0, sizeof(ifr));
-#ifdef linux
- /* XXX Work around Linux kernel bug */
- ifr.ifr_addr.sa_family = AF_INET;
-#endif
- (void)strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
- if (ioctl(fd, SIOCGIFADDR, (char *)&ifr) < 0) {
- (void)sprintf(errbuf, "SIOCGIFADDR: %s: %s",
- device, pcap_strerror(errno));
- (void)close(fd);
- return (-1);
- }
- sin = (struct sockaddr_in *)&ifr.ifr_addr;
- *netp = sin->sin_addr.s_addr;
- if (ioctl(fd, SIOCGIFNETMASK, (char *)&ifr) < 0) {
- (void)sprintf(errbuf, "SIOCGIFNETMASK: %s: %s",
- device, pcap_strerror(errno));
- (void)close(fd);
- return (-1);
- }
- (void)close(fd);
- *maskp = sin->sin_addr.s_addr;
- if (*maskp == 0) {
- if (IN_CLASSA(*netp))
- *maskp = IN_CLASSA_NET;
- else if (IN_CLASSB(*netp))
- *maskp = IN_CLASSB_NET;
- else if (IN_CLASSC(*netp))
- *maskp = IN_CLASSC_NET;
- else {
- (void)sprintf(errbuf, "inet class for 0x%x unknown",
- *netp);
- return (-1);
- }
- }
- *netp &= *maskp;
- return (0);
-}
diff --git a/libpcap/lbl/gnuc.h b/libpcap/lbl/gnuc.h
deleted file mode 100644
index a5e7107..0000000
--- a/libpcap/lbl/gnuc.h
+++ b/dev/null
@@ -1,43 +0,0 @@
-/* @(#) $Header: /cvsroot/ipacct/ipacct/libpcap/lbl/Attic/gnuc.h,v 1.1 2001/05/31 13:40:56 gray Exp $ (LBL) */
-
-/* Define __P() macro, if necessary */
-#ifndef __P
-#if __STDC__
-#define __P(protos) protos
-#else
-#define __P(protos) ()
-#endif
-#endif
-
-/* inline foo */
-#ifdef __GNUC__
-#define inline __inline
-#else
-#define inline
-#endif
-
-/*
- * Handle new and old "dead" routine prototypes
- *
- * For example:
- *
- * __dead void foo(void) __attribute__((volatile));
- *
- */
-#ifdef __GNUC__
-#ifndef __dead
-#define __dead volatile
-#endif
-#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
-#ifndef __attribute__
-#define __attribute__(args)
-#endif
-#endif
-#else
-#ifndef __dead
-#define __dead
-#endif
-#ifndef __attribute__
-#define __attribute__(args)
-#endif
-#endif
diff --git a/libpcap/lbl/os-solaris2.h b/libpcap/lbl/os-solaris2.h
deleted file mode 100644
index 03dae79..0000000
--- a/libpcap/lbl/os-solaris2.h
+++ b/dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1993, 1994, 1995, 1996, 1997
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /cvsroot/ipacct/ipacct/libpcap/lbl/Attic/os-solaris2.h,v 1.1 2001/05/31 13:40:56 gray Exp $ (LBL)
- */
-
-/* Prototypes missing in SunOS 5 */
-int daemon(int, int);
-int dn_expand(const u_char *, const u_char *, const u_char *, char *, int);
-int dn_skipname(const u_char *, const u_char *);
-int flock(int, int);
-int getdtablesize(void);
-int gethostname(char *, int);
-int getpagesize(void);
-char *getusershell(void);
-char *getwd(char *);
-int iruserok(u_int, int, char *, char *);
-#ifdef __STDC__
-struct utmp;
-void login(struct utmp *);
-#endif
-int logout(const char *);
-int res_query(const char *, int, int, u_char *, int);
-int setenv(const char *, const char *, int);
-#if defined(_STDIO_H) && defined(HAVE_SETLINEBUF)
-int setlinebuf(FILE *);
-#endif
-int sigblock(int);
-int sigsetmask(int);
-char *strerror(int);
-int snprintf(char *, size_t, const char *, ...);
-int strcasecmp(const char *, const char *);
-void unsetenv(const char *);
-#ifdef __STDC__
-struct timeval;
-#endif
-int utimes(const char *, struct timeval *);
diff --git a/libpcap/lbl/os-sunos4.h b/libpcap/lbl/os-sunos4.h
deleted file mode 100644
index b9815df..0000000
--- a/libpcap/lbl/os-sunos4.h
+++ b/dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (c) 1989, 1990, 1993, 1994, 1995, 1996
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /cvsroot/ipacct/ipacct/libpcap/lbl/Attic/os-sunos4.h,v 1.1 2001/05/31 13:40:56 gray Exp $ (LBL)
- */
-
-/* Prototypes missing in SunOS 4 */
-#ifdef FILE
-int _filbuf(FILE *);
-int _flsbuf(u_char, FILE *);
-int fclose(FILE *);
-int fflush(FILE *);
-int fgetc(FILE *);
-int fprintf(FILE *, const char *, ...);
-int fputc(int, FILE *);
-int fputs(const char *, FILE *);
-u_int fread(void *, u_int, u_int, FILE *);
-int fseek(FILE *, long, int);
-u_int fwrite(const void *, u_int, u_int, FILE *);
-int pclose(FILE *);
-void rewind(FILE *);
-void setbuf(FILE *, char *);
-int setlinebuf(FILE *);
-int ungetc(int, FILE *);
-int vfprintf(FILE *, const char *, ...);
-int vprintf(const char *, ...);
-#endif
-
-#if __GNUC__ <= 1
-int read(int, char *, u_int);
-int write(int, char *, u_int);
-#endif
-
-long a64l(const char *);
-#ifdef __STDC__
-struct sockaddr;
-#endif
-int accept(int, struct sockaddr *, int *);
-int bind(int, struct sockaddr *, int);
-int bcmp(const void *, const void *, u_int);
-void bcopy(const void *, void *, u_int);
-void bzero(void *, int);
-int chroot(const char *);
-int close(int);
-void closelog(void);
-int connect(int, struct sockaddr *, int);
-char *crypt(const char *, const char *);
-int daemon(int, int);
-int fchmod(int, int);
-int fchown(int, int, int);
-void endgrent(void);
-void endpwent(void);
-void endservent(void);
-#ifdef __STDC__
-struct ether_addr;
-#endif
-struct ether_addr *ether_aton(const char *);
-int flock(int, int);
-#ifdef __STDC__
-struct stat;
-#endif
-int fstat(int, struct stat *);
-#ifdef __STDC__
-struct statfs;
-#endif
-int fstatfs(int, struct statfs *);
-int fsync(int);
-#ifdef __STDC__
-struct timeb;
-#endif
-int ftime(struct timeb *);
-int ftruncate(int, off_t);
-int getdtablesize(void);
-long gethostid(void);
-int gethostname(char *, int);
-int getopt(int, char * const *, const char *);
-int getpagesize(void);
-char *getpass(char *);
-int getpeername(int, struct sockaddr *, int *);
-int getpriority(int, int);
-#ifdef __STDC__
-struct rlimit;
-#endif
-int getrlimit(int, struct rlimit *);
-int getsockname(int, struct sockaddr *, int *);
-int getsockopt(int, int, int, char *, int *);
-#ifdef __STDC__
-struct timeval;
-struct timezone;
-#endif
-int gettimeofday(struct timeval *, struct timezone *);
-char *getusershell(void);
-char *getwd(char *);
-int initgroups(const char *, int);
-int ioctl(int, int, caddr_t);
-int iruserok(u_long, int, char *, char *);
-int isatty(int);
-int killpg(int, int);
-int listen(int, int);
-#ifdef __STDC__
-struct utmp;
-#endif
-void login(struct utmp *);
-int logout(const char *);
-off_t lseek(int, off_t, int);
-int lstat(const char *, struct stat *);
-int mkstemp(char *);
-char *mktemp(char *);
-int munmap(caddr_t, int);
-void openlog(const char *, int, int);
-void perror(const char *);
-int printf(const char *, ...);
-int puts(const char *);
-long random(void);
-int readlink(const char *, char *, int);
-#ifdef __STDC__
-struct iovec;
-#endif
-int readv(int, struct iovec *, int);
-int recv(int, char *, u_int, int);
-int recvfrom(int, char *, u_int, int, struct sockaddr *, int *);
-int rename(const char *, const char *);
-int rcmd(char **, u_short, char *, char *, char *, int *);
-int rresvport(int *);
-int send(int, char *, u_int, int);
-int sendto(int, char *, u_int, int, struct sockaddr *, int);
-int setenv(const char *, const char *, int);
-int seteuid(int);
-int setpriority(int, int, int);
-int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
-int setpgrp(int, int);
-void setpwent(void);
-int setrlimit(int, struct rlimit *);
-void setservent(int);
-int setsockopt(int, int, int, char *, int);
-int shutdown(int, int);
-int sigblock(int);
-void (*signal (int, void (*) (int))) (int);
-int sigpause(int);
-int sigsetmask(int);
-#ifdef __STDC__
-struct sigvec;
-#endif
-int sigvec(int, struct sigvec *, struct sigvec*);
-int snprintf(char *, size_t, const char *, ...);
-int socket(int, int, int);
-int socketpair(int, int, int, int *);
-int symlink(const char *, const char *);
-void srandom(int);
-int sscanf(char *, const char *, ...);
-int stat(const char *, struct stat *);
-int statfs(char *, struct statfs *);
-char *strerror(int);
-int strcasecmp(const char *, const char *);
-#ifdef __STDC__
-struct tm;
-#endif
-int strftime(char *, int, char *, struct tm *);
-int strncasecmp(const char *, const char *, int);
-long strtol(const char *, char **, int);
-void sync(void);
-void syslog(int, const char *, ...);
-int system(const char *);
-long tell(int);
-time_t time(time_t *);
-char *timezone(int, int);
-int tolower(int);
-int toupper(int);
-int truncate(char *, off_t);
-void unsetenv(const char *);
-int vfork(void);
-int vsprintf(char *, const char *, ...);
-int writev(int, struct iovec *, int);
-#ifdef __STDC__
-struct rusage;
-#endif
-int utimes(const char *, struct timeval *);
-#if __GNUC__ <= 1
-int wait(int *);
-pid_t wait3(int *, int, struct rusage *);
-#endif
-
-/* Ugly signal hacking */
-#ifdef SIG_ERR
-#undef SIG_ERR
-#define SIG_ERR (void (*)(int))-1
-#undef SIG_DFL
-#define SIG_DFL (void (*)(int))0
-#undef SIG_IGN
-#define SIG_IGN (void (*)(int))1
-
-#ifdef KERNEL
-#undef SIG_CATCH
-#define SIG_CATCH (void (*)(int))2
-#endif
-#undef SIG_HOLD
-#define SIG_HOLD (void (*)(int))3
-#endif
diff --git a/libpcap/lbl/os-ultrix4.h b/libpcap/lbl/os-ultrix4.h
deleted file mode 100644
index 2105733..0000000
--- a/libpcap/lbl/os-ultrix4.h
+++ b/dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1990, 1993, 1994, 1995, 1996
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /cvsroot/ipacct/ipacct/libpcap/lbl/Attic/os-ultrix4.h,v 1.1 2001/05/31 13:40:56 gray Exp $ (LBL)
- */
-
-/* Prototypes missing in Ultrix 4 */
-int bcmp(const char *, const char *, u_int);
-void bcopy(const void *, void *, u_int);
-void bzero(void *, u_int);
-void endservent(void);
-int getopt(int, char * const *, const char *);
-#ifdef __STDC__
-struct timeval;
-struct timezone;
-#endif
-int gettimeofday(struct timeval *, struct timezone *);
-int ioctl(int, int, caddr_t);
-int pfopen(char *, int);
-int setlinebuf(FILE *);
-int socket(int, int, int);
-int strcasecmp(const char *, const char *);
diff --git a/libpcap/linux-include/netinet/if_ether.h b/libpcap/linux-include/netinet/if_ether.h
deleted file mode 100644
index 4148ab8..0000000
--- a/libpcap/linux-include/netinet/if_ether.h
+++ b/dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)if_ether.h 8.3 (Berkeley) 5/2/95
- */
-
-#include <net/if_arp.h>
-
-/*
- * Ethernet address - 6 octets
- */
-struct ether_addr {
- u_char ether_addr_octet[6];
-};
-
-/*
- * Structure of a 10Mb/s Ethernet header.
- */
-struct ether_header {
- u_char ether_dhost[6];
- u_char ether_shost[6];
- u_short ether_type;
-};
-
-#define ETHERTYPE_PUP 0x0200 /* PUP protocol */
-#define ETHERTYPE_IP 0x0800 /* IP protocol */
-#define ETHERTYPE_ARP 0x0806 /* Addr. resolution protocol */
-#define ETHERTYPE_REVARP 0x8035 /* reverse Addr. resolution protocol */
-
-/*
- * The ETHERTYPE_NTRAILER packet types starting at ETHERTYPE_TRAIL have
- * (type-ETHERTYPE_TRAIL)*512 bytes of data followed
- * by an ETHER type (as given above) and then the (variable-length) header.
- */
-#define ETHERTYPE_TRAIL 0x1000 /* Trailer packet */
-#define ETHERTYPE_NTRAILER 16
-
-#define ETHERMTU 1500
-#define ETHERMIN (60-14)
-
-/*
- * Ethernet Address Resolution Protocol.
- *
- * See RFC 826 for protocol description. Structure below is adapted
- * to resolving internet addresses. Field names used correspond to
- * RFC 826.
- */
-struct ether_arp {
- struct arphdr ea_hdr; /* fixed-size header */
- u_char arp_sha[6]; /* sender hardware address */
- u_char arp_spa[4]; /* sender protocol address */
- u_char arp_tha[6]; /* target hardware address */
- u_char arp_tpa[4]; /* target protocol address */
-};
-#define arp_hrd ea_hdr.ar_hrd
-#define arp_pro ea_hdr.ar_pro
-#define arp_hln ea_hdr.ar_hln
-#define arp_pln ea_hdr.ar_pln
-#define arp_op ea_hdr.ar_op
diff --git a/libpcap/linux-include/netinet/ip_var.h b/libpcap/linux-include/netinet/ip_var.h
deleted file mode 100644
index c528b62..0000000
--- a/libpcap/linux-include/netinet/ip_var.h
+++ b/dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)ip_var.h 8.2 (Berkeley) 1/9/95
- */
-
-#include <endian.h>
-
-/*
- * Overlay for ip header used by other protocols (tcp, udp).
- */
-struct ipovly {
- caddr_t ih_next, ih_prev; /* for protocol sequence q's */
- u_char ih_x1; /* (unused) */
- u_char ih_pr; /* protocol */
- short ih_len; /* protocol length */
- struct in_addr ih_src; /* source internet address */
- struct in_addr ih_dst; /* destination internet address */
-};
-
-/*
- * Ip reassembly queue structure. Each fragment
- * being reassembled is attached to one of these structures.
- * They are timed out after ipq_ttl drops to 0, and may also
- * be reclaimed if memory becomes tight.
- */
-struct ipq {
- struct ipq *next,*prev; /* to other reass headers */
- u_char ipq_ttl; /* time for reass q to live */
- u_char ipq_p; /* protocol of this fragment */
- u_short ipq_id; /* sequence id for reassembly */
- struct ipasfrag *ipq_next,*ipq_prev;
- /* to ip headers of fragments */
- struct in_addr ipq_src,ipq_dst;
-};
-
-/*
- * Ip header, when holding a fragment.
- *
- * Note: ipf_next must be at same offset as ipq_next above
- */
-struct ipasfrag {
-#if BYTE_ORDER == LITTLE_ENDIAN
- u_char ip_hl:4,
- ip_v:4;
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
- u_char ip_v:4,
- ip_hl:4;
-#endif
- u_char ipf_mff; /* XXX overlays ip_tos: use low bit
- * to avoid destroying tos;
- * copied from (ip_off&IP_MF) */
- short ip_len;
- u_short ip_id;
- short ip_off;
- u_char ip_ttl;
- u_char ip_p;
- u_short ip_sum;
- struct ipasfrag *ipf_next; /* next fragment */
- struct ipasfrag *ipf_prev; /* previous fragment */
-};
-
-/*
- * Structure stored in mbuf in inpcb.ip_options
- * and passed to ip_output when ip options are in use.
- * The actual length of the options (including ipopt_dst)
- * is in m_len.
- */
-#define MAX_IPOPTLEN 40
-
-struct ipoption {
- struct in_addr ipopt_dst; /* first-hop dst if source routed */
- char ipopt_list[MAX_IPOPTLEN]; /* options proper */
-};
-
-struct ipstat {
- n_long ips_total; /* total packets received */
- n_long ips_badsum; /* checksum bad */
- n_long ips_tooshort; /* packet too short */
- n_long ips_toosmall; /* not enough data */
- n_long ips_badhlen; /* ip header length < data size */
- n_long ips_badlen; /* ip length < ip header length */
- n_long ips_fragments; /* fragments received */
- n_long ips_fragdropped; /* frags dropped (dups, out of space) */
- n_long ips_fragtimeout; /* fragments timed out */
- n_long ips_forward; /* packets forwarded */
- n_long ips_cantforward; /* packets rcvd for unreachable dest */
- n_long ips_redirectsent; /* packets forwarded on same net */
- n_long ips_noproto; /* unknown or unsupported protocol */
- n_long ips_delivered; /* datagrams delivered to upper level*/
- n_long ips_localout; /* total ip packets generated here */
- n_long ips_odropped; /* lost packets due to nobufs, etc. */
- n_long ips_reassembled; /* total packets reassembled ok */
- n_long ips_fragmented; /* datagrams sucessfully fragmented */
- n_long ips_ofragments; /* output fragments created */
- n_long ips_cantfrag; /* don't fragment flag was set, etc. */
- n_long ips_badoptions; /* error in option processing */
- n_long ips_noroute; /* packets discarded due to no route */
- n_long ips_badvers; /* ip version != 4 */
- n_long ips_rawout; /* total raw ip packets generated */
-};
-
-#ifdef KERNEL
-/* flags passed to ip_output as last parameter */
-#define IP_FORWARDING 0x1 /* most of ip header exists */
-#define IP_RAWOUTPUT 0x2 /* raw ip header exists */
-#define IP_ROUTETOIF SO_DONTROUTE /* bypass routing tables */
-#define IP_ALLOWBROADCAST SO_BROADCAST /* can send broadcast packets */
-
-struct ipstat ipstat;
-struct ipq ipq; /* ip reass. queue */
-u_short ip_id; /* ip packet ctr, for ids */
-int ip_defttl; /* default IP ttl */
-
-int in_control __P((struct socket *, n_long, caddr_t, struct ifnet *));
-int ip_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
-void ip_deq __P((struct ipasfrag *));
-int ip_dooptions __P((struct mbuf *));
-void ip_drain __P((void));
-void ip_enq __P((struct ipasfrag *, struct ipasfrag *));
-void ip_forward __P((struct mbuf *, int));
-void ip_freef __P((struct ipq *));
-void ip_freemoptions __P((struct ip_moptions *));
-int ip_getmoptions __P((int, struct ip_moptions *, struct mbuf **));
-void ip_init __P((void));
-int ip_mforward __P((struct mbuf *, struct ifnet *));
-int ip_optcopy __P((struct ip *, struct ip *));
-int ip_output __P((struct mbuf *,
- struct mbuf *, struct route *, int, struct ip_moptions *));
-int ip_pcbopts __P((struct mbuf **, struct mbuf *));
-struct ip *
- ip_reass __P((struct ipasfrag *, struct ipq *));
-struct in_ifaddr *
- ip_rtaddr __P((struct in_addr));
-int ip_setmoptions __P((int, struct ip_moptions **, struct mbuf *));
-void ip_slowtimo __P((void));
-struct mbuf *
- ip_srcroute __P((void));
-void ip_stripoptions __P((struct mbuf *, struct mbuf *));
-int ip_sysctl __P((int *, n_long, void *, size_t *, void *, size_t));
-void ipintr __P((void));
-int rip_ctloutput __P((int, struct socket *, int, int, struct mbuf **));
-void rip_init __P((void));
-void rip_input __P((struct mbuf *));
-int rip_output __P((struct mbuf *, struct socket *, n_long));
-int rip_usrreq __P((struct socket *,
- int, struct mbuf *, struct mbuf *, struct mbuf *));
-#endif
diff --git a/libpcap/nametoaddr.c b/libpcap/nametoaddr.c
deleted file mode 100644
index 7cfe10e..0000000
--- a/libpcap/nametoaddr.c
+++ b/dev/null
@@ -1,376 +0,0 @@
-/*
- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Name to id translation routines used by the scanner.
- * These functions are not time critical.
- */
-
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/nametoaddr.c,v 1.1 2001/05/31 13:40:52 gray Exp $ (LBL)";
-#endif
-
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-
-#include <sys/param.h>
-#include <sys/types.h> /* concession to AIX */
-#include <sys/socket.h>
-#include <sys/time.h>
-
-#if __STDC__
-struct mbuf;
-struct rtentry;
-#endif
-
-#include <net/if.h>
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-#include <arpa/inet.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <netdb.h>
-#include <stdio.h>
-
-#include <pcap-int.h>
-
-#include <gencode.h>
-#include <pcap-namedb.h>
-
-#include <gnuc.h>
-#ifdef HAVE_OS_PROTO_H
-#include <os-proto.h>
-#endif
-
-#ifndef NTOHL
-#define NTOHL(x) (x) = ntohl(x)
-#define NTOHS(x) (x) = ntohs(x)
-#endif
-
-static inline int xdtoi(int);
-
-/*
- * Convert host name to internet address.
- * Return 0 upon failure.
- */
-bpf_u_int32 **
-pcap_nametoaddr(const char *name)
-{
-#ifndef h_addr
- static bpf_u_int32 *hlist[2];
-#endif
- bpf_u_int32 **p;
- struct hostent *hp;
-
- if ((hp = gethostbyname(name)) != NULL) {
-#ifndef h_addr
- hlist[0] = (bpf_u_int32 *)hp->h_addr;
- NTOHL(hp->h_addr);
- return hlist;
-#else
- for (p = (bpf_u_int32 **)hp->h_addr_list; *p; ++p)
- NTOHL(**p);
- return (bpf_u_int32 **)hp->h_addr_list;
-#endif
- }
- else
- return 0;
-}
-
-/*
- * Convert net name to internet address.
- * Return 0 upon failure.
- */
-bpf_u_int32
-pcap_nametonetaddr(const char *name)
-{
- struct netent *np;
-
- if ((np = getnetbyname(name)) != NULL)
- return np->n_net;
- else
- return 0;
-}
-
-/*
- * Convert a port name to its port and protocol numbers.
- * We assume only TCP or UDP.
- * Return 0 upon failure.
- */
-int
-pcap_nametoport(const char *name, int *port, int *proto)
-{
- struct servent *sp;
- char *other;
-
- sp = getservbyname(name, (char *)0);
- if (sp != NULL) {
- NTOHS(sp->s_port);
- *port = sp->s_port;
- *proto = pcap_nametoproto(sp->s_proto);
- /*
- * We need to check /etc/services for ambiguous entries.
- * If we find the ambiguous entry, and it has the
- * same port number, change the proto to PROTO_UNDEF
- * so both TCP and UDP will be checked.
- */
- if (*proto == IPPROTO_TCP)
- other = "udp";
- else
- other = "tcp";
-
- sp = getservbyname(name, other);
- if (sp != 0) {
- NTOHS(sp->s_port);
-#ifdef notdef
- if (*port != sp->s_port)
- /* Can't handle ambiguous names that refer
- to different port numbers. */
- warning("ambiguous port %s in /etc/services",
- name);
-#endif
- *proto = PROTO_UNDEF;
- }
- return 1;
- }
-#if defined(ultrix) || defined(__osf__)
- /* Special hack in case NFS isn't in /etc/services */
- if (strcmp(name, "nfs") == 0) {
- *port = 2049;
- *proto = PROTO_UNDEF;
- return 1;
- }
-#endif
- return 0;
-}
-
-int
-pcap_nametoproto(const char *str)
-{
- struct protoent *p;
-
- p = getprotobyname(str);
- if (p != 0)
- return p->p_proto;
- else
- return PROTO_UNDEF;
-}
-
-#include "ethertype.h"
-
-struct eproto {
- char *s;
- u_short p;
-};
-
-/* Static data base of ether protocol types. */
-struct eproto eproto_db[] = {
- { "pup", ETHERTYPE_PUP },
- { "xns", ETHERTYPE_NS },
- { "ip", ETHERTYPE_IP },
- { "arp", ETHERTYPE_ARP },
- { "rarp", ETHERTYPE_REVARP },
- { "sprite", ETHERTYPE_SPRITE },
- { "mopdl", ETHERTYPE_MOPDL },
- { "moprc", ETHERTYPE_MOPRC },
- { "decnet", ETHERTYPE_DN },
- { "lat", ETHERTYPE_LAT },
- { "sca", ETHERTYPE_SCA },
- { "lanbridge", ETHERTYPE_LANBRIDGE },
- { "vexp", ETHERTYPE_VEXP },
- { "vprod", ETHERTYPE_VPROD },
- { "atalk", ETHERTYPE_ATALK },
- { "atalkarp", ETHERTYPE_AARP },
- { "loopback", ETHERTYPE_LOOPBACK },
- { "decdts", ETHERTYPE_DECDTS },
- { "decdns", ETHERTYPE_DECDNS },
- { (char *)0, 0 }
-};
-
-int
-pcap_nametoeproto(const char *s)
-{
- struct eproto *p = eproto_db;
-
- while (p->s != 0) {
- if (strcmp(p->s, s) == 0)
- return p->p;
- p += 1;
- }
- return PROTO_UNDEF;
-}
-
-/* Hex digit to integer. */
-static inline int
-xdtoi(c)
- register int c;
-{
- if (isdigit(c))
- return c - '0';
- else if (islower(c))
- return c - 'a' + 10;
- else
- return c - 'A' + 10;
-}
-
-int
-__pcap_atoin(const char *s, bpf_u_int32 *addr)
-{
- u_int n;
- int len;
-
- *addr = 0;
- len = 0;
- while (1) {
- n = 0;
- while (*s && *s != '.')
- n = n * 10 + *s++ - '0';
- *addr <<= 8;
- *addr |= n & 0xff;
- len += 8;
- if (*s == '\0')
- return len;
- ++s;
- }
- /* NOTREACHED */
-}
-
-int
-__pcap_atodn(const char *s, bpf_u_int32 *addr)
-{
-#define AREASHIFT 10
-#define AREAMASK 0176000
-#define NODEMASK 01777
-
- u_int node, area;
-
- if (sscanf((char *)s, "%d.%d", &area, &node) != 2)
- bpf_error("malformed decnet address '%s'", s);
-
- *addr = (area << AREASHIFT) & AREAMASK;
- *addr |= (node & NODEMASK);
-
- return(32);
-}
-
-/*
- * Convert 's' which has the form "xx:xx:xx:xx:xx:xx" into a new
- * ethernet address. Assumes 's' is well formed.
- */
-u_char *
-pcap_ether_aton(const char *s)
-{
- register u_char *ep, *e;
- register u_int d;
-
- e = ep = (u_char *)malloc(6);
-
- while (*s) {
- if (*s == ':')
- s += 1;
- d = xdtoi(*s++);
- if (isxdigit(*s)) {
- d <<= 4;
- d |= xdtoi(*s++);
- }
- *ep++ = d;
- }
-
- return (e);
-}
-
-#ifndef HAVE_ETHER_HOSTTON
-/* Roll our own */
-u_char *
-pcap_ether_hostton(const char *name)
-{
- register struct pcap_etherent *ep;
- register u_char *ap;
- static FILE *fp = NULL;
- static init = 0;
-
- if (!init) {
- fp = fopen(PCAP_ETHERS_FILE, "r");
- ++init;
- if (fp == NULL)
- return (NULL);
- } else if (fp == NULL)
- return (NULL);
- else
- rewind(fp);
-
- while ((ep = pcap_next_etherent(fp)) != NULL) {
- if (strcmp(ep->name, name) == 0) {
- ap = (u_char *)malloc(6);
- if (ap != NULL) {
- memcpy(ap, ep->addr, 6);
- return (ap);
- }
- break;
- }
- }
- return (NULL);
-}
-#else
-
-#ifndef sgi
-extern int ether_hostton(char *, struct ether_addr *);
-#endif
-
-/* Use the os supplied routines */
-u_char *
-pcap_ether_hostton(const char *name)
-{
- register u_char *ap;
- u_char a[6];
-
- ap = NULL;
- if (ether_hostton((char *)name, (struct ether_addr *)a) == 0) {
- ap = (u_char *)malloc(6);
- if (ap != NULL)
- memcpy((char *)ap, (char *)a, 6);
- }
- return (ap);
-}
-#endif
-
-u_short
-__pcap_nametodnaddr(const char *name)
-{
-#ifdef DECNETLIB
- struct nodeent *getnodebyname();
- struct nodeent *nep;
- unsigned short res;
-
- nep = getnodebyname(name);
- if (nep == ((struct nodeent *)0))
- bpf_error("unknown decnet host name '%s'\n", name);
-
- memcpy((char *)&res, (char *)nep->n_addr, sizeof(unsigned short));
- return(res);
-#else
- bpf_error("decnet name support not included, '%s' cannot be translated\n",
- name);
-#endif
-}
diff --git a/libpcap/net/bpf.h b/libpcap/net/bpf.h
deleted file mode 100644
index 3ba3835..0000000
--- a/libpcap/net/bpf.h
+++ b/dev/null
@@ -1,264 +0,0 @@
-/*-
- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
- * The Regents of the University of California. All rights reserved.
- *
- * This code is derived from the Stanford/CMU enet packet filter,
- * (net/enet.c) distributed as part of 4.3BSD, and code contributed
- * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
- * Berkeley Laboratory.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)bpf.h 7.1 (Berkeley) 5/7/91
- *
- * @(#) $Header: /cvsroot/ipacct/ipacct/libpcap/net/Attic/bpf.h,v 1.1 2001/05/31 13:40:53 gray Exp $ (LBL)
- */
-
-#ifndef BPF_MAJOR_VERSION
-
-/* BSD style release date */
-#define BPF_RELEASE 199606
-
-typedef int bpf_int32;
-typedef u_int bpf_u_int32;
-
-/*
- * Alignment macros. BPF_WORDALIGN rounds up to the next
- * even multiple of BPF_ALIGNMENT.
- */
-#define BPF_ALIGNMENT sizeof(bpf_int32)
-#define BPF_WORDALIGN(x) (((x)+(BPF_ALIGNMENT-1))&~(BPF_ALIGNMENT-1))
-
-#define BPF_MAXINSNS 512
-#define BPF_MAXBUFSIZE 0x8000
-#define BPF_MINBUFSIZE 32
-
-/*
- * Structure for BIOCSETF.
- */
-struct bpf_program {
- u_int bf_len;
- struct bpf_insn *bf_insns;
-};
-
-/*
- * Struct returned by BIOCGSTATS.
- */
-struct bpf_stat {
- u_int bs_recv; /* number of packets received */
- u_int bs_drop; /* number of packets dropped */
-};
-
-/*
- * Struct return by BIOCVERSION. This represents the version number of
- * the filter language described by the instruction encodings below.
- * bpf understands a program iff kernel_major == filter_major &&
- * kernel_minor >= filter_minor, that is, if the value returned by the
- * running kernel has the same major number and a minor number equal
- * equal to or less than the filter being downloaded. Otherwise, the
- * results are undefined, meaning an error may be returned or packets
- * may be accepted haphazardly.
- * It has nothing to do with the source code version.
- */
-struct bpf_version {
- u_short bv_major;
- u_short bv_minor;
-};
-/* Current version number of filter architecture. */
-#define BPF_MAJOR_VERSION 1
-#define BPF_MINOR_VERSION 1
-
-/*
- * BPF ioctls
- *
- * The first set is for compatibility with Sun's pcc style
- * header files. If your using gcc, we assume that you
- * have run fixincludes so the latter set should work.
- */
-#if (defined(sun) || defined(ibm032)) && !defined(__GNUC__)
-#define BIOCGBLEN _IOR(B,102, u_int)
-#define BIOCSBLEN _IOWR(B,102, u_int)
-#define BIOCSETF _IOW(B,103, struct bpf_program)
-#define BIOCFLUSH _IO(B,104)
-#define BIOCPROMISC _IO(B,105)
-#define BIOCGDLT _IOR(B,106, u_int)
-#define BIOCGETIF _IOR(B,107, struct ifreq)
-#define BIOCSETIF _IOW(B,108, struct ifreq)
-#define BIOCSRTIMEOUT _IOW(B,109, struct timeval)
-#define BIOCGRTIMEOUT _IOR(B,110, struct timeval)
-#define BIOCGSTATS _IOR(B,111, struct bpf_stat)
-#define BIOCIMMEDIATE _IOW(B,112, u_int)
-#define BIOCVERSION _IOR(B,113, struct bpf_version)
-#define BIOCSTCPF _IOW(B,114, struct bpf_program)
-#define BIOCSUDPF _IOW(B,115, struct bpf_program)
-#else
-#define BIOCGBLEN _IOR('B',102, u_int)
-#define BIOCSBLEN _IOWR('B',102, u_int)
-#define BIOCSETF _IOW('B',103, struct bpf_program)
-#define BIOCFLUSH _IO('B',104)
-#define BIOCPROMISC _IO('B',105)
-#define BIOCGDLT _IOR('B',106, u_int)
-#define BIOCGETIF _IOR('B',107, struct ifreq)
-#define BIOCSETIF _IOW('B',108, struct ifreq)
-#define BIOCSRTIMEOUT _IOW('B',109, struct timeval)
-#define BIOCGRTIMEOUT _IOR('B',110, struct timeval)
-#define BIOCGSTATS _IOR('B',111, struct bpf_stat)
-#define BIOCIMMEDIATE _IOW('B',112, u_int)
-#define BIOCVERSION _IOR('B',113, struct bpf_version)
-#define BIOCSTCPF _IOW('B',114, struct bpf_program)
-#define BIOCSUDPF _IOW('B',115, struct bpf_program)
-#endif
-
-/*
- * Structure prepended to each packet.
- */
-struct bpf_hdr {
- struct timeval bh_tstamp; /* time stamp */
- bpf_u_int32 bh_caplen; /* length of captured portion */
- bpf_u_int32 bh_datalen; /* original length of packet */
- u_short bh_hdrlen; /* length of bpf header (this struct
- plus alignment padding) */
-};
-/*
- * Because the structure above is not a multiple of 4 bytes, some compilers
- * will insist on inserting padding; hence, sizeof(struct bpf_hdr) won't work.
- * Only the kernel needs to know about it; applications use bh_hdrlen.
- */
-#ifdef KERNEL
-#define SIZEOF_BPF_HDR 18
-#endif
-
-/*
- * Data-link level type codes.
- */
-#define DLT_NULL 0 /* no link-layer encapsulation */
-#define DLT_EN10MB 1 /* Ethernet (10Mb) */
-#define DLT_EN3MB 2 /* Experimental Ethernet (3Mb) */
-#define DLT_AX25 3 /* Amateur Radio AX.25 */
-#define DLT_PRONET 4 /* Proteon ProNET Token Ring */
-#define DLT_CHAOS 5 /* Chaos */
-#define DLT_IEEE802 6 /* IEEE 802 Networks */
-#define DLT_ARCNET 7 /* ARCNET */
-#define DLT_SLIP 8 /* Serial Line IP */
-#define DLT_PPP 9 /* Point-to-point Protocol */
-#define DLT_FDDI 10 /* FDDI */
-#define DLT_ATM_RFC1483 11 /* LLC/SNAP encapsulated atm */
-#define DLT_RAW 12 /* raw IP */
-#define DLT_SLIP_BSDOS 13 /* BSD/OS Serial Line IP */
-#define DLT_PPP_BSDOS 14 /* BSD/OS Point-to-point Protocol */
-
-/*
- * The instruction encondings.
- */
-/* instruction classes */
-#define BPF_CLASS(code) ((code) & 0x07)
-#define BPF_LD 0x00
-#define BPF_LDX 0x01
-#define BPF_ST 0x02
-#define BPF_STX 0x03
-#define BPF_ALU 0x04
-#define BPF_JMP 0x05
-#define BPF_RET 0x06
-#define BPF_MISC 0x07
-
-/* ld/ldx fields */
-#define BPF_SIZE(code) ((code) & 0x18)
-#define BPF_W 0x00
-#define BPF_H 0x08
-#define BPF_B 0x10
-#define BPF_MODE(code) ((code) & 0xe0)
-#define BPF_IMM 0x00
-#define BPF_ABS 0x20
-#define BPF_IND 0x40
-#define BPF_MEM 0x60
-#define BPF_LEN 0x80
-#define BPF_MSH 0xa0
-
-/* alu/jmp fields */
-#define BPF_OP(code) ((code) & 0xf0)
-#define BPF_ADD 0x00
-#define BPF_SUB 0x10
-#define BPF_MUL 0x20
-#define BPF_DIV 0x30
-#define BPF_OR 0x40
-#define BPF_AND 0x50
-#define BPF_LSH 0x60
-#define BPF_RSH 0x70
-#define BPF_NEG 0x80
-#define BPF_JA 0x00
-#define BPF_JEQ 0x10
-#define BPF_JGT 0x20
-#define BPF_JGE 0x30
-#define BPF_JSET 0x40
-#define BPF_SRC(code) ((code) & 0x08)
-#define BPF_K 0x00
-#define BPF_X 0x08
-
-/* ret - BPF_K and BPF_X also apply */
-#define BPF_RVAL(code) ((code) & 0x18)
-#define BPF_A 0x10
-
-/* misc */
-#define BPF_MISCOP(code) ((code) & 0xf8)
-#define BPF_TAX 0x00
-#define BPF_TXA 0x80
-
-/*
- * The instruction data structure.
- */
-struct bpf_insn {
- u_short code;
- u_char jt;
- u_char jf;
- bpf_int32 k;
-};
-
-/*
- * Macros for insn array initializers.
- */
-#define BPF_STMT(code, k) { (u_short)(code), 0, 0, k }
-#define BPF_JUMP(code, k, jt, jf) { (u_short)(code), jt, jf, k }
-
-#ifdef KERNEL
-extern u_int bpf_filter();
-extern void bpfattach();
-extern void bpf_tap();
-extern void bpf_mtap();
-#else
-#if __STDC__
-extern u_int bpf_filter(struct bpf_insn *, u_char *, u_int, u_int);
-#endif
-#endif
-
-/*
- * Number of scratch memory words (for BPF_LD|BPF_MEM and BPF_ST).
- */
-#define BPF_MEMWORDS 16
-
-#endif
diff --git a/libpcap/optimize.c b/libpcap/optimize.c
deleted file mode 100644
index 9ff3a08..0000000
--- a/libpcap/optimize.c
+++ b/dev/null
@@ -1,2008 +0,0 @@
-/*
- * Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994, 1995, 1996
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Optimization module for tcpdump intermediate representation.
- */
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/optimize.c,v 1.1 2001/05/31 13:40:52 gray Exp $ (LBL)";
-#endif
-
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/time.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <memory.h>
-
-#include <pcap-int.h>
-
-#include <gencode.h>
-
-#include <gnuc.h>
-#ifdef HAVE_OS_PROTO_H
-#include <os-proto.h>
-#endif
-
-#ifdef BDEBUG
-extern int dflag;
-#endif
-
-#define A_ATOM BPF_MEMWORDS
-#define X_ATOM (BPF_MEMWORDS+1)
-
-#define NOP -1
-
-/*
- * This define is used to represent *both* the accumulator and
- * x register in use-def computations.
- * Currently, the use-def code assumes only one definition per instruction.
- */
-#define AX_ATOM N_ATOMS
-
-/*
- * A flag to indicate that further optimization is needed.
- * Iterative passes are continued until a given pass yields no
- * branch movement.
- */
-static int done;
-
-/*
- * A block is marked if only if its mark equals the current mark.
- * Rather than traverse the code array, marking each item, 'cur_mark' is
- * incremented. This automatically makes each element unmarked.
- */
-static int cur_mark;
-#define isMarked(p) ((p)->mark == cur_mark)
-#define unMarkAll() cur_mark += 1
-#define Mark(p) ((p)->mark = cur_mark)
-
-static void opt_init(struct block *);
-static void opt_cleanup(void);
-
-static void make_marks(struct block *);
-static void mark_code(struct block *);
-
-static void intern_blocks(struct block *);
-
-static int eq_slist(struct slist *, struct slist *);
-
-static void find_levels_r(struct block *);
-
-static void find_levels(struct block *);
-static void find_dom(struct block *);
-static void propedom(struct edge *);
-static void find_edom(struct block *);
-static void find_closure(struct block *);
-static int atomuse(struct stmt *);
-static int atomdef(struct stmt *);
-static void compute_local_ud(struct block *);
-static void find_ud(struct block *);
-static void init_val(void);
-static int F(int, int, int);
-static inline void vstore(struct stmt *, int *, int, int);
-static void opt_blk(struct block *, int);
-static int use_conflict(struct block *, struct block *);
-static void opt_j(struct edge *);
-static void or_pullup(struct block *);
-static void and_pullup(struct block *);
-static void opt_blks(struct block *, int);
-static inline void link_inedge(struct edge *, struct block *);
-static void find_inedges(struct block *);
-static void opt_root(struct block **);
-static void opt_loop(struct block *, int);
-static void fold_op(struct stmt *, int, int);
-static inline struct slist *this_op(struct slist *);
-static void opt_not(struct block *);
-static void opt_peep(struct block *);
-static void opt_stmt(struct stmt *, int[], int);
-static void deadstmt(struct stmt *, struct stmt *[]);
-static void opt_deadstores(struct block *);
-static void opt_blk(struct block *, int);
-static int use_conflict(struct block *, struct block *);
-static void opt_j(struct edge *);
-static struct block *fold_edge(struct block *, struct edge *);
-static inline int eq_blk(struct block *, struct block *);
-static int slength(struct slist *);
-static int count_blocks(struct block *);
-static void number_blks_r(struct block *);
-static int count_stmts(struct block *);
-static int convert_code_r(struct block *);
-#ifdef BDEBUG
-static void opt_dump(struct block *);
-#endif
-
-static int n_blocks;
-struct block **blocks;
-static int n_edges;
-struct edge **edges;
-
-/*
- * A bit vector set representation of the dominators.
- * We round up the set size to the next power of two.
- */
-static int nodewords;
-static int edgewords;
-struct block **levels;
-bpf_u_int32 *space;
-#define BITS_PER_WORD (8*sizeof(bpf_u_int32))
-/*
- * True if a is in uset {p}
- */
-#define SET_MEMBER(p, a) \
-((p)[(unsigned)(a) / BITS_PER_WORD] & (1 << ((unsigned)(a) % BITS_PER_WORD)))
-
-/*
- * Add 'a' to uset p.
- */
-#define SET_INSERT(p, a) \
-(p)[(unsigned)(a) / BITS_PER_WORD] |= (1 << ((unsigned)(a) % BITS_PER_WORD))
-
-/*
- * Delete 'a' from uset p.
- */
-#define SET_DELETE(p, a) \
-(p)[(unsigned)(a) / BITS_PER_WORD] &= ~(1 << ((unsigned)(a) % BITS_PER_WORD))
-
-/*
- * a := a intersect b
- */
-#define SET_INTERSECT(a, b, n)\
-{\
- register bpf_u_int32 *_x = a, *_y = b;\
- register int _n = n;\
- while (--_n >= 0) *_x++ &= *_y++;\
-}
-
-/*
- * a := a - b
- */
-#define SET_SUBTRACT(a, b, n)\
-{\
- register bpf_u_int32 *_x = a, *_y = b;\
- register int _n = n;\
- while (--_n >= 0) *_x++ &=~ *_y++;\
-}
-
-/*
- * a := a union b
- */
-#define SET_UNION(a, b, n)\
-{\
- register bpf_u_int32 *_x = a, *_y = b;\
- register int _n = n;\
- while (--_n >= 0) *_x++ |= *_y++;\
-}
-
-static uset all_dom_sets;
-static uset all_closure_sets;
-static uset all_edge_sets;
-
-#ifndef MAX
-#define MAX(a,b) ((a)>(b)?(a):(b))
-#endif
-
-static void
-find_levels_r(b)
- struct block *b;
-{
- int level;
-
- if (isMarked(b))
- return;
-
- Mark(b);
- b->link = 0;
-
- if (JT(b)) {
- find_levels_r(JT(b));
- find_levels_r(JF(b));
- level = MAX(JT(b)->level, JF(b)->level) + 1;
- } else
- level = 0;
- b->level = level;
- b->link = levels[level];
- levels[level] = b;
-}
-
-/*
- * Level graph. The levels go from 0 at the leaves to
- * N_LEVELS at the root. The levels[] array points to the
- * first node of the level list, whose elements are linked
- * with the 'link' field of the struct block.
- */
-static void
-find_levels(root)
- struct block *root;
-{
- memset((char *)levels, 0, n_blocks * sizeof(*levels));
- unMarkAll();
- find_levels_r(root);
-}
-
-/*
- * Find dominator relationships.
- * Assumes graph has been leveled.
- */
-static void
-find_dom(root)
- struct block *root;
-{
- int i;
- struct block *b;
- bpf_u_int32 *x;
-
- /*
- * Initialize sets to contain all nodes.
- */
- x = all_dom_sets;
- i = n_blocks * nodewords;
- while (--i >= 0)
- *x++ = ~0;
- /* Root starts off empty. */
- for (i = nodewords; --i >= 0;)
- root->dom[i] = 0;
-
- /* root->level is the highest level no found. */
- for (i = root->level; i >= 0; --i) {
- for (b = levels[i]; b; b = b->link) {
- SET_INSERT(b->dom, b->id);
- if (JT(b) == 0)
- continue;
- SET_INTERSECT(JT(b)->dom, b->dom, nodewords);
- SET_INTERSECT(JF(b)->dom, b->dom, nodewords);
- }
- }
-}
-
-static void
-propedom(ep)
- struct edge *ep;
-{
- SET_INSERT(ep->edom, ep->id);
- if (ep->succ) {
- SET_INTERSECT(ep->succ->et.edom, ep->edom, edgewords);
- SET_INTERSECT(ep->succ->ef.edom, ep->edom, edgewords);
- }
-}
-
-/*
- * Compute edge dominators.
- * Assumes graph has been leveled and predecessors established.
- */
-static void
-find_edom(root)
- struct block *root;
-{
- int i;
- uset x;
- struct block *b;
-
- x = all_edge_sets;
- for (i = n_edges * edgewords; --i >= 0; )
- x[i] = ~0;
-
- /* root->level is the highest level no found. */
- memset(root->et.edom, 0, edgewords * sizeof(*(uset)0));
- memset(root->ef.edom, 0, edgewords * sizeof(*(uset)0));
- for (i = root->level; i >= 0; --i) {
- for (b = levels[i]; b != 0; b = b->link) {
- propedom(&b->et);
- propedom(&b->ef);
- }
- }
-}
-
-/*
- * Find the backwards transitive closure of the flow graph. These sets
- * are backwards in the sense that we find the set of nodes that reach
- * a given node, not the set of nodes that can be reached by a node.
- *
- * Assumes graph has been leveled.
- */
-static void
-find_closure(root)
- struct block *root;
-{
- int i;
- struct block *b;
-
- /*
- * Initialize sets to contain no nodes.
- */
- memset((char *)all_closure_sets, 0,
- n_blocks * nodewords * sizeof(*all_closure_sets));
-
- /* root->level is the highest level no found. */
- for (i = root->level; i >= 0; --i) {
- for (b = levels[i]; b; b = b->link) {
- SET_INSERT(b->closure, b->id);
- if (JT(b) == 0)
- continue;
- SET_UNION(JT(b)->closure, b->closure, nodewords);
- SET_UNION(JF(b)->closure, b->closure, nodewords);
- }
- }
-}
-
-/*
- * Return the register number that is used by s. If A and X are both
- * used, return AX_ATOM. If no register is used, return -1.
- *
- * The implementation should probably change to an array access.
- */
-static int
-atomuse(s)
- struct stmt *s;
-{
- register int c = s->code;
-
- if (c == NOP)
- return -1;
-
- switch (BPF_CLASS(c)) {
-
- case BPF_RET:
- return (BPF_RVAL(c) == BPF_A) ? A_ATOM :
- (BPF_RVAL(c) == BPF_X) ? X_ATOM : -1;
-
- case BPF_LD:
- case BPF_LDX:
- return (BPF_MODE(c) == BPF_IND) ? X_ATOM :
- (BPF_MODE(c) == BPF_MEM) ? s->k : -1;
-
- case BPF_ST:
- return A_ATOM;
-
- case BPF_STX:
- return X_ATOM;
-
- case BPF_JMP:
- case BPF_ALU:
- if (BPF_SRC(c) == BPF_X)
- return AX_ATOM;
- return A_ATOM;
-
- case BPF_MISC:
- return BPF_MISCOP(c) == BPF_TXA ? X_ATOM : A_ATOM;
- }
- abort();
- /* NOTREACHED */
-}
-
-/*
- * Return the register number that is defined by 's'. We assume that
- * a single stmt cannot define more than one register. If no register
- * is defined, return -1.
- *
- * The implementation should probably change to an array access.
- */
-static int
-atomdef(s)
- struct stmt *s;
-{
- if (s->code == NOP)
- return -1;
-
- switch (BPF_CLASS(s->code)) {
-
- case BPF_LD:
- case BPF_ALU:
- return A_ATOM;
-
- case BPF_LDX:
- return X_ATOM;
-
- case BPF_ST:
- case BPF_STX:
- return s->k;
-
- case BPF_MISC:
- return BPF_MISCOP(s->code) == BPF_TAX ? X_ATOM : A_ATOM;
- }
- return -1;
-}
-
-static void
-compute_local_ud(b)
- struct block *b;
-{
- struct slist *s;
- atomset def = 0, use = 0, kill = 0;
- int atom;
-
- for (s = b->stmts; s; s = s->next) {
- if (s->s.code == NOP)
- continue;
- atom = atomuse(&s->s);
- if (atom >= 0) {
- if (atom == AX_ATOM) {
- if (!ATOMELEM(def, X_ATOM))
- use |= ATOMMASK(X_ATOM);
- if (!ATOMELEM(def, A_ATOM))
- use |= ATOMMASK(A_ATOM);
- }
- else if (atom < N_ATOMS) {
- if (!ATOMELEM(def, atom))
- use |= ATOMMASK(atom);
- }
- else
- abort();
- }
- atom = atomdef(&s->s);
- if (atom >= 0) {
- if (!ATOMELEM(use, atom))
- kill |= ATOMMASK(atom);
- def |= ATOMMASK(atom);
- }
- }
- if (!ATOMELEM(def, A_ATOM) && BPF_CLASS(b->s.code) == BPF_JMP)
- use |= ATOMMASK(A_ATOM);
-
- b->def = def;
- b->kill = kill;
- b->in_use = use;
-}
-
-/*
- * Assume graph is already leveled.
- */
-static void
-find_ud(root)
- struct block *root;
-{
- int i, maxlevel;
- struct block *p;
-
- /*
- * root->level is the highest level no found;
- * count down from there.
- */
- maxlevel = root->level;
- for (i = maxlevel; i >= 0; --i)
- for (p = levels[i]; p; p = p->link) {
- compute_local_ud(p);
- p->out_use = 0;
- }
-
- for (i = 1; i <= maxlevel; ++i) {
- for (p = levels[i]; p; p = p->link) {
- p->out_use |= JT(p)->in_use | JF(p)->in_use;
- p->in_use |= p->out_use &~ p->kill;
- }
- }
-}
-
-/*
- * These data structures are used in a Cocke and Shwarz style
- * value numbering scheme. Since the flowgraph is acyclic,
- * exit values can be propagated from a node's predecessors
- * provided it is uniquely defined.
- */
-struct valnode {
- int code;
- int v0, v1;
- int val;
- struct valnode *next;
-};
-
-#define MODULUS 213
-static struct valnode *hashtbl[MODULUS];
-static int curval;
-static int maxval;
-
-/* Integer constants mapped with the load immediate opcode. */
-#define K(i) F(BPF_LD|BPF_IMM|BPF_W, i, 0L)
-
-struct vmapinfo {
- int is_const;
- bpf_int32 const_val;
-};
-
-struct vmapinfo *vmap;
-struct valnode *vnode_base;
-struct valnode *next_vnode;
-
-static void
-init_val()
-{
- curval = 0;
- next_vnode = vnode_base;
- memset((char *)vmap, 0, maxval * sizeof(*vmap));
- memset((char *)hashtbl, 0, sizeof hashtbl);
-}
-
-/* Because we really don't have an IR, this stuff is a little messy. */
-static int
-F(code, v0, v1)
- int code;
- int v0, v1;
-{
- u_int hash;
- int val;
- struct valnode *p;
-
- hash = (u_int)code ^ (v0 << 4) ^ (v1 << 8);
- hash %= MODULUS;
-
- for (p = hashtbl[hash]; p; p = p->next)
- if (p->code == code && p->v0 == v0 && p->v1 == v1)
- return p->val;
-
- val = ++curval;
- if (BPF_MODE(code) == BPF_IMM &&
- (BPF_CLASS(code) == BPF_LD || BPF_CLASS(code) == BPF_LDX)) {
- vmap[val].const_val = v0;
- vmap[val].is_const = 1;
- }
- p = next_vnode++;
- p->val = val;
- p->code = code;
- p->v0 = v0;
- p->v1 = v1;
- p->next = hashtbl[hash];
- hashtbl[hash] = p;
-
- return val;
-}
-
-static inline void
-vstore(s, valp, newval, alter)
- struct stmt *s;
- int *valp;
- int newval;
- int alter;
-{
- if (alter && *valp == newval)
- s->code = NOP;
- else
- *valp = newval;
-}
-
-static void
-fold_op(s, v0, v1)
- struct stmt *s;
- int v0, v1;
-{
- bpf_int32 a, b;
-
- a = vmap[v0].const_val;
- b = vmap[v1].const_val;
-
- switch (BPF_OP(s->code)) {
- case BPF_ADD:
- a += b;
- break;
-
- case BPF_SUB:
- a -= b;
- break;
-
- case BPF_MUL:
- a *= b;
- break;
-
- case BPF_DIV:
- if (b == 0)
- bpf_error("division by zero");
- a /= b;
- break;
-
- case BPF_AND:
- a &= b;
- break;
-
- case BPF_OR:
- a |= b;
- break;
-
- case BPF_LSH:
- a <<= b;
- break;
-
- case BPF_RSH:
- a >>= b;
- break;
-
- case BPF_NEG:
- a = -a;
- break;
-
- default:
- abort();
- }
- s->k = a;
- s->code = BPF_LD|BPF_IMM;
- done = 0;
-}
-
-static inline struct slist *
-this_op(s)
- struct slist *s;
-{
- while (s != 0 && s->s.code == NOP)
- s = s->next;
- return s;
-}
-
-static void
-opt_not(b)
- struct block *b;
-{
- struct block *tmp = JT(b);
-
- JT(b) = JF(b);
- JF(b) = tmp;
-}
-
-static void
-opt_peep(b)
- struct block *b;
-{
- struct slist *s;
- struct slist *next, *last;
- int val;
-
- s = b->stmts;
- if (s == 0)
- return;
-
- last = s;
- while (1) {
- s = this_op(s);
- if (s == 0)
- break;
- next = this_op(s->next);
- if (next == 0)
- break;
- last = next;
-
- /*
- * st M[k] --> st M[k]
- * ldx M[k] tax
- */
- if (s->s.code == BPF_ST &&
- next->s.code == (BPF_LDX|BPF_MEM) &&
- s->s.k == next->s.k) {
- done = 0;
- next->s.code = BPF_MISC|BPF_TAX;
- }
- /*
- * ld #k --> ldx #k
- * tax txa
- */
- if (s->s.code == (BPF_LD|BPF_IMM) &&
- next->s.code == (BPF_MISC|BPF_TAX)) {
- s->s.code = BPF_LDX|BPF_IMM;
- next->s.code = BPF_MISC|BPF_TXA;
- done = 0;
- }
- /*
- * This is an ugly special case, but it happens
- * when you say tcp[k] or udp[k] where k is a constant.
- */
- if (s->s.code == (BPF_LD|BPF_IMM)) {
- struct slist *add, *tax, *ild;
-
- /*
- * Check that X isn't used on exit from this
- * block (which the optimizer might cause).
- * We know the code generator won't generate
- * any local dependencies.
- */
- if (ATOMELEM(b->out_use, X_ATOM))
- break;
-
- if (next->s.code != (BPF_LDX|BPF_MSH|BPF_B))
- add = next;
- else
- add = this_op(next->next);
- if (add == 0 || add->s.code != (BPF_ALU|BPF_ADD|BPF_X))
- break;
-
- tax = this_op(add->next);
- if (tax == 0 || tax->s.code != (BPF_MISC|BPF_TAX))
- break;
-
- ild = this_op(tax->next);
- if (ild == 0 || BPF_CLASS(ild->s.code) != BPF_LD ||
- BPF_MODE(ild->s.code) != BPF_IND)
- break;
- /*
- * XXX We need to check that X is not
- * subsequently used. We know we can eliminate the
- * accumulator modifications since it is defined
- * by the last stmt of this sequence.
- *
- * We want to turn this sequence:
- *
- * (004) ldi #0x2 {s}
- * (005) ldxms [14] {next} -- optional
- * (006) addx {add}
- * (007) tax {tax}
- * (008) ild [x+0] {ild}
- *
- * into this sequence:
- *
- * (004) nop
- * (005) ldxms [14]
- * (006) nop
- * (007) nop
- * (008) ild [x+2]
- *
- */
- ild->s.k += s->s.k;
- s->s.code = NOP;
- add->s.code = NOP;
- tax->s.code = NOP;
- done = 0;
- }
- s = next;
- }
- /*
- * If we have a subtract to do a comparison, and the X register
- * is a known constant, we can merge this value into the
- * comparison.
- */
- if (last->s.code == (BPF_ALU|BPF_SUB|BPF_X) &&
- !ATOMELEM(b->out_use, A_ATOM)) {
- val = b->val[X_ATOM];
- if (vmap[val].is_const) {
- int op;
-
- b->s.k += vmap[val].const_val;
- op = BPF_OP(b->s.code);
- if (op == BPF_JGT || op == BPF_JGE) {
- struct block *t = JT(b);
- JT(b) = JF(b);
- JF(b) = t;
- b->s.k += 0x80000000;
- }
- last->s.code = NOP;
- done = 0;
- } else if (b->s.k == 0) {
- /*
- * sub x -> nop
- * j #0 j x
- */
- last->s.code = NOP;
- b->s.code = BPF_CLASS(b->s.code) | BPF_OP(b->s.code) |
- BPF_X;
- done = 0;
- }
- }
- /*
- * Likewise, a constant subtract can be simplified.
- */
- else if (last->s.code == (BPF_ALU|BPF_SUB|BPF_K) &&
- !ATOMELEM(b->out_use, A_ATOM)) {
- int op;
-
- b->s.k += last->s.k;
- last->s.code = NOP;
- op = BPF_OP(b->s.code);
- if (op == BPF_JGT || op == BPF_JGE) {
- struct block *t = JT(b);
- JT(b) = JF(b);
- JF(b) = t;
- b->s.k += 0x80000000;
- }
- done = 0;
- }
- /*
- * and #k nop
- * jeq #0 -> jset #k
- */
- if (last->s.code == (BPF_ALU|BPF_AND|BPF_K) &&
- !ATOMELEM(b->out_use, A_ATOM) && b->s.k == 0) {
- b->s.k = last->s.k;
- b->s.code = BPF_JMP|BPF_K|BPF_JSET;
- last->s.code = NOP;
- done = 0;
- opt_not(b);
- }
- /*
- * If the accumulator is a known constant, we can compute the
- * comparison result.
- */
- val = b->val[A_ATOM];
- if (vmap[val].is_const && BPF_SRC(b->s.code) == BPF_K) {
- bpf_int32 v = vmap[val].const_val;
- switch (BPF_OP(b->s.code)) {
-
- case BPF_JEQ:
- v = v == b->s.k;
- break;
-
- case BPF_JGT:
- v = (unsigned)v > b->s.k;
- break;
-
- case BPF_JGE:
- v = (unsigned)v >= b->s.k;
- break;
-
- case BPF_JSET:
- v &= b->s.k;
- break;
-
- default:
- abort();
- }
- if (JF(b) != JT(b))
- done = 0;
- if (v)
- JF(b) = JT(b);
- else
- JT(b) = JF(b);
- }
-}
-
-/*
- * Compute the symbolic value of expression of 's', and update
- * anything it defines in the value table 'val'. If 'alter' is true,
- * do various optimizations. This code would be cleaner if symbolic
- * evaluation and code transformations weren't folded together.
- */
-static void
-opt_stmt(s, val, alter)
- struct stmt *s;
- int val[];
- int alter;
-{
- int op;
- int v;
-
- switch (s->code) {
-
- case BPF_LD|BPF_ABS|BPF_W:
- case BPF_LD|BPF_ABS|BPF_H:
- case BPF_LD|BPF_ABS|BPF_B:
- v = F(s->code, s->k, 0L);
- vstore(s, &val[A_ATOM], v, alter);
- break;
-
- case BPF_LD|BPF_IND|BPF_W:
- case BPF_LD|BPF_IND|BPF_H:
- case BPF_LD|BPF_IND|BPF_B:
- v = val[X_ATOM];
- if (alter && vmap[v].is_const) {
- s->code = BPF_LD|BPF_ABS|BPF_SIZE(s->code);
- s->k += vmap[v].const_val;
- v = F(s->code, s->k, 0L);
- done = 0;
- }
- else
- v = F(s->code, s->k, v);
- vstore(s, &val[A_ATOM], v, alter);
- break;
-
- case BPF_LD|BPF_LEN:
- v = F(s->code, 0L, 0L);
- vstore(s, &val[A_ATOM], v, alter);
- break;
-
- case BPF_LD|BPF_IMM:
- v = K(s->k);
- vstore(s, &val[A_ATOM], v, alter);
- break;
-
- case BPF_LDX|BPF_IMM:
- v = K(s->k);
- vstore(s, &val[X_ATOM], v, alter);
- break;
-
- case BPF_LDX|BPF_MSH|BPF_B:
- v = F(s->code, s->k, 0L);
- vstore(s, &val[X_ATOM], v, alter);
- break;
-
- case BPF_ALU|BPF_NEG:
- if (alter && vmap[val[A_ATOM]].is_const) {
- s->code = BPF_LD|BPF_IMM;
- s->k = -vmap[val[A_ATOM]].const_val;
- val[A_ATOM] = K(s->k);
- }
- else
- val[A_ATOM] = F(s->code, val[A_ATOM], 0L);
- break;
-
- case BPF_ALU|BPF_ADD|BPF_K:
- case BPF_ALU|BPF_SUB|BPF_K:
- case BPF_ALU|BPF_MUL|BPF_K:
- case BPF_ALU|BPF_DIV|BPF_K:
- case BPF_ALU|BPF_AND|BPF_K:
- case BPF_ALU|BPF_OR|BPF_K:
- case BPF_ALU|BPF_LSH|BPF_K:
- case BPF_ALU|BPF_RSH|BPF_K:
- op = BPF_OP(s->code);
- if (alter) {
- if (s->k == 0) {
- if (op == BPF_ADD || op == BPF_SUB ||
- op == BPF_LSH || op == BPF_RSH ||
- op == BPF_OR) {
- s->code = NOP;
- break;
- }
- if (op == BPF_MUL || op == BPF_AND) {
- s->code = BPF_LD|BPF_IMM;
- val[A_ATOM] = K(s->k);
- break;
- }
- }
- if (vmap[val[A_ATOM]].is_const) {
- fold_op(s, val[A_ATOM], K(s->k));
- val[A_ATOM] = K(s->k);
- break;
- }
- }
- val[A_ATOM] = F(s->code, val[A_ATOM], K(s->k));
- break;
-
- case BPF_ALU|BPF_ADD|BPF_X:
- case BPF_ALU|BPF_SUB|BPF_X:
- case BPF_ALU|BPF_MUL|BPF_X:
- case BPF_ALU|BPF_DIV|BPF_X:
- case BPF_ALU|BPF_AND|BPF_X:
- case BPF_ALU|BPF_OR|BPF_X:
- case BPF_ALU|BPF_LSH|BPF_X:
- case BPF_ALU|BPF_RSH|BPF_X:
- op = BPF_OP(s->code);
- if (alter && vmap[val[X_ATOM]].is_const) {
- if (vmap[val[A_ATOM]].is_const) {
- fold_op(s, val[A_ATOM], val[X_ATOM]);
- val[A_ATOM] = K(s->k);
- }
- else {
- s->code = BPF_ALU|BPF_K|op;
- s->k = vmap[val[X_ATOM]].const_val;
- done = 0;
- val[A_ATOM] =
- F(s->code, val[A_ATOM], K(s->k));
- }
- break;
- }
- /*
- * Check if we're doing something to an accumulator
- * that is 0, and simplify. This may not seem like
- * much of a simplification but it could open up further
- * optimizations.
- * XXX We could also check for mul by 1, and -1, etc.
- */
- if (alter && vmap[val[A_ATOM]].is_const
- && vmap[val[A_ATOM]].const_val == 0) {
- if (op == BPF_ADD || op == BPF_OR ||
- op == BPF_LSH || op == BPF_RSH || op == BPF_SUB) {
- s->code = BPF_MISC|BPF_TXA;
- vstore(s, &val[A_ATOM], val[X_ATOM], alter);
- break;
- }
- else if (op == BPF_MUL || op == BPF_DIV ||
- op == BPF_AND) {
- s->code = BPF_LD|BPF_IMM;
- s->k = 0;
- vstore(s, &val[A_ATOM], K(s->k), alter);
- break;
- }
- else if (op == BPF_NEG) {
- s->code = NOP;
- break;
- }
- }
- val[A_ATOM] = F(s->code, val[A_ATOM], val[X_ATOM]);
- break;
-
- case BPF_MISC|BPF_TXA:
- vstore(s, &val[A_ATOM], val[X_ATOM], alter);
- break;
-
- case BPF_LD|BPF_MEM:
- v = val[s->k];
- if (alter && vmap[v].is_const) {
- s->code = BPF_LD|BPF_IMM;
- s->k = vmap[v].const_val;
- done = 0;
- }
- vstore(s, &val[A_ATOM], v, alter);
- break;
-
- case BPF_MISC|BPF_TAX:
- vstore(s, &val[X_ATOM], val[A_ATOM], alter);
- break;
-
- case BPF_LDX|BPF_MEM:
- v = val[s->k];
- if (alter && vmap[v].is_const) {
- s->code = BPF_LDX|BPF_IMM;
- s->k = vmap[v].const_val;
- done = 0;
- }
- vstore(s, &val[X_ATOM], v, alter);
- break;
-
- case BPF_ST:
- vstore(s, &val[s->k], val[A_ATOM], alter);
- break;
-
- case BPF_STX:
- vstore(s, &val[s->k], val[X_ATOM], alter);
- break;
- }
-}
-
-static void
-deadstmt(s, last)
- register struct stmt *s;
- register struct stmt *last[];
-{
- register int atom;
-
- atom = atomuse(s);
- if (atom >= 0) {
- if (atom == AX_ATOM) {
- last[X_ATOM] = 0;
- last[A_ATOM] = 0;
- }
- else
- last[atom] = 0;
- }
- atom = atomdef(s);
- if (atom >= 0) {
- if (last[atom]) {
- done = 0;
- last[atom]->code = NOP;
- }
- last[atom] = s;
- }
-}
-
-static void
-opt_deadstores(b)
- register struct block *b;
-{
- register struct slist *s;
- register int atom;
- struct stmt *last[N_ATOMS];
-
- memset((char *)last, 0, sizeof last);
-
- for (s = b->stmts; s != 0; s = s->next)
- deadstmt(&s->s, last);
- deadstmt(&b->s, last);
-
- for (atom = 0; atom < N_ATOMS; ++atom)
- if (last[atom] && !ATOMELEM(b->out_use, atom)) {
- last[atom]->code = NOP;
- done = 0;
- }
-}
-
-static void
-opt_blk(b, do_stmts)
- struct block *b;
- int do_stmts;
-{
- struct slist *s;
- struct edge *p;
- int i;
- bpf_int32 aval;
-
- /*
- * Initialize the atom values.
- * If we have no predecessors, everything is undefined.
- * Otherwise, we inherent our values from our predecessors.
- * If any register has an ambiguous value (i.e. control paths are
- * merging) give it the undefined value of 0.
- */
- p = b->in_edges;
- if (p == 0)
- memset((char *)b->val, 0, sizeof(b->val));
- else {
- memcpy((char *)b->val, (char *)p->pred->val, sizeof(b->val));
- while ((p = p->next) != NULL) {
- for (i = 0; i < N_ATOMS; ++i)
- if (b->val[i] != p->pred->val[i])
- b->val[i] = 0;
- }
- }
- aval = b->val[A_ATOM];
- for (s = b->stmts; s; s = s->next)
- opt_stmt(&s->s, b->val, do_stmts);
-
- /*
- * This is a special case: if we don't use anything from this
- * block, and we load the accumulator with value that is
- * already there, or if this block is a return,
- * eliminate all the statements.
- */
- if (do_stmts &&
- ((b->out_use == 0 && aval != 0 &&b->val[A_ATOM] == aval) ||
- BPF_CLASS(b->s.code) == BPF_RET)) {
- if (b->stmts != 0) {
- b->stmts = 0;
- done = 0;
- }
- } else {
- opt_peep(b);
- opt_deadstores(b);
- }
- /*
- * Set up values for branch optimizer.
- */
- if (BPF_SRC(b->s.code) == BPF_K)
- b->oval = K(b->s.k);
- else
- b->oval = b->val[X_ATOM];
- b->et.code = b->s.code;
- b->ef.code = -b->s.code;
-}
-
-/*
- * Return true if any register that is used on exit from 'succ', has
- * an exit value that is different from the corresponding exit value
- * from 'b'.
- */
-static int
-use_conflict(b, succ)
- struct block *b, *succ;
-{
- int atom;
- atomset use = succ->out_use;
-
- if (use == 0)
- return 0;
-
- for (atom = 0; atom < N_ATOMS; ++atom)
- if (ATOMELEM(use, atom))
- if (b->val[atom] != succ->val[atom])
- return 1;
- return 0;
-}
-
-static struct block *
-fold_edge(child, ep)
- struct block *child;
- struct edge *ep;
-{
- int sense;
- int aval0, aval1, oval0, oval1;
- int code = ep->code;
-
- if (code < 0) {
- code = -code;
- sense = 0;
- } else
- sense = 1;
-
- if (child->s.code != code)
- return 0;
-
- aval0 = child->val[A_ATOM];
- oval0 = child->oval;
- aval1 = ep->pred->val[A_ATOM];
- oval1 = ep->pred->oval;
-
- if (aval0 != aval1)
- return 0;
-
- if (oval0 == oval1)
- /*
- * The operands are identical, so the
- * result is true if a true branch was
- * taken to get here, otherwise false.
- */
- return sense ? JT(child) : JF(child);
-
- if (sense && code == (BPF_JMP|BPF_JEQ|BPF_K))
- /*
- * At this point, we only know the comparison if we
- * came down the true branch, and it was an equality
- * comparison with a constant. We rely on the fact that
- * distinct constants have distinct value numbers.
- */
- return JF(child);
-
- return 0;
-}
-
-static void
-opt_j(ep)
- struct edge *ep;
-{
- register int i, k;
- register struct block *target;
-
- if (JT(ep->succ) == 0)
- return;
-
- if (JT(ep->succ) == JF(ep->succ)) {
- /*
- * Common branch targets can be eliminated, provided
- * there is no data dependency.
- */
- if (!use_conflict(ep->pred, ep->succ->et.succ)) {
- done = 0;
- ep->succ = JT(ep->succ);
- }
- }
- /*
- * For each edge dominator that matches the successor of this
- * edge, promote the edge successor to the its grandchild.
- *
- * XXX We violate the set abstraction here in favor a reasonably
- * efficient loop.
- */
- top:
- for (i = 0; i < edgewords; ++i) {
- register bpf_u_int32 x = ep->edom[i];
-
- while (x != 0) {
- k = ffs(x) - 1;
- x &=~ (1 << k);
- k += i * BITS_PER_WORD;
-
- target = fold_edge(ep->succ, edges[k]);
- /*
- * Check that there is no data dependency between
- * nodes that will be violated if we move the edge.
- */
- if (target != 0 && !use_conflict(ep->pred, target)) {
- done = 0;
- ep->succ = target;
- if (JT(target) != 0)
- /*
- * Start over unless we hit a leaf.
- */
- goto top;
- return;
- }
- }
- }
-}
-
-
-static void
-or_pullup(b)
- struct block *b;
-{
- int val, at_top;
- struct block *pull;
- struct block **diffp, **samep;
- struct edge *ep;
-
- ep = b->in_edges;
- if (ep == 0)
- return;
-
- /*
- * Make sure each predecessor loads the same value.
- * XXX why?
- */
- val = ep->pred->val[A_ATOM];
- for (ep = ep->next; ep != 0; ep = ep->next)
- if (val != ep->pred->val[A_ATOM])
- return;
-
- if (JT(b->in_edges->pred) == b)
- diffp = &JT(b->in_edges->pred);
- else
- diffp = &JF(b->in_edges->pred);
-
- at_top = 1;
- while (1) {
- if (*diffp == 0)
- return;
-
- if (JT(*diffp) != JT(b))
- return;
-
- if (!SET_MEMBER((*diffp)->dom, b->id))
- return;
-
- if ((*diffp)->val[A_ATOM] != val)
- break;
-
- diffp = &JF(*diffp);
- at_top = 0;
- }
- samep = &JF(*diffp);
- while (1) {
- if (*samep == 0)
- return;
-
- if (JT(*samep) != JT(b))
- return;
-
- if (!SET_MEMBER((*samep)->dom, b->id))
- return;
-
- if ((*samep)->val[A_ATOM] == val)
- break;
-
- /* XXX Need to check that there are no data dependencies
- between dp0 and dp1. Currently, the code generator
- will not produce such dependencies. */
- samep = &JF(*samep);
- }
-#ifdef notdef
- /* XXX This doesn't cover everything. */
- for (i = 0; i < N_ATOMS; ++i)
- if ((*samep)->val[i] != pred->val[i])
- return;
-#endif
- /* Pull up the node. */
- pull = *samep;
- *samep = JF(pull);
- JF(pull) = *diffp;
-
- /*
- * At the top of the chain, each predecessor needs to point at the
- * pulled up node. Inside the chain, there is only one predecessor
- * to worry about.
- */
- if (at_top) {
- for (ep = b->in_edges; ep != 0; ep = ep->next) {
- if (JT(ep->pred) == b)
- JT(ep->pred) = pull;
- else
- JF(ep->pred) = pull;
- }
- }
- else
- *diffp = pull;
-
- done = 0;
-}
-
-static void
-and_pullup(b)
- struct block *b;
-{
- int val, at_top;
- struct block *pull;
- struct block **diffp, **samep;
- struct edge *ep;
-
- ep = b->in_edges;
- if (ep == 0)
- return;
-
- /*
- * Make sure each predecessor loads the same value.
- */
- val = ep->pred->val[A_ATOM];
- for (ep = ep->next; ep != 0; ep = ep->next)
- if (val != ep->pred->val[A_ATOM])
- return;
-
- if (JT(b->in_edges->pred) == b)
- diffp = &JT(b->in_edges->pred);
- else
- diffp = &JF(b->in_edges->pred);
-
- at_top = 1;
- while (1) {
- if (*diffp == 0)
- return;
-
- if (JF(*diffp) != JF(b))
- return;
-
- if (!SET_MEMBER((*diffp)->dom, b->id))
- return;
-
- if ((*diffp)->val[A_ATOM] != val)
- break;
-
- diffp = &JT(*diffp);
- at_top = 0;
- }
- samep = &JT(*diffp);
- while (1) {
- if (*samep == 0)
- return;
-
- if (JF(*samep) != JF(b))
- return;
-
- if (!SET_MEMBER((*samep)->dom, b->id))
- return;
-
- if ((*samep)->val[A_ATOM] == val)
- break;
-
- /* XXX Need to check that there are no data dependencies
- between diffp and samep. Currently, the code generator
- will not produce such dependencies. */
- samep = &JT(*samep);
- }
-#ifdef notdef
- /* XXX This doesn't cover everything. */
- for (i = 0; i < N_ATOMS; ++i)
- if ((*samep)->val[i] != pred->val[i])
- return;
-#endif
- /* Pull up the node. */
- pull = *samep;
- *samep = JT(pull);
- JT(pull) = *diffp;
-
- /*
- * At the top of the chain, each predecessor needs to point at the
- * pulled up node. Inside the chain, there is only one predecessor
- * to worry about.
- */
- if (at_top) {
- for (ep = b->in_edges; ep != 0; ep = ep->next) {
- if (JT(ep->pred) == b)
- JT(ep->pred) = pull;
- else
- JF(ep->pred) = pull;
- }
- }
- else
- *diffp = pull;
-
- done = 0;
-}
-
-static void
-opt_blks(root, do_stmts)
- struct block *root;
- int do_stmts;
-{
- int i, maxlevel;
- struct block *p;
-
- init_val();
- maxlevel = root->level;
- for (i = maxlevel; i >= 0; --i)
- for (p = levels[i]; p; p = p->link)
- opt_blk(p, do_stmts);
-
- if (do_stmts)
- /*
- * No point trying to move branches; it can't possibly
- * make a difference at this point.
- */
- return;
-
- for (i = 1; i <= maxlevel; ++i) {
- for (p = levels[i]; p; p = p->link) {
- opt_j(&p->et);
- opt_j(&p->ef);
- }
- }
- for (i = 1; i <= maxlevel; ++i) {
- for (p = levels[i]; p; p = p->link) {
- or_pullup(p);
- and_pullup(p);
- }
- }
-}
-
-static inline void
-link_inedge(parent, child)
- struct edge *parent;
- struct block *child;
-{
- parent->next = child->in_edges;
- child->in_edges = parent;
-}
-
-static void
-find_inedges(root)
- struct block *root;
-{
- int i;
- struct block *b;
-
- for (i = 0; i < n_blocks; ++i)
- blocks[i]->in_edges = 0;
-
- /*
- * Traverse the graph, adding each edge to the predecessor
- * list of its successors. Skip the leaves (i.e. level 0).
- */
- for (i = root->level; i > 0; --i) {
- for (b = levels[i]; b != 0; b = b->link) {
- link_inedge(&b->et, JT(b));
- link_inedge(&b->ef, JF(b));
- }
- }
-}
-
-static void
-opt_root(b)
- struct block **b;
-{
- struct slist *tmp, *s;
-
- s = (*b)->stmts;
- (*b)->stmts = 0;
- while (BPF_CLASS((*b)->s.code) == BPF_JMP && JT(*b) == JF(*b))
- *b = JT(*b);
-
- tmp = (*b)->stmts;
- if (tmp != 0)
- sappend(s, tmp);
- (*b)->stmts = s;
-
- /*
- * If the root node is a return, then there is no
- * point executing any statements (since the bpf machine
- * has no side effects).
- */
- if (BPF_CLASS((*b)->s.code) == BPF_RET)
- (*b)->stmts = 0;
-}
-
-static void
-opt_loop(root, do_stmts)
- struct block *root;
- int do_stmts;
-{
-
-#ifdef BDEBUG
- if (dflag > 1)
- opt_dump(root);
-#endif
- do {
- done = 1;
- find_levels(root);
- find_dom(root);
- find_closure(root);
- find_inedges(root);
- find_ud(root);
- find_edom(root);
- opt_blks(root, do_stmts);
-#ifdef BDEBUG
- if (dflag > 1)
- opt_dump(root);
-#endif
- } while (!done);
-}
-
-/*
- * Optimize the filter code in its dag representation.
- */
-void
-bpf_optimize(rootp)
- struct block **rootp;
-{
- struct block *root;
-
- root = *rootp;
-
- opt_init(root);
- opt_loop(root, 0);
- opt_loop(root, 1);
- intern_blocks(root);
- opt_root(rootp);
- opt_cleanup();
-}
-
-static void
-make_marks(p)
- struct block *p;
-{
- if (!isMarked(p)) {
- Mark(p);
- if (BPF_CLASS(p->s.code) != BPF_RET) {
- make_marks(JT(p));
- make_marks(JF(p));
- }
- }
-}
-
-/*
- * Mark code array such that isMarked(i) is true
- * only for nodes that are alive.
- */
-static void
-mark_code(p)
- struct block *p;
-{
- cur_mark += 1;
- make_marks(p);
-}
-
-/*
- * True iff the two stmt lists load the same value from the packet into
- * the accumulator.
- */
-static int
-eq_slist(x, y)
- struct slist *x, *y;
-{
- while (1) {
- while (x && x->s.code == NOP)
- x = x->next;
- while (y && y->s.code == NOP)
- y = y->next;
- if (x == 0)
- return y == 0;
- if (y == 0)
- return x == 0;
- if (x->s.code != y->s.code || x->s.k != y->s.k)
- return 0;
- x = x->next;
- y = y->next;
- }
-}
-
-static inline int
-eq_blk(b0, b1)
- struct block *b0, *b1;
-{
- if (b0->s.code == b1->s.code &&
- b0->s.k == b1->s.k &&
- b0->et.succ == b1->et.succ &&
- b0->ef.succ == b1->ef.succ)
- return eq_slist(b0->stmts, b1->stmts);
- return 0;
-}
-
-static void
-intern_blocks(root)
- struct block *root;
-{
- struct block *p;
- int i, j;
- int done;
- top:
- done = 1;
- for (i = 0; i < n_blocks; ++i)
- blocks[i]->link = 0;
-
- mark_code(root);
-
- for (i = n_blocks - 1; --i >= 0; ) {
- if (!isMarked(blocks[i]))
- continue;
- for (j = i + 1; j < n_blocks; ++j) {
- if (!isMarked(blocks[j]))
- continue;
- if (eq_blk(blocks[i], blocks[j])) {
- blocks[i]->link = blocks[j]->link ?
- blocks[j]->link : blocks[j];
- break;
- }
- }
- }
- for (i = 0; i < n_blocks; ++i) {
- p = blocks[i];
- if (JT(p) == 0)
- continue;
- if (JT(p)->link) {
- done = 0;
- JT(p) = JT(p)->link;
- }
- if (JF(p)->link) {
- done = 0;
- JF(p) = JF(p)->link;
- }
- }
- if (!done)
- goto top;
-}
-
-static void
-opt_cleanup()
-{
- free((void *)vnode_base);
- free((void *)vmap);
- free((void *)edges);
- free((void *)space);
- free((void *)levels);
- free((void *)blocks);
-}
-
-/*
- * Return the number of stmts in 's'.
- */
-static int
-slength(s)
- struct slist *s;
-{
- int n = 0;
-
- for (; s; s = s->next)
- if (s->s.code != NOP)
- ++n;
- return n;
-}
-
-/*
- * Return the number of nodes reachable by 'p'.
- * All nodes should be initially unmarked.
- */
-static int
-count_blocks(p)
- struct block *p;
-{
- if (p == 0 || isMarked(p))
- return 0;
- Mark(p);
- return count_blocks(JT(p)) + count_blocks(JF(p)) + 1;
-}
-
-/*
- * Do a depth first search on the flow graph, numbering the
- * the basic blocks, and entering them into the 'blocks' array.`
- */
-static void
-number_blks_r(p)
- struct block *p;
-{
- int n;
-
- if (p == 0 || isMarked(p))
- return;
-
- Mark(p);
- n = n_blocks++;
- p->id = n;
- blocks[n] = p;
-
- number_blks_r(JT(p));
- number_blks_r(JF(p));
-}
-
-/*
- * Return the number of stmts in the flowgraph reachable by 'p'.
- * The nodes should be unmarked before calling.
- */
-static int
-count_stmts(p)
- struct block *p;
-{
- int n;
-
- if (p == 0 || isMarked(p))
- return 0;
- Mark(p);
- n = count_stmts(JT(p)) + count_stmts(JF(p));
- return slength(p->stmts) + n + 1;
-}
-
-/*
- * Allocate memory. All allocation is done before optimization
- * is begun. A linear bound on the size of all data structures is computed
- * from the total number of blocks and/or statements.
- */
-static void
-opt_init(root)
- struct block *root;
-{
- bpf_u_int32 *p;
- int i, n, max_stmts;
-
- /*
- * First, count the blocks, so we can malloc an array to map
- * block number to block. Then, put the blocks into the array.
- */
- unMarkAll();
- n = count_blocks(root);
- blocks = (struct block **)malloc(n * sizeof(*blocks));
- unMarkAll();
- n_blocks = 0;
- number_blks_r(root);
-
- n_edges = 2 * n_blocks;
- edges = (struct edge **)malloc(n_edges * sizeof(*edges));
-
- /*
- * The number of levels is bounded by the number of nodes.
- */
- levels = (struct block **)malloc(n_blocks * sizeof(*levels));
-
- edgewords = n_edges / (8 * sizeof(bpf_u_int32)) + 1;
- nodewords = n_blocks / (8 * sizeof(bpf_u_int32)) + 1;
-
- /* XXX */
- space = (bpf_u_int32 *)malloc(2 * n_blocks * nodewords * sizeof(*space)
- + n_edges * edgewords * sizeof(*space));
- p = space;
- all_dom_sets = p;
- for (i = 0; i < n; ++i) {
- blocks[i]->dom = p;
- p += nodewords;
- }
- all_closure_sets = p;
- for (i = 0; i < n; ++i) {
- blocks[i]->closure = p;
- p += nodewords;
- }
- all_edge_sets = p;
- for (i = 0; i < n; ++i) {
- register struct block *b = blocks[i];
-
- b->et.edom = p;
- p += edgewords;
- b->ef.edom = p;
- p += edgewords;
- b->et.id = i;
- edges[i] = &b->et;
- b->ef.id = n_blocks + i;
- edges[n_blocks + i] = &b->ef;
- b->et.pred = b;
- b->ef.pred = b;
- }
- max_stmts = 0;
- for (i = 0; i < n; ++i)
- max_stmts += slength(blocks[i]->stmts) + 1;
- /*
- * We allocate at most 3 value numbers per statement,
- * so this is an upper bound on the number of valnodes
- * we'll need.
- */
- maxval = 3 * max_stmts;
- vmap = (struct vmapinfo *)malloc(maxval * sizeof(*vmap));
- vnode_base = (struct valnode *)malloc(maxval * sizeof(*vmap));
-}
-
-/*
- * Some pointers used to convert the basic block form of the code,
- * into the array form that BPF requires. 'fstart' will point to
- * the malloc'd array while 'ftail' is used during the recursive traversal.
- */
-static struct bpf_insn *fstart;
-static struct bpf_insn *ftail;
-
-#ifdef BDEBUG
-int bids[1000];
-#endif
-
-/*
- * Returns true if successful. Returns false if a branch has
- * an offset that is too large. If so, we have marked that
- * branch so that on a subsequent iteration, it will be treated
- * properly.
- */
-static int
-convert_code_r(p)
- struct block *p;
-{
- struct bpf_insn *dst;
- struct slist *src;
- int slen;
- u_int off;
- int extrajmps; /* number of extra jumps inserted */
-
- if (p == 0 || isMarked(p))
- return (1);
- Mark(p);
-
- if (convert_code_r(JF(p)) == 0)
- return (0);
- if (convert_code_r(JT(p)) == 0)
- return (0);
-
- slen = slength(p->stmts);
- dst = ftail -= (slen + 1 + p->longjt + p->longjf);
- /* inflate length by any extra jumps */
-
- p->offset = dst - fstart;
-
- for (src = p->stmts; src; src = src->next) {
- if (src->s.code == NOP)
- continue;
- dst->code = (u_short)src->s.code;
- dst->k = src->s.k;
- ++dst;
- }
-#ifdef BDEBUG
- bids[dst - fstart] = p->id + 1;
-#endif
- dst->code = (u_short)p->s.code;
- dst->k = p->s.k;
- if (JT(p)) {
- extrajmps = 0;
- off = JT(p)->offset - (p->offset + slen) - 1;
- if (off >= 256) {
- /* offset too large for branch, must add a jump */
- if (p->longjt == 0) {
- /* mark this instruction and retry */
- p->longjt++;
- return(0);
- }
- /* branch if T to following jump */
- dst->jt = extrajmps;
- extrajmps++;
- dst[extrajmps].code = BPF_JMP|BPF_JA;
- dst[extrajmps].k = off - extrajmps;
- }
- else
- dst->jt = off;
- off = JF(p)->offset - (p->offset + slen) - 1;
- if (off >= 256) {
- /* offset too large for branch, must add a jump */
- if (p->longjf == 0) {
- /* mark this instruction and retry */
- p->longjf++;
- return(0);
- }
- /* branch if F to following jump */
- /* if two jumps are inserted, F goes to second one */
- dst->jf = extrajmps;
- extrajmps++;
- dst[extrajmps].code = BPF_JMP|BPF_JA;
- dst[extrajmps].k = off - extrajmps;
- }
- else
- dst->jf = off;
- }
- return (1);
-}
-
-
-/*
- * Convert flowgraph intermediate representation to the
- * BPF array representation. Set *lenp to the number of instructions.
- */
-struct bpf_insn *
-icode_to_fcode(root, lenp)
- struct block *root;
- int *lenp;
-{
- int n;
- struct bpf_insn *fp;
-
- /*
- * Loop doing convert_codr_r() until no branches remain
- * with too-large offsets.
- */
- while (1) {
- unMarkAll();
- n = *lenp = count_stmts(root);
-
- fp = (struct bpf_insn *)malloc(sizeof(*fp) * n);
- memset((char *)fp, 0, sizeof(*fp) * n);
- fstart = fp;
- ftail = fp + n;
-
- unMarkAll();
- if (convert_code_r(root))
- break;
- free(fp);
- }
-
- return fp;
-}
-
-#ifdef BDEBUG
-static void
-opt_dump(root)
- struct block *root;
-{
- struct bpf_program f;
-
- memset(bids, 0, sizeof bids);
- f.bf_insns = icode_to_fcode(root, &f.bf_len);
- bpf_dump(&f, 1);
- putchar('\n');
- free((char *)f.bf_insns);
-}
-#endif
diff --git a/libpcap/pcap-bpf.c b/libpcap/pcap-bpf.c
deleted file mode 100644
index 60caeb3..0000000
--- a/libpcap/pcap-bpf.c
+++ b/dev/null
@@ -1,267 +0,0 @@
-/*
- * Copyright (c) 1993, 1994, 1995, 1996, 1998
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/pcap-bpf.c,v 1.1 2001/05/31 13:40:53 gray Exp $ (LBL)";
-#endif
-
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-
-#include <sys/param.h> /* optionally get BSD define */
-#include <sys/time.h>
-#include <sys/timeb.h>
-#include <sys/socket.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-
-#include <net/if.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <pcap-int.h>
-
-#include <gnuc.h>
-#ifdef HAVE_OS_PROTO_H
-#include <os-proto.h>
-#endif
-
-int
-pcap_stats(pcap_t *p, struct pcap_stat *ps)
-{
- struct bpf_stat s;
-
- if (ioctl(p->fd, BIOCGSTATS, (caddr_t)&s) < 0) {
- sprintf(p->errbuf, "BIOCGSTATS: %s", pcap_strerror(errno));
- return (-1);
- }
-
- ps->ps_recv = s.bs_recv;
- ps->ps_drop = s.bs_drop;
- return (0);
-}
-
-int
-pcap_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
-{
- int cc;
- int n = 0;
- register u_char *bp, *ep;
-
- again:
- cc = p->cc;
- if (p->cc == 0) {
- cc = read(p->fd, (char *)p->buffer, p->bufsize);
- if (cc < 0) {
- /* Don't choke when we get ptraced */
- switch (errno) {
-
- case EINTR:
- goto again;
-
- case EWOULDBLOCK:
- return (0);
-#if defined(sun) && !defined(BSD)
- /*
- * Due to a SunOS bug, after 2^31 bytes, the kernel
- * file offset overflows and read fails with EINVAL.
- * The lseek() to 0 will fix things.
- */
- case EINVAL:
- if (lseek(p->fd, 0L, SEEK_CUR) +
- p->bufsize < 0) {
- (void)lseek(p->fd, 0L, SEEK_SET);
- goto again;
- }
- /* fall through */
-#endif
- }
- sprintf(p->errbuf, "read: %s", pcap_strerror(errno));
- return (-1);
- }
- bp = p->buffer;
- } else
- bp = p->bp;
-
- /*
- * Loop through each packet.
- */
-#define bhp ((struct bpf_hdr *)bp)
- ep = bp + cc;
- while (bp < ep) {
- register int caplen, hdrlen;
- caplen = bhp->bh_caplen;
- hdrlen = bhp->bh_hdrlen;
- /*
- * XXX A bpf_hdr matches a pcap_pkthdr.
- */
- (*callback)(user, (struct pcap_pkthdr*)bp, bp + hdrlen);
- bp += BPF_WORDALIGN(caplen + hdrlen);
- if (++n >= cnt && cnt > 0) {
- p->bp = bp;
- p->cc = ep - bp;
- return (n);
- }
- }
-#undef bhp
- p->cc = 0;
- return (n);
-}
-
-static inline int
-bpf_open(pcap_t *p, char *errbuf)
-{
- int fd;
- int n = 0;
- char device[sizeof "/dev/bpf000"];
-
- /*
- * Go through all the minors and find one that isn't in use.
- */
- do {
- (void)sprintf(device, "/dev/bpf%d", n++);
- fd = open(device, O_RDONLY);
- } while (fd < 0 && errno == EBUSY);
-
- /*
- * XXX better message for all minors used
- */
- if (fd < 0)
- sprintf(errbuf, "%s: %s", device, pcap_strerror(errno));
-
- return (fd);
-}
-
-pcap_t *
-pcap_open_live(char *device, int snaplen, int promisc, int to_ms, char *ebuf)
-{
- int fd;
- struct ifreq ifr;
- struct bpf_version bv;
- u_int v;
- pcap_t *p;
-
- p = (pcap_t *)malloc(sizeof(*p));
- if (p == NULL) {
- sprintf(ebuf, "malloc: %s", pcap_strerror(errno));
- return (NULL);
- }
- bzero(p, sizeof(*p));
- fd = bpf_open(p, ebuf);
- if (fd < 0)
- goto bad;
-
- p->fd = fd;
- p->snapshot = snaplen;
-
- if (ioctl(fd, BIOCVERSION, (caddr_t)&bv) < 0) {
- sprintf(ebuf, "BIOCVERSION: %s", pcap_strerror(errno));
- goto bad;
- }
- if (bv.bv_major != BPF_MAJOR_VERSION ||
- bv.bv_minor < BPF_MINOR_VERSION) {
- sprintf(ebuf, "kernel bpf filter out of date");
- goto bad;
- }
- v = 32768; /* XXX this should be a user-accessible hook */
- /* Ignore the return value - this is because the call fails on
- * BPF systems that don't have kernel malloc. And if the call
- * fails, it's no big deal, we just continue to use the standard
- * buffer size.
- */
- (void) ioctl(fd, BIOCSBLEN, (caddr_t)&v);
-
- (void)strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
- if (ioctl(fd, BIOCSETIF, (caddr_t)&ifr) < 0) {
- sprintf(ebuf, "%s: %s", device, pcap_strerror(errno));
- goto bad;
- }
- /* Get the data link layer type. */
- if (ioctl(fd, BIOCGDLT, (caddr_t)&v) < 0) {
- sprintf(ebuf, "BIOCGDLT: %s", pcap_strerror(errno));
- goto bad;
- }
-#if _BSDI_VERSION - 0 >= 199510
- /* The SLIP and PPP link layer header changed in BSD/OS 2.1 */
- switch (v) {
-
- case DLT_SLIP:
- v = DLT_SLIP_BSDOS;
- break;
-
- case DLT_PPP:
- v = DLT_PPP_BSDOS;
- break;
- }
-#endif
- p->linktype = v;
-
- /* set timeout */
- if (to_ms != 0) {
- struct timeval to;
- to.tv_sec = to_ms / 1000;
- to.tv_usec = (to_ms * 1000) % 1000000;
- if (ioctl(p->fd, BIOCSRTIMEOUT, (caddr_t)&to) < 0) {
- sprintf(ebuf, "BIOCSRTIMEOUT: %s",
- pcap_strerror(errno));
- goto bad;
- }
- }
- if (promisc)
- /* set promiscuous mode, okay if it fails */
- (void)ioctl(p->fd, BIOCPROMISC, NULL);
-
- if (ioctl(fd, BIOCGBLEN, (caddr_t)&v) < 0) {
- sprintf(ebuf, "BIOCGBLEN: %s", pcap_strerror(errno));
- goto bad;
- }
- p->bufsize = v;
- p->buffer = (u_char *)malloc(p->bufsize);
- if (p->buffer == NULL) {
- sprintf(ebuf, "malloc: %s", pcap_strerror(errno));
- goto bad;
- }
-
- return (p);
- bad:
- (void)close(fd);
- free(p);
- return (NULL);
-}
-
-int
-pcap_setfilter(pcap_t *p, struct bpf_program *fp)
-{
- if (p->sf.rfile != NULL)
- p->fcode = *fp;
- else if (ioctl(p->fd, BIOCSETF, (caddr_t)fp) < 0) {
- sprintf(p->errbuf, "BIOCSETF: %s", pcap_strerror(errno));
- return (-1);
- }
- return (0);
-}
diff --git a/libpcap/pcap-dlpi.c b/libpcap/pcap-dlpi.c
deleted file mode 100644
index a4f8e80..0000000
--- a/libpcap/pcap-dlpi.c
+++ b/dev/null
@@ -1,852 +0,0 @@
-/*
- * Copyright (c) 1993, 1994, 1995, 1996, 1997
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * This code contributed by Atanu Ghosh (atanu@cs.ucl.ac.uk),
- * University College London.
- */
-
-/*
- * Packet capture routine for dlpi under SunOS 5
- *
- * Notes:
- *
- * - Apparently the DLIOCRAW ioctl() is specific to SunOS.
- *
- * - There is a bug in bufmod(7) such that setting the snapshot
- * length results in data being left of the front of the packet.
- *
- * - It might be desirable to use pfmod(7) to filter packets in the
- * kernel.
- */
-
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/pcap-dlpi.c,v 1.1 2001/05/31 13:40:53 gray Exp $ (LBL)";
-#endif
-
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/time.h>
-#ifdef HAVE_SYS_BUFMOD_H
-#include <sys/bufmod.h>
-#endif
-#include <sys/dlpi.h>
-#ifdef HAVE_SYS_DLPI_EXT_H
-#include <sys/dlpi_ext.h>
-#endif
-#ifdef HAVE_HPUX9
-#include <sys/socket.h>
-#endif
-#ifdef DL_HP_PPA_ACK_OBS
-#include <sys/stat.h>
-#endif
-#include <sys/stream.h>
-#if defined(HAVE_SOLARIS) && defined(HAVE_SYS_BUFMOD_H)
-#include <sys/systeminfo.h>
-#endif
-
-#ifdef HAVE_HPUX9
-#include <net/if.h>
-#endif
-
-#include <ctype.h>
-#ifdef HAVE_HPUX9
-#include <nlist.h>
-#endif
-#include <errno.h>
-#include <fcntl.h>
-#include <memory.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stropts.h>
-#include <unistd.h>
-
-#include <pcap-int.h>
-
-#include <gnuc.h>
-#ifdef HAVE_OS_PROTO_H
-#include <os-proto.h>
-#endif
-
-#ifndef PCAP_DEV_PREFIX
-#define PCAP_DEV_PREFIX "/dev"
-#endif
-
-#define MAXDLBUF 8192
-
-/* Forwards */
-static int dlattachreq(int, bpf_u_int32, char *);
-static int dlbindack(int, char *, char *);
-static int dlbindreq(int, bpf_u_int32, char *);
-static int dlinfoack(int, char *, char *);
-static int dlinforeq(int, char *);
-static int dlokack(int, const char *, char *, char *);
-static int recv_ack(int, int, const char *, char *, char *);
-static int dlpromisconreq(int, bpf_u_int32, char *);
-#if defined(HAVE_SOLARIS) && defined(HAVE_SYS_BUFMOD_H)
-static char *get_release(bpf_u_int32 *, bpf_u_int32 *, bpf_u_int32 *);
-#endif
-static int send_request(int, char *, int, char *, char *);
-#ifdef HAVE_SYS_BUFMOD_H
-static int strioctl(int, int, int, char *);
-#endif
-#ifdef HAVE_HPUX9
-static int dlpi_kread(int, off_t, void *, u_int, char *);
-#endif
-#ifdef HAVE_DEV_DLPI
-static int get_dlpi_ppa(int, const char *, int, char *);
-#endif
-
-int
-pcap_stats(pcap_t *p, struct pcap_stat *ps)
-{
-
- *ps = p->md.stat;
- return (0);
-}
-
-/* XXX Needed by HP-UX (at least) */
-static bpf_u_int32 ctlbuf[MAXDLBUF];
-static struct strbuf ctl = {
- MAXDLBUF,
- 0,
- (char *)ctlbuf
-};
-
-int
-pcap_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
-{
- register int cc, n, caplen, origlen;
- register u_char *bp, *ep, *pk;
- register struct bpf_insn *fcode;
-#ifdef HAVE_SYS_BUFMOD_H
- register struct sb_hdr *sbp;
-#ifdef LBL_ALIGN
- struct sb_hdr sbhdr;
-#endif
-#endif
- int flags;
- struct strbuf data;
- struct pcap_pkthdr pkthdr;
-
- flags = 0;
- cc = p->cc;
- if (cc == 0) {
- data.buf = (char *)p->buffer + p->offset;
- data.maxlen = MAXDLBUF;
- data.len = 0;
- do {
- if (getmsg(p->fd, &ctl, &data, &flags) < 0) {
- /* Don't choke when we get ptraced */
- if (errno == EINTR) {
- cc = 0;
- continue;
- }
- strcpy(p->errbuf, pcap_strerror(errno));
- return (-1);
- }
- cc = data.len;
- } while (cc == 0);
- bp = p->buffer + p->offset;
- } else
- bp = p->bp;
-
- /* Loop through packets */
- fcode = p->fcode.bf_insns;
- ep = bp + cc;
- n = 0;
-#ifdef HAVE_SYS_BUFMOD_H
- while (bp < ep) {
-#ifdef LBL_ALIGN
- if ((long)bp & 3) {
- sbp = &sbhdr;
- memcpy(sbp, bp, sizeof(*sbp));
- } else
-#endif
- sbp = (struct sb_hdr *)bp;
- p->md.stat.ps_drop += sbp->sbh_drops;
- pk = bp + sizeof(*sbp);
- bp += sbp->sbh_totlen;
- origlen = sbp->sbh_origlen;
- caplen = sbp->sbh_msglen;
-#else
- origlen = cc;
- caplen = min(p->snapshot, cc);
- pk = bp;
- bp += caplen;
-#endif
- ++p->md.stat.ps_recv;
- if (bpf_filter(fcode, pk, origlen, caplen)) {
-#ifdef HAVE_SYS_BUFMOD_H
- pkthdr.ts = sbp->sbh_timestamp;
-#else
- (void)gettimeofday(&pkthdr.ts, NULL);
-#endif
- pkthdr.len = origlen;
- pkthdr.caplen = caplen;
- /* Insure caplen does not exceed snapshot */
- if (pkthdr.caplen > p->snapshot)
- pkthdr.caplen = p->snapshot;
- (*callback)(user, &pkthdr, pk);
- if (++n >= cnt && cnt >= 0) {
- p->cc = ep - bp;
- p->bp = bp;
- return (n);
- }
- }
-#ifdef HAVE_SYS_BUFMOD_H
- }
-#endif
- p->cc = 0;
- return (n);
-}
-
-pcap_t *
-pcap_open_live(char *device, int snaplen, int promisc, int to_ms, char *ebuf)
-{
- register char *cp;
- char *eos;
- register pcap_t *p;
- register int ppa;
- register dl_info_ack_t *infop;
-#ifdef HAVE_SYS_BUFMOD_H
- bpf_u_int32 ss, flag;
-#ifdef HAVE_SOLARIS
- register char *release;
- bpf_u_int32 osmajor, osminor, osmicro;
-#endif
-#endif
- bpf_u_int32 buf[MAXDLBUF];
- char dname[100];
-#ifndef HAVE_DEV_DLPI
- char dname2[100];
-#endif
-
- p = (pcap_t *)malloc(sizeof(*p));
- if (p == NULL) {
- strcpy(ebuf, pcap_strerror(errno));
- return (NULL);
- }
- memset(p, 0, sizeof(*p));
-
- /*
- ** Determine device and ppa
- */
- cp = strpbrk(device, "0123456789");
- if (cp == NULL) {
- sprintf(ebuf, "%s missing unit number", device);
- goto bad;
- }
- ppa = strtol(cp, &eos, 10);
- if (*eos != '\0') {
- sprintf(ebuf, "%s bad unit number", device);
- goto bad;
- }
-
- if (*device == '/')
- strcpy(dname, device);
- else
- sprintf(dname, "%s/%s", PCAP_DEV_PREFIX, device);
-#ifdef HAVE_DEV_DLPI
- /* Map network device to /dev/dlpi unit */
- cp = "/dev/dlpi";
- if ((p->fd = open(cp, O_RDWR)) < 0) {
- sprintf(ebuf, "%s: %s", cp, pcap_strerror(errno));
- goto bad;
- }
- /* Map network interface to /dev/dlpi unit */
- ppa = get_dlpi_ppa(p->fd, dname, ppa, ebuf);
- if (ppa < 0)
- goto bad;
-#else
- /* Try device without unit number */
- strcpy(dname2, dname);
- cp = strchr(dname, *cp);
- *cp = '\0';
- if ((p->fd = open(dname, O_RDWR)) < 0) {
- if (errno != ENOENT) {
- sprintf(ebuf, "%s: %s", dname, pcap_strerror(errno));
- goto bad;
- }
-
- /* Try again with unit number */
- if ((p->fd = open(dname2, O_RDWR)) < 0) {
- sprintf(ebuf, "%s: %s", dname2, pcap_strerror(errno));
- goto bad;
- }
- /* XXX Assume unit zero */
- ppa = 0;
- }
-#endif
-
- p->snapshot = snaplen;
-
- /*
- ** Attach if "style 2" provider
- */
- if (dlinforeq(p->fd, ebuf) < 0 ||
- dlinfoack(p->fd, (char *)buf, ebuf) < 0)
- goto bad;
- infop = &((union DL_primitives *)buf)->info_ack;
- if (infop->dl_provider_style == DL_STYLE2 &&
- (dlattachreq(p->fd, ppa, ebuf) < 0 ||
- dlokack(p->fd, "attach", (char *)buf, ebuf) < 0))
- goto bad;
- /*
- ** Bind (defer if using HP-UX 9 or HP-UX 10.20, totally skip if
- ** using SINIX)
- */
-#if !defined(HAVE_HPUX9) && !defined(HAVE_HPUX10_20) && !defined(sinix)
- if (dlbindreq(p->fd, 0, ebuf) < 0 ||
- dlbindack(p->fd, (char *)buf, ebuf) < 0)
- goto bad;
-#endif
-
- if (promisc) {
- /*
- ** Enable promiscuous
- */
- if (dlpromisconreq(p->fd, DL_PROMISC_PHYS, ebuf) < 0 ||
- dlokack(p->fd, "promisc_phys", (char *)buf, ebuf) < 0)
- goto bad;
-
- /*
- ** Try to enable multicast (you would have thought
- ** promiscuous would be sufficient). (Skip if using
- ** HP-UX or SINIX)
- */
-#if !defined(__hpux) && !defined(sinix)
- if (dlpromisconreq(p->fd, DL_PROMISC_MULTI, ebuf) < 0 ||
- dlokack(p->fd, "promisc_multi", (char *)buf, ebuf) < 0)
- fprintf(stderr,
- "WARNING: DL_PROMISC_MULTI failed (%s)\n", ebuf);
-#endif
- }
- /*
- ** Try to enable sap (when not in promiscuous mode when using
- ** using HP-UX and never under SINIX)
- */
-#ifndef sinix
- if (
-#ifdef __hpux
- !promisc &&
-#endif
- (dlpromisconreq(p->fd, DL_PROMISC_SAP, ebuf) < 0 ||
- dlokack(p->fd, "promisc_sap", (char *)buf, ebuf) < 0)) {
- /* Not fatal if promisc since the DL_PROMISC_PHYS worked */
- if (promisc)
- fprintf(stderr,
- "WARNING: DL_PROMISC_SAP failed (%s)\n", ebuf);
- else
- goto bad;
- }
-#endif
-
- /*
- ** HP-UX 9 and HP-UX 10.20 must bind after setting promiscuous
- ** options)
- */
-#if defined(HAVE_HPUX9) || defined(HAVE_HPUX10_20)
- if (dlbindreq(p->fd, 0, ebuf) < 0 ||
- dlbindack(p->fd, (char *)buf, ebuf) < 0)
- goto bad;
-#endif
-
- /*
- ** Determine link type
- */
- if (dlinforeq(p->fd, ebuf) < 0 ||
- dlinfoack(p->fd, (char *)buf, ebuf) < 0)
- goto bad;
-
- infop = &((union DL_primitives *)buf)->info_ack;
- switch (infop->dl_mac_type) {
-
- case DL_CSMACD:
- case DL_ETHER:
- p->linktype = DLT_EN10MB;
- p->offset = 2;
- break;
-
- case DL_FDDI:
- p->linktype = DLT_FDDI;
- p->offset = 3;
- break;
-
- default:
- sprintf(ebuf, "unknown mac type 0x%lu", infop->dl_mac_type);
- goto bad;
- }
-
-#ifdef DLIOCRAW
- /*
- ** This is a non standard SunOS hack to get the ethernet header.
- */
- if (strioctl(p->fd, DLIOCRAW, 0, NULL) < 0) {
- sprintf(ebuf, "DLIOCRAW: %s", pcap_strerror(errno));
- goto bad;
- }
-#endif
-
-#ifdef HAVE_SYS_BUFMOD_H
- /*
- ** Another non standard call to get the data nicely buffered
- */
- if (ioctl(p->fd, I_PUSH, "bufmod") != 0) {
- sprintf(ebuf, "I_PUSH bufmod: %s", pcap_strerror(errno));
- goto bad;
- }
-
- /*
- ** Now that the bufmod is pushed lets configure it.
- **
- ** There is a bug in bufmod(7). When dealing with messages of
- ** less than snaplen size it strips data from the beginning not
- ** the end.
- **
- ** This bug is supposed to be fixed in 5.3.2. Also, there is a
- ** patch available. Ask for bugid 1149065.
- */
- ss = snaplen;
-#ifdef HAVE_SOLARIS
- release = get_release(&osmajor, &osminor, &osmicro);
- if (osmajor == 5 && (osminor <= 2 || (osminor == 3 && osmicro < 2)) &&
- getenv("BUFMOD_FIXED") == NULL) {
- fprintf(stderr,
- "WARNING: bufmod is broken in SunOS %s; ignoring snaplen.\n",
- release);
- ss = 0;
- }
-#endif
- if (ss > 0 &&
- strioctl(p->fd, SBIOCSSNAP, sizeof(ss), (char *)&ss) != 0) {
- sprintf(ebuf, "SBIOCSSNAP: %s", pcap_strerror(errno));
- goto bad;
- }
-
- /*
- ** Set up the bufmod flags
- */
- if (strioctl(p->fd, SBIOCGFLAGS, sizeof(flag), (char *)&flag) < 0) {
- sprintf(ebuf, "SBIOCGFLAGS: %s", pcap_strerror(errno));
- goto bad;
- }
- flag |= SB_NO_DROPS;
- if (strioctl(p->fd, SBIOCSFLAGS, sizeof(flag), (char *)&flag) != 0) {
- sprintf(ebuf, "SBIOCSFLAGS: %s", pcap_strerror(errno));
- goto bad;
- }
- /*
- ** Set up the bufmod timeout
- */
- if (to_ms != 0) {
- struct timeval to;
-
- to.tv_sec = to_ms / 1000;
- to.tv_usec = (to_ms * 1000) % 1000000;
- if (strioctl(p->fd, SBIOCSTIME, sizeof(to), (char *)&to) != 0) {
- sprintf(ebuf, "SBIOCSTIME: %s", pcap_strerror(errno));
- goto bad;
- }
- }
-#endif
-
- /*
- ** As the last operation flush the read side.
- */
- if (ioctl(p->fd, I_FLUSH, FLUSHR) != 0) {
- sprintf(ebuf, "FLUSHR: %s", pcap_strerror(errno));
- goto bad;
- }
- /* Allocate data buffer */
- p->bufsize = MAXDLBUF * sizeof(bpf_u_int32);
- p->buffer = (u_char *)malloc(p->bufsize + p->offset);
-
- return (p);
-bad:
- free(p);
- return (NULL);
-}
-
-int
-pcap_setfilter(pcap_t *p, struct bpf_program *fp)
-{
-
- p->fcode = *fp;
- return (0);
-}
-
-static int
-send_request(int fd, char *ptr, int len, char *what, char *ebuf)
-{
- struct strbuf ctl;
- int flags;
-
- ctl.maxlen = 0;
- ctl.len = len;
- ctl.buf = ptr;
-
- flags = 0;
- if (putmsg(fd, &ctl, (struct strbuf *) NULL, flags) < 0) {
- sprintf(ebuf, "send_request: putmsg \"%s\": %s",
- what, pcap_strerror(errno));
- return (-1);
- }
- return (0);
-}
-
-static int
-recv_ack(int fd, int size, const char *what, char *bufp, char *ebuf)
-{
- union DL_primitives *dlp;
- struct strbuf ctl;
- int flags;
-
- ctl.maxlen = MAXDLBUF;
- ctl.len = 0;
- ctl.buf = bufp;
-
- flags = 0;
- if (getmsg(fd, &ctl, (struct strbuf*)NULL, &flags) < 0) {
- sprintf(ebuf, "recv_ack: %s getmsg: %s",
- what, pcap_strerror(errno));
- return (-1);
- }
-
- dlp = (union DL_primitives *) ctl.buf;
- switch (dlp->dl_primitive) {
-
- case DL_INFO_ACK:
- case DL_BIND_ACK:
- case DL_OK_ACK:
-#ifdef DL_HP_PPA_ACK
- case DL_HP_PPA_ACK:
-#endif
-
- /* These are OK */
- break;
-
- case DL_ERROR_ACK:
- switch (dlp->error_ack.dl_errno) {
-
- case DL_BADPPA:
- sprintf(ebuf, "recv_ack: %s bad ppa (device unit)",
- what);
- break;
-
-
- case DL_SYSERR:
- sprintf(ebuf, "recv_ack: %s: %s",
- what, pcap_strerror(dlp->error_ack.dl_unix_errno));
- break;
-
- case DL_UNSUPPORTED:
- sprintf(ebuf,
- "recv_ack: %s: Service not supplied by provider",
- what);
- break;
-
- default:
- sprintf(ebuf, "recv_ack: %s error 0x%x",
- what, (bpf_u_int32)dlp->error_ack.dl_errno);
- break;
- }
- return (-1);
-
- default:
- sprintf(ebuf, "recv_ack: %s unexpected primitive ack 0x%x ",
- what, (bpf_u_int32)dlp->dl_primitive);
- return (-1);
- }
-
- if (ctl.len < size) {
- sprintf(ebuf, "recv_ack: %s ack too small (%d < %d)",
- what, ctl.len, size);
- return (-1);
- }
- return (ctl.len);
-}
-
-static int
-dlattachreq(int fd, bpf_u_int32 ppa, char *ebuf)
-{
- dl_attach_req_t req;
-
- req.dl_primitive = DL_ATTACH_REQ;
- req.dl_ppa = ppa;
-
- return (send_request(fd, (char *)&req, sizeof(req), "attach", ebuf));
-}
-
-static int
-dlbindreq(int fd, bpf_u_int32 sap, char *ebuf)
-{
-
- dl_bind_req_t req;
-
- memset((char *)&req, 0, sizeof(req));
- req.dl_primitive = DL_BIND_REQ;
-#ifdef DL_HP_RAWDLS
- req.dl_max_conind = 1; /* XXX magic number */
- /* 22 is INSAP as per the HP-UX DLPI Programmer's Guide */
- req.dl_sap = 22;
- req.dl_service_mode = DL_HP_RAWDLS;
-#else
- req.dl_sap = sap;
-#ifdef DL_CLDLS
- req.dl_service_mode = DL_CLDLS;
-#endif
-#endif
-
- return (send_request(fd, (char *)&req, sizeof(req), "bind", ebuf));
-}
-
-static int
-dlbindack(int fd, char *bufp, char *ebuf)
-{
-
- return (recv_ack(fd, DL_BIND_ACK_SIZE, "bind", bufp, ebuf));
-}
-
-static int
-dlpromisconreq(int fd, bpf_u_int32 level, char *ebuf)
-{
- dl_promiscon_req_t req;
-
- req.dl_primitive = DL_PROMISCON_REQ;
- req.dl_level = level;
-
- return (send_request(fd, (char *)&req, sizeof(req), "promiscon", ebuf));
-}
-
-static int
-dlokack(int fd, const char *what, char *bufp, char *ebuf)
-{
-
- return (recv_ack(fd, DL_OK_ACK_SIZE, what, bufp, ebuf));
-}
-
-
-static int
-dlinforeq(int fd, char *ebuf)
-{
- dl_info_req_t req;
-
- req.dl_primitive = DL_INFO_REQ;
-
- return (send_request(fd, (char *)&req, sizeof(req), "info", ebuf));
-}
-
-static int
-dlinfoack(int fd, char *bufp, char *ebuf)
-{
-
- return (recv_ack(fd, DL_INFO_ACK_SIZE, "info", bufp, ebuf));
-}
-
-#ifdef HAVE_SYS_BUFMOD_H
-static int
-strioctl(int fd, int cmd, int len, char *dp)
-{
- struct strioctl str;
- int rc;
-
- str.ic_cmd = cmd;
- str.ic_timout = -1;
- str.ic_len = len;
- str.ic_dp = dp;
- rc = ioctl(fd, I_STR, &str);
-
- if (rc < 0)
- return (rc);
- else
- return (str.ic_len);
-}
-#endif
-
-#if defined(HAVE_SOLARIS) && defined(HAVE_SYS_BUFMOD_H)
-static char *
-get_release(bpf_u_int32 *majorp, bpf_u_int32 *minorp, bpf_u_int32 *microp)
-{
- char *cp;
- static char buf[32];
-
- *majorp = 0;
- *minorp = 0;
- *microp = 0;
- if (sysinfo(SI_RELEASE, buf, sizeof(buf)) < 0)
- return ("?");
- cp = buf;
- if (!isdigit(*cp))
- return (buf);
- *majorp = strtol(cp, &cp, 10);
- if (*cp++ != '.')
- return (buf);
- *minorp = strtol(cp, &cp, 10);
- if (*cp++ != '.')
- return (buf);
- *microp = strtol(cp, &cp, 10);
- return (buf);
-}
-#endif
-
-#ifdef DL_HP_PPA_ACK_OBS
-/*
- * Under HP-UX 10, we can ask for the ppa
- */
-
-
-/* Determine ppa number that specifies ifname */
-static int
-get_dlpi_ppa(register int fd, register const char *device, register int unit,
- register char *ebuf)
-{
- register dl_hp_ppa_ack_t *ap;
- register dl_hp_ppa_info_t *ip;
- register int i;
- register u_long majdev;
- dl_hp_ppa_req_t req;
- struct stat statbuf;
- bpf_u_int32 buf[MAXDLBUF];
-
- if (stat(device, &statbuf) < 0) {
- sprintf(ebuf, "stat: %s: %s", device, pcap_strerror(errno));
- return (-1);
- }
- majdev = major(statbuf.st_rdev);
-
- memset((char *)&req, 0, sizeof(req));
- req.dl_primitive = DL_HP_PPA_REQ;
-
- memset((char *)buf, 0, sizeof(buf));
- if (send_request(fd, (char *)&req, sizeof(req), "hpppa", ebuf) < 0 ||
- recv_ack(fd, DL_HP_PPA_ACK_SIZE, "hpppa", (char *)buf, ebuf) < 0)
- return (-1);
-
- ap = (dl_hp_ppa_ack_t *)buf;
- ip = (dl_hp_ppa_info_t *)((u_char *)ap + ap->dl_offset);
-
- for(i = 0; i < ap->dl_count; i++) {
- if (ip->dl_mjr_num == majdev && ip->dl_instance_num == unit)
- break;
-
- ip = (dl_hp_ppa_info_t *)((u_char *)ip + ip->dl_next_offset);
- }
- if (i == ap->dl_count) {
- sprintf(ebuf, "can't find PPA for %s", device);
- return (-1);
- }
- if (ip->dl_hdw_state == HDW_DEAD) {
- sprintf(ebuf, "%s: hardware state: DOWN\n", device);
- return (-1);
- }
- return ((int)ip->dl_ppa);
-}
-#endif
-
-#ifdef HAVE_HPUX9
-/*
- * Under HP-UX 9, there is no good way to determine the ppa.
- * So punt and read it from /dev/kmem.
- */
-static struct nlist nl[] = {
-#define NL_IFNET 0
- { "ifnet" },
- { "" }
-};
-
-static char path_vmunix[] = "/hp-ux";
-
-/* Determine ppa number that specifies ifname */
-static int
-get_dlpi_ppa(register int fd, register const char *ifname, register int unit,
- register char *ebuf)
-{
- register const char *cp;
- register int kd;
- void *addr;
- struct ifnet ifnet;
- char if_name[sizeof(ifnet.if_name)], tifname[32];
-
- cp = strrchr(ifname, '/');
- if (cp != NULL)
- ifname = cp + 1;
- if (nlist(path_vmunix, &nl) < 0) {
- sprintf(ebuf, "nlist %s failed", path_vmunix);
- return (-1);
- }
- if (nl[NL_IFNET].n_value == 0) {
- sprintf(ebuf, "could't find %s kernel symbol",
- nl[NL_IFNET].n_name);
- return (-1);
- }
- kd = open("/dev/kmem", O_RDONLY);
- if (kd < 0) {
- sprintf(ebuf, "kmem open: %s", pcap_strerror(errno));
- return (-1);
- }
- if (dlpi_kread(kd, nl[NL_IFNET].n_value,
- &addr, sizeof(addr), ebuf) < 0) {
- close(kd);
- return (-1);
- }
- for (; addr != NULL; addr = ifnet.if_next) {
- if (dlpi_kread(kd, (off_t)addr,
- &ifnet, sizeof(ifnet), ebuf) < 0 ||
- dlpi_kread(kd, (off_t)ifnet.if_name,
- if_name, sizeof(if_name), ebuf) < 0) {
- (void)close(kd);
- return (-1);
- }
- sprintf(tifname, "%.*s%d",
- (int)sizeof(if_name), if_name, ifnet.if_unit);
- if (strcmp(tifname, ifname) == 0)
- return (ifnet.if_index);
- }
-
- sprintf(ebuf, "Can't find %s", ifname);
- return (-1);
-}
-
-static int
-dlpi_kread(register int fd, register off_t addr,
- register void *buf, register u_int len, register char *ebuf)
-{
- register int cc;
-
- if (lseek(fd, addr, SEEK_SET) < 0) {
- sprintf(ebuf, "lseek: %s", pcap_strerror(errno));
- return (-1);
- }
- cc = read(fd, buf, len);
- if (cc < 0) {
- sprintf(ebuf, "read: %s", pcap_strerror(errno));
- return (-1);
- } else if (cc != len) {
- sprintf(ebuf, "short read (%d != %d)", cc, len);
- return (-1);
- }
- return (cc);
-}
-#endif
diff --git a/libpcap/pcap-enet.c b/libpcap/pcap-enet.c
deleted file mode 100644
index d257d3c..0000000
--- a/libpcap/pcap-enet.c
+++ b/dev/null
@@ -1,231 +0,0 @@
-/*
- * Stanford Enetfilter subroutines for tcpdump
- *
- * Based on the MERIT NNstat etherifrt.c and the Ultrix pcap-pf.c
- * subroutines.
- *
- * Rayan Zachariassen, CA*Net
- */
-
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-
-#include <net/if.h>
-#include <net/bpf.h>
-#include <net/enet.h>
-
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-
-#include <stdio.h>
-#include <errno.h>
-
-#include <interface.h>
-
-struct packet_header {
-#ifdef IBMRTPC
- struct LengthWords length;
- struct tap_header tap;
-#endif /* IBMRTPC */
- u_char packet[8]
-};
-
-extern int errno;
-
-#define BUFSPACE (4*1024)
-
-/* Forwards */
-static void efReadError(int, char *);
-
-void
-readloop(int cnt, int if_fd, struct bpf_program *fp, printfunc printit)
-{
-#ifdef IBMRTPC
- register struct packet_header *ph;
- register u_char *bp;
- register int inc;
-#else /* !IBMRTPC */
- static struct timeval tv = { 0 };
-#endif /* IBMRTPC */
- register int cc, caplen;
- register struct bpf_insn *fcode = fp->bf_insns;
- union {
- struct packet_header hdr;
- u_char p[BUFSPACE];
- u_short s;
- } buf;
-
- while (1) {
- if ((cc = read(if_fd, (char *)buf.p, sizeof(buf))) < 0)
- efReadError(if_fd, "reader");
-
-#ifdef IBMRTPC
- /*
- * Loop through each packet.
- */
- bp = buf.p;
- while (cc > 0) {
- ph = (struct packet_header *)bp;
- caplen = ph->tap.th_wirelen > snaplen ? snaplen : ph->tap
-.th_wirelen ;
- if (bpf_filter(fcode, (char *)ph->packet,
- ph->tap.th_wirelen, caplen)) {
- if (cnt >= 0 && --cnt < 0)
- goto out;
- (*printit)((char *)ph->packet,
- (struct timeval *)ph->tap.th_timestamp,
- ph->tap.th_wirelen, caplen);
- }
- inc = ph->length.PacketOffset;
- cc -= inc;
- bp += inc;
- }
-#else /* !IBMRTPC */
- caplen = cc > snaplen ? snaplen : cc ;
- if (bpf_filter(fcode, buf.hdr.packet, cc, caplen)) {
- if (cnt >= 0 && --cnt < 0)
- goto out;
- (*printit)(buf.hdr.packet, &tv, cc, caplen);
- }
-#endif /* IBMRTPC */
- }
- out:
- wrapup(if_fd);
-}
-
-/* Call ONLY if read() has returned an error on packet filter */
-static void
-efReadError(int fid, char *msg)
-{
- if (errno == EINVAL) { /* read MAXINT bytes already! */
- if (lseek(fid, 0, 0) < 0) {
- perror("tcpdump: efReadError/lseek");
- exit(-1);
- }
- else
- return;
- }
- else {
- (void) fprintf(stderr, "tcpdump: ");
- perror(msg);
- exit(-1);
- }
-}
-
-void
-wrapup(int fd)
-{
-#ifdef IBMRTPC
- struct enstats es;
-
- if (ioctl(fd, EIOSTATS, &es) == -1) {
- perror("tcpdump: enet ioctl EIOSTATS error");
- exit(-1);
- }
-
- fprintf(stderr, "%d packets queued", es.enStat_Rcnt);
- if (es.enStat_Rdrops > 0)
- fprintf(stderr, ", %d dropped", es.enStat_Rdrops);
- if (es.enStat_Reads > 0)
- fprintf(stderr, ", %d tcpdump %s", es.enStat_Reads,
- es.enStat_Reads > 1 ? "reads" : "read");
- if (es.enStat_MaxRead > 1)
- fprintf(stderr, ", %d packets in largest read",
- es.enStat_MaxRead);
- putc('\n', stderr);
-#endif /* IBMRTPC */
- close(fd);
-}
-
-int
-initdevice(char *device, int pflag, int *linktype)
-{
- struct eniocb ctl;
- struct enfilter filter;
- u_int maxwaiting;
- int if_fd;
-
-#ifdef IBMRTPC
- GETENETDEVICE(0, O_RDONLY, &if_fd);
-#else /* !IBMRTPC */
- if_fd = open("/dev/enet", O_RDONLY, 0);
-#endif /* IBMRTPC */
-
- if (if_fd == -1) {
- perror("tcpdump: enet open error");
- error(
-"your system may not be properly configured; see \"man enet(4)\"");
- exit(-1);
- }
-
- /* Get operating parameters. */
-
- if (ioctl(if_fd, EIOCGETP, (char *)&ctl) == -1) {
- perror("tcpdump: enet ioctl EIOCGETP error");
- exit(-1);
- }
-
- /* Set operating parameters. */
-
-#ifdef IBMRTPC
- ctl.en_rtout = 1 * ctl.en_hz;
- ctl.en_tr_etherhead = 1;
- ctl.en_tap_network = 1;
- ctl.en_multi_packet = 1;
- ctl.en_maxlen = BUFSPACE;
-#else /* !IBMRTPC */
- ctl.en_rtout = 64; /* randomly picked value for HZ */
-#endif /* IBMRTPC */
- if (ioctl(if_fd, EIOCSETP, &ctl) == -1) {
- perror("tcpdump: enet ioctl EIOCSETP error");
- exit(-1);
- }
-
- /* Flush the receive queue, since we've changed
- the operating parameters and we otherwise might
- receive data without headers. */
-
- if (ioctl(if_fd, EIOCFLUSH) == -1) {
- perror("tcpdump: enet ioctl EIOCFLUSH error");
- exit(-1);
- }
-
- /* Set the receive queue depth to its maximum. */
-
- maxwaiting = ctl.en_maxwaiting;
- if (ioctl(if_fd, EIOCSETW, &maxwaiting) == -1) {
- perror("tcpdump: enet ioctl EIOCSETW error");
- exit(-1);
- }
-
-#ifdef IBMRTPC
- /* Clear statistics. */
-
- if (ioctl(if_fd, EIOCLRSTAT, 0) == -1) {
- perror("tcpdump: enet ioctl EIOCLRSTAT error");
- exit(-1);
- }
-#endif /* IBMRTPC */
-
- /* Set the filter (accept all packets). */
-
- filter.enf_Priority = 3;
- filter.enf_FilterLen = 0;
- if (ioctl(if_fd, EIOCSETF, &filter) == -1) {
- perror("tcpdump: enet ioctl EIOCSETF error");
- exit(-1);
- }
- /*
- * "enetfilter" supports only ethernets.
- */
- *linktype = DLT_EN10MB;
-
- return(if_fd);
-}
diff --git a/libpcap/pcap-int.h b/libpcap/pcap-int.h
deleted file mode 100644
index e463f2e..0000000
--- a/libpcap/pcap-int.h
+++ b/dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 1994, 1995, 1996
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the Computer Systems
- * Engineering Group at Lawrence Berkeley Laboratory.
- * 4. Neither the name of the University nor of the Laboratory may be used
- * to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/pcap-int.h,v 1.1 2001/05/31 13:40:53 gray Exp $ (LBL)
- */
-
-#ifndef pcap_int_h
-#define pcap_int_h
-
-#include <pcap.h>
-
-/*
- * Savefile
- */
-struct pcap_sf {
- FILE *rfile;
- int swapped;
- int version_major;
- int version_minor;
- u_char *base;
-};
-
-struct pcap_md {
- struct pcap_stat stat;
- /*XXX*/
- int use_bpf;
- u_long TotPkts; /* can't oflow for 79 hrs on ether */
- u_long TotAccepted; /* count accepted by filter */
- u_long TotDrops; /* count of dropped packets */
- long TotMissed; /* missed by i/f during this run */
- long OrigMissed; /* missed by i/f before this run */
-#ifdef linux
- int pad;
- int skip;
- char *device;
-#endif
-};
-
-struct pcap {
- int fd;
- int snapshot;
- int linktype;
- int tzoff; /* timezone offset */
- int offset; /* offset for proper alignment */
-
- struct pcap_sf sf;
- struct pcap_md md;
-
- /*
- * Read buffer.
- */
- int bufsize;
- u_char *buffer;
- u_char *bp;
- int cc;
-
- /*
- * Place holder for pcap_next().
- */
- u_char *pkt;
-
-
- /*
- * Placeholder for filter code if bpf not in kernel.
- */
- struct bpf_program fcode;
-
- char errbuf[PCAP_ERRBUF_SIZE];
-};
-
-int yylex(void);
-
-#ifndef min
-#define min(a, b) ((a) > (b) ? (b) : (a))
-#endif
-
-/* XXX should these be in pcap.h? */
-int pcap_offline_read(pcap_t *, int, pcap_handler, u_char *);
-int pcap_read(pcap_t *, int cnt, pcap_handler, u_char *);
-
-/* Ultrix pads to make everything line up on a nice boundary */
-#if defined(ultrix) || defined(__alpha)
-#define PCAP_FDDIPAD 3
-#endif
-
-/* XXX */
-extern int pcap_fddipad;
-#endif
diff --git a/libpcap/pcap-linux.c b/libpcap/pcap-linux.c
deleted file mode 100644
index 6eaba41..0000000
--- a/libpcap/pcap-linux.c
+++ b/dev/null
@@ -1,335 +0,0 @@
-/*
- * Copyright (c) 1996, 1997
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/pcap-linux.c,v 1.1 2001/05/31 13:40:53 gray Exp $ (LBL)";
-#endif
-
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-
-#include <sys/param.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-
-#include <net/if.h>
-#ifdef HAVE_NET_IF_ARP_H
-#include <net/if_arp.h>
-#else
-#include <linux/if_arp.h>
-#endif
-#include <linux/if_ether.h>
-
-#include <netinet/in.h>
-
-#include <errno.h>
-#include <malloc.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-static struct ifreq saved_ifr;
-
-#include <pcap-int.h>
-
-#include <gnuc.h>
-#ifdef HAVE_OS_PROTO_H
-#include <os-proto.h>
-#endif
-
-void linux_restore_ifr(void);
-
-int
-pcap_stats(pcap_t *p, struct pcap_stat *ps)
-{
-
- *ps = p->md.stat;
- return (0);
-}
-
-int
-pcap_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
-{
- register int cc;
- register int bufsize;
- register int caplen;
- register u_char *bp;
- struct sockaddr from;
- int fromlen;
-
- bp = p->buffer + p->offset;
- bufsize = p->bufsize;
- if (p->md.pad > 0) {
- memset(bp, 0, p->md.pad);
- bp += p->md.pad;
- bufsize -= p->md.pad;
- }
-
-again:
- do {
- fromlen = sizeof(from);
- cc = recvfrom(p->fd, bp, bufsize, 0, &from, &fromlen);
- if (cc < 0) {
- /* Don't choke when we get ptraced */
- switch (errno) {
-
- case EINTR:
- goto again;
-
- case EWOULDBLOCK:
- return (0); /* XXX */
- }
- sprintf(p->errbuf, "read: %s", pcap_strerror(errno));
- return (-1);
- }
- } while (strcmp(p->md.device, from.sa_data));
-
- /* If we need have leading zero bytes, adjust count */
- cc += p->md.pad;
- bp = p->buffer + p->offset;
-
- /* If we need to step over leading junk, adjust count and pointer */
- cc -= p->md.skip;
- bp += p->md.skip;
-
- /* Captured length can't exceed our read buffer size */
- caplen = cc;
- if (caplen > bufsize)
- caplen = bufsize;
-
- /* Captured length can't exceed the snapshot length */
- if (caplen > p->snapshot)
- caplen = p->snapshot;
-
- if (p->fcode.bf_insns == NULL ||
- bpf_filter(p->fcode.bf_insns, bp, cc, caplen)) {
- struct pcap_pkthdr h;
-
- ++p->md.stat.ps_recv;
- /* Get timestamp */
- if (ioctl(p->fd, SIOCGSTAMP, &h.ts) < 0) {
- sprintf(p->errbuf, "SIOCGSTAMP: %s",
- pcap_strerror(errno));
- return (-1);
- }
- h.len = cc;
- h.caplen = caplen;
- (*callback)(user, &h, bp);
- return (1);
- }
- return (0);
-}
-
-pcap_t *
-pcap_open_live(char *device, int snaplen, int promisc, int to_ms, char *ebuf)
-{
- register int fd, broadcast;
- register pcap_t *p;
- struct ifreq ifr;
- struct sockaddr sa;
-
- p = (pcap_t *)malloc(sizeof(*p));
- if (p == NULL) {
- sprintf(ebuf, "malloc: %s", pcap_strerror(errno));
- return (NULL);
- }
- memset(p, 0, sizeof(*p));
- fd = -1;
-
- fd = socket(PF_INET, SOCK_PACKET, htons(ETH_P_ALL));
- if (fd < 0) {
- sprintf(ebuf, "socket: %s", pcap_strerror(errno));
- goto bad;
- }
- p->fd = fd;
-
- /* Bind to the interface name */
- memset(&sa, 0, sizeof(sa));
- sa.sa_family = AF_INET;
- (void)strncpy(sa.sa_data, device, sizeof(sa.sa_data));
- if (bind(p->fd, &sa, sizeof(sa))) {
- sprintf(ebuf, "bind: %s: %s", device, pcap_strerror(errno));
- goto bad;
- }
-
- memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
- if (ioctl(p->fd, SIOCGIFHWADDR, &ifr) < 0 ) {
- sprintf(ebuf, "SIOCGIFHWADDR: %s", pcap_strerror(errno));
- goto bad;
- }
- broadcast = 0;
- switch (ifr.ifr_hwaddr.sa_family) {
-
- case ARPHRD_ETHER:
- case ARPHRD_METRICOM:
- p->linktype = DLT_EN10MB;
- p->offset = 2;
- ++broadcast;
- break;
-
- case ARPHRD_EETHER:
- p->linktype = DLT_EN3MB;
- ++broadcast;
- break;
-
- case ARPHRD_AX25:
- p->linktype = DLT_AX25;
- ++broadcast;
- break;
-
- case ARPHRD_PRONET:
- p->linktype = DLT_PRONET;
- break;
-
- case ARPHRD_CHAOS:
- p->linktype = DLT_CHAOS;
- break;
-
- case ARPHRD_IEEE802:
- p->linktype = DLT_IEEE802;
- ++broadcast;
- break;
-
- case ARPHRD_ARCNET:
- p->linktype = DLT_ARCNET;
- ++broadcast;
- break;
-
- case ARPHRD_SLIP:
- case ARPHRD_CSLIP:
- case ARPHRD_SLIP6:
- case ARPHRD_CSLIP6:
- case ARPHRD_PPP:
- p->linktype = DLT_RAW;
- break;
-
- case ARPHRD_LOOPBACK:
- p->linktype = DLT_NULL;
- p->md.pad = 2;
- p->md.skip = 12;
- break;
-
-#ifdef ARPHRD_FDDI
- /* Not all versions of the kernel has this define */
- case ARPHRD_FDDI:
- p->linktype = DLT_FDDI;
- ++broadcast;
- break;
-#endif
-
-#ifdef notdef
- case ARPHRD_LOCALTLK:
- case ARPHRD_NETROM:
- case ARPHRD_APPLETLK:
- case ARPHRD_DLCI:
- case ARPHRD_RSRVD:
- case ARPHRD_ADAPT:
- case ARPHRD_TUNNEL:
- case ARPHRD_TUNNEL6:
- case ARPHRD_FRAD:
- case ARPHRD_SKIP:
- /* XXX currently do not know what to do with these... */
- abort();
-#endif
-
- default:
- sprintf(ebuf, "unknown physical layer type 0x%x",
- ifr.ifr_hwaddr.sa_family);
- goto bad;
- }
-
- /* Base the buffer size on the interface MTU */
- memset(&ifr, 0, sizeof(ifr));
- strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
- if (ioctl(p->fd, SIOCGIFMTU, &ifr) < 0 ) {
- sprintf(ebuf, "SIOCGIFMTU: %s", pcap_strerror(errno));
- goto bad;
- }
-
- /* Leave room for link header (which is never large under linux...) */
- p->bufsize = ifr.ifr_mtu + 64;
-
- p->buffer = (u_char *)malloc(p->bufsize + p->offset);
- if (p->buffer == NULL) {
- sprintf(ebuf, "malloc: %s", pcap_strerror(errno));
- goto bad;
- }
-
- /* XXX */
- if (promisc && broadcast) {
- memset(&ifr, 0, sizeof(ifr));
- strcpy(ifr.ifr_name, device);
- if (ioctl(p->fd, SIOCGIFFLAGS, &ifr) < 0 ) {
- sprintf(ebuf, "SIOCGIFFLAGS: %s", pcap_strerror(errno));
- goto bad;
- }
- saved_ifr = ifr;
- ifr.ifr_flags |= IFF_PROMISC;
- if (ioctl(p->fd, SIOCSIFFLAGS, &ifr) < 0 ) {
- sprintf(ebuf, "SIOCSIFFLAGS: %s", pcap_strerror(errno));
- goto bad;
- }
- ifr.ifr_flags &= ~IFF_PROMISC;
- atexit(linux_restore_ifr);
- }
-
- p->md.device = strdup(device);
- if (p->md.device == NULL) {
- sprintf(ebuf, "malloc: %s", pcap_strerror(errno));
- goto bad;
- }
- p->snapshot = snaplen;
-
- return (p);
-bad:
- if (fd >= 0)
- (void)close(fd);
- if (p->buffer != NULL)
- free(p->buffer);
- if (p->md.device != NULL)
- free(p->md.device);
- free(p);
- return (NULL);
-}
-
-int
-pcap_setfilter(pcap_t *p, struct bpf_program *fp)
-{
-
- p->fcode = *fp;
- return (0);
-}
-
-void
-linux_restore_ifr(void)
-{
- register int fd;
-
- fd = socket(PF_INET, SOCK_PACKET, htons(0x0003));
- if (fd < 0)
- fprintf(stderr, "linux socket: %s", pcap_strerror(errno));
- else if (ioctl(fd, SIOCSIFFLAGS, &saved_ifr) < 0)
- fprintf(stderr, "linux SIOCSIFFLAGS: %s", pcap_strerror(errno));
-}
diff --git a/libpcap/pcap-namedb.h b/libpcap/pcap-namedb.h
deleted file mode 100644
index 90cc192..0000000
--- a/libpcap/pcap-namedb.h
+++ b/dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 1994, 1996
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the Computer Systems
- * Engineering Group at Lawrence Berkeley Laboratory.
- * 4. Neither the name of the University nor of the Laboratory may be used
- * to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/pcap-namedb.h,v 1.1 2001/05/31 13:40:53 gray Exp $ (LBL)
- */
-
-#ifndef lib_pcap_ethers_h
-#define lib_pcap_ethers_h
-
-/*
- * As returned by the pcap_next_etherent()
- * XXX this stuff doesn't belong in this interface, but this
- * library already must do name to address translation, so
- * on systems that don't have support for /etc/ethers, we
- * export these hooks since they'll
- */
-struct pcap_etherent {
- u_char addr[6];
- char name[122];
-};
-#ifndef PCAP_ETHERS_FILE
-#define PCAP_ETHERS_FILE "/etc/ethers"
-#endif
-struct pcap_etherent *pcap_next_etherent(FILE *);
-u_char *pcap_ether_hostton(const char*);
-u_char *pcap_ether_aton(const char *);
-
-bpf_u_int32 **pcap_nametoaddr(const char *);
-bpf_u_int32 pcap_nametonetaddr(const char *);
-
-int pcap_nametoport(const char *, int *, int *);
-int pcap_nametoproto(const char *);
-int pcap_nametoeproto(const char *);
-/*
- * If a protocol is unknown, PROTO_UNDEF is returned.
- * Also, pcap_nametoport() returns the protocol along with the port number.
- * If there are ambiguous entried in /etc/services (i.e. domain
- * can be either tcp or udp) PROTO_UNDEF is returned.
- */
-#define PROTO_UNDEF -1
-
-/* XXX move these to pcap-int.h? */
-int __pcap_atodn(const char *, bpf_u_int32 *);
-int __pcap_atoin(const char *, bpf_u_int32 *);
-u_short __pcap_nametodnaddr(const char *);
-
-#endif
diff --git a/libpcap/pcap-nit.c b/libpcap/pcap-nit.c
deleted file mode 100644
index ab569ce..0000000
--- a/libpcap/pcap-nit.c
+++ b/dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/pcap-nit.c,v 1.1 2001/05/31 13:40:53 gray Exp $ (LBL)";
-#endif
-
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/timeb.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-
-#include <net/if.h>
-#include <net/nit.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/if_ether.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcpip.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-
-#include <pcap-int.h>
-
-#include <gnuc.h>
-#ifdef HAVE_OS_PROTO_H
-#include <os-proto.h>
-#endif
-
-/*
- * The chunk size for NIT. This is the amount of buffering
- * done for read calls.
- */
-#define CHUNKSIZE (2*1024)
-
-/*
- * The total buffer space used by NIT.
- */
-#define BUFSPACE (4*CHUNKSIZE)
-
-/* Forwards */
-static int nit_setflags(int, int, int, char *);
-
-int
-pcap_stats(pcap_t *p, struct pcap_stat *ps)
-{
-
- *ps = p->md.stat;
- return (0);
-}
-
-int
-pcap_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
-{
- register int cc, n;
- register struct bpf_insn *fcode = p->fcode.bf_insns;
- register u_char *bp, *cp, *ep;
- register struct nit_hdr *nh;
- register int caplen;
-
- cc = p->cc;
- if (cc == 0) {
- cc = read(p->fd, (char *)p->buffer, p->bufsize);
- if (cc < 0) {
- if (errno == EWOULDBLOCK)
- return (0);
- sprintf(p->errbuf, "pcap_read: %s",
- pcap_strerror(errno));
- return (-1);
- }
- bp = p->buffer;
- } else
- bp = p->bp;
-
- /*
- * Loop through each packet. The increment expression
- * rounds up to the next int boundary past the end of
- * the previous packet.
- */
- n = 0;
- ep = bp + cc;
- while (bp < ep) {
- nh = (struct nit_hdr *)bp;
- cp = bp + sizeof(*nh);
-
- switch (nh->nh_state) {
-
- case NIT_CATCH:
- break;
-
- case NIT_NOMBUF:
- case NIT_NOCLUSTER:
- case NIT_NOSPACE:
- p->md.stat.ps_drop = nh->nh_dropped;
- continue;
-
- case NIT_SEQNO:
- continue;
-
- default:
- sprintf(p->errbuf, "bad nit state %d", nh->nh_state);
- return (-1);
- }
- ++p->md.stat.ps_recv;
- bp += ((sizeof(struct nit_hdr) + nh->nh_datalen +
- sizeof(int) - 1) & ~(sizeof(int) - 1));
-
- caplen = nh->nh_wirelen;
- if (caplen > p->snapshot)
- caplen = p->snapshot;
- if (bpf_filter(fcode, cp, nh->nh_wirelen, caplen)) {
- struct pcap_pkthdr h;
- h.ts = nh->nh_timestamp;
- h.len = nh->nh_wirelen;
- h.caplen = caplen;
- (*callback)(user, &h, cp);
- if (++n >= cnt && cnt >= 0) {
- p->cc = ep - bp;
- p->bp = bp;
- return (n);
- }
- }
- }
- p->cc = 0;
- return (n);
-}
-
-static int
-nit_setflags(int fd, int promisc, int to_ms, char *ebuf)
-{
- struct nit_ioc nioc;
-
- bzero((char *)&nioc, sizeof(nioc));
- nioc.nioc_bufspace = BUFSPACE;
- nioc.nioc_chunksize = CHUNKSIZE;
- nioc.nioc_typetomatch = NT_ALLTYPES;
- nioc.nioc_snaplen = p->snapshot;
- nioc.nioc_bufalign = sizeof(int);
- nioc.nioc_bufoffset = 0;
-
- if (to_ms != 0) {
- nioc.nioc_flags |= NF_TIMEOUT;
- nioc.nioc_timeout.tv_sec = to_ms / 1000;
- nioc.nioc_timeout.tv_usec = (to_ms * 1000) % 1000000;
- }
- if (promisc)
- nioc.nioc_flags |= NF_PROMISC;
-
- if (ioctl(fd, SIOCSNIT, &nioc) < 0) {
- sprintf(ebuf, "SIOCSNIT: %s", pcap_strerror(errno));
- return (-1);
- }
- return (0);
-}
-
-pcap_t *
-pcap_open_live(char *device, int snaplen, int promisc, int to_ms, char *ebuf)
-{
- int fd;
- struct sockaddr_nit snit;
- register pcap_t *p;
-
- p = (pcap_t *)malloc(sizeof(*p));
- if (p == NULL) {
- strcpy(ebuf, pcap_strerror(errno));
- return (NULL);
- }
-
- if (snaplen < 96)
- /*
- * NIT requires a snapshot length of at least 96.
- */
- snaplen = 96;
-
- bzero(p, sizeof(*p));
- p->fd = fd = socket(AF_NIT, SOCK_RAW, NITPROTO_RAW);
- if (fd < 0) {
- sprintf(ebuf, "socket: %s", pcap_strerror(errno));
- goto bad;
- }
- snit.snit_family = AF_NIT;
- (void)strncpy(snit.snit_ifname, device, NITIFSIZ);
-
- if (bind(fd, (struct sockaddr *)&snit, sizeof(snit))) {
- sprintf(ebuf, "bind: %s: %s", snit.snit_ifname,
- pcap_strerror(errno));
- goto bad;
- }
- p->snapshot = snaplen;
- nit_setflags(p->fd, promisc, to_ms, ebuf);
-
- /*
- * NIT supports only ethernets.
- */
- p->linktype = DLT_EN10MB;
-
- p->bufsize = BUFSPACE;
- p->buffer = (u_char *)malloc(p->bufsize);
- if (p->buffer == NULL) {
- strcpy(ebuf, pcap_strerror(errno));
- goto bad;
- }
- return (p);
- bad:
- if (fd >= 0)
- close(fd);
- free(p);
- return (NULL);
-}
-
-int
-pcap_setfilter(pcap_t *p, struct bpf_program *fp)
-{
-
- p->fcode = *fp;
- return (0);
-}
diff --git a/libpcap/pcap-nit.h b/libpcap/pcap-nit.h
deleted file mode 100644
index a269d48..0000000
--- a/libpcap/pcap-nit.h
+++ b/dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 1990, 1994
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Lawrence Berkeley Laboratory,
- * Berkeley, CA. The name of the University may not be used to
- * endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/pcap-nit.h,v 1.1 2001/05/31 13:40:53 gray Exp $ (LBL)
- */
diff --git a/libpcap/pcap-null.c b/libpcap/pcap-null.c
deleted file mode 100644
index 7652350..0000000
--- a/libpcap/pcap-null.c
+++ b/dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 1994, 1995, 1996
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/pcap-null.c,v 1.1 2001/05/31 13:40:53 gray Exp $ (LBL)";
-#endif
-
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-
-#include <sys/param.h> /* optionally get BSD define */
-
-#include <string.h>
-
-#include <gnuc.h>
-#ifdef HAVE_OS_PROTO_H
-#include <os-proto.h>
-#endif
-
-#include <pcap-int.h>
-
-static char nosup[] = "live packet capture not supported on this system";
-
-int
-pcap_stats(pcap_t *p, struct pcap_stat *ps)
-{
-
- (void)sprintf(p->errbuf, "pcap_stats: %s", nosup);
- return (-1);
-}
-
-int
-pcap_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
-{
-
- (void)sprintf(p->errbuf, "pcap_read: %s", nosup);
- return (-1);
-}
-
-pcap_t *
-pcap_open_live(char *device, int snaplen, int promisc, int to_ms, char *ebuf)
-{
-
- (void)strcpy(ebuf, nosup);
- return (NULL);
-}
-
-int
-pcap_setfilter(pcap_t *p, struct bpf_program *fp)
-{
-
- if (p->sf.rfile == NULL) {
- (void)sprintf(p->errbuf, "pcap_setfilter: %s", nosup);
- return (-1);
- }
- p->fcode = *fp;
- return (0);
-}
diff --git a/libpcap/pcap-pf.c b/libpcap/pcap-pf.c
deleted file mode 100644
index 8f5bce7..0000000
--- a/libpcap/pcap-pf.c
+++ b/dev/null
@@ -1,355 +0,0 @@
-/*
- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * packet filter subroutines for tcpdump
- * Extraction/creation by Jeffrey Mogul, DECWRL
- */
-
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/pcap-pf.c,v 1.1 2001/05/31 13:40:53 gray Exp $ (LBL)";
-#endif
-
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/timeb.h>
-#include <sys/socket.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <net/pfilt.h>
-
-#if __STDC__
-struct mbuf;
-struct rtentry;
-#endif
-
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/if_ether.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcpip.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <pcap-int.h>
-
-#include <gnuc.h>
-#ifdef HAVE_OS_PROTO_H
-#include <os-proto.h>
-#endif
-
-/*
- * BUFSPACE is the size in bytes of the packet read buffer. Most tcpdump
- * applications aren't going to need more than 200 bytes of packet header
- * and the read shouldn't return more packets than packetfilter's internal
- * queue limit (bounded at 256).
- */
-#define BUFSPACE (200 * 256)
-
-int
-pcap_read(pcap_t *pc, int cnt, pcap_handler callback, u_char *user)
-{
- register u_char *p, *bp;
- struct bpf_insn *fcode;
- register int cc, n, buflen, inc;
- register struct enstamp *sp;
-#ifdef LBL_ALIGN
- struct enstamp stamp;
-#endif
-#ifdef PCAP_FDDIPAD
- register int pad;
-#endif
-
- fcode = pc->md.use_bpf ? NULL : pc->fcode.bf_insns;
- again:
- cc = pc->cc;
- if (cc == 0) {
- cc = read(pc->fd, (char *)pc->buffer + pc->offset, pc->bufsize);
- if (cc < 0) {
- if (errno == EWOULDBLOCK)
- return (0);
- if (errno == EINVAL &&
- lseek(pc->fd, 0L, SEEK_CUR) + pc->bufsize < 0) {
- /*
- * Due to a kernel bug, after 2^31 bytes,
- * the kernel file offset overflows and
- * read fails with EINVAL. The lseek()
- * to 0 will fix things.
- */
- (void)lseek(pc->fd, 0L, SEEK_SET);
- goto again;
- }
- sprintf(pc->errbuf, "pf read: %s",
- pcap_strerror(errno));
- return (-1);
- }
- bp = pc->buffer + pc->offset;
- } else
- bp = pc->bp;
- /*
- * Loop through each packet.
- */
- n = 0;
-#ifdef PCAP_FDDIPAD
- if (pc->linktype == DLT_FDDI)
- pad = pcap_fddipad;
- else
- pad = 0;
-#endif
- while (cc > 0) {
- if (cc < sizeof(*sp)) {
- sprintf(pc->errbuf, "pf short read (%d)", cc);
- return (-1);
- }
-#ifdef LBL_ALIGN
- if ((long)bp & 3) {
- sp = &stamp;
- memcpy((char *)sp, (char *)bp, sizeof(*sp));
- } else
-#endif
- sp = (struct enstamp *)bp;
- if (sp->ens_stamplen != sizeof(*sp)) {
- sprintf(pc->errbuf, "pf short stamplen (%d)",
- sp->ens_stamplen);
- return (-1);
- }
-
- p = bp + sp->ens_stamplen;
- buflen = sp->ens_count;
- if (buflen > pc->snapshot)
- buflen = pc->snapshot;
-
- /* Calculate inc before possible pad update */
- inc = ENALIGN(buflen + sp->ens_stamplen);
- cc -= inc;
- bp += inc;
-#ifdef PCAP_FDDIPAD
- p += pad;
- buflen -= pad;
-#endif
- pc->md.TotPkts++;
- pc->md.TotDrops += sp->ens_dropped;
- pc->md.TotMissed = sp->ens_ifoverflows;
- if (pc->md.OrigMissed < 0)
- pc->md.OrigMissed = pc->md.TotMissed;
-
- /*
- * Short-circuit evaluation: if using BPF filter
- * in kernel, no need to do it now.
- */
- if (fcode == NULL ||
- bpf_filter(fcode, p, sp->ens_count, buflen)) {
- struct pcap_pkthdr h;
- pc->md.TotAccepted++;
- h.ts = sp->ens_tstamp;
-#ifdef PCAP_FDDIPAD
- h.len = sp->ens_count - pad;
-#else
- h.len = sp->ens_count;
-#endif
- h.caplen = buflen;
- (*callback)(user, &h, p);
- if (++n >= cnt && cnt > 0) {
- pc->cc = cc;
- pc->bp = bp;
- return (n);
- }
- }
- }
- pc->cc = 0;
- return (n);
-}
-
-int
-pcap_stats(pcap_t *p, struct pcap_stat *ps)
-{
-
- ps->ps_recv = p->md.TotAccepted;
- ps->ps_drop = p->md.TotDrops;
- ps->ps_ifdrop = p->md.TotMissed - p->md.OrigMissed;
- return (0);
-}
-
-pcap_t *
-pcap_open_live(char *device, int snaplen, int promisc, int to_ms, char *ebuf)
-{
- pcap_t *p;
- short enmode;
- int backlog = -1; /* request the most */
- struct enfilter Filter;
- struct endevp devparams;
-
- p = (pcap_t *)malloc(sizeof(*p));
- if (p == NULL) {
- sprintf(ebuf, "pcap_open_live: %s", pcap_strerror(errno));
- return (0);
- }
- bzero((char *)p, sizeof(*p));
- p->fd = pfopen(device, O_RDONLY);
- if (p->fd < 0) {
- sprintf(ebuf, "pf open: %s: %s\n\
-your system may not be properly configured; see \"man packetfilter(4)\"\n",
- device, pcap_strerror(errno));
- goto bad;
- }
- p->md.OrigMissed = -1;
- enmode = ENTSTAMP|ENBATCH|ENNONEXCL;
- if (promisc)
- enmode |= ENPROMISC;
- if (ioctl(p->fd, EIOCMBIS, (caddr_t)&enmode) < 0) {
- sprintf(ebuf, "EIOCMBIS: %s", pcap_strerror(errno));
- goto bad;
- }
-#ifdef ENCOPYALL
- /* Try to set COPYALL mode so that we see packets to ourself */
- enmode = ENCOPYALL;
- (void)ioctl(p->fd, EIOCMBIS, (caddr_t)&enmode);/* OK if this fails */
-#endif
- /* set the backlog */
- if (ioctl(p->fd, EIOCSETW, (caddr_t)&backlog) < 0) {
- sprintf(ebuf, "EIOCSETW: %s", pcap_strerror(errno));
- goto bad;
- }
- /* discover interface type */
- if (ioctl(p->fd, EIOCDEVP, (caddr_t)&devparams) < 0) {
- sprintf(ebuf, "EIOCDEVP: %s", pcap_strerror(errno));
- goto bad;
- }
- /* HACK: to compile prior to Ultrix 4.2 */
-#ifndef ENDT_FDDI
-#define ENDT_FDDI 4
-#endif
- switch (devparams.end_dev_type) {
-
- case ENDT_10MB:
- p->linktype = DLT_EN10MB;
- p->offset = 2;
- break;
-
- case ENDT_FDDI:
- p->linktype = DLT_FDDI;
- break;
-
- default:
- /*
- * XXX
- * Currently, the Ultrix packet filter supports only
- * Ethernet and FDDI. Eventually, support for SLIP and PPP
- * (and possibly others: T1?) should be added.
- */
-#ifdef notdef
- warning(
- "Packet filter data-link type %d unknown, assuming Ethernet",
- devparams.end_dev_type);
-#endif
- p->linktype = DLT_EN10MB;
- p->offset = 2;
- break;
- }
- /* set truncation */
-#ifdef PCAP_FDDIPAD
- if (p->linktype == DLT_FDDI)
- /* packetfilter includes the padding in the snapshot */
- snaplen += pcap_fddipad;
-#endif
- if (ioctl(p->fd, EIOCTRUNCATE, (caddr_t)&snaplen) < 0) {
- sprintf(ebuf, "EIOCTRUNCATE: %s", pcap_strerror(errno));
- goto bad;
- }
- p->snapshot = snaplen;
- /* accept all packets */
- bzero((char *)&Filter, sizeof(Filter));
- Filter.enf_Priority = 37; /* anything > 2 */
- Filter.enf_FilterLen = 0; /* means "always true" */
- if (ioctl(p->fd, EIOCSETF, (caddr_t)&Filter) < 0) {
- sprintf(ebuf, "EIOCSETF: %s", pcap_strerror(errno));
- goto bad;
- }
-
- if (to_ms != 0) {
- struct timeval timeout;
- timeout.tv_sec = to_ms / 1000;
- timeout.tv_usec = (to_ms * 1000) % 1000000;
- if (ioctl(p->fd, EIOCSRTIMEOUT, (caddr_t)&timeout) < 0) {
- sprintf(ebuf, "EIOCSRTIMEOUT: %s",
- pcap_strerror(errno));
- goto bad;
- }
- }
- p->bufsize = BUFSPACE;
- p->buffer = (u_char*)malloc(p->bufsize + p->offset);
-
- return (p);
- bad:
- free(p);
- return (NULL);
-}
-
-int
-pcap_setfilter(pcap_t *p, struct bpf_program *fp)
-{
- /*
- * See if BIOCSETF works. If it does, the kernel supports
- * BPF-style filters, and we do not need to do post-filtering.
- */
- p->md.use_bpf = (ioctl(p->fd, BIOCSETF, (caddr_t)fp) >= 0);
- if (p->md.use_bpf) {
- struct bpf_version bv;
-
- if (ioctl(p->fd, BIOCVERSION, (caddr_t)&bv) < 0) {
- sprintf(p->errbuf, "BIOCVERSION: %s",
- pcap_strerror(errno));
- return (-1);
- }
- else if (bv.bv_major != BPF_MAJOR_VERSION ||
- bv.bv_minor < BPF_MINOR_VERSION) {
- fprintf(stderr,
- "requires bpf language %d.%d or higher; kernel is %d.%d",
- BPF_MAJOR_VERSION, BPF_MINOR_VERSION,
- bv.bv_major, bv.bv_minor);
- /* don't give up, just be inefficient */
- p->md.use_bpf = 0;
- }
- } else
- p->fcode = *fp;
-
- /*XXX this goes in tcpdump*/
- if (p->md.use_bpf)
- fprintf(stderr, "tcpdump: Using kernel BPF filter\n");
- else
- fprintf(stderr, "tcpdump: Filtering in user process\n");
- return (0);
-}
diff --git a/libpcap/pcap-pf.h b/libpcap/pcap-pf.h
deleted file mode 100644
index 73bddd4..0000000
--- a/libpcap/pcap-pf.h
+++ b/dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 1990, 1994
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Lawrence Berkeley Laboratory,
- * Berkeley, CA. The name of the University may not be used to
- * endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * @(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/pcap-pf.h,v 1.1 2001/05/31 13:40:53 gray Exp $ (LBL)
- */
diff --git a/libpcap/pcap-snit.c b/libpcap/pcap-snit.c
deleted file mode 100644
index 0ddecfb..0000000
--- a/libpcap/pcap-snit.c
+++ b/dev/null
@@ -1,304 +0,0 @@
-/*
- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Modifications made to accommodate the new SunOS4.0 NIT facility by
- * Micky Liu, micky@cunixc.cc.columbia.edu, Columbia University in May, 1989.
- * This module now handles the STREAMS based NIT.
- */
-
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/pcap-snit.c,v 1.1 2001/05/31 13:40:53 gray Exp $ (LBL)";
-#endif
-
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/timeb.h>
-#include <sys/dir.h>
-#include <sys/fcntlcom.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/stropts.h>
-
-#include <net/if.h>
-#include <net/nit.h>
-#include <net/nit_if.h>
-#include <net/nit_pf.h>
-#include <net/nit_buf.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/if_ether.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcpip.h>
-
-#include <ctype.h>
-#include <errno.h>
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <pcap-int.h>
-
-#include <gnuc.h>
-#ifdef HAVE_OS_PROTO_H
-#include <os-proto.h>
-#endif
-
-/*
- * The chunk size for NIT. This is the amount of buffering
- * done for read calls.
- */
-#define CHUNKSIZE (2*1024)
-
-/*
- * The total buffer space used by NIT.
- */
-#define BUFSPACE (4*CHUNKSIZE)
-
-/* Forwards */
-static int nit_setflags(int, int, int, char *);
-
-int
-pcap_stats(pcap_t *p, struct pcap_stat *ps)
-{
-
- *ps = p->md.stat;
- return (0);
-}
-
-int
-pcap_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
-{
- register int cc, n;
- register struct bpf_insn *fcode = p->fcode.bf_insns;
- register u_char *bp, *cp, *ep;
- register struct nit_bufhdr *hdrp;
- register struct nit_iftime *ntp;
- register struct nit_iflen *nlp;
- register struct nit_ifdrops *ndp;
- register int caplen;
-
- cc = p->cc;
- if (cc == 0) {
- cc = read(p->fd, (char *)p->buffer, p->bufsize);
- if (cc < 0) {
- if (errno == EWOULDBLOCK)
- return (0);
- sprintf(p->errbuf, "pcap_read: %s",
- pcap_strerror(errno));
- return (-1);
- }
- bp = p->buffer;
- } else
- bp = p->bp;
-
- /*
- * loop through each snapshot in the chunk
- */
- n = 0;
- ep = bp + cc;
- while (bp < ep) {
- ++p->md.stat.ps_recv;
- cp = bp;
-
- /* get past NIT buffer */
- hdrp = (struct nit_bufhdr *)cp;
- cp += sizeof(*hdrp);
-
- /* get past NIT timer */
- ntp = (struct nit_iftime *)cp;
- cp += sizeof(*ntp);
-
- ndp = (struct nit_ifdrops *)cp;
- p->md.stat.ps_drop = ndp->nh_drops;
- cp += sizeof *ndp;
-
- /* get past packet len */
- nlp = (struct nit_iflen *)cp;
- cp += sizeof(*nlp);
-
- /* next snapshot */
- bp += hdrp->nhb_totlen;
-
- caplen = nlp->nh_pktlen;
- if (caplen > p->snapshot)
- caplen = p->snapshot;
-
- if (bpf_filter(fcode, cp, nlp->nh_pktlen, caplen)) {
- struct pcap_pkthdr h;
- h.ts = ntp->nh_timestamp;
- h.len = nlp->nh_pktlen;
- h.caplen = caplen;
- (*callback)(user, &h, cp);
- if (++n >= cnt && cnt >= 0) {
- p->cc = ep - bp;
- p->bp = bp;
- return (n);
- }
- }
- }
- p->cc = 0;
- return (n);
-}
-
-static int
-nit_setflags(int fd, int promisc, int to_ms, char *ebuf)
-{
- bpf_u_int32 flags;
- struct strioctl si;
- struct timeval timeout;
-
- si.ic_timout = INFTIM;
- if (to_ms != 0) {
- timeout.tv_sec = to_ms / 1000;
- timeout.tv_usec = (to_ms * 1000) % 1000000;
- si.ic_cmd = NIOCSTIME;
- si.ic_len = sizeof(timeout);
- si.ic_dp = (char *)&timeout;
- if (ioctl(fd, I_STR, (char *)&si) < 0) {
- sprintf(ebuf, "NIOCSTIME: %s", pcap_strerror(errno));
- return (-1);
- }
- }
- flags = NI_TIMESTAMP | NI_LEN | NI_DROPS;
- if (promisc)
- flags |= NI_PROMISC;
- si.ic_cmd = NIOCSFLAGS;
- si.ic_len = sizeof(flags);
- si.ic_dp = (char *)&flags;
- if (ioctl(fd, I_STR, (char *)&si) < 0) {
- sprintf(ebuf, "NIOCSFLAGS: %s", pcap_strerror(errno));
- return (-1);
- }
- return (0);
-}
-
-pcap_t *
-pcap_open_live(char *device, int snaplen, int promisc, int to_ms, char *ebuf)
-{
- struct strioctl si; /* struct for ioctl() */
- struct ifreq ifr; /* interface request struct */
- int chunksize = CHUNKSIZE;
- int fd;
- static char dev[] = "/dev/nit";
- register pcap_t *p;
-
- p = (pcap_t *)malloc(sizeof(*p));
- if (p == NULL) {
- strcpy(ebuf, pcap_strerror(errno));
- return (NULL);
- }
-
- if (snaplen < 96)
- /*
- * NIT requires a snapshot length of at least 96.
- */
- snaplen = 96;
-
- bzero(p, sizeof(*p));
- p->fd = fd = open(dev, O_RDONLY);
- if (fd < 0) {
- sprintf(ebuf, "%s: %s", dev, pcap_strerror(errno));
- goto bad;
- }
-
- /* arrange to get discrete messages from the STREAM and use NIT_BUF */
- if (ioctl(fd, I_SRDOPT, (char *)RMSGD) < 0) {
- sprintf(ebuf, "I_SRDOPT: %s", pcap_strerror(errno));
- goto bad;
- }
- if (ioctl(fd, I_PUSH, "nbuf") < 0) {
- sprintf(ebuf, "push nbuf: %s", pcap_strerror(errno));
- goto bad;
- }
- /* set the chunksize */
- si.ic_cmd = NIOCSCHUNK;
- si.ic_timout = INFTIM;
- si.ic_len = sizeof(chunksize);
- si.ic_dp = (char *)&chunksize;
- if (ioctl(fd, I_STR, (char *)&si) < 0) {
- sprintf(ebuf, "NIOCSCHUNK: %s", pcap_strerror(errno));
- goto bad;
- }
-
- /* request the interface */
- strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
- ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = ' ';
- si.ic_cmd = NIOCBIND;
- si.ic_len = sizeof(ifr);
- si.ic_dp = (char *)&ifr;
- if (ioctl(fd, I_STR, (char *)&si) < 0) {
- sprintf(ebuf, "NIOCBIND: %s: %s",
- ifr.ifr_name, pcap_strerror(errno));
- goto bad;
- }
-
- /* set the snapshot length */
- si.ic_cmd = NIOCSSNAP;
- si.ic_len = sizeof(snaplen);
- si.ic_dp = (char *)&snaplen;
- if (ioctl(fd, I_STR, (char *)&si) < 0) {
- sprintf(ebuf, "NIOCSSNAP: %s", pcap_strerror(errno));
- goto bad;
- }
- p->snapshot = snaplen;
- if (nit_setflags(p->fd, promisc, to_ms, ebuf) < 0)
- goto bad;
-
- (void)ioctl(fd, I_FLUSH, (char *)FLUSHR);
- /*
- * NIT supports only ethernets.
- */
- p->linktype = DLT_EN10MB;
-
- p->bufsize = BUFSPACE;
- p->buffer = (u_char *)malloc(p->bufsize);
- if (p->buffer == NULL) {
- strcpy(ebuf, pcap_strerror(errno));
- goto bad;
- }
- return (p);
- bad:
- if (fd >= 0)
- close(fd);
- free(p);
- return (NULL);
-}
-
-int
-pcap_setfilter(pcap_t *p, struct bpf_program *fp)
-{
-
- p->fcode = *fp;
- return (0);
-}
diff --git a/libpcap/pcap-snoop.c b/libpcap/pcap-snoop.c
deleted file mode 100644
index 2476f42..0000000
--- a/libpcap/pcap-snoop.c
+++ b/dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright (c) 1993, 1994, 1995, 1996, 1997
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/pcap-snoop.c,v 1.1 2001/05/31 13:40:53 gray Exp $ (LBL)";
-#endif
-
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-
-#include <sys/param.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-
-#include <net/raw.h>
-#include <net/if.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/if_ether.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcpip.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <pcap-int.h>
-
-#include <gnuc.h>
-#ifdef HAVE_OS_PROTO_H
-#include <os-proto.h>
-#endif
-
-int
-pcap_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
-{
- int cc;
- register struct snoopheader *sh;
- register int datalen;
- register int caplen;
- register u_char *cp;
-
-again:
- cc = read(p->fd, (char *)p->buffer, p->bufsize);
- if (cc < 0) {
- /* Don't choke when we get ptraced */
- switch (errno) {
-
- case EINTR:
- goto again;
-
- case EWOULDBLOCK:
- return (0); /* XXX */
- }
- sprintf(p->errbuf, "read: %s", pcap_strerror(errno));
- return (-1);
- }
- sh = (struct snoopheader *)p->buffer;
- datalen = sh->snoop_packetlen;
- caplen = (datalen < p->snapshot) ? datalen : p->snapshot;
- cp = (u_char *)(sh + 1) + p->offset; /* XXX */
-
- if (p->fcode.bf_insns == NULL ||
- bpf_filter(p->fcode.bf_insns, cp, datalen, caplen)) {
- struct pcap_pkthdr h;
- ++p->md.stat.ps_recv;
- h.ts = sh->snoop_timestamp;
- h.len = datalen;
- h.caplen = caplen;
- (*callback)(user, &h, cp);
- return (1);
- }
- return (0);
-}
-
-int
-pcap_stats(pcap_t *p, struct pcap_stat *ps)
-{
- register struct rawstats *rs;
- struct rawstats rawstats;
-
- rs = &rawstats;
- bzero((char *)rs, sizeof(*rs));
- if (ioctl(p->fd, SIOCRAWSTATS, (char *)rs) < 0) {
- sprintf(p->errbuf, "SIOCRAWSTATS: %s", pcap_strerror(errno));
- return (-1);
- }
-
- p->md.stat.ps_drop =
- rs->rs_snoop.ss_ifdrops + rs->rs_snoop.ss_sbdrops +
- rs->rs_drain.ds_ifdrops + rs->rs_drain.ds_sbdrops;
-
- *ps = p->md.stat;
- return (0);
-}
-
-/* XXX can't disable promiscuous */
-pcap_t *
-pcap_open_live(char *device, int snaplen, int promisc, int to_ms, char *ebuf)
-{
- int fd;
- struct sockaddr_raw sr;
- struct snoopfilter sf;
- u_int v;
- pcap_t *p;
-
- p = (pcap_t *)malloc(sizeof(*p));
- if (p == NULL) {
- sprintf(ebuf, "malloc: %s", pcap_strerror(errno));
- return (NULL);
- }
- bzero((char *)p, sizeof(*p));
- fd = socket(PF_RAW, SOCK_RAW, RAWPROTO_SNOOP);
- if (fd < 0) {
- sprintf(ebuf, "snoop socket: %s", pcap_strerror(errno));
- goto bad;
- }
- p->fd = fd;
- bzero((char *)&sr, sizeof(sr));
- sr.sr_family = AF_RAW;
- (void)strncpy(sr.sr_ifname, device, sizeof(sr.sr_ifname));
- if (bind(fd, (struct sockaddr *)&sr, sizeof(sr))) {
- sprintf(ebuf, "snoop bind: %s", pcap_strerror(errno));
- goto bad;
- }
- bzero((char *)&sf, sizeof(sf));
- if (ioctl(fd, SIOCADDSNOOP, &sf) < 0) {
- sprintf(ebuf, "SIOCADDSNOOP: %s", pcap_strerror(errno));
- goto bad;
- }
- v = 64 * 1024;
- (void)setsockopt(fd, SOL_SOCKET, SO_RCVBUF, (char *)&v, sizeof(v));
- if (ioctl(fd, SIOCSNOOPLEN, &snaplen) < 0) {
- sprintf(ebuf, "SIOCSNOOPLEN: %s", pcap_strerror(errno));
- goto bad;
- }
- p->snapshot = snaplen;
- v = 1;
- if (ioctl(fd, SIOCSNOOPING, &v) < 0) {
- sprintf(ebuf, "SIOCSNOOPING: %s", pcap_strerror(errno));
- goto bad;
- }
- /*
- * XXX hack - map device name to link layer type
- */
- if (strncmp("et", device, 2) == 0 || /* Challenge 10 Mbit */
- strncmp("ec", device, 2) == 0 || /* Indigo/Indy 10 Mbit,
- O2 10/100 */
- strncmp("ef", device, 2) == 0 || /* O200/2000 10/100 Mbit */
- strncmp("gfe", device, 3) == 0 || /* GIO 100 Mbit */
- strncmp("fxp", device, 3) == 0 || /* Challenge VME Enet */
- strncmp("ep", device, 2) == 0 || /* Challenge 8x10 Mbit EPLEX */
- strncmp("vfe", device, 3) == 0 || /* Challenge VME 100Mbit */
- strncmp("fa", device, 2) == 0 ||
- strncmp("qaa", device, 3) == 0) {
- p->linktype = DLT_EN10MB;
- p->offset = RAW_HDRPAD(sizeof(struct ether_header));
- } else if (strncmp("ipg", device, 3) == 0 ||
- strncmp("rns", device, 3) == 0 || /* O2/200/2000 FDDI */
- strncmp("xpi", device, 3) == 0) {
- p->linktype = DLT_FDDI;
- p->offset = 3; /* XXX yeah? */
- } else if (strncmp("ppp", device, 3) == 0) {
- p->linktype = DLT_RAW;
- } else if (strncmp("lo", device, 2) == 0) {
- p->linktype = DLT_NULL;
- } else {
- sprintf(ebuf, "snoop: unknown physical layer type");
- goto bad;
- }
-
- p->bufsize = 4096; /* XXX */
- p->buffer = (u_char *)malloc(p->bufsize);
- if (p->buffer == NULL) {
- sprintf(ebuf, "malloc: %s", pcap_strerror(errno));
- goto bad;
- }
-
- return (p);
- bad:
- (void)close(fd);
- free(p);
- return (NULL);
-}
-
-int
-pcap_setfilter(pcap_t *p, struct bpf_program *fp)
-{
-
- p->fcode = *fp;
- return (0);
-}
diff --git a/libpcap/pcap.3 b/libpcap/pcap.3
deleted file mode 100644
index 23e5b52..0000000
--- a/libpcap/pcap.3
+++ b/dev/null
@@ -1,340 +0,0 @@
-.\" Copyright (c) 1994, 1996, 1997
-.\" The Regents of the University of California. All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that: (1) source code distributions
-.\" retain the above copyright notice and this paragraph in its entirety, (2)
-.\" distributions including binary code include the above copyright notice and
-.\" this paragraph in its entirety in the documentation or other materials
-.\" provided with the distribution, and (3) all advertising materials mentioning
-.\" features or use of this software display the following acknowledgement:
-.\" ``This product includes software developed by the University of California,
-.\" Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
-.\" the University nor the names of its contributors may be used to endorse
-.\" or promote products derived from this software without specific prior
-.\" written permission.
-.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-.\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-.\"
-.TH PCAP 3 "24 June 1998"
-.SH NAME
-pcap \- Packet Capture library
-.SH SYNOPSIS
-.nf
-.ft B
-#include <pcap.h>
-.ft
-.LP
-.ft B
-pcap_t *pcap_open_live(char *device, int snaplen,
-.ti +8
-int promisc, int to_ms, char *ebuf)
-pcap_t *pcap_open_offline(char *fname, char *ebuf)
-pcap_dumper_t *pcap_dump_open(pcap_t *p, char *fname)
-.ft
-.LP
-.ft B
-char errbuf[PCAP_ERRBUF_SIZE];
-char *pcap_lookupdev(char *errbuf)
-int pcap_lookupnet(char *device, bpf_u_int32 *netp,
-.ti +8
-bpf_u_int32 *maskp, char *errbuf)
-.ft
-.LP
-.ft B
-int pcap_dispatch(pcap_t *p, int cnt,
-.ti +8
-pcap_handler callback, u_char *user)
-int pcap_loop(pcap_t *p, int cnt,
-.ti +8
-pcap_handler callback, u_char *user)
-void pcap_dump(u_char *user, struct pcap_pkthdr *h,
-.ti +8
-u_char *sp)
-.ft
-.LP
-.ft B
-int pcap_compile(pcap_t *p, struct bpf_program *fp,
-.ti +8
-char *str, int optimize, bpf_u_int32 netmask)
-int pcap_setfilter(pcap_t *p, struct bpf_program *fp)
-.ft
-.LP
-.ft B
-u_char *pcap_next(pcap_t *p, struct pcap_pkthdr *h)
-.ft
-.LP
-.ft B
-int pcap_datalink(pcap_t *p)
-int pcap_snapshot(pcap_t *p)
-int pcap_is_swapped(pcap_t *p)
-int pcap_major_version(pcap_t *p)
-int pcap_minor_version(pcap_t *p)
-int pcap_stats(pcap_t *p, struct pcap_stat *ps)
-FILE *pcap_file(pcap_t *p)
-int pcap_fileno(pcap_t *p)
-void pcap_perror(pcap_t *p, char *prefix)
-char *pcap_geterr(pcap_t *p)
-char *pcap_strerror(int error)
-.ft
-.LP
-.ft B
-void pcap_close(pcap_t *p)
-void pcap_dump_close(pcap_dumper_t *p)
-.ft
-.fi
-.SH DESCRIPTION
-The Packet Capture library
-provides a high level interface to packet capture systems. All packets
-on the network, even those destined for other hosts, are accessible
-through this mechanism.
-.PP
-.SH ROUTINES
-.B pcap_open_live()
-is used to obtain a packet capture descriptor to look
-at packets on the network.
-.I device
-is a string that specifies the network device to open.
-.I snaplen
-specifies the maximum number of bytes to capture.
-.I promisc
-specifies if the interface is to be put into promiscuous mode.
-(Note that even if this parameter is false, the interface
-could well be in promiscuous mode for some other reason.)
-.I to_ms
-specifies the read timeout in milliseconds.
-.I ebuf
-is used to return error text and is only set when
-.B pcap_open_live()
-fails and returns
-.BR NULL .
-.PP
-.B pcap_open_offline()
-is called to open a ``savefile'' for reading.
-.I fname
-specifies the name of the file to open. The file has
-the same format as those used by
-.B tcpdump(1)
-and
-.BR tcpslice(1) .
-The name "-" in a synonym for
-.BR stdin .
-.I ebuf
-is used to return error text and is only set when
-.B pcap_open_offline()
-fails and returns
-.BR NULL .
-.PP
-.B pcap_dump_open()
-is called to open a ``savefile'' for writing. The name "-" in a synonym
-for
-.BR stdout .
-.B NULL
-is returned on failure.
-.I p
-is a
-.I pcap
-struct as returned by
-.B pcap_open_offline()
-or
-.BR pcap_open_live() .
-.I fname
-specifies the name of the file to open.
-If
-.B NULL
-is returned,
-.B pcap_geterr()
-can be used to get the error text.
-.PP
-.B pcap_lookupdev()
-returns a pointer to a network device suitable for use with
-.B pcap_open_live()
-and
-.BR pcap_lookupnet() .
-If there is an error,
-.B NULL
-is returned and
-.I errbuf
-is filled in with with an appropriate error message.
-.PP
-.B pcap_lookupnet()
-is used to determine the network number and mask
-associated with the network device
-.BR device .
-Both
-.I netp
-and
-.I maskp
-are
-.I bpf_u_int32
-pointers.
-A return of -1 indicates an error in which case
-.I errbuf
-is filled in with with an appropriate error message.
-.PP
-.B pcap_dispatch()
-is used to collect and process packets.
-.I cnt
-specifies the maximum number of packets to process before returning. A
-.I cnt
-of -1 processes all the packets received in one buffer. A
-.I cnt
-of 0 processes all packets until an error occurs,
-.B EOF
-is reached, or the read times out (when doing live reads and a non-zero
-read timeout is specified).
-.I callback
-specifies a routine to be called with three arguments:
-a
-.I u_char
-pointer which is passed in from
-.BR pcap_dispatch() ,
-a pointer to the
-.I pcap_pkthdr
-struct (which precede the actual network headers and data),
-and a
-.I u_char
-pointer to the packet data. The number of packets read is returned.
-Zero is returned when
-.B EOF
-is reached in a ``savefile.'' A return of -1 indicates
-an error in which case
-.B pcap_perror()
-or
-.BR pcap_geterr()
-may be used to display the error text.
-.PP
-.B pcap_dump()
-outputs a packet to the ``savefile'' opened with
-.BR pcap_dump_open() .
-Note that its calling arguments are suitable for use with
-.BR pcap_dispatch() .
-.PP
-.B pcap_compile()
-is used to compile the string
-.I str
-into a filter program.
-.I program
-is a pointer to a
-.I bpf_program
-struct and is filled in by
-.BR pcap_compile() .
-.I optimize
-controls whether optimization on the resulting code is performed.
-.I netmask
-specifies the netmask of the local net.
-.PP
-.B pcap_setfilter()
-is used to specify a filter program.
-.I fp
-is a pointer to an array of
-.I bpf_program
-struct, usually the result of a call to
-.BR pcap_compile() .
-.B \-1
-is returned on failure;
-.B 0
-is returned on success.
-.PP
-.B pcap_loop()
-is similar to
-.B pcap_dispatch()
-except it keeps reading packets until
-.I cnt
-packets are processed or an error occurs.
-It does
-.B not
-return when live read timeouts occur.
-Rather, specifying a non-zero read timeout to
-.B pcap_open_live()
-and then calling
-.B pcap_dispatch()
-allows the reception and processing of any packets that arrive when the
-timeout occurs.
-A negative
-.I cnt
-causes
-.B pcap_loop()
-to loop forever (or at least until an error occurs).
-.PP
-.B pcap_next()
-returns a
-.I u_char
-pointer to the next packet.
-.PP
-.B pcap_datalink()
-returns the link layer type, e.g.
-.BR DLT_EN10MB .
-.PP
-.B pcap_snapshot()
-returns the snapshot length specified when
-.B pcap_open_live
-was called.
-.PP
-.B pcap_is_swapped()
-returns true if the current ``savefile'' uses a different byte order
-than the current system.
-.PP
-.B pcap_major_version()
-returns the major number of the version of the pcap used to write the
-savefile.
-.PP
-.B pcap_minor_version()
-returns the minor number of the version of the pcap used to write the
-savefile.
-.PP
-.B pcap_file()
-returns the name of the ``savefile.''
-.PP
-.B int pcap_stats()
-returns 0 and fills in a
-.B pcap_stat
-struct. The values represent packet statistics from the start of the
-run to the time of the call. If there is an error or the under lying
-packet capture doesn't support packet statistics, -1 is returned and
-the error text can be obtained with
-.B pcap_perror()
-or
-.BR pcap_geterr() .
-.PP
-.B pcap_fileno()
-returns the file descriptor number of the ``savefile.''
-.PP
-.B pcap_perror()
-prints the text of the last pcap library error on
-.BR stderr ,
-prefixed by
-.IR prefix .
-.PP
-.B pcap_geterr()
-returns the error text pertaining to the last pcap library error.
-.PP
-.B pcap_strerror()
-is provided in case
-.BR strerror (1)
-isn't available.
-.PP
-.B pcap_close()
-closes the files associated with
-.I p
-and deallocates resources.
-.PP
-.B pcap_dump_close()
-closes the ``savefile.''
-.PP
-.SH SEE ALSO
-tcpdump(1), tcpslice(1)
-.SH AUTHORS
-Van Jacobson,
-Craig Leres and
-Steven McCanne, all of the
-Lawrence Berkeley National Laboratory, University of California, Berkeley, CA.
-.LP
-The current version is available via anonymous ftp:
-.LP
-.RS
-.I ftp://ftp.ee.lbl.gov/libpcap.tar.Z
-.RE
-.SH BUGS
-Please send bug reports to libpcap@ee.lbl.gov.
diff --git a/libpcap/pcap.c b/libpcap/pcap.c
deleted file mode 100644
index 4e2f18e..0000000
--- a/libpcap/pcap.c
+++ b/dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the Computer Systems
- * Engineering Group at Lawrence Berkeley Laboratory.
- * 4. Neither the name of the University nor of the Laboratory may be used
- * to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/pcap.c,v 1.2 2002/06/17 16:29:19 gray Exp $ (LBL)";
-#endif
-
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <gnuc.h>
-#ifdef HAVE_OS_PROTO_H
-#include <os-proto.h>
-#endif
-
-#include <pcap-int.h>
-
-int
-pcap_dispatch(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
-{
-
- if (p->sf.rfile != NULL)
- return (pcap_offline_read(p, cnt, callback, user));
- return (pcap_read(p, cnt, callback, user));
-}
-
-int
-pcap_loop(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
-{
- register int n;
-
- for (;;) {
- if (p->sf.rfile != NULL)
- n = pcap_offline_read(p, cnt, callback, user);
- else {
- /*
- * XXX keep reading until we get something
- * (or an error occurs)
- */
- do {
- n = pcap_read(p, cnt, callback, user);
- } while (n == 0);
- }
- if (n <= 0)
- return (n);
- if (cnt > 0) {
- cnt -= n;
- if (cnt <= 0)
- return (0);
- }
- }
-}
-
-struct singleton {
- struct pcap_pkthdr *hdr;
- const u_char *pkt;
-};
-
-
-static void
-pcap_oneshot(u_char *userData, const struct pcap_pkthdr *h, const u_char *pkt)
-{
- struct singleton *sp = (struct singleton *)userData;
- *sp->hdr = *h;
- sp->pkt = pkt;
-}
-
-const u_char *
-pcap_next(pcap_t *p, struct pcap_pkthdr *h)
-{
- struct singleton s;
-
- s.hdr = h;
- if (pcap_dispatch(p, 1, pcap_oneshot, (u_char*)&s) <= 0)
- return (0);
- return (s.pkt);
-}
-
-int
-pcap_datalink(pcap_t *p)
-{
- return (p->linktype);
-}
-
-int
-pcap_snapshot(pcap_t *p)
-{
- return (p->snapshot);
-}
-
-int
-pcap_is_swapped(pcap_t *p)
-{
- return (p->sf.swapped);
-}
-
-int
-pcap_major_version(pcap_t *p)
-{
- return (p->sf.version_major);
-}
-
-int
-pcap_minor_version(pcap_t *p)
-{
- return (p->sf.version_minor);
-}
-
-FILE *
-pcap_file(pcap_t *p)
-{
- return (p->sf.rfile);
-}
-
-int
-pcap_fileno(pcap_t *p)
-{
- return (p->fd);
-}
-
-void
-pcap_perror(pcap_t *p, char *prefix)
-{
- fprintf(stderr, "%s: %s\n", prefix, p->errbuf);
-}
-
-char *
-pcap_geterr(pcap_t *p)
-{
- return (p->errbuf);
-}
-
-/*
- * Not all systems have strerror().
- */
-char *
-pcap_strerror(int errnum)
-{
- return (strerror(errnum));
-}
-
-void
-pcap_close(pcap_t *p)
-{
- /*XXX*/
- if (p->fd >= 0)
- close(p->fd);
- if (p->sf.rfile != NULL) {
- (void)fclose(p->sf.rfile);
- if (p->sf.base != NULL)
- free(p->sf.base);
- } else if (p->buffer != NULL)
- free(p->buffer);
-#ifdef linux
- if (p->md.device != NULL)
- free(p->md.device);
-#endif
-
- free(p);
-}
diff --git a/libpcap/pcap.h b/libpcap/pcap.h
deleted file mode 100644
index 4b7c04a..0000000
--- a/libpcap/pcap.h
+++ b/dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 1993, 1994, 1995, 1996, 1997
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the Computer Systems
- * Engineering Group at Lawrence Berkeley Laboratory.
- * 4. Neither the name of the University nor of the Laboratory may be used
- * to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/pcap.h,v 1.1 2001/05/31 13:40:53 gray Exp $ (LBL)
- */
-
-#ifndef lib_pcap_h
-#define lib_pcap_h
-
-#include <sys/types.h>
-#include <sys/time.h>
-
-#include <net/bpf.h>
-
-#include <stdio.h>
-
-#define PCAP_VERSION_MAJOR 2
-#define PCAP_VERSION_MINOR 4
-
-#define PCAP_ERRBUF_SIZE 256
-
-/*
- * Compatibility for systems that have a bpf.h that
- * predates the bpf typedefs for 64-bit support.
- */
-#if BPF_RELEASE - 0 < 199406
-typedef int bpf_int32;
-typedef u_int bpf_u_int32;
-#endif
-
-typedef struct pcap pcap_t;
-typedef struct pcap_dumper pcap_dumper_t;
-
-/*
- * The first record in the file contains saved values for some
- * of the flags used in the printout phases of tcpdump.
- * Many fields here are 32 bit ints so compilers won't insert unwanted
- * padding; these files need to be interchangeable across architectures.
- */
-struct pcap_file_header {
- bpf_u_int32 magic;
- u_short version_major;
- u_short version_minor;
- bpf_int32 thiszone; /* gmt to local correction */
- bpf_u_int32 sigfigs; /* accuracy of timestamps */
- bpf_u_int32 snaplen; /* max length saved portion of each pkt */
- bpf_u_int32 linktype; /* data link type (DLT_*) */
-};
-
-/*
- * Each packet in the dump file is prepended with this generic header.
- * This gets around the problem of different headers for different
- * packet interfaces.
- */
-struct pcap_pkthdr {
- struct timeval ts; /* time stamp */
- bpf_u_int32 caplen; /* length of portion present */
- bpf_u_int32 len; /* length this packet (off wire) */
-};
-
-/*
- * As returned by the pcap_stats()
- */
-struct pcap_stat {
- u_int ps_recv; /* number of packets received */
- u_int ps_drop; /* number of packets dropped */
- u_int ps_ifdrop; /* drops by interface XXX not yet supported */
-};
-
-typedef void (*pcap_handler)(u_char *, const struct pcap_pkthdr *,
- const u_char *);
-
-char *pcap_lookupdev(char *);
-int pcap_lookupnet(char *, bpf_u_int32 *, bpf_u_int32 *, char *);
-pcap_t *pcap_open_live(char *, int, int, int, char *);
-pcap_t *pcap_open_offline(const char *, char *);
-void pcap_close(pcap_t *);
-int pcap_loop(pcap_t *, int, pcap_handler, u_char *);
-int pcap_dispatch(pcap_t *, int, pcap_handler, u_char *);
-const u_char*
- pcap_next(pcap_t *, struct pcap_pkthdr *);
-int pcap_stats(pcap_t *, struct pcap_stat *);
-int pcap_setfilter(pcap_t *, struct bpf_program *);
-void pcap_perror(pcap_t *, char *);
-char *pcap_strerror(int);
-char *pcap_geterr(pcap_t *);
-int pcap_compile(pcap_t *, struct bpf_program *, char *, int,
- bpf_u_int32);
-/* XXX */
-int pcap_freecode(pcap_t *, struct bpf_program *);
-int pcap_datalink(pcap_t *);
-int pcap_snapshot(pcap_t *);
-int pcap_is_swapped(pcap_t *);
-int pcap_major_version(pcap_t *);
-int pcap_minor_version(pcap_t *);
-
-/* XXX */
-FILE *pcap_file(pcap_t *);
-int pcap_fileno(pcap_t *);
-
-pcap_dumper_t *pcap_dump_open(pcap_t *, const char *);
-void pcap_dump_close(pcap_dumper_t *);
-void pcap_dump(u_char *, const struct pcap_pkthdr *, const u_char *);
-
-/* XXX this guy lives in the bpf tree */
-u_int bpf_filter(struct bpf_insn *, u_char *, u_int, u_int);
-char *bpf_image(struct bpf_insn *, int);
-#endif
diff --git a/libpcap/ppp.h b/libpcap/ppp.h
deleted file mode 100644
index 0635a28..0000000
--- a/libpcap/ppp.h
+++ b/dev/null
@@ -1,50 +0,0 @@
-/* @(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/ppp.h,v 1.1 2001/05/31 13:40:53 gray Exp $ (LBL) */
-/*
- * Point to Point Protocol (PPP) RFC1331
- *
- * Copyright 1989 by Carnegie Mellon.
- *
- * Permission to use, copy, modify, and distribute this program for any
- * purpose and without fee is hereby granted, provided that this copyright
- * and permission notice appear on all copies and supporting documentation,
- * the name of Carnegie Mellon not be used in advertising or publicity
- * pertaining to distribution of the program without specific prior
- * permission, and notice be given in supporting documentation that copying
- * and distribution is by permission of Carnegie Mellon and Stanford
- * University. Carnegie Mellon makes no representations about the
- * suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- */
-#define PPP_ADDRESS 0xff /* The address byte value */
-#define PPP_CONTROL 0x03 /* The control byte value */
-
-/* Protocol numbers */
-#define PPP_IP 0x0021 /* Raw IP */
-#define PPP_OSI 0x0023 /* OSI Network Layer */
-#define PPP_NS 0x0025 /* Xerox NS IDP */
-#define PPP_DECNET 0x0027 /* DECnet Phase IV */
-#define PPP_APPLE 0x0029 /* Appletalk */
-#define PPP_IPX 0x002b /* Novell IPX */
-#define PPP_VJC 0x002d /* Van Jacobson Compressed TCP/IP */
-#define PPP_VJNC 0x002f /* Van Jacobson Uncompressed TCP/IP */
-#define PPP_BRPDU 0x0031 /* Bridging PDU */
-#define PPP_STII 0x0033 /* Stream Protocol (ST-II) */
-#define PPP_VINES 0x0035 /* Banyan Vines */
-
-#define PPP_HELLO 0x0201 /* 802.1d Hello Packets */
-#define PPP_LUXCOM 0x0231 /* Luxcom */
-#define PPP_SNS 0x0233 /* Sigma Network Systems */
-
-#define PPP_IPCP 0x8021 /* IP Control Protocol */
-#define PPP_OSICP 0x8023 /* OSI Network Layer Control Protocol */
-#define PPP_NSCP 0x8025 /* Xerox NS IDP Control Protocol */
-#define PPP_DECNETCP 0x8027 /* DECnet Control Protocol */
-#define PPP_APPLECP 0x8029 /* Appletalk Control Protocol */
-#define PPP_IPXCP 0x802b /* Novell IPX Control Protocol */
-#define PPP_STIICP 0x8033 /* Strean Protocol Control Protocol */
-#define PPP_VINESCP 0x8035 /* Banyan Vines Control Protocol */
-
-#define PPP_LCP 0xc021 /* Link Control Protocol */
-#define PPP_PAP 0xc023 /* Password Authentication Protocol */
-#define PPP_LQM 0xc025 /* Link Quality Monitoring */
-#define PPP_CHAP 0xc223 /* Challenge Handshake Authentication Protocol */
diff --git a/libpcap/savefile.c b/libpcap/savefile.c
deleted file mode 100644
index e6bc13b..0000000
--- a/libpcap/savefile.c
+++ b/dev/null
@@ -1,356 +0,0 @@
-/*
- * Copyright (c) 1993, 1994, 1995, 1996, 1997
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * savefile.c - supports offline use of tcpdump
- * Extraction/creation by Jeffrey Mogul, DECWRL
- * Modified by Steve McCanne, LBL.
- *
- * Used to save the received packet headers, after filtering, to
- * a file, and then read them later.
- * The first record in the file contains saved values for the machine
- * dependent values so we can print the dump file on any architecture.
- */
-
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/savefile.c,v 1.1 2001/05/31 13:40:53 gray Exp $ (LBL)";
-#endif
-
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/time.h>
-
-#include <errno.h>
-#include <memory.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <pcap-int.h>
-
-#include <gnuc.h>
-#ifdef HAVE_OS_PROTO_H
-#include <os-proto.h>
-#endif
-
-#define TCPDUMP_MAGIC 0xa1b2c3d4
-
-/*
- * We use the "receiver-makes-right" approach to byte order,
- * because time is at a premium when we are writing the file.
- * In other words, the pcap_file_header and pcap_pkthdr,
- * records are written in host byte order.
- * Note that the packets are always written in network byte order.
- *
- * ntoh[ls] aren't sufficient because we might need to swap on a big-endian
- * machine (if the file was written in little-end order).
- */
-#define SWAPLONG(y) \
-((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
-#define SWAPSHORT(y) \
- ( (((y)&0xff)<<8) | ((u_short)((y)&0xff00)>>8) )
-
-#define SFERR_TRUNC 1
-#define SFERR_BADVERSION 2
-#define SFERR_BADF 3
-#define SFERR_EOF 4 /* not really an error, just a status */
-
-static int
-sf_write_header(FILE *fp, int linktype, int thiszone, int snaplen)
-{
- struct pcap_file_header hdr;
-
- hdr.magic = TCPDUMP_MAGIC;
- hdr.version_major = PCAP_VERSION_MAJOR;
- hdr.version_minor = PCAP_VERSION_MINOR;
-
- hdr.thiszone = thiszone;
- hdr.snaplen = snaplen;
- hdr.sigfigs = 0;
- hdr.linktype = linktype;
-
- if (fwrite((char *)&hdr, sizeof(hdr), 1, fp) != 1)
- return (-1);
-
- return (0);
-}
-
-static void
-swap_hdr(struct pcap_file_header *hp)
-{
- hp->version_major = SWAPSHORT(hp->version_major);
- hp->version_minor = SWAPSHORT(hp->version_minor);
- hp->thiszone = SWAPLONG(hp->thiszone);
- hp->sigfigs = SWAPLONG(hp->sigfigs);
- hp->snaplen = SWAPLONG(hp->snaplen);
- hp->linktype = SWAPLONG(hp->linktype);
-}
-
-pcap_t *
-pcap_open_offline(const char *fname, char *errbuf)
-{
- register pcap_t *p;
- register FILE *fp;
- struct pcap_file_header hdr;
- int linklen;
-
- p = (pcap_t *)malloc(sizeof(*p));
- if (p == NULL) {
- strcpy(errbuf, "out of swap");
- return (NULL);
- }
-
- memset((char *)p, 0, sizeof(*p));
- /*
- * Set this field so we don't close stdin in pcap_close!
- */
- p->fd = -1;
-
- if (fname[0] == '-' && fname[1] == '\0')
- fp = stdin;
- else {
- fp = fopen(fname, "r");
- if (fp == NULL) {
- sprintf(errbuf, "%s: %s", fname, pcap_strerror(errno));
- goto bad;
- }
- }
- if (fread((char *)&hdr, sizeof(hdr), 1, fp) != 1) {
- sprintf(errbuf, "fread: %s", pcap_strerror(errno));
- goto bad;
- }
- if (hdr.magic != TCPDUMP_MAGIC) {
- if (SWAPLONG(hdr.magic) != TCPDUMP_MAGIC) {
- sprintf(errbuf, "bad dump file format");
- goto bad;
- }
- p->sf.swapped = 1;
- swap_hdr(&hdr);
- }
- if (hdr.version_major < PCAP_VERSION_MAJOR) {
- sprintf(errbuf, "archaic file format");
- goto bad;
- }
- p->tzoff = hdr.thiszone;
- p->snapshot = hdr.snaplen;
- p->linktype = hdr.linktype;
- p->sf.rfile = fp;
- p->bufsize = hdr.snaplen;
-
- /* Align link header as required for proper data alignment */
- /* XXX should handle all types */
- switch (p->linktype) {
-
- case DLT_EN10MB:
- linklen = 14;
- break;
-
- case DLT_FDDI:
- linklen = 13 + 8; /* fddi_header + llc */
- break;
-
- case DLT_NULL:
- default:
- linklen = 0;
- break;
- }
-
- p->sf.base = (u_char *)malloc(p->bufsize + BPF_ALIGNMENT);
- p->buffer = p->sf.base + BPF_ALIGNMENT - (linklen % BPF_ALIGNMENT);
- p->sf.version_major = hdr.version_major;
- p->sf.version_minor = hdr.version_minor;
-#ifdef PCAP_FDDIPAD
- /* XXX padding only needed for kernel fcode */
- pcap_fddipad = 0;
-#endif
-
- return (p);
- bad:
- free(p);
- return (NULL);
-}
-
-/*
- * Read sf_readfile and return the next packet. Return the header in hdr
- * and the contents in buf. Return 0 on success, SFERR_EOF if there were
- * no more packets, and SFERR_TRUNC if a partial packet was encountered.
- */
-static int
-sf_next_packet(pcap_t *p, struct pcap_pkthdr *hdr, u_char *buf, int buflen)
-{
- FILE *fp = p->sf.rfile;
-
- /* read the stamp */
- if (fread((char *)hdr, sizeof(struct pcap_pkthdr), 1, fp) != 1) {
- /* probably an EOF, though could be a truncated packet */
- return (1);
- }
-
- if (p->sf.swapped) {
- /* these were written in opposite byte order */
- hdr->caplen = SWAPLONG(hdr->caplen);
- hdr->len = SWAPLONG(hdr->len);
- hdr->ts.tv_sec = SWAPLONG(hdr->ts.tv_sec);
- hdr->ts.tv_usec = SWAPLONG(hdr->ts.tv_usec);
- }
- /*
- * We interchanged the caplen and len fields at version 2.3,
- * in order to match the bpf header layout. But unfortunately
- * some files were written with version 2.3 in their headers
- * but without the interchanged fields.
- */
- if (p->sf.version_minor < 3 ||
- (p->sf.version_minor == 3 && hdr->caplen > hdr->len)) {
- int t = hdr->caplen;
- hdr->caplen = hdr->len;
- hdr->len = t;
- }
-
- if (hdr->caplen > buflen) {
- /*
- * This can happen due to Solaris 2.3 systems tripping
- * over the BUFMOD problem and not setting the snapshot
- * correctly in the savefile header. If the caplen isn't
- * grossly wrong, try to salvage.
- */
- static u_char *tp = NULL;
- static int tsize = 0;
-
- if (hdr->caplen > 65535) {
- sprintf(p->errbuf, "bogus savefile header");
- return (-1);
- }
- if (tsize < hdr->caplen) {
- tsize = ((hdr->caplen + 1023) / 1024) * 1024;
- if (tp != NULL)
- free((u_char *)tp);
- tp = (u_char *)malloc(tsize);
- if (tp == NULL) {
- tsize = 0;
- sprintf(p->errbuf, "BUFMOD hack malloc");
- return (-1);
- }
- }
- if (fread((char *)tp, hdr->caplen, 1, fp) != 1) {
- sprintf(p->errbuf, "truncated dump file");
- return (-1);
- }
- /*
- * We can only keep up to buflen bytes. Since caplen > buflen
- * is exactly how we got here, we know we can only keep the
- * first buflen bytes and must drop the remainder. Adjust
- * caplen accordingly, so we don't get confused later as
- * to how many bytes we have to play with.
- */
- hdr->caplen = buflen;
- memcpy((char *)buf, (char *)tp, buflen);
-
- } else {
- /* read the packet itself */
-
- if (fread((char *)buf, hdr->caplen, 1, fp) != 1) {
- sprintf(p->errbuf, "truncated dump file");
- return (-1);
- }
- }
- return (0);
-}
-
-/*
- * Print out packets stored in the file initialized by sf_read_init().
- * If cnt > 0, return after 'cnt' packets, otherwise continue until eof.
- */
-int
-pcap_offline_read(pcap_t *p, int cnt, pcap_handler callback, u_char *user)
-{
- struct bpf_insn *fcode = p->fcode.bf_insns;
- int status = 0;
- int n = 0;
-
- while (status == 0) {
- struct pcap_pkthdr h;
-
- status = sf_next_packet(p, &h, p->buffer, p->bufsize);
- if (status) {
- if (status == 1)
- return (0);
- return (status);
- }
-
- if (fcode == NULL ||
- bpf_filter(fcode, p->buffer, h.len, h.caplen)) {
- (*callback)(user, &h, p->buffer);
- if (++n >= cnt && cnt > 0)
- break;
- }
- }
- /*XXX this breaks semantics tcpslice expects */
- return (n);
-}
-
-/*
- * Output a packet to the initialized dump file.
- */
-void
-pcap_dump(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
-{
- register FILE *f;
-
- f = (FILE *)user;
- /* XXX we should check the return status */
- (void)fwrite((char *)h, sizeof(*h), 1, f);
- (void)fwrite((char *)sp, h->caplen, 1, f);
-}
-
-/*
- * Initialize so that sf_write() will output to the file named 'fname'.
- */
-pcap_dumper_t *
-pcap_dump_open(pcap_t *p, const char *fname)
-{
- FILE *f;
- if (fname[0] == '-' && fname[1] == '\0')
- f = stdout;
- else {
- f = fopen(fname, "w");
- if (f == NULL) {
- sprintf(p->errbuf, "%s: %s",
- fname, pcap_strerror(errno));
- return (NULL);
- }
- }
- (void)sf_write_header(f, p->linktype, p->tzoff, p->snapshot);
- return ((pcap_dumper_t *)f);
-}
-
-void
-pcap_dump_close(pcap_dumper_t *p)
-{
-
-#ifdef notyet
- if (ferror((FILE *)p))
- return-an-error;
- /* XXX should check return from fclose() too */
-#endif
- (void)fclose((FILE *)p);
-}
diff --git a/libpcap/scanner.c b/libpcap/scanner.c
deleted file mode 100644
index c6cae6a..0000000
--- a/libpcap/scanner.c
+++ b/dev/null
@@ -1,2048 +0,0 @@
-/* A lexical scanner generated by flex */
-
-/* Scanner skeleton version:
- * $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/scanner.c,v 1.1 2001/05/31 13:40:53 gray Exp $
- */
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-
-#include <stdio.h>
-
-
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
-#endif
-
-
-#ifdef __cplusplus
-
-#include <stdlib.h>
-#include <unistd.h>
-
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else /* ! __cplusplus */
-
-#if __STDC__
-
-#define YY_USE_PROTOS
-#define YY_USE_CONST
-
-#endif /* __STDC__ */
-#endif /* ! __cplusplus */
-
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
-#ifdef YY_USE_CONST
-#define pcap_const const
-#else
-#define pcap_const
-#endif
-
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index. If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition. This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN pcap__start = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state. The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START ((pcap__start - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE pcap_restart( pcap_in )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#define YY_BUF_SIZE 16384
-
-typedef struct pcap__buffer_state *YY_BUFFER_STATE;
-
-extern int pcap_leng;
-extern FILE *pcap_in, *pcap_out;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator). This
- * avoids problems with code like:
- *
- * if ( condition_holds )
- * pcap_less( 5 );
- * else
- * do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the pcap_less() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
-#define pcap_less(n) \
- do \
- { \
- /* Undo effects of setting up pcap_text. */ \
- *pcap__cp = pcap__hold_char; \
- YY_RESTORE_YY_MORE_OFFSET \
- pcap__c_buf_p = pcap__cp = pcap__bp + n - YY_MORE_ADJ; \
- YY_DO_BEFORE_ACTION; /* set up pcap_text again */ \
- } \
- while ( 0 )
-
-#define unput(c) pcap_unput( c, pcap_text_ptr )
-
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-typedef unsigned int pcap__size_t;
-
-
-struct pcap__buffer_state
- {
- FILE *pcap__input_file;
-
- char *pcap__ch_buf; /* input buffer */
- char *pcap__buf_pos; /* current position in input buffer */
-
- /* Size of input buffer in bytes, not including room for EOB
- * characters.
- */
- pcap__size_t pcap__buf_size;
-
- /* Number of characters read into pcap__ch_buf, not including EOB
- * characters.
- */
- int pcap__n_chars;
-
- /* Whether we "own" the buffer - i.e., we know we created it,
- * and can realloc() it to grow it, and should free() it to
- * delete it.
- */
- int pcap__is_our_buffer;
-
- /* Whether this is an "interactive" input source; if so, and
- * if we're using stdio for input, then we want to use getc()
- * instead of fread(), to make sure we stop fetching input after
- * each newline.
- */
- int pcap__is_interactive;
-
- /* Whether we're considered to be at the beginning of a line.
- * If so, '^' rules will be active on the next match, otherwise
- * not.
- */
- int pcap__at_bol;
-
- /* Whether to try to fill the input buffer when we reach the
- * end of it.
- */
- int pcap__fill_buffer;
-
- int pcap__buffer_status;
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
- /* When an EOF's been seen but there's still some text to process
- * then we mark the buffer as YY_EOF_PENDING, to indicate that we
- * shouldn't try reading from the input source any more. We might
- * still have a bunch of tokens to match, though, because of
- * possible backing-up.
- *
- * When we actually see the EOF, we change the status to "new"
- * (via pcap_restart()), so that the user can continue scanning by
- * just pointing pcap_in at a new input file.
- */
-#define YY_BUFFER_EOF_PENDING 2
- };
-
-static YY_BUFFER_STATE pcap__current_buffer = 0;
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- */
-#define YY_CURRENT_BUFFER pcap__current_buffer
-
-
-/* pcap__hold_char holds the character lost when pcap_text is formed. */
-static char pcap__hold_char;
-
-static int pcap__n_chars; /* number of characters read into pcap__ch_buf */
-
-
-int pcap_leng;
-
-/* Points to current character in buffer. */
-static char *pcap__c_buf_p = (char *) 0;
-static int pcap__init = 1; /* whether we need to initialize */
-static int pcap__start = 0; /* start state number */
-
-/* Flag which is used to allow pcap_wrap()'s to do buffer switches
- * instead of setting up a fresh pcap_in. A bit of a hack ...
- */
-static int pcap__did_buffer_switch_on_eof;
-
-void pcap_restart YY_PROTO(( FILE *input_file ));
-
-void pcap__switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void pcap__load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE pcap__create_buffer YY_PROTO(( FILE *file, int size ));
-void pcap__delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void pcap__init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void pcap__flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER pcap__flush_buffer( pcap__current_buffer )
-
-YY_BUFFER_STATE pcap__scan_buffer YY_PROTO(( char *base, pcap__size_t size ));
-YY_BUFFER_STATE pcap__scan_string YY_PROTO(( pcap_const char *pcap__str ));
-YY_BUFFER_STATE pcap__scan_bytes YY_PROTO(( pcap_const char *bytes, int len ));
-
-static void *pcap__flex_alloc YY_PROTO(( pcap__size_t ));
-static void *pcap__flex_realloc YY_PROTO(( void *, pcap__size_t ));
-static void pcap__flex_free YY_PROTO(( void * ));
-
-#define pcap__new_buffer pcap__create_buffer
-
-#define pcap__set_interactive(is_interactive) \
- { \
- if ( ! pcap__current_buffer ) \
- pcap__current_buffer = pcap__create_buffer( pcap_in, YY_BUF_SIZE ); \
- pcap__current_buffer->pcap__is_interactive = is_interactive; \
- }
-
-#define pcap__set_bol(at_bol) \
- { \
- if ( ! pcap__current_buffer ) \
- pcap__current_buffer = pcap__create_buffer( pcap_in, YY_BUF_SIZE ); \
- pcap__current_buffer->pcap__at_bol = at_bol; \
- }
-
-#define YY_AT_BOL() (pcap__current_buffer->pcap__at_bol)
-
-typedef unsigned char YY_CHAR;
-FILE *pcap_in = (FILE *) 0, *pcap_out = (FILE *) 0;
-typedef int pcap__state_type;
-extern char *pcap_text;
-#define pcap_text_ptr pcap_text
-
-static pcap__state_type pcap__get_previous_state YY_PROTO(( void ));
-static pcap__state_type pcap__try_NUL_trans YY_PROTO(( pcap__state_type current_state ));
-static int pcap__get_next_buffer YY_PROTO(( void ));
-static void pcap__fatal_error YY_PROTO(( pcap_const char msg[] ));
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up pcap_text.
- */
-#define YY_DO_BEFORE_ACTION \
- pcap_text_ptr = pcap__bp; \
- pcap_leng = (int) (pcap__cp - pcap__bp); \
- pcap__hold_char = *pcap__cp; \
- *pcap__cp = '\0'; \
- pcap__c_buf_p = pcap__cp;
-
-#define YY_NUM_RULES 52
-#define YY_END_OF_BUFFER 53
-static pcap_const short int pcap__accept[217] =
- { 0,
- 0, 0, 53, 51, 36, 36, 37, 37, 37, 37,
- 51, 44, 44, 37, 37, 37, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 51, 51, 51, 51,
- 51, 51, 51, 51, 51, 51, 37, 0, 50, 40,
- 30, 0, 48, 44, 0, 48, 48, 48, 42, 39,
- 41, 38, 43, 49, 49, 49, 48, 48, 48, 48,
- 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,
- 48, 7, 48, 48, 48, 48, 48, 48, 48, 48,
- 31, 48, 48, 48, 48, 48, 48, 48, 48, 48,
- 48, 31, 45, 45, 44, 0, 0, 44, 30, 5,
-
- 48, 48, 48, 48, 1, 48, 48, 48, 48, 48,
- 48, 48, 48, 48, 15, 33, 48, 48, 48, 48,
- 48, 20, 32, 48, 48, 3, 48, 48, 16, 48,
- 2, 8, 9, 48, 48, 0, 47, 0, 48, 48,
- 27, 48, 48, 4, 48, 48, 19, 10, 11, 12,
- 48, 48, 25, 21, 48, 48, 48, 48, 22, 48,
- 6, 45, 45, 45, 0, 47, 0, 13, 48, 48,
- 48, 48, 48, 48, 18, 17, 48, 48, 23, 48,
- 48, 0, 47, 48, 14, 48, 48, 48, 33, 48,
- 48, 45, 45, 45, 0, 48, 24, 26, 34, 48,
-
- 48, 48, 0, 47, 48, 48, 35, 45, 0, 28,
- 29, 0, 47, 46, 46, 0
- } ;
-
-static pcap_const int pcap__ec[256] =
- { 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 2, 4, 1, 1, 1, 1, 5, 1, 6,
- 6, 7, 7, 1, 8, 9, 7, 10, 11, 11,
- 11, 11, 11, 11, 11, 11, 11, 12, 1, 13,
- 14, 15, 1, 1, 16, 16, 16, 16, 16, 16,
- 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
- 17, 17, 17, 17, 17, 17, 17, 18, 17, 17,
- 19, 20, 19, 1, 21, 1, 22, 23, 24, 25,
-
- 26, 27, 28, 29, 30, 17, 31, 32, 33, 34,
- 35, 36, 17, 37, 38, 39, 40, 17, 41, 42,
- 43, 17, 1, 44, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1
- } ;
-
-static pcap_const int pcap__meta[45] =
- { 0,
- 1, 2, 2, 2, 1, 2, 1, 1, 1, 3,
- 3, 3, 1, 1, 1, 3, 1, 1, 1, 1,
- 1, 3, 3, 3, 3, 3, 3, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1
- } ;
-
-static pcap_const short int pcap__base[230] =
- { 0,
- 0, 0, 381, 44, 382, 382, 366, 374, 382, 45,
- 382, 68, 29, 35, 364, 39, 103, 137, 121, 171,
- 24, 92, 86, 131, 33, 342, 108, 113, 47, 24,
- 79, 136, 354, 36, 351, 349, 329, 176, 382, 382,
- 382, 0, 127, 175, 360, 359, 0, 204, 382, 382,
- 382, 382, 382, 191, 0, 0, 345, 333, 346, 332,
- 327, 103, 326, 335, 142, 324, 336, 323, 327, 29,
- 336, 0, 319, 140, 323, 318, 319, 322, 314, 313,
- 0, 312, 313, 313, 313, 310, 324, 315, 320, 307,
- 306, 382, 191, 184, 207, 329, 328, 330, 0, 0,
-
- 306, 315, 310, 301, 0, 308, 303, 306, 309, 291,
- 293, 292, 291, 291, 0, 297, 286, 292, 291, 115,
- 282, 0, 0, 297, 280, 0, 279, 281, 0, 280,
- 0, 0, 0, 147, 224, 303, 302, 301, 281, 286,
- 0, 284, 272, 0, 267, 268, 0, 0, 0, 0,
- 266, 266, 0, 0, 272, 279, 272, 266, 0, 265,
- 0, 214, 227, 290, 286, 284, 276, 0, 263, 247,
- 263, 258, 248, 252, 0, 0, 256, 239, 0, 165,
- 247, 263, 256, 245, 0, 223, 228, 239, 0, 240,
- 227, 234, 180, 251, 247, 217, 0, 0, 0, 216,
-
- 228, 267, 231, 230, 202, 200, 0, 0, 210, 0,
- 0, 207, 200, 195, 192, 382, 294, 196, 194, 166,
- 163, 147, 131, 121, 114, 85, 80, 78, 69
- } ;
-
-static pcap_const short int pcap__def[230] =
- { 0,
- 216, 1, 216, 216, 216, 216, 216, 216, 216, 216,
- 216, 216, 12, 216, 216, 216, 12, 12, 217, 12,
- 20, 20, 20, 20, 18, 18, 18, 18, 18, 18,
- 18, 18, 18, 18, 18, 18, 216, 216, 216, 216,
- 216, 18, 18, 18, 218, 18, 18, 18, 216, 216,
- 216, 216, 216, 217, 217, 217, 18, 18, 18, 18,
- 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
- 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
- 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
- 18, 216, 18, 18, 18, 219, 220, 48, 18, 18,
-
- 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
- 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
- 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
- 18, 18, 18, 18, 18, 216, 221, 222, 18, 18,
- 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
- 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
- 18, 18, 18, 135, 223, 220, 216, 18, 18, 18,
- 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
- 18, 216, 224, 18, 18, 18, 18, 18, 18, 18,
- 18, 18, 18, 181, 225, 18, 18, 18, 18, 18,
-
- 18, 18, 216, 226, 18, 18, 18, 202, 227, 18,
- 18, 216, 228, 229, 216, 0, 216, 216, 216, 216,
- 216, 216, 216, 216, 216, 216, 216, 216, 216
- } ;
-
-static pcap_const short int pcap__nxt[427] =
- { 0,
- 4, 5, 6, 7, 8, 9, 10, 9, 11, 12,
- 13, 10, 14, 15, 16, 17, 18, 18, 9, 19,
- 11, 20, 21, 17, 22, 23, 24, 25, 26, 27,
- 18, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 18, 18, 18, 37, 38, 38, 47, 49, 50, 79,
- 38, 38, 52, 53, 66, 38, 38, 47, 80, 87,
- 60, 112, 47, 38, 38, 113, 61, 88, 76, 67,
- 47, 215, 89, 39, 39, 42, 43, 44, 44, 45,
- 214, 77, 212, 46, 47, 48, 78, 209, 42, 46,
- 46, 46, 46, 46, 46, 47, 47, 47, 47, 47,
-
- 47, 47, 47, 47, 47, 47, 47, 47, 47, 48,
- 47, 47, 46, 46, 45, 81, 203, 62, 82, 47,
- 47, 54, 47, 195, 64, 47, 104, 54, 47, 63,
- 47, 69, 54, 182, 73, 70, 93, 94, 74, 155,
- 54, 71, 75, 72, 47, 47, 47, 47, 216, 167,
- 56, 156, 47, 45, 47, 65, 162, 163, 47, 47,
- 47, 47, 47, 47, 47, 165, 107, 47, 138, 47,
- 83, 84, 85, 116, 192, 193, 38, 117, 47, 47,
- 46, 46, 38, 43, 95, 95, 45, 38, 47, 193,
- 193, 54, 134, 94, 94, 38, 136, 54, 96, 134,
-
- 94, 94, 54, 166, 57, 39, 166, 58, 135, 59,
- 54, 166, 47, 98, 98, 43, 95, 95, 213, 98,
- 56, 213, 180, 163, 163, 98, 98, 98, 98, 98,
- 98, 181, 135, 164, 164, 180, 163, 163, 211, 164,
- 210, 166, 204, 193, 193, 164, 164, 164, 164, 164,
- 164, 202, 207, 206, 205, 181, 194, 194, 204, 180,
- 201, 200, 194, 199, 198, 197, 196, 166, 194, 194,
- 194, 194, 194, 194, 183, 202, 208, 208, 191, 190,
- 189, 188, 208, 187, 186, 185, 184, 166, 208, 208,
- 208, 208, 208, 208, 55, 166, 55, 183, 134, 179,
-
- 178, 177, 176, 175, 174, 173, 172, 171, 126, 170,
- 169, 168, 166, 166, 137, 126, 161, 160, 159, 158,
- 157, 154, 126, 153, 152, 151, 150, 149, 148, 147,
- 146, 145, 144, 143, 142, 141, 140, 139, 43, 97,
- 137, 133, 132, 131, 130, 129, 128, 127, 126, 125,
- 124, 123, 122, 121, 120, 119, 118, 115, 114, 111,
- 110, 109, 108, 106, 105, 103, 102, 101, 100, 99,
- 45, 97, 92, 91, 90, 86, 68, 51, 41, 40,
- 216, 3, 216, 216, 216, 216, 216, 216, 216, 216,
- 216, 216, 216, 216, 216, 216, 216, 216, 216, 216,
-
- 216, 216, 216, 216, 216, 216, 216, 216, 216, 216,
- 216, 216, 216, 216, 216, 216, 216, 216, 216, 216,
- 216, 216, 216, 216, 216, 216
- } ;
-
-static pcap_const short int pcap__chk[427] =
- { 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 4, 10, 13, 14, 14, 30,
- 4, 10, 16, 16, 25, 4, 10, 21, 30, 34,
- 21, 70, 21, 4, 10, 70, 21, 34, 29, 25,
- 13, 229, 34, 4, 10, 12, 12, 12, 12, 12,
- 228, 29, 227, 12, 12, 12, 29, 226, 12, 12,
- 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-
- 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
- 12, 17, 17, 17, 62, 31, 225, 22, 31, 23,
- 17, 19, 23, 224, 23, 22, 62, 19, 22, 22,
- 22, 27, 19, 223, 28, 27, 43, 43, 28, 120,
- 19, 27, 28, 27, 17, 18, 18, 18, 18, 222,
- 19, 120, 18, 65, 18, 24, 134, 134, 18, 18,
- 18, 18, 18, 18, 24, 221, 65, 24, 220, 24,
- 32, 32, 32, 74, 180, 180, 38, 74, 18, 20,
- 20, 20, 38, 44, 44, 44, 44, 38, 20, 193,
- 193, 54, 94, 94, 94, 38, 219, 54, 218, 93,
-
- 93, 93, 54, 215, 20, 38, 214, 20, 93, 20,
- 54, 213, 20, 48, 48, 95, 95, 95, 212, 48,
- 54, 209, 162, 162, 162, 48, 48, 48, 48, 48,
- 48, 162, 93, 135, 135, 163, 163, 163, 206, 135,
- 205, 204, 203, 192, 192, 135, 135, 135, 135, 135,
- 135, 192, 201, 200, 196, 162, 181, 181, 195, 194,
- 191, 190, 181, 188, 187, 186, 184, 183, 181, 181,
- 181, 181, 181, 181, 182, 192, 202, 202, 178, 177,
- 174, 173, 202, 172, 171, 170, 169, 167, 202, 202,
- 202, 202, 202, 202, 217, 166, 217, 165, 164, 160,
-
- 158, 157, 156, 155, 152, 151, 146, 145, 143, 142,
- 140, 139, 138, 137, 136, 130, 128, 127, 125, 124,
- 121, 119, 118, 117, 116, 114, 113, 112, 111, 110,
- 109, 108, 107, 106, 104, 103, 102, 101, 98, 97,
- 96, 91, 90, 89, 88, 87, 86, 85, 84, 83,
- 82, 80, 79, 78, 77, 76, 75, 73, 71, 69,
- 68, 67, 66, 64, 63, 61, 60, 59, 58, 57,
- 46, 45, 37, 36, 35, 33, 26, 15, 8, 7,
- 3, 216, 216, 216, 216, 216, 216, 216, 216, 216,
- 216, 216, 216, 216, 216, 216, 216, 216, 216, 216,
-
- 216, 216, 216, 216, 216, 216, 216, 216, 216, 216,
- 216, 216, 216, 216, 216, 216, 216, 216, 216, 216,
- 216, 216, 216, 216, 216, 216
- } ;
-
-static pcap__state_type pcap__last_accepting_state;
-static char *pcap__last_accepting_cpos;
-
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define pcap_more() pcap_more_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-char *pcap_text;
-#line 1 "/export/home/gray/ipacct/libpcap/./scanner.l"
-#define INITIAL 0
-#line 2 "/export/home/gray/ipacct/libpcap/./scanner.l"
-/*
- * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/scanner.c,v 1.1 2001/05/31 13:40:53 gray Exp $ (LBL)";
-#endif
-
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/time.h>
-
-#include <ctype.h>
-#include <unistd.h>
-
-#include <pcap-int.h>
-
-#include <gencode.h>
-#include <pcap-namedb.h>
-#include "tokdefs.h"
-
-#include <gnuc.h>
-#ifdef HAVE_OS_PROTO_H
-#include <os-proto.h>
-#endif
-
-static int stoi(char *);
-static inline int xdtoi(int);
-
-#ifdef FLEX_SCANNER
-#define YY_NO_UNPUT
-#undef YY_INPUT
-#define YY_INPUT(buf, result, max)\
- {\
- char *src = in_buffer;\
- int i;\
-\
- if (*src == 0)\
- result = YY_NULL;\
- else {\
- for (i = 0; *src && i < max; ++i)\
- buf[i] = *src++;\
- in_buffer += i;\
- result = i;\
- }\
- }
-#else
-#undef getc
-#define getc(fp) (*in_buffer == 0 ? EOF : *in_buffer++)
-#endif
-
-static char *in_buffer;
-
-#line 605 "scanner.c"
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int pcap_wrap YY_PROTO(( void ));
-#else
-extern int pcap_wrap YY_PROTO(( void ));
-#endif
-#endif
-
-#ifndef YY_NO_UNPUT
-static void pcap_unput YY_PROTO(( int c, char *buf_ptr ));
-#endif
-
-#ifndef pcap_text_ptr
-static void pcap__flex_strncpy YY_PROTO(( char *, pcap_const char *, int ));
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int pcap__flex_strlen YY_PROTO(( pcap_const char * ));
-#endif
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int pcap_input YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-#endif
-
-#if YY_STACK_USED
-static int pcap__start_stack_ptr = 0;
-static int pcap__start_stack_depth = 0;
-static int *pcap__start_stack = 0;
-#ifndef YY_NO_PUSH_STATE
-static void pcap__push_state YY_PROTO(( int new_state ));
-#endif
-#ifndef YY_NO_POP_STATE
-static void pcap__pop_state YY_PROTO(( void ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int pcap__top_state YY_PROTO(( void ));
-#endif
-
-#else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
-#endif
-
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines. This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-
-#ifndef ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO (void) fwrite( pcap_text, pcap_leng, 1, pcap_out )
-#endif
-
-/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
- if ( pcap__current_buffer->pcap__is_interactive ) \
- { \
- int c = '*', n; \
- for ( n = 0; n < max_size && \
- (c = getc( pcap_in )) != EOF && c != '\n'; ++n ) \
- buf[n] = (char) c; \
- if ( c == '\n' ) \
- buf[n++] = (char) c; \
- if ( c == EOF && ferror( pcap_in ) ) \
- YY_FATAL_ERROR( "input in flex scanner failed" ); \
- result = n; \
- } \
- else if ( ((result = fread( buf, 1, max_size, pcap_in )) == 0) \
- && ferror( pcap_in ) ) \
- YY_FATAL_ERROR( "input in flex scanner failed" );
-#endif
-
-/* No semi-colon after return; correct usage is to write "pcap_terminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef pcap_terminate
-#define pcap_terminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) pcap__fatal_error( msg )
-#endif
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL int pcap_lex YY_PROTO(( void ))
-#endif
-
-/* Code executed at the beginning of each rule, after pcap_text and pcap_leng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-#define YY_RULE_SETUP \
- YY_USER_ACTION
-
-YY_DECL
- {
- register pcap__state_type pcap__current_state;
- register char *pcap__cp, *pcap__bp;
- register int pcap__act;
-
-#line 83 "/export/home/gray/ipacct/libpcap/./scanner.l"
-
-#line 758 "scanner.c"
-
- if ( pcap__init )
- {
- pcap__init = 0;
-
-#ifdef YY_USER_INIT
- YY_USER_INIT;
-#endif
-
- if ( ! pcap__start )
- pcap__start = 1; /* first start state */
-
- if ( ! pcap_in )
- pcap_in = stdin;
-
- if ( ! pcap_out )
- pcap_out = stdout;
-
- if ( ! pcap__current_buffer )
- pcap__current_buffer =
- pcap__create_buffer( pcap_in, YY_BUF_SIZE );
-
- pcap__load_buffer_state();
- }
-
- while ( 1 ) /* loops until end-of-file is reached */
- {
- pcap__cp = pcap__c_buf_p;
-
- /* Support of pcap_text. */
- *pcap__cp = pcap__hold_char;
-
- /* pcap__bp points to the position in pcap__ch_buf of the start of
- * the current run.
- */
- pcap__bp = pcap__cp;
-
- pcap__current_state = pcap__start;
-pcap__match:
- do
- {
- register YY_CHAR pcap__c = pcap__ec[YY_SC_TO_UI(*pcap__cp)];
- if ( pcap__accept[pcap__current_state] )
- {
- pcap__last_accepting_state = pcap__current_state;
- pcap__last_accepting_cpos = pcap__cp;
- }
- while ( pcap__chk[pcap__base[pcap__current_state] + pcap__c] != pcap__current_state )
- {
- pcap__current_state = (int) pcap__def[pcap__current_state];
- if ( pcap__current_state >= 217 )
- pcap__c = pcap__meta[(unsigned int) pcap__c];
- }
- pcap__current_state = pcap__nxt[pcap__base[pcap__current_state] + (unsigned int) pcap__c];
- ++pcap__cp;
- }
- while ( pcap__base[pcap__current_state] != 382 );
-
-pcap__find_action:
- pcap__act = pcap__accept[pcap__current_state];
- if ( pcap__act == 0 )
- { /* have to back up */
- pcap__cp = pcap__last_accepting_cpos;
- pcap__current_state = pcap__last_accepting_state;
- pcap__act = pcap__accept[pcap__current_state];
- }
-
- YY_DO_BEFORE_ACTION;
-
-
-do_action: /* This label is used only to access EOF actions. */
-
-
- switch ( pcap__act )
- { /* beginning of action switch */
- case 0: /* must back up */
- /* undo the effects of YY_DO_BEFORE_ACTION */
- *pcap__cp = pcap__hold_char;
- pcap__cp = pcap__last_accepting_cpos;
- pcap__current_state = pcap__last_accepting_state;
- goto pcap__find_action;
-
-case 1:
-YY_RULE_SETUP
-#line 84 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return DST;
- YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 85 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return SRC;
- YY_BREAK
-case 3:
-YY_RULE_SETUP
-#line 87 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return LINK;
- YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 88 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return LINK;
- YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 89 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return ARP;
- YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 90 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return RARP;
- YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 91 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return IP;
- YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 92 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return TCP;
- YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 93 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return UDP;
- YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 94 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return ICMP;
- YY_BREAK
-case 11:
-YY_RULE_SETUP
-#line 95 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return IGMP;
- YY_BREAK
-case 12:
-YY_RULE_SETUP
-#line 96 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return IGRP;
- YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 98 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return ATALK;
- YY_BREAK
-case 14:
-YY_RULE_SETUP
-#line 99 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return DECNET;
- YY_BREAK
-case 15:
-YY_RULE_SETUP
-#line 100 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return LAT;
- YY_BREAK
-case 16:
-YY_RULE_SETUP
-#line 101 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return SCA;
- YY_BREAK
-case 17:
-YY_RULE_SETUP
-#line 102 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return MOPRC;
- YY_BREAK
-case 18:
-YY_RULE_SETUP
-#line 103 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return MOPDL;
- YY_BREAK
-case 19:
-YY_RULE_SETUP
-#line 105 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return HOST;
- YY_BREAK
-case 20:
-YY_RULE_SETUP
-#line 106 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return NET;
- YY_BREAK
-case 21:
-YY_RULE_SETUP
-#line 107 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return MASK;
- YY_BREAK
-case 22:
-YY_RULE_SETUP
-#line 108 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return PORT;
- YY_BREAK
-case 23:
-YY_RULE_SETUP
-#line 109 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return PROTO;
- YY_BREAK
-case 24:
-YY_RULE_SETUP
-#line 111 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return GATEWAY;
- YY_BREAK
-case 25:
-YY_RULE_SETUP
-#line 113 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return LESS;
- YY_BREAK
-case 26:
-YY_RULE_SETUP
-#line 114 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return GREATER;
- YY_BREAK
-case 27:
-YY_RULE_SETUP
-#line 115 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return BYTE;
- YY_BREAK
-case 28:
-YY_RULE_SETUP
-#line 116 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return TK_BROADCAST;
- YY_BREAK
-case 29:
-YY_RULE_SETUP
-#line 117 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return TK_MULTICAST;
- YY_BREAK
-case 30:
-YY_RULE_SETUP
-#line 119 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return AND;
- YY_BREAK
-case 31:
-YY_RULE_SETUP
-#line 120 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return OR;
- YY_BREAK
-case 32:
-YY_RULE_SETUP
-#line 121 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return '!';
- YY_BREAK
-case 33:
-YY_RULE_SETUP
-#line 123 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return LEN;
- YY_BREAK
-case 34:
-YY_RULE_SETUP
-#line 124 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return INBOUND;
- YY_BREAK
-case 35:
-YY_RULE_SETUP
-#line 125 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return OUTBOUND;
- YY_BREAK
-case 36:
-YY_RULE_SETUP
-#line 127 "/export/home/gray/ipacct/libpcap/./scanner.l"
-;
- YY_BREAK
-case 37:
-YY_RULE_SETUP
-#line 128 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return pcap_text[0];
- YY_BREAK
-case 38:
-YY_RULE_SETUP
-#line 129 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return GEQ;
- YY_BREAK
-case 39:
-YY_RULE_SETUP
-#line 130 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return LEQ;
- YY_BREAK
-case 40:
-YY_RULE_SETUP
-#line 131 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return NEQ;
- YY_BREAK
-case 41:
-YY_RULE_SETUP
-#line 132 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return '=';
- YY_BREAK
-case 42:
-YY_RULE_SETUP
-#line 133 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return LSH;
- YY_BREAK
-case 43:
-YY_RULE_SETUP
-#line 134 "/export/home/gray/ipacct/libpcap/./scanner.l"
-return RSH;
- YY_BREAK
-case 44:
-YY_RULE_SETUP
-#line 135 "/export/home/gray/ipacct/libpcap/./scanner.l"
-{ pcap_lval.i = stoi((char *)pcap_text); return NUM; }
- YY_BREAK
-case 45:
-YY_RULE_SETUP
-#line 136 "/export/home/gray/ipacct/libpcap/./scanner.l"
-{
- pcap_lval.s = sdup((char *)pcap_text); return HID; }
- YY_BREAK
-case 46:
-YY_RULE_SETUP
-#line 138 "/export/home/gray/ipacct/libpcap/./scanner.l"
-{ pcap_lval.e = pcap_ether_aton((char *)pcap_text);
- return EID; }
- YY_BREAK
-case 47:
-YY_RULE_SETUP
-#line 140 "/export/home/gray/ipacct/libpcap/./scanner.l"
-{ bpf_error("bogus ethernet address %s", pcap_text); }
- YY_BREAK
-case 48:
-YY_RULE_SETUP
-#line 141 "/export/home/gray/ipacct/libpcap/./scanner.l"
-{
- pcap_lval.s = sdup((char *)pcap_text); return ID; }
- YY_BREAK
-case 49:
-YY_RULE_SETUP
-#line 143 "/export/home/gray/ipacct/libpcap/./scanner.l"
-{ pcap_lval.s = sdup((char *)pcap_text + 1); return ID; }
- YY_BREAK
-case 50:
-YY_RULE_SETUP
-#line 144 "/export/home/gray/ipacct/libpcap/./scanner.l"
-{
- bpf_error("illegal token: %s\n", pcap_text); }
- YY_BREAK
-case 51:
-YY_RULE_SETUP
-#line 146 "/export/home/gray/ipacct/libpcap/./scanner.l"
-{ bpf_error("illegal char '%c'", *pcap_text); }
- YY_BREAK
-case 52:
-YY_RULE_SETUP
-#line 147 "/export/home/gray/ipacct/libpcap/./scanner.l"
-ECHO;
- YY_BREAK
-#line 1105 "scanner.c"
-case YY_STATE_EOF(INITIAL):
- pcap_terminate();
-
- case YY_END_OF_BUFFER:
- {
- /* Amount of text matched not including the EOB char. */
- int pcap__amount_of_matched_text = (int) (pcap__cp - pcap_text_ptr) - 1;
-
- /* Undo the effects of YY_DO_BEFORE_ACTION. */
- *pcap__cp = pcap__hold_char;
- YY_RESTORE_YY_MORE_OFFSET
-
- if ( pcap__current_buffer->pcap__buffer_status == YY_BUFFER_NEW )
- {
- /* We're scanning a new file or input source. It's
- * possible that this happened because the user
- * just pointed pcap_in at a new source and called
- * pcap_lex(). If so, then we have to assure
- * consistency between pcap__current_buffer and our
- * globals. Here is the right place to do so, because
- * this is the first action (other than possibly a
- * back-up) that will match for the new input source.
- */
- pcap__n_chars = pcap__current_buffer->pcap__n_chars;
- pcap__current_buffer->pcap__input_file = pcap_in;
- pcap__current_buffer->pcap__buffer_status = YY_BUFFER_NORMAL;
- }
-
- /* Note that here we test for pcap__c_buf_p "<=" to the position
- * of the first EOB in the buffer, since pcap__c_buf_p will
- * already have been incremented past the NUL character
- * (since all states make transitions on EOB to the
- * end-of-buffer state). Contrast this with the test
- * in input().
- */
- if ( pcap__c_buf_p <= &pcap__current_buffer->pcap__ch_buf[pcap__n_chars] )
- { /* This was really a NUL. */
- pcap__state_type pcap__next_state;
-
- pcap__c_buf_p = pcap_text_ptr + pcap__amount_of_matched_text;
-
- pcap__current_state = pcap__get_previous_state();
-
- /* Okay, we're now positioned to make the NUL
- * transition. We couldn't have
- * pcap__get_previous_state() go ahead and do it
- * for us because it doesn't know how to deal
- * with the possibility of jamming (and we don't
- * want to build jamming into it because then it
- * will run more slowly).
- */
-
- pcap__next_state = pcap__try_NUL_trans( pcap__current_state );
-
- pcap__bp = pcap_text_ptr + YY_MORE_ADJ;
-
- if ( pcap__next_state )
- {
- /* Consume the NUL. */
- pcap__cp = ++pcap__c_buf_p;
- pcap__current_state = pcap__next_state;
- goto pcap__match;
- }
-
- else
- {
- pcap__cp = pcap__c_buf_p;
- goto pcap__find_action;
- }
- }
-
- else switch ( pcap__get_next_buffer() )
- {
- case EOB_ACT_END_OF_FILE:
- {
- pcap__did_buffer_switch_on_eof = 0;
-
- if ( pcap_wrap() )
- {
- /* Note: because we've taken care in
- * pcap__get_next_buffer() to have set up
- * pcap_text, we can now set up
- * pcap__c_buf_p so that if some total
- * hoser (like flex itself) wants to
- * call the scanner after we return the
- * YY_NULL, it'll still work - another
- * YY_NULL will get returned.
- */
- pcap__c_buf_p = pcap_text_ptr + YY_MORE_ADJ;
-
- pcap__act = YY_STATE_EOF(YY_START);
- goto do_action;
- }
-
- else
- {
- if ( ! pcap__did_buffer_switch_on_eof )
- YY_NEW_FILE;
- }
- break;
- }
-
- case EOB_ACT_CONTINUE_SCAN:
- pcap__c_buf_p =
- pcap_text_ptr + pcap__amount_of_matched_text;
-
- pcap__current_state = pcap__get_previous_state();
-
- pcap__cp = pcap__c_buf_p;
- pcap__bp = pcap_text_ptr + YY_MORE_ADJ;
- goto pcap__match;
-
- case EOB_ACT_LAST_MATCH:
- pcap__c_buf_p =
- &pcap__current_buffer->pcap__ch_buf[pcap__n_chars];
-
- pcap__current_state = pcap__get_previous_state();
-
- pcap__cp = pcap__c_buf_p;
- pcap__bp = pcap_text_ptr + YY_MORE_ADJ;
- goto pcap__find_action;
- }
- break;
- }
-
- default:
- YY_FATAL_ERROR(
- "fatal flex scanner internal error--no action found" );
- } /* end of action switch */
- } /* end of scanning one token */
- } /* end of pcap_lex */
-
-
-/* pcap__get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- * EOB_ACT_LAST_MATCH -
- * EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- * EOB_ACT_END_OF_FILE - end of file
- */
-
-static int pcap__get_next_buffer()
- {
- register char *dest = pcap__current_buffer->pcap__ch_buf;
- register char *source = pcap_text_ptr;
- register int number_to_move, i;
- int ret_val;
-
- if ( pcap__c_buf_p > &pcap__current_buffer->pcap__ch_buf[pcap__n_chars + 1] )
- YY_FATAL_ERROR(
- "fatal flex scanner internal error--end of buffer missed" );
-
- if ( pcap__current_buffer->pcap__fill_buffer == 0 )
- { /* Don't try to fill the buffer, so this is an EOF. */
- if ( pcap__c_buf_p - pcap_text_ptr - YY_MORE_ADJ == 1 )
- {
- /* We matched a single character, the EOB, so
- * treat this as a final EOF.
- */
- return EOB_ACT_END_OF_FILE;
- }
-
- else
- {
- /* We matched some text prior to the EOB, first
- * process it.
- */
- return EOB_ACT_LAST_MATCH;
- }
- }
-
- /* Try to read more data. */
-
- /* First move last chars to start of buffer. */
- number_to_move = (int) (pcap__c_buf_p - pcap_text_ptr) - 1;
-
- for ( i = 0; i < number_to_move; ++i )
- *(dest++) = *(source++);
-
- if ( pcap__current_buffer->pcap__buffer_status == YY_BUFFER_EOF_PENDING )
- /* don't do the read, it's not guaranteed to return an EOF,
- * just force an EOF
- */
- pcap__current_buffer->pcap__n_chars = pcap__n_chars = 0;
-
- else
- {
- int num_to_read =
- pcap__current_buffer->pcap__buf_size - number_to_move - 1;
-
- while ( num_to_read <= 0 )
- { /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
- YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
-
- /* just a shorter name for the current buffer */
- YY_BUFFER_STATE b = pcap__current_buffer;
-
- int pcap__c_buf_p_offset =
- (int) (pcap__c_buf_p - b->pcap__ch_buf);
-
- if ( b->pcap__is_our_buffer )
- {
- int new_size = b->pcap__buf_size * 2;
-
- if ( new_size <= 0 )
- b->pcap__buf_size += b->pcap__buf_size / 8;
- else
- b->pcap__buf_size *= 2;
-
- b->pcap__ch_buf = (char *)
- /* Include room in for 2 EOB chars. */
- pcap__flex_realloc( (void *) b->pcap__ch_buf,
- b->pcap__buf_size + 2 );
- }
- else
- /* Can't grow it, we don't own it. */
- b->pcap__ch_buf = 0;
-
- if ( ! b->pcap__ch_buf )
- YY_FATAL_ERROR(
- "fatal error - scanner input buffer overflow" );
-
- pcap__c_buf_p = &b->pcap__ch_buf[pcap__c_buf_p_offset];
-
- num_to_read = pcap__current_buffer->pcap__buf_size -
- number_to_move - 1;
-#endif
- }
-
- if ( num_to_read > YY_READ_BUF_SIZE )
- num_to_read = YY_READ_BUF_SIZE;
-
- /* Read in more data. */
- YY_INPUT( (&pcap__current_buffer->pcap__ch_buf[number_to_move]),
- pcap__n_chars, num_to_read );
-
- pcap__current_buffer->pcap__n_chars = pcap__n_chars;
- }
-
- if ( pcap__n_chars == 0 )
- {
- if ( number_to_move == YY_MORE_ADJ )
- {
- ret_val = EOB_ACT_END_OF_FILE;
- pcap_restart( pcap_in );
- }
-
- else
- {
- ret_val = EOB_ACT_LAST_MATCH;
- pcap__current_buffer->pcap__buffer_status =
- YY_BUFFER_EOF_PENDING;
- }
- }
-
- else
- ret_val = EOB_ACT_CONTINUE_SCAN;
-
- pcap__n_chars += number_to_move;
- pcap__current_buffer->pcap__ch_buf[pcap__n_chars] = YY_END_OF_BUFFER_CHAR;
- pcap__current_buffer->pcap__ch_buf[pcap__n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-
- pcap_text_ptr = &pcap__current_buffer->pcap__ch_buf[0];
-
- return ret_val;
- }
-
-
-/* pcap__get_previous_state - get the state just before the EOB char was reached */
-
-static pcap__state_type pcap__get_previous_state()
- {
- register pcap__state_type pcap__current_state;
- register char *pcap__cp;
-
- pcap__current_state = pcap__start;
-
- for ( pcap__cp = pcap_text_ptr + YY_MORE_ADJ; pcap__cp < pcap__c_buf_p; ++pcap__cp )
- {
- register YY_CHAR pcap__c = (*pcap__cp ? pcap__ec[YY_SC_TO_UI(*pcap__cp)] : 1);
- if ( pcap__accept[pcap__current_state] )
- {
- pcap__last_accepting_state = pcap__current_state;
- pcap__last_accepting_cpos = pcap__cp;
- }
- while ( pcap__chk[pcap__base[pcap__current_state] + pcap__c] != pcap__current_state )
- {
- pcap__current_state = (int) pcap__def[pcap__current_state];
- if ( pcap__current_state >= 217 )
- pcap__c = pcap__meta[(unsigned int) pcap__c];
- }
- pcap__current_state = pcap__nxt[pcap__base[pcap__current_state] + (unsigned int) pcap__c];
- }
-
- return pcap__current_state;
- }
-
-
-/* pcap__try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- * next_state = pcap__try_NUL_trans( current_state );
- */
-
-#ifdef YY_USE_PROTOS
-static pcap__state_type pcap__try_NUL_trans( pcap__state_type pcap__current_state )
-#else
-static pcap__state_type pcap__try_NUL_trans( pcap__current_state )
-pcap__state_type pcap__current_state;
-#endif
- {
- register int pcap__is_jam;
- register char *pcap__cp = pcap__c_buf_p;
-
- register YY_CHAR pcap__c = 1;
- if ( pcap__accept[pcap__current_state] )
- {
- pcap__last_accepting_state = pcap__current_state;
- pcap__last_accepting_cpos = pcap__cp;
- }
- while ( pcap__chk[pcap__base[pcap__current_state] + pcap__c] != pcap__current_state )
- {
- pcap__current_state = (int) pcap__def[pcap__current_state];
- if ( pcap__current_state >= 217 )
- pcap__c = pcap__meta[(unsigned int) pcap__c];
- }
- pcap__current_state = pcap__nxt[pcap__base[pcap__current_state] + (unsigned int) pcap__c];
- pcap__is_jam = (pcap__current_state == 216);
-
- return pcap__is_jam ? 0 : pcap__current_state;
- }
-
-
-#ifndef YY_NO_UNPUT
-#ifdef YY_USE_PROTOS
-static void pcap_unput( int c, register char *pcap__bp )
-#else
-static void pcap_unput( c, pcap__bp )
-int c;
-register char *pcap__bp;
-#endif
- {
- register char *pcap__cp = pcap__c_buf_p;
-
- /* undo effects of setting up pcap_text */
- *pcap__cp = pcap__hold_char;
-
- if ( pcap__cp < pcap__current_buffer->pcap__ch_buf + 2 )
- { /* need to shift things up to make room */
- /* +2 for EOB chars. */
- register int number_to_move = pcap__n_chars + 2;
- register char *dest = &pcap__current_buffer->pcap__ch_buf[
- pcap__current_buffer->pcap__buf_size + 2];
- register char *source =
- &pcap__current_buffer->pcap__ch_buf[number_to_move];
-
- while ( source > pcap__current_buffer->pcap__ch_buf )
- *--dest = *--source;
-
- pcap__cp += (int) (dest - source);
- pcap__bp += (int) (dest - source);
- pcap__current_buffer->pcap__n_chars =
- pcap__n_chars = pcap__current_buffer->pcap__buf_size;
-
- if ( pcap__cp < pcap__current_buffer->pcap__ch_buf + 2 )
- YY_FATAL_ERROR( "flex scanner push-back overflow" );
- }
-
- *--pcap__cp = (char) c;
-
-
- pcap_text_ptr = pcap__bp;
- pcap__hold_char = *pcap__cp;
- pcap__c_buf_p = pcap__cp;
- }
-#endif /* ifndef YY_NO_UNPUT */
-
-
-#ifdef __cplusplus
-static int pcap_input()
-#else
-static int input()
-#endif
- {
- int c;
-
- *pcap__c_buf_p = pcap__hold_char;
-
- if ( *pcap__c_buf_p == YY_END_OF_BUFFER_CHAR )
- {
- /* pcap__c_buf_p now points to the character we want to return.
- * If this occurs *before* the EOB characters, then it's a
- * valid NUL; if not, then we've hit the end of the buffer.
- */
- if ( pcap__c_buf_p < &pcap__current_buffer->pcap__ch_buf[pcap__n_chars] )
- /* This was really a NUL. */
- *pcap__c_buf_p = '\0';
-
- else
- { /* need more input */
- int offset = pcap__c_buf_p - pcap_text_ptr;
- ++pcap__c_buf_p;
-
- switch ( pcap__get_next_buffer() )
- {
- case EOB_ACT_LAST_MATCH:
- /* This happens because pcap__g_n_b()
- * sees that we've accumulated a
- * token and flags that we need to
- * try matching the token before
- * proceeding. But for input(),
- * there's no matching to consider.
- * So convert the EOB_ACT_LAST_MATCH
- * to EOB_ACT_END_OF_FILE.
- */
-
- /* Reset buffer status. */
- pcap_restart( pcap_in );
-
- /* fall through */
-
- case EOB_ACT_END_OF_FILE:
- {
- if ( pcap_wrap() )
- return EOF;
-
- if ( ! pcap__did_buffer_switch_on_eof )
- YY_NEW_FILE;
-#ifdef __cplusplus
- return pcap_input();
-#else
- return input();
-#endif
- }
-
- case EOB_ACT_CONTINUE_SCAN:
- pcap__c_buf_p = pcap_text_ptr + offset;
- break;
- }
- }
- }
-
- c = *(unsigned char *) pcap__c_buf_p; /* cast for 8-bit char's */
- *pcap__c_buf_p = '\0'; /* preserve pcap_text */
- pcap__hold_char = *++pcap__c_buf_p;
-
-
- return c;
- }
-
-
-#ifdef YY_USE_PROTOS
-void pcap_restart( FILE *input_file )
-#else
-void pcap_restart( input_file )
-FILE *input_file;
-#endif
- {
- if ( ! pcap__current_buffer )
- pcap__current_buffer = pcap__create_buffer( pcap_in, YY_BUF_SIZE );
-
- pcap__init_buffer( pcap__current_buffer, input_file );
- pcap__load_buffer_state();
- }
-
-
-#ifdef YY_USE_PROTOS
-void pcap__switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void pcap__switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
- {
- if ( pcap__current_buffer == new_buffer )
- return;
-
- if ( pcap__current_buffer )
- {
- /* Flush out information for old buffer. */
- *pcap__c_buf_p = pcap__hold_char;
- pcap__current_buffer->pcap__buf_pos = pcap__c_buf_p;
- pcap__current_buffer->pcap__n_chars = pcap__n_chars;
- }
-
- pcap__current_buffer = new_buffer;
- pcap__load_buffer_state();
-
- /* We don't actually know whether we did this switch during
- * EOF (pcap_wrap()) processing, but the only time this flag
- * is looked at is after pcap_wrap() is called, so it's safe
- * to go ahead and always set it.
- */
- pcap__did_buffer_switch_on_eof = 1;
- }
-
-
-#ifdef YY_USE_PROTOS
-void pcap__load_buffer_state( void )
-#else
-void pcap__load_buffer_state()
-#endif
- {
- pcap__n_chars = pcap__current_buffer->pcap__n_chars;
- pcap_text_ptr = pcap__c_buf_p = pcap__current_buffer->pcap__buf_pos;
- pcap_in = pcap__current_buffer->pcap__input_file;
- pcap__hold_char = *pcap__c_buf_p;
- }
-
-
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE pcap__create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE pcap__create_buffer( file, size )
-FILE *file;
-int size;
-#endif
- {
- YY_BUFFER_STATE b;
-
- b = (YY_BUFFER_STATE) pcap__flex_alloc( sizeof( struct pcap__buffer_state ) );
- if ( ! b )
- YY_FATAL_ERROR( "out of dynamic memory in pcap__create_buffer()" );
-
- b->pcap__buf_size = size;
-
- /* pcap__ch_buf has to be 2 characters longer than the size given because
- * we need to put in 2 end-of-buffer characters.
- */
- b->pcap__ch_buf = (char *) pcap__flex_alloc( b->pcap__buf_size + 2 );
- if ( ! b->pcap__ch_buf )
- YY_FATAL_ERROR( "out of dynamic memory in pcap__create_buffer()" );
-
- b->pcap__is_our_buffer = 1;
-
- pcap__init_buffer( b, file );
-
- return b;
- }
-
-
-#ifdef YY_USE_PROTOS
-void pcap__delete_buffer( YY_BUFFER_STATE b )
-#else
-void pcap__delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
- {
- if ( ! b )
- return;
-
- if ( b == pcap__current_buffer )
- pcap__current_buffer = (YY_BUFFER_STATE) 0;
-
- if ( b->pcap__is_our_buffer )
- pcap__flex_free( (void *) b->pcap__ch_buf );
-
- pcap__flex_free( (void *) b );
- }
-
-
-#ifndef YY_ALWAYS_INTERACTIVE
-#ifndef YY_NEVER_INTERACTIVE
-extern int isatty YY_PROTO(( int ));
-#endif
-#endif
-
-#ifdef YY_USE_PROTOS
-void pcap__init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void pcap__init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-
-
- {
- pcap__flush_buffer( b );
-
- b->pcap__input_file = file;
- b->pcap__fill_buffer = 1;
-
-#if YY_ALWAYS_INTERACTIVE
- b->pcap__is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
- b->pcap__is_interactive = 0;
-#else
- b->pcap__is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
- }
-
-
-#ifdef YY_USE_PROTOS
-void pcap__flush_buffer( YY_BUFFER_STATE b )
-#else
-void pcap__flush_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-
- {
- if ( ! b )
- return;
-
- b->pcap__n_chars = 0;
-
- /* We always need two end-of-buffer characters. The first causes
- * a transition to the end-of-buffer state. The second causes
- * a jam in that state.
- */
- b->pcap__ch_buf[0] = YY_END_OF_BUFFER_CHAR;
- b->pcap__ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
- b->pcap__buf_pos = &b->pcap__ch_buf[0];
-
- b->pcap__at_bol = 1;
- b->pcap__buffer_status = YY_BUFFER_NEW;
-
- if ( b == pcap__current_buffer )
- pcap__load_buffer_state();
- }
-
-
-#ifndef YY_NO_SCAN_BUFFER
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE pcap__scan_buffer( char *base, pcap__size_t size )
-#else
-YY_BUFFER_STATE pcap__scan_buffer( base, size )
-char *base;
-pcap__size_t size;
-#endif
- {
- YY_BUFFER_STATE b;
-
- if ( size < 2 ||
- base[size-2] != YY_END_OF_BUFFER_CHAR ||
- base[size-1] != YY_END_OF_BUFFER_CHAR )
- /* They forgot to leave room for the EOB's. */
- return 0;
-
- b = (YY_BUFFER_STATE) pcap__flex_alloc( sizeof( struct pcap__buffer_state ) );
- if ( ! b )
- YY_FATAL_ERROR( "out of dynamic memory in pcap__scan_buffer()" );
-
- b->pcap__buf_size = size - 2; /* "- 2" to take care of EOB's */
- b->pcap__buf_pos = b->pcap__ch_buf = base;
- b->pcap__is_our_buffer = 0;
- b->pcap__input_file = 0;
- b->pcap__n_chars = b->pcap__buf_size;
- b->pcap__is_interactive = 0;
- b->pcap__at_bol = 1;
- b->pcap__fill_buffer = 0;
- b->pcap__buffer_status = YY_BUFFER_NEW;
-
- pcap__switch_to_buffer( b );
-
- return b;
- }
-#endif
-
-
-#ifndef YY_NO_SCAN_STRING
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE pcap__scan_string( pcap_const char *pcap__str )
-#else
-YY_BUFFER_STATE pcap__scan_string( pcap__str )
-pcap_const char *pcap__str;
-#endif
- {
- int len;
- for ( len = 0; pcap__str[len]; ++len )
- ;
-
- return pcap__scan_bytes( pcap__str, len );
- }
-#endif
-
-
-#ifndef YY_NO_SCAN_BYTES
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE pcap__scan_bytes( pcap_const char *bytes, int len )
-#else
-YY_BUFFER_STATE pcap__scan_bytes( bytes, len )
-pcap_const char *bytes;
-int len;
-#endif
- {
- YY_BUFFER_STATE b;
- char *buf;
- pcap__size_t n;
- int i;
-
- /* Get memory for full buffer, including space for trailing EOB's. */
- n = len + 2;
- buf = (char *) pcap__flex_alloc( n );
- if ( ! buf )
- YY_FATAL_ERROR( "out of dynamic memory in pcap__scan_bytes()" );
-
- for ( i = 0; i < len; ++i )
- buf[i] = bytes[i];
-
- buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
-
- b = pcap__scan_buffer( buf, n );
- if ( ! b )
- YY_FATAL_ERROR( "bad buffer in pcap__scan_bytes()" );
-
- /* It's okay to grow etc. this buffer, and we should throw it
- * away when we're done.
- */
- b->pcap__is_our_buffer = 1;
-
- return b;
- }
-#endif
-
-
-#ifndef YY_NO_PUSH_STATE
-#ifdef YY_USE_PROTOS
-static void pcap__push_state( int new_state )
-#else
-static void pcap__push_state( new_state )
-int new_state;
-#endif
- {
- if ( pcap__start_stack_ptr >= pcap__start_stack_depth )
- {
- pcap__size_t new_size;
-
- pcap__start_stack_depth += YY_START_STACK_INCR;
- new_size = pcap__start_stack_depth * sizeof( int );
-
- if ( ! pcap__start_stack )
- pcap__start_stack = (int *) pcap__flex_alloc( new_size );
-
- else
- pcap__start_stack = (int *) pcap__flex_realloc(
- (void *) pcap__start_stack, new_size );
-
- if ( ! pcap__start_stack )
- YY_FATAL_ERROR(
- "out of memory expanding start-condition stack" );
- }
-
- pcap__start_stack[pcap__start_stack_ptr++] = YY_START;
-
- BEGIN(new_state);
- }
-#endif
-
-
-#ifndef YY_NO_POP_STATE
-static void pcap__pop_state()
- {
- if ( --pcap__start_stack_ptr < 0 )
- YY_FATAL_ERROR( "start-condition stack underflow" );
-
- BEGIN(pcap__start_stack[pcap__start_stack_ptr]);
- }
-#endif
-
-
-#ifndef YY_NO_TOP_STATE
-static int pcap__top_state()
- {
- return pcap__start_stack[pcap__start_stack_ptr - 1];
- }
-#endif
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-#ifdef YY_USE_PROTOS
-static void pcap__fatal_error( pcap_const char msg[] )
-#else
-static void pcap__fatal_error( msg )
-char msg[];
-#endif
- {
- (void) fprintf( stderr, "%s\n", msg );
- exit( YY_EXIT_FAILURE );
- }
-
-
-
-/* Redefine pcap_less() so it works in section 3 code. */
-
-#undef pcap_less
-#define pcap_less(n) \
- do \
- { \
- /* Undo effects of setting up pcap_text. */ \
- pcap_text[pcap_leng] = pcap__hold_char; \
- pcap__c_buf_p = pcap_text + n; \
- pcap__hold_char = *pcap__c_buf_p; \
- *pcap__c_buf_p = '\0'; \
- pcap_leng = n; \
- } \
- while ( 0 )
-
-
-/* Internal utility routines. */
-
-#ifndef pcap_text_ptr
-#ifdef YY_USE_PROTOS
-static void pcap__flex_strncpy( char *s1, pcap_const char *s2, int n )
-#else
-static void pcap__flex_strncpy( s1, s2, n )
-char *s1;
-pcap_const char *s2;
-int n;
-#endif
- {
- register int i;
- for ( i = 0; i < n; ++i )
- s1[i] = s2[i];
- }
-#endif
-
-#ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int pcap__flex_strlen( pcap_const char *s )
-#else
-static int pcap__flex_strlen( s )
-pcap_const char *s;
-#endif
- {
- register int n;
- for ( n = 0; s[n]; ++n )
- ;
-
- return n;
- }
-#endif
-
-
-#ifdef YY_USE_PROTOS
-static void *pcap__flex_alloc( pcap__size_t size )
-#else
-static void *pcap__flex_alloc( size )
-pcap__size_t size;
-#endif
- {
- return (void *) malloc( size );
- }
-
-#ifdef YY_USE_PROTOS
-static void *pcap__flex_realloc( void *ptr, pcap__size_t size )
-#else
-static void *pcap__flex_realloc( ptr, size )
-void *ptr;
-pcap__size_t size;
-#endif
- {
- /* The cast to (char *) in the following accommodates both
- * implementations that use char* generic pointers, and those
- * that use void* generic pointers. It works with the latter
- * because both ANSI C and C++ allow castless assignment from
- * any pointer type to void*, and deal with argument conversions
- * as though doing an assignment.
- */
- return (void *) realloc( (char *) ptr, size );
- }
-
-#ifdef YY_USE_PROTOS
-static void pcap__flex_free( void *ptr )
-#else
-static void pcap__flex_free( ptr )
-void *ptr;
-#endif
- {
- free( ptr );
- }
-
-#if YY_MAIN
-int main()
- {
- pcap_lex();
- return 0;
- }
-#endif
-#line 147 "/export/home/gray/ipacct/libpcap/./scanner.l"
-
-void
-lex_init(buf)
- char *buf;
-{
- in_buffer = buf;
-}
-
-/*
- * Also define a pcap_wrap. Note that if we're using flex, it will
- * define a macro to map this identifier to pcap_wrap.
- */
-int
-pcap_wrap()
-{
- return 1;
-}
-
-/* Hex digit to integer. */
-static inline int
-xdtoi(c)
- register int c;
-{
- if (isdigit(c))
- return c - '0';
- else if (islower(c))
- return c - 'a' + 10;
- else
- return c - 'A' + 10;
-}
-
-/*
- * Convert string to integer. Just like atoi(), but checks for
- * preceding 0x or 0 and uses hex or octal instead of decimal.
- */
-static int
-stoi(s)
- char *s;
-{
- int base = 10;
- int n = 0;
-
- if (*s == '0') {
- if (s[1] == 'x' || s[1] == 'X') {
- s += 2;
- base = 16;
- }
- else {
- base = 8;
- s += 1;
- }
- }
- while (*s)
- n = n * base + xdtoi(*s++);
-
- return n;
-}
-
diff --git a/libpcap/scanner.l b/libpcap/scanner.l
deleted file mode 100644
index 30c8f7e..0000000
--- a/libpcap/scanner.l
+++ b/dev/null
@@ -1,204 +0,0 @@
-%{
-/*
- * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
- * The Regents of the University of California. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /cvsroot/ipacct/ipacct/libpcap/Attic/scanner.l,v 1.1 2001/05/31 13:40:53 gray Exp $ (LBL)";
-#endif
-
-#if defined(HAVE_CONFIG_H)
-# include <config.h>
-#endif
-
-#include <sys/types.h>
-#include <sys/time.h>
-
-#include <ctype.h>
-#include <unistd.h>
-
-#include <pcap-int.h>
-
-#include <gencode.h>
-#include <pcap-namedb.h>
-#include "tokdefs.h"
-
-#include <gnuc.h>
-#ifdef HAVE_OS_PROTO_H
-#include <os-proto.h>
-#endif
-
-static int stoi(char *);
-static inline int xdtoi(int);
-
-#ifdef FLEX_SCANNER
-#define YY_NO_UNPUT
-#undef YY_INPUT
-#define YY_INPUT(buf, result, max)\
- {\
- char *src = in_buffer;\
- int i;\
-\
- if (*src == 0)\
- result = YY_NULL;\
- else {\
- for (i = 0; *src && i < max; ++i)\
- buf[i] = *src++;\
- in_buffer += i;\
- result = i;\
- }\
- }
-#else
-#undef getc
-#define getc(fp) (*in_buffer == 0 ? EOF : *in_buffer++)
-#endif
-
-static char *in_buffer;
-
-%}
-
-N ([0-9]+|(0X|0x)[0-9A-Fa-f]+)
-B ([0-9A-Fa-f][0-9A-Fa-f]?)
-
-%a 3000
-
-%%
-dst return DST;
-src return SRC;
-
-link|ether|ppp|slip return LINK;
-fddi return LINK;
-arp return ARP;
-rarp return RARP;
-ip return IP;
-tcp return TCP;
-udp return UDP;
-icmp return ICMP;
-igmp return IGMP;
-igrp return IGRP;
-
-atalk return ATALK;
-decnet return DECNET;
-lat return LAT;
-sca return SCA;
-moprc return MOPRC;
-mopdl return MOPDL;
-
-host return HOST;
-net return NET;
-mask return MASK;
-port return PORT;
-proto return PROTO;
-
-gateway return GATEWAY;
-
-less return LESS;
-greater return GREATER;
-byte return BYTE;
-broadcast return TK_BROADCAST;
-multicast return TK_MULTICAST;
-
-and|"&&" return AND;
-or|"||" return OR;
-not return '!';
-
-len|length return LEN;
-inbound return INBOUND;
-outbound return OUTBOUND;
-
-[ \n\t] ;
-[+\-*/:\[\]!<>()&|=] return yytext[0];
-">=" return GEQ;
-"<=" return LEQ;
-"!=" return NEQ;
-"==" return '=';
-"<<" return LSH;
-">>" return RSH;
-{N} { yylval.i = stoi((char *)yytext); return NUM; }
-({N}\.{N})|({N}\.{N}\.{N})|({N}\.{N}\.{N}\.{N}) {
- yylval.s = sdup((char *)yytext); return HID; }
-{B}:{B}:{B}:{B}:{B}:{B} { yylval.e = pcap_ether_aton((char *)yytext);
- return EID; }
-{B}:+({B}:+)+ { bpf_error("bogus ethernet address %s", yytext); }
-[A-Za-z0-9][-_.A-Za-z0-9]*[.A-Za-z0-9] {
- yylval.s = sdup((char *)yytext); return ID; }
-"\\"[^ !()\n\t]+ { yylval.s = sdup((char *)yytext + 1); return ID; }
-[^ \[\]\t\n\-_.A-Za-z0-9!<>()&|=]+i {
- bpf_error("illegal token: %s\n", yytext); }
-. { bpf_error("illegal char '%c'", *yytext); }
-%%
-void
-lex_init(buf)
- char *buf;
-{
- in_buffer = buf;
-}
-
-/*
- * Also define a yywrap. Note that if we're using flex, it will
- * define a macro to map this identifier to pcap_wrap.
- */
-int
-yywrap()
-{
- return 1;
-}
-
-/* Hex digit to integer. */
-static inline int
-xdtoi(c)
- register int c;
-{
- if (isdigit(c))
- return c - '0';
- else if (islower(c))
- return c - 'a' + 10;
- else
- return c - 'A' + 10;
-}
-
-/*
- * Convert string to integer. Just like atoi(), but checks for
- * preceding 0x or 0 and uses hex or octal instead of decimal.
- */
-static int
-stoi(s)
- char *s;
-{
- int base = 10;
- int n = 0;
-
- if (*s == '0') {
- if (s[1] == 'x' || s[1] == 'X') {
- s += 2;
- base = 16;
- }
- else {
- base = 8;
- s += 1;
- }
- }
- while (*s)
- n = n * base + xdtoi(*s++);
-
- return n;
-}
-
diff --git a/libpcap/tokdefs.h b/libpcap/tokdefs.h
deleted file mode 100644
index 09b3f5a..0000000
--- a/libpcap/tokdefs.h
+++ b/dev/null
@@ -1,57 +0,0 @@
-#define DST 257
-#define SRC 258
-#define HOST 259
-#define GATEWAY 260
-#define NET 261
-#define MASK 262
-#define PORT 263
-#define LESS 264
-#define GREATER 265
-#define PROTO 266
-#define BYTE 267
-#define ARP 268
-#define RARP 269
-#define IP 270
-#define TCP 271
-#define UDP 272
-#define ICMP 273
-#define IGMP 274
-#define IGRP 275
-#define ATALK 276
-#define DECNET 277
-#define LAT 278
-#define SCA 279
-#define MOPRC 280
-#define MOPDL 281
-#define TK_BROADCAST 282
-#define TK_MULTICAST 283
-#define NUM 284
-#define INBOUND 285
-#define OUTBOUND 286
-#define LINK 287
-#define GEQ 288
-#define LEQ 289
-#define NEQ 290
-#define ID 291
-#define EID 292
-#define HID 293
-#define LSH 294
-#define RSH 295
-#define LEN 296
-#define OR 297
-#define AND 298
-#define UMINUS 299
-typedef union {
- int i;
- bpf_u_int32 h;
- u_char *e;
- char *s;
- struct stmt *stmt;
- struct arth *a;
- struct {
- struct qual q;
- struct block *b;
- } blk;
- struct block *rblk;
-} YYSTYPE;
-extern YYSTYPE pcap_lval;

Return to:

Send suggestions and report system problems to the System administrator.