3rd-party/libtins
1
0
Fork 0
mirror of https://github.com/mfontanini/libtins synced 2026-01-23 02:35:57 +01:00
Code Issues Releases Wiki Activity

TCPStreamFollower now doesn't clear its state each time follow_streams is called.

Browse Source
This commit is contained in:
Matias Fontanini
2014-04-07 11:29:09 -03:00
parent f05840b9e9
commit cd2b9aab98
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/tcp_stream.h
View File

@@ -300,11 +300,6 @@ private:
EndFunctor end_fun;
};
void clear_state() {
sessions.clear();
last_identifier = 0;
}
template<typename DataFunctor, typename EndFunctor>
bool callback(PDU &pdu, const DataFunctor &fun, const EndFunctor &end_fun);
static void dummy_function(TCPStream&) { }
@@ -317,7 +312,6 @@ template<typename DataFunctor, typename EndFunctor>
void TCPStreamFollower::follow_streams(BaseSniffer &sniffer, DataFunctor data_fun, EndFunctor end_fun) {
typedef proxy_caller<DataFunctor, EndFunctor> proxy_type;
proxy_type proxy = { this, data_fun, end_fun };
clear_state();
sniffer.sniff_loop(make_sniffer_handler(&proxy, &proxy_type::callback));
}
@@ -325,7 +319,6 @@ template<typename ForwardIterator, typename DataFunctor, typename EndFunctor>
void TCPStreamFollower::follow_streams(ForwardIterator start, ForwardIterator end,
DataFunctor data_fun, EndFunctor end_fun)
{
clear_state();
while(start != end) {
if(!callback(Utils::dereference_until_pdu(start), data_fun, end_fun))
return;

2
src/sniffer.cpp
View File

@@ -199,7 +199,7 @@ Sniffer::Sniffer(const std::string &device, promisc_type promisc,
void Sniffer::init_sniffer(const std::string &device, unsigned max_packet_size,
bool promisc, const std::string &filter)
{
char error[PCAP_ERRBUF_SIZE];
char error[PCAP_ERRBUF_SIZE];
bpf_u_int32 ip, if_mask;
if (pcap_lookupnet(device.c_str(), &ip, &if_mask, error) == -1) {
ip = 0;