diff options
| author | guy <guy> | 2005-07-05 22:14:06 +0000 |
|---|---|---|
| committer | guy <guy> | 2005-07-05 22:14:06 +0000 |
| commit | 35a2ab952748e99e6117e92f3967dd7e5b6f5a23 (patch) | |
| tree | 14da161feca247b7f4e91ce03904329cd6877be9 /pcap-linux.c | |
| parent | 5b0b65e6f453547d856a4bbec66cda3225417c72 (diff) | |
Rename "direction_t" to "pcap_direction_t", and rename "D_IN" and
"D_OUT" to "PCAP_D_IN" and "PCAP_D_OUT", to avoid potential namespace
collisions, as per a suggestion by Dean Gaudet.
Diffstat (limited to 'pcap-linux.c')
| -rw-r--r-- | pcap-linux.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pcap-linux.c b/pcap-linux.c index 2988ecc..0c4ce7e 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.110.2.2 2005-06-20 21:30:18 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/pcap-linux.c,v 1.110.2.3 2005-07-05 22:14:06 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 *, direction_t); +static int pcap_setdirection_linux(pcap_t *, pcap_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 == D_IN) + if (handle->direction == PCAP_D_IN) return 0; } else { /* * Incoming packet. * If the user only wants outgoing packets, reject it. */ - if (handle->direction == D_OUT) + if (handle->direction == PCAP_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, direction_t d) +pcap_setdirection_linux(pcap_t *handle, pcap_direction_t d) { #ifdef HAVE_PF_PACKET_SOCKETS if (!handle->md.sock_packet) { |