Update config.{guess,sub}, timestamps 2023-01-01,2023-01-21

[libpcap] / pcap.h

diff --git a/pcap.h b/pcap.h
index ac9f05cceae7787d61cc71c3d00ef924f53b2e45..174e32d25fdbec78d13c0310a8d38ecf8d75b6da 100644 (file)
--- a/pcap.h
+++ b/pcap.h
@@ -29,123 +29,15 @@
  * 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.
  * 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: /tcpdump/master/libpcap/pcap.h,v 1.24 2000-07-29 07:36:43 guy 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>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#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()
+ * For backwards compatibility.
+ *
+ * Note to OS vendors: do NOT get rid of this file!  Many applications
+ * expect to be able to include <pcap.h>, and at least some of them
+ * go through contortions in their configure scripts to try to detect
+ * OSes that have "helpfully" moved pcap.h to <pcap/pcap.h> without
+ * leaving behind a <pcap.h> file.

  */
  */

-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_dead(int, int);
-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);
-int    pcap_compile_nopcap(int, int, 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);
-int    bpf_validate(struct bpf_insn *f, int len);
-char   *bpf_image(struct bpf_insn *, int);
-void   bpf_dump(struct bpf_program *, int);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
+#include <pcap/pcap.h>