The stuff in the "linux-include" directory is no longer needed, as we no
longer depend on the OS's header files for packet format and packet
field value definitions; get rid of the stuff in that directory.
diff --git a/FILES b/FILES
index b6f8ea8..85de8f0 100644
--- a/FILES
+++ b/FILES
@@ -32,8 +32,6 @@
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
nlpid.h
diff --git a/INSTALL b/INSTALL
index b17ea8a..d6010dc 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-@(#) $Header: /tcpdump/master/libpcap/Attic/INSTALL,v 1.45 2000-12-01 07:47:07 guy Exp $ (LBL)
+@(#) $Header: /tcpdump/master/libpcap/Attic/INSTALL,v 1.46 2000-12-16 09:05:11 guy Exp $ (LBL)
To build libpcap, run "./configure" (a shell script). The configure
script will determine your system attributes and generate an
@@ -318,7 +318,6 @@
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
diff --git a/TODO b/TODO
index 644ef02..e90b9d8 100644
--- a/TODO
+++ b/TODO
@@ -22,14 +22,6 @@
be corrected so that capture starts when pcap_read is called for the
first time.
-- For what is that silly linux-include directory needed? This should
- a) be documented
- b) not be neccessary. libpcap builds for me without that directory and
- I don't think it is our responsible to work around broken build
- environments. If we detect a problem configure should fail but that's
- about it.
-
-
Less urgent items
-----------------
diff --git a/linux-include/netinet/if_ether.h b/linux-include/netinet/if_ether.h
deleted file mode 100644
index dd5044a..0000000
--- a/linux-include/netinet/if_ether.h
+++ /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];
-} __attribute__ ((packed));
-
-/*
- * Structure of a 10Mb/s Ethernet header.
- */
-struct ether_header {
- u_char ether_dhost[6];
- u_char ether_shost[6];
- u_short ether_type;
-} __attribute__ ((packed));
-
-#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 */
-} __attribute__ ((packed));
-#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/linux-include/netinet/ip_var.h b/linux-include/netinet/ip_var.h
deleted file mode 100644
index f2ce7ea..0000000
--- a/linux-include/netinet/ip_var.h
+++ /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 */
-} __attribute__ ((packed));
-
-/*
- * 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;
-} __attribute__ ((packed));
-
-/*
- * 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 */
-} __attribute__ ((packed));
-
-/*
- * 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 (struct socket *, n_long, caddr_t, struct ifnet *);
-int ip_ctloutput (int, struct socket *, int, int, struct mbuf **);
-void ip_deq (struct ipasfrag *);
-int ip_dooptions (struct mbuf *);
-void ip_drain (void);
-void ip_enq (struct ipasfrag *, struct ipasfrag *);
-void ip_forward (struct mbuf *, int);
-void ip_freef (struct ipq *);
-void ip_freemoptions (struct ip_moptions *);
-int ip_getmoptions (int, struct ip_moptions *, struct mbuf **);
-void ip_init (void);
-int ip_mforward (struct mbuf *, struct ifnet *);
-int ip_optcopy (struct ip *, struct ip *);
-int ip_output (struct mbuf *,
- struct mbuf *, struct route *, int, struct ip_moptions *);
-int ip_pcbopts (struct mbuf **, struct mbuf *);
-struct ip *
- ip_reass (struct ipasfrag *, struct ipq *);
-struct in_ifaddr *
- ip_rtaddr (struct in_addr);
-int ip_setmoptions (int, struct ip_moptions **, struct mbuf *);
-void ip_slowtimo (void);
-struct mbuf *
- ip_srcroute (void);
-void ip_stripoptions (struct mbuf *, struct mbuf *);
-int ip_sysctl (int *, n_long, void *, size_t *, void *, size_t);
-void ipintr (void);
-int rip_ctloutput (int, struct socket *, int, int, struct mbuf **);
-void rip_init (void);
-void rip_input (struct mbuf *);
-int rip_output (struct mbuf *, struct socket *, n_long);
-int rip_usrreq (struct socket *,
- int, struct mbuf *, struct mbuf *, struct mbuf *);
-#endif
