Verified Commit 95303cbc authored by Pavel Doležal's avatar Pavel Doležal

Merge branch 'devel'

parents f2926b51 50400432
Pipeline #73773 passed with stage
in 3 minutes and 19 seconds
cmake_minimum_required(VERSION 3.5)
project("DNS Probe" VERSION 0.7.0)
project("DNS Probe" VERSION 0.7.1)
set(AF_PACKET_BACKEND ON CACHE BOOL "Define backend for packet processing")
set(DPDK_BACKEND OFF CACHE BOOL "Define backend for packet processing")
......
......@@ -167,6 +167,7 @@ bool DDP::DnsTcpConnection::update_connection(DnsRecord& record, const Packet& p
// Received FIN to close connection
if (header->fin) {
m_rtt = m_state == TcpConnectionState::ESTABLISHED ? m_rtt : Time(Time::Clock::MONOTONIC) - m_rtt;
m_state = TcpConnectionState::FIN1;
m_fin[conn_side] = true;
}
......
......@@ -148,7 +148,7 @@ namespace DDP {
friend Time operator-(Time first, const Time& second)
{
if(first.m_timespec.tv_nsec - second.m_timespec.tv_nsec < 0) {
first.m_timespec.tv_sec -= second.m_timespec.tv_sec - 1;
first.m_timespec.tv_sec = first.m_timespec.tv_sec - second.m_timespec.tv_sec - 1;
first.m_timespec.tv_nsec = first.m_timespec.tv_nsec + 1000000000 - second.m_timespec.tv_nsec;
}
else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment