diff options
author | guy <guy> | 2005-07-05 22:31:57 +0000 |
---|---|---|
committer | guy <guy> | 2005-07-05 22:31:57 +0000 |
commit | 5e92dec08841585eaca3c5e6cd90590dcba8f576 (patch) | |
tree | 243a2b7aff1df76b62ec517248bfa41e89ed1d9b | |
parent | 727beef298afe19aeb3728c3368bb3bf9003d63a (diff) | |
download | libpcap-5e92dec08841585eaca3c5e6cd90590dcba8f576.tar.gz |
0.9's already been released, so, for better or worse, we're stuck with
the old names.
-rw-r--r-- | pcap-bpf.c | 16 | ||||
-rw-r--r-- | pcap-int.h | 6 | ||||
-rw-r--r-- | pcap-linux.c | 10 | ||||
-rw-r--r-- | pcap.3 | 22 | ||||
-rw-r--r-- | pcap.c | 4 | ||||
-rw-r--r-- | pcap.h | 12 | ||||
-rw-r--r-- | savefile.c | 4 |
7 files changed, 37 insertions, 37 deletions
@@ -20,7 +20,7 @@ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/libpcap/pcap-bpf.c,v 1.91 2005-07-05 22:12:17 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/pcap-bpf.c,v 1.92 2005-07-05 22:31:57 guy Exp $ (LBL)"; #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); -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 @@ -1095,26 +1095,26 @@ pcap_setfilter_bpf(pcap_t *p, struct bpf_program *fp) * 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 /* - * 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), - "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 - 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", - (d == PCAP_D_INOUT) ? "PCAP_D_INOUT" : "PCAP_D_IN", + (d == D_INOUT) ? "D_INOUT" : "D_IN", strerror(errno)); return (-1); } @@ -30,7 +30,7 @@ * 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.72 2005-07-05 22:12:18 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.73 2005-07-05 22:31:57 guy Exp $ (LBL) */ #ifndef pcap_int_h @@ -151,7 +151,7 @@ struct pcap { u_char *pkt; /* We're accepting only packets in this direction/these directions. */ - pcap_direction_t direction; + direction_t direction; /* * 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 (*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 *); diff --git a/pcap-linux.c b/pcap-linux.c index d84b93c1..f141801c 100644 --- a/pcap-linux.c +++ b/pcap-linux.c @@ -27,7 +27,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.113 2005-07-05 22:12:18 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.114 2005-07-05 22:31:57 guy Exp $ (LBL)"; #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_setdirection_linux(pcap_t *, pcap_direction_t); +static int pcap_setdirection_linux(pcap_t *, direction_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 (handle->direction == PCAP_D_IN) + if (handle->direction == D_IN) 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; } } @@ -1014,7 +1014,7 @@ pcap_setfilter_linux(pcap_t *handle, struct bpf_program *filter) * 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) { @@ -1,4 +1,4 @@ -.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap.3,v 1.69 2005-07-05 22:12:18 guy Exp $ +.\" @(#) $Header: /tcpdump/master/libpcap/Attic/pcap.3,v 1.70 2005-07-05 22:31:57 guy Exp $ .\" .\" 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 *) -int pcap_setdirection(pcap_t *p, pcap_direction_t d) +int pcap_setdirection(pcap_t *p, direction_t d) .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. -.I pcap_direction_t +.I direction_t is one of the constants -.BR PCAP_D_IN , -.B PCAP_D_OUT +.BR D_IN , +.B D_OUT or -.BR PCAP_D_INOUT . -.B PCAP_D_IN +.BR D_INOUT . +.B D_IN will only capture packets received by the device, -.B PCAP_D_OUT +.B D_OUT 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. -.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 -.BR PCAP_D_OUT . +.BR D_OUT . This operation is not supported if a ``savefile'' is being read. .B \-1 is returned on failure, @@ -33,7 +33,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.92 2005-07-05 22:12:19 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/pcap.c,v 1.93 2005-07-05 22:31:58 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -696,7 +696,7 @@ pcap_setfilter(pcap_t *p, struct bpf_program *fp) * 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, @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.55 2005-07-05 22:12:19 guy Exp $ (LBL) + * @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.56 2005-07-05 22:31:58 guy Exp $ (LBL) */ #ifndef lib_pcap_h @@ -121,10 +121,10 @@ struct pcap_file_header { }; 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. @@ -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 *); -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 *); @@ -30,7 +30,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.136 2005-07-05 22:12:19 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.137 2005-07-05 22:31:58 guy Exp $ (LBL)"; #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 -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"); |