Fix typoes (sigh, using both "p" and "handle" for the pcap_t pointer in
different modules can lead to confusion).
This commit is contained in:
parent
f35ab115a6
commit
30b39d84b7
|
@ -33,7 +33,7 @@
|
||||||
*/
|
*/
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char rcsid[] _U_ =
|
static const char rcsid[] _U_ =
|
||||||
"@(#) $Header: /tcpdump/master/libpcap/pcap-bt-linux.c,v 1.13 2008-04-14 20:40:58 guy Exp $ (LBL)";
|
"@(#) $Header: /tcpdump/master/libpcap/pcap-bt-linux.c,v 1.14 2008-04-14 21:07:50 guy Exp $ (LBL)";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -231,7 +231,7 @@ bt_activate(pcap_t* handle)
|
||||||
goto close_fail;
|
goto close_fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (p->opt.rfmon) {
|
if (handle->opt.rfmon) {
|
||||||
/*
|
/*
|
||||||
* Monitor mode doesn't apply to Bluetooth devices.
|
* Monitor mode doesn't apply to Bluetooth devices.
|
||||||
*/
|
*/
|
||||||
|
@ -256,7 +256,7 @@ bt_activate(pcap_t* handle)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
close_fail:
|
close_fail:
|
||||||
pcap_cleanup_live_common(p);
|
pcap_cleanup_live_common(handle);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
*/
|
*/
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char rcsid[] _U_ =
|
static const char rcsid[] _U_ =
|
||||||
"@(#) $Header: /tcpdump/master/libpcap/pcap-usb-linux.c,v 1.23 2008-04-14 20:40:58 guy Exp $ (LBL)";
|
"@(#) $Header: /tcpdump/master/libpcap/pcap-usb-linux.c,v 1.24 2008-04-14 21:06:09 guy Exp $ (LBL)";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
@ -226,7 +226,7 @@ usb_activate(pcap_t* handle)
|
||||||
handle->fd = open(full_path, O_RDONLY, 0);
|
handle->fd = open(full_path, O_RDONLY, 0);
|
||||||
if (handle->fd >= 0)
|
if (handle->fd >= 0)
|
||||||
{
|
{
|
||||||
if (p->opt.rfmon) {
|
if (handle->opt.rfmon) {
|
||||||
/*
|
/*
|
||||||
* Monitor mode doesn't apply to USB devices.
|
* Monitor mode doesn't apply to USB devices.
|
||||||
*/
|
*/
|
||||||
|
@ -266,7 +266,7 @@ usb_activate(pcap_t* handle)
|
||||||
handle->read_op = usb_read_linux;
|
handle->read_op = usb_read_linux;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (p->opt.rfmon) {
|
if (handle->opt.rfmon) {
|
||||||
/*
|
/*
|
||||||
* Monitor mode doesn't apply to USB devices.
|
* Monitor mode doesn't apply to USB devices.
|
||||||
*/
|
*/
|
||||||
|
|
Reference in New Issue