3rd-party/libtins
1
0
Fork 0
mirror of https://github.com/mfontanini/libtins synced 2026-01-26 12:01:34 +01:00
Code Issues Releases Wiki Activity

Add overload of Sniffer ctor taking only the device

Browse Source
This commit is contained in:
Matias Fontanini
2017-05-20 13:43:16 -07:00
parent 76395370de
commit 1da2c1dcdc
2 changed files with 21 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/sniffer.cpp
View File

@@ -232,30 +232,12 @@ bool BaseSniffer::set_direction(pcap_direction_t d) {
// ****************************** Sniffer ******************************
Sniffer::Sniffer(const string& device) {
init(device, SnifferConfiguration());
}
Sniffer::Sniffer(const string& device, const SnifferConfiguration& configuration) {
char error[PCAP_ERRBUF_SIZE];
pcap_t* phandle = pcap_create(TINS_PREFIX_INTERFACE(device).c_str(), error);
if (!phandle) {
throw pcap_error(error);
}
set_pcap_handle(phandle);
// Set the netmask if we are able to find it.
bpf_u_int32 ip, if_mask;
if (pcap_lookupnet(TINS_PREFIX_INTERFACE(device).c_str(), &ip, &if_mask, error) == 0) {
set_if_mask(if_mask);
}
// Configure the sniffer's attributes prior to activation.
configuration.configure_sniffer_pre_activation(*this);
// Finally, activate the pcap. In case of error, throw
if (pcap_activate(get_pcap_handle()) < 0) {
throw pcap_error(pcap_geterr(get_pcap_handle()));
}
// Configure the sniffer's attributes after activation.
configuration.configure_sniffer_post_activation(*this);
init(device, configuration);
}
Sniffer::Sniffer(const string& device,
@@ -269,29 +251,7 @@ Sniffer::Sniffer(const string& device,
configuration.set_filter(filter);
configuration.set_rfmon(rfmon);
char error[PCAP_ERRBUF_SIZE];
pcap_t* phandle = pcap_create(TINS_PREFIX_INTERFACE(device).c_str(), error);
if (!phandle) {
throw pcap_error(error);
}
set_pcap_handle(phandle);
// Set the netmask if we are able to find it.
bpf_u_int32 ip, if_mask;
if (pcap_lookupnet(TINS_PREFIX_INTERFACE(device).c_str(), &ip, &if_mask, error) == 0) {
set_if_mask(if_mask);
}
// Configure the sniffer's attributes prior to activation.
configuration.configure_sniffer_pre_activation(*this);
// Finally, activate the pcap. In case of error, throw
if (pcap_activate(get_pcap_handle()) < 0) {
throw pcap_error(pcap_geterr(get_pcap_handle()));
}
// Configure the sniffer's attributes after activation.
configuration.configure_sniffer_post_activation(*this);
init(device, configuration);
}
Sniffer::Sniffer(const string& device,
@@ -303,6 +263,10 @@ Sniffer::Sniffer(const string& device,
configuration.set_filter(filter);
configuration.set_rfmon(rfmon);
init(device, configuration);
}
void Sniffer::init(const string& device, const SnifferConfiguration& configuration) {
char error[PCAP_ERRBUF_SIZE];
pcap_t* phandle = pcap_create(TINS_PREFIX_INTERFACE(device).c_str(), error);
if (!phandle) {