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

Replaced calls to PDU::rfind_pdu to find_pdu on TCPStreamFollower.

Browse Source
This commit is contained in:
Matias Fontanini
2014-11-13 22:07:31 -08:00
parent 3b126ca02b
commit 3d832cc48e
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/tins/tcp_stream.h
View File

@@ -340,29 +340,32 @@ void TCPStreamFollower::follow_streams(ForwardIterator start, ForwardIterator en
template<typename DataFunctor, typename EndFunctor> template<typename DataFunctor, typename EndFunctor>
bool TCPStreamFollower::callback(PDU &pdu, const DataFunctor &data_fun, const EndFunctor &end_fun) { bool TCPStreamFollower::callback(PDU &pdu, const DataFunctor &data_fun, const EndFunctor &end_fun) {
IP &ip = pdu.rfind_pdu<IP>(); IP *ip = pdu.find_pdu<IP>();
TCP &tcp = pdu.rfind_pdu<TCP>(); TCP *tcp = pdu.find_pdu<TCP>();
if(!ip || !tcp) {
return true;
}
TCPStream::StreamInfo info( TCPStream::StreamInfo info(
ip.src_addr(), ip.dst_addr(), ip->src_addr(), ip->dst_addr(),
tcp.sport(), tcp.dport() tcp->sport(), tcp->dport()
); );
sessions_type::iterator it = sessions.find(info); sessions_type::iterator it = sessions.find(info);
if(it == sessions.end()) { if(it == sessions.end()) {
std::swap(info.client_addr, info.server_addr); std::swap(info.client_addr, info.server_addr);
std::swap(info.client_port, info.server_port); std::swap(info.client_port, info.server_port);
if((it = sessions.find(info)) == sessions.end()) { if((it = sessions.find(info)) == sessions.end()) {
if(tcp.get_flag(TCP::SYN) && !tcp.get_flag(TCP::ACK)) { if(tcp->get_flag(TCP::SYN) && !tcp->get_flag(TCP::ACK)) {
sessions.insert( sessions.insert(
std::make_pair( std::make_pair(
info, info,
TCPStream(&ip, &tcp, last_identifier++) TCPStream(ip, tcp, last_identifier++)
) )
); );
} }
return true; return true;
} }
} }
if(it->second.update(&ip, &tcp)) if(it->second.update(ip, tcp))
data_fun(it->second); data_fun(it->second);
// We're done with this stream // We're done with this stream
if(it->second.is_finished()) { if(it->second.is_finished()) {