0.9's already been released, so, for better or worse, we're stuck with

the old names.

diff --git a/pcap-bpf.c b/pcap-bpf.c
index 78ad1d70777a1994788b2e9a7cb944fe0faa5c6b..b221ac6fcd2f97a2697afef388bc534323096c85 100644 (file)
--- a/pcap-bpf.c
+++ b/pcap-bpf.c
@@ -20,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
  */
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/libpcap/pcap-bpf.c,v 1.86.2.5 2005-07-05 22:14:06 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-bpf.c,v 1.86.2.6 2005-07-05 22:33:16 guy Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -105,7 +105,7 @@ static int odmlockid = 0;
 #include "gencode.h"   /* for "no_optimize" */
 
 static int pcap_setfilter_bpf(pcap_t *p, struct bpf_program *fp);
 #include "gencode.h"   /* for "no_optimize" */
 
 static int pcap_setfilter_bpf(pcap_t *p, struct bpf_program *fp);

-static int pcap_setdirection_bpf(pcap_t *, pcap_direction_t);
+static int pcap_setdirection_bpf(pcap_t *, direction_t);

 static int pcap_set_datalink_bpf(pcap_t *p, int dlt);
 
 static int
 static int pcap_set_datalink_bpf(pcap_t *p, int dlt);
 
 static int


@@ -1095,26 +1095,26 @@ pcap_setfilter_bpf(pcap_t *p, struct bpf_program *fp)
  * single device? IN, OUT or both?
  */
 static int
  * single device? IN, OUT or both?
  */
 static int

-pcap_setdirection_bpf(pcap_t *p, pcap_direction_t d)
+pcap_setdirection_bpf(pcap_t *p, direction_t d)

 {
 #ifdef BIOCSSEESENT
        u_int seesent;
 #endif
 
        /*
 {
 #ifdef BIOCSSEESENT
        u_int seesent;
 #endif
 
        /*

-        * We don't support PCAP_D_OUT.
+        * We don't support D_OUT.

         */
         */

-       if (d == PCAP_D_OUT) {
+       if (d == D_OUT) {

                snprintf(p->errbuf, sizeof(p->errbuf),
                snprintf(p->errbuf, sizeof(p->errbuf),

-                   "Setting direction to PCAP_D_OUT is not supported on BPF");
+                   "Setting direction to D_OUT is not supported on BPF");

                return -1;
        }
 #ifdef BIOCSSEESENT
                return -1;
        }
 #ifdef BIOCSSEESENT

-       seesent = (d == PCAP_D_INOUT);
+       seesent = (d == D_INOUT);

        if (ioctl(p->fd, BIOCSSEESENT, &seesent) == -1) {
                (void) snprintf(p->errbuf, sizeof(p->errbuf),
                    "Cannot set direction to %s: %s",
        if (ioctl(p->fd, BIOCSSEESENT, &seesent) == -1) {
                (void) snprintf(p->errbuf, sizeof(p->errbuf),
                    "Cannot set direction to %s: %s",

-                       (d == PCAP_D_INOUT) ? "PCAP_D_INOUT" : "PCAP_D_IN",
+                       (d == D_INOUT) ? "D_INOUT" : "D_IN",

                        strerror(errno));
                return (-1);
        }
                        strerror(errno));
                return (-1);
        }

diff --git a/pcap-int.h b/pcap-int.h
index 46d15d7db47ffec3926edb06c93c0f719650a2f7..83b4b3050ee84a0f16f51f7de477e26db47f4a33 100644 (file)
--- a/pcap-int.h
+++ b/pcap-int.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *

- * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.68.2.3 2005-07-05 22:14:06 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.68.2.4 2005-07-05 22:33:16 guy Exp $ (LBL)

  */
 
 #ifndef pcap_int_h
  */
 
 #ifndef pcap_int_h


@@ -151,7 +151,7 @@ struct pcap {
        u_char *pkt;
 
        /* We're accepting only packets in this direction/these directions. */
        u_char *pkt;
 
        /* We're accepting only packets in this direction/these directions. */

-       pcap_direction_t direction;
+       direction_t direction;

 
        /*
         * Methods.
 
        /*
         * Methods.


@@ -159,7 +159,7 @@ struct pcap {
        int     (*read_op)(pcap_t *, int cnt, pcap_handler, u_char *);
        int     (*inject_op)(pcap_t *, const void *, size_t);
        int     (*setfilter_op)(pcap_t *, struct bpf_program *);
        int     (*read_op)(pcap_t *, int cnt, pcap_handler, u_char *);
        int     (*inject_op)(pcap_t *, const void *, size_t);
        int     (*setfilter_op)(pcap_t *, struct bpf_program *);

-       int     (*setdirection_op)(pcap_t *, pcap_direction_t);
+       int     (*setdirection_op)(pcap_t *, direction_t);

        int     (*set_datalink_op)(pcap_t *, int);
        int     (*getnonblock_op)(pcap_t *, char *);
        int     (*setnonblock_op)(pcap_t *, int, char *);
        int     (*set_datalink_op)(pcap_t *, int);
        int     (*getnonblock_op)(pcap_t *, char *);
        int     (*setnonblock_op)(pcap_t *, int, char *);

diff --git a/pcap-linux.c b/pcap-linux.c
index 0c4ce7e347295aeedb60e66e31a8bb9c355ab7a4..947776532a7611f666cd4748b02017b54a93241c 100644 (file)
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.110.2.3 2005-07-05 22:14:06 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.110.2.4 2005-07-05 22:33:16 guy Exp $ (LBL)";

 #endif
 
 /*
 #endif
 
 /*


@@ -195,7 +195,7 @@ static int pcap_read_packet(pcap_t *, pcap_handler, u_char *);
 static int pcap_inject_linux(pcap_t *, const void *, size_t);
 static int pcap_stats_linux(pcap_t *, struct pcap_stat *);
 static int pcap_setfilter_linux(pcap_t *, struct bpf_program *);
 static int pcap_inject_linux(pcap_t *, const void *, size_t);
 static int pcap_stats_linux(pcap_t *, struct pcap_stat *);
 static int pcap_setfilter_linux(pcap_t *, struct bpf_program *);

-static int pcap_setdirection_linux(pcap_t *, pcap_direction_t);
+static int pcap_setdirection_linux(pcap_t *, direction_t);

 static void pcap_close_linux(pcap_t *);
 
 /*
 static void pcap_close_linux(pcap_t *);
 
 /*


@@ -536,14 +536,14 @@ pcap_read_packet(pcap_t *handle, pcap_handler callback, u_char *userdata)
                        /*
                         * If the user only wants incoming packets, reject it.
                         */
                        /*
                         * If the user only wants incoming packets, reject it.
                         */

-                       if (handle->direction == PCAP_D_IN)
+                       if (handle->direction == D_IN)

                                return 0;
                } else {
                        /*
                         * Incoming packet.
                         * If the user only wants outgoing packets, reject it.
                         */
                                return 0;
                } else {
                        /*
                         * Incoming packet.
                         * If the user only wants outgoing packets, reject it.
                         */

-                       if (handle->direction == PCAP_D_OUT)
+                       if (handle->direction == D_OUT)

                                return 0;
                }
        }
                                return 0;
                }
        }


@@ -1014,7 +1014,7 @@ pcap_setfilter_linux(pcap_t *handle, struct bpf_program *filter)
  * single device? IN, OUT or both?
  */
 static int
  * single device? IN, OUT or both?
  */
 static int

-pcap_setdirection_linux(pcap_t *handle, pcap_direction_t d)
+pcap_setdirection_linux(pcap_t *handle, direction_t d)

 {
 #ifdef HAVE_PF_PACKET_SOCKETS
        if (!handle->md.sock_packet) {
 {
 #ifdef HAVE_PF_PACKET_SOCKETS
        if (!handle->md.sock_packet) {

diff --git a/pcap.3 b/pcap.3
index 7b439988af33e609bfe56d55924a84f14beb3121..c3d98a0d27b6f04a018ba5acb91705854acdba9c 100644 (file)
--- a/pcap.3
+++ b/pcap.3
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap.3,v 1.64.2.5 2005-07-05 22:14:07 guy Exp $
+.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap.3,v 1.64.2.6 2005-07-05 22:33:17 guy Exp $

 .\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"    The Regents of the University of California.  All rights reserved.
 .\"
 .\" Copyright (c) 1994, 1996, 1997
 .\"    The Regents of the University of California.  All rights reserved.


@@ -80,7 +80,7 @@ int pcap_compile(pcap_t *p, struct bpf_program *fp,
 char *str, int optimize, bpf_u_int32 netmask)
 int pcap_setfilter(pcap_t *p, struct bpf_program *fp)
 void pcap_freecode(struct bpf_program *)
 char *str, int optimize, bpf_u_int32 netmask)
 int pcap_setfilter(pcap_t *p, struct bpf_program *fp)
 void pcap_freecode(struct bpf_program *)

-int pcap_setdirection(pcap_t *p, pcap_direction_t d)
+int pcap_setdirection(pcap_t *p, direction_t d)

 .ft
 .LP
 .ft B
 .ft
 .LP
 .ft B


@@ -781,23 +781,23 @@ has been made the filter program for a pcap structure by a call to
 .PP
 .B pcap_setdirection()
 is used to specify a direction that packets will be captured.
 .PP
 .B pcap_setdirection()
 is used to specify a direction that packets will be captured.

-.I pcap_direction_t 
+.I direction_t 

 is one of the constants
 is one of the constants

-.BR PCAP_D_IN ,
-.B PCAP_D_OUT
+.BR D_IN ,
+.B D_OUT

 or 
 or 

-.BR PCAP_D_INOUT .
-.B PCAP_D_IN
+.BR D_INOUT .
+.B D_IN

 will only capture packets received by the device,
 will only capture packets received by the device,

-.B PCAP_D_OUT
+.B D_OUT

 will only capture packets sent by the device and
 will only capture packets sent by the device and

-.B PCAP_D_INOUT
+.B D_INOUT

 will capture packets received by or sent by the device.
 will capture packets received by or sent by the device.

-.B PCAP_D_INOUT
+.B D_INOUT

 is the default setting if this function is not called.  This isn't
 necessarily supported on all platforms; some platforms might return an
 error, and some other platforms might not support
 is the default setting if this function is not called.  This isn't
 necessarily supported on all platforms; some platforms might return an
 error, and some other platforms might not support

-.BR PCAP_D_OUT .
+.BR D_OUT .

 This operation is not supported if a ``savefile'' is being read.
 .B \-1
 is returned on failure,
 This operation is not supported if a ``savefile'' is being read.
 .B \-1
 is returned on failure,

diff --git a/pcap.c b/pcap.c
index 2d552c1b8e81ebd94d1d97e14618ab8a22a5a076..02e219266f52d9984b3c908f0019519cb803d0c8 100644 (file)
--- a/pcap.c
+++ b/pcap.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.88.2.4 2005-07-05 22:14:08 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.88.2.5 2005-07-05 22:33:17 guy Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -696,7 +696,7 @@ pcap_setfilter(pcap_t *p, struct bpf_program *fp)
  * might not be supported.
  */
 int
  * might not be supported.
  */
 int

-pcap_setdirection(pcap_t *p, pcap_direction_t d)
+pcap_setdirection(pcap_t *p, direction_t d)

 {
        if (p->setdirection_op == NULL) {
                snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
 {
        if (p->setdirection_op == NULL) {
                snprintf(p->errbuf, PCAP_ERRBUF_SIZE,

diff --git a/pcap.h b/pcap.h
index d1da63f79848c331a56b4bf88f6eb2a75c78196c..544d626ac73a168ab17bfbe0c1c6771860b7aa94 100644 (file)
--- a/pcap.h
+++ b/pcap.h
@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *

- * @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.52.2.3 2005-07-05 22:14:08 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.52.2.4 2005-07-05 22:33:18 guy Exp $ (LBL)

  */
 
 #ifndef lib_pcap_h
  */
 
 #ifndef lib_pcap_h


@@ -121,10 +121,10 @@ struct pcap_file_header {
 };
 
 typedef enum {
 };
 
 typedef enum {

-       PCAP_D_INOUT = 0,
-       PCAP_D_IN,
-       PCAP_D_OUT
-} pcap_direction_t;
+       D_INOUT = 0,
+       D_IN,
+       D_OUT
+} direction_t;

 
 /*
  * Each packet in the dump file is prepended with this generic header.
 
 /*
  * Each packet in the dump file is prepended with this generic header.


@@ -224,7 +224,7 @@ int         pcap_next_ex(pcap_t *, struct pcap_pkthdr **, const u_char **);
 void   pcap_breakloop(pcap_t *);
 int    pcap_stats(pcap_t *, struct pcap_stat *);
 int    pcap_setfilter(pcap_t *, struct bpf_program *);
 void   pcap_breakloop(pcap_t *);
 int    pcap_stats(pcap_t *, struct pcap_stat *);
 int    pcap_setfilter(pcap_t *, struct bpf_program *);

-int    pcap_setdirection(pcap_t *, pcap_direction_t);
+int    pcap_setdirection(pcap_t *, direction_t);

 int    pcap_getnonblock(pcap_t *, char *);
 int    pcap_setnonblock(pcap_t *, int, char *);
 void   pcap_perror(pcap_t *, char *);
 int    pcap_getnonblock(pcap_t *, char *);
 int    pcap_setnonblock(pcap_t *, int, char *);
 void   pcap_perror(pcap_t *, char *);

diff --git a/savefile.c b/savefile.c
index 9dd229aa71fdbb56d929feb9581ef479205a2846..a34aa5da94f98b395505753cd8a60f76b267ce75 100644 (file)
--- a/savefile.c
+++ b/savefile.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.126.2.9 2005-07-05 22:14:08 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.126.2.10 2005-07-05 22:33:18 guy Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -722,7 +722,7 @@ sf_inject(pcap_t *p, const void *buf _U_, size_t size _U_)
  * single device? IN, OUT or both?
  */
 static int
  * single device? IN, OUT or both?
  */
 static int

-sf_setdirection(pcap_t *p, pcap_direction_t d)
+sf_setdirection(pcap_t *p, direction_t d)

 {
        snprintf(p->errbuf, sizeof(p->errbuf),
            "Setting direction is not supported on savefiles");
 {
        snprintf(p->errbuf, sizeof(p->errbuf),
            "Setting direction is not supported on savefiles");