Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@leoparente
leoparente committed Oct 27, 2023
1 parent 12bad0e commit 4ac8fcd
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 18 deletions.
5 changes: 5 additions & 0 deletions libs/visor_dns/dns.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@

namespace visor::lib::dns {

inline bool isDnsPort(uint16_t port)
{
return pcpp::DnsLayer::isDnsPort(port) || port == 53000;
}

inline std::unique_ptr<pcpp::DnsLayer> createDnsOverTcp(pcpp::TcpLayer *tcpLayer, pcpp::Packet *packet)
{
return std::make_unique<pcpp::DnsLayer>(tcpLayer->getData() + sizeof(pcpp::tcphdr), tcpLayer->getDataLen() - sizeof(pcpp::tcphdr), tcpLayer, packet);
Expand Down
18 changes: 8 additions & 10 deletions src/handlers/dns/v1/DnsStreamHandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,9 @@ void DnsStreamHandler::process_udp_packet_cb(pcpp::Packet &payload, PacketDirect
auto src_port = udpLayer->getSrcPort();
// note we want to capture metrics only when one of the ports is dns,
// but metrics on the port which is _not_ the dns port
if (pcpp::DnsLayer::isDnsPort(dst_port)) {
if (isDnsPort(dst_port)) {
metric_port = src_port;
} else if (pcpp::DnsLayer::isDnsPort(src_port)) {
} else if (isDnsPort(src_port)) {
metric_port = dst_port;
}
if (metric_port) {
Expand Down Expand Up @@ -313,9 +313,9 @@ void DnsStreamHandler::process_tcp_reassembled_packet_cb(pcpp::Packet &payload,
auto src_port = tcpLayer->getSrcPort();
// note we want to capture metrics only when one of the ports is dns,
// but metrics on the port which is _not_ the dns port
if (pcpp::DnsLayer::isDnsPort(dst_port)) {
if (isDnsPort(dst_port)) {
metric_port = src_port;
} else if (pcpp::DnsLayer::isDnsPort(src_port)) {
} else if (isDnsPort(src_port)) {
metric_port = dst_port;
}
if (metric_port) {
Expand Down Expand Up @@ -385,9 +385,9 @@ void DnsStreamHandler::tcp_message_ready_cb(int8_t side, const pcpp::TcpStreamDa
// note we want to capture metrics only when one of the ports is dns,
// but metrics on the port which is _not_ the dns port
uint16_t metric_port{0};
if (pcpp::DnsLayer::isDnsPort(tcpData.getConnectionData().dstPort)) {
if (isDnsPort(tcpData.getConnectionData().dstPort)) {
metric_port = tcpData.getConnectionData().srcPort;
} else if (pcpp::DnsLayer::isDnsPort(tcpData.getConnectionData().srcPort)) {
} else if (isDnsPort(tcpData.getConnectionData().srcPort)) {
metric_port = tcpData.getConnectionData().dstPort;
}
if (metric_port) {
Expand Down Expand Up @@ -445,9 +445,9 @@ void DnsStreamHandler::tcp_connection_start_cb(const pcpp::ConnectionData &conne
// note we want to capture metrics only when one of the ports is dns,
// but metrics on the port which is _not_ the dns port
uint16_t metric_port{0};
if (pcpp::DnsLayer::isDnsPort(connectionData.dstPort)) {
if (isDnsPort(connectionData.dstPort)) {
metric_port = connectionData.srcPort;
} else if (pcpp::DnsLayer::isDnsPort(connectionData.srcPort)) {
} else if (isDnsPort(connectionData.srcPort)) {
metric_port = connectionData.dstPort;
}
if (iter == _tcp_connections.end() && metric_port) {
Expand Down Expand Up @@ -497,7 +497,6 @@ inline void DnsStreamHandler::_register_predicate_filter(Filters filter, std::st
cache.flowKey = flowkey;
cache.timestamp = stamp;
cache.dnsLayer = createDnsOverUdp(udpLayer, &payload);
;
}
auto dnsLayer = cache.dnsLayer.get();
// return the 'jump key' for pcap to make O(1) call to appropriate signals
Expand All @@ -515,7 +514,6 @@ inline void DnsStreamHandler::_register_predicate_filter(Filters filter, std::st
cache.flowKey = flowkey;
cache.timestamp = stamp;
cache.dnsLayer = createDnsOverUdp(udpLayer, &payload);
;
}
auto dnsLayer = cache.dnsLayer.get();
// return the 'jump key' for pcap to make O(1) call to appropriate signals
Expand Down
16 changes: 8 additions & 8 deletions src/handlers/dns/v2/DnsStreamHandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,9 +278,9 @@ void DnsStreamHandler::process_udp_packet_cb(pcpp::Packet &payload, PacketDirect
auto src_port = udpLayer->getSrcPort();
// note we want to capture metrics only when one of the ports is dns,
// but metrics on the port which is _not_ the dns port
if (pcpp::DnsLayer::isDnsPort(dst_port)) {
if (isDnsPort(dst_port)) {
metric_port = src_port;
} else if (pcpp::DnsLayer::isDnsPort(src_port)) {
} else if (isDnsPort(src_port)) {
metric_port = dst_port;
}
if (metric_port) {
Expand Down Expand Up @@ -312,9 +312,9 @@ void DnsStreamHandler::process_tcp_reassembled_packet_cb(pcpp::Packet &payload,
auto src_port = tcpLayer->getSrcPort();
// note we want to capture metrics only when one of the ports is dns,
// but metrics on the port which is _not_ the dns port
if (pcpp::DnsLayer::isDnsPort(dst_port)) {
if (isDnsPort(dst_port)) {
metric_port = src_port;
} else if (pcpp::DnsLayer::isDnsPort(src_port)) {
} else if (isDnsPort(src_port)) {
metric_port = dst_port;
}
if (metric_port) {
Expand Down Expand Up @@ -384,9 +384,9 @@ void DnsStreamHandler::tcp_message_ready_cb(int8_t side, const pcpp::TcpStreamDa
// note we want to capture metrics only when one of the ports is dns,
// but metrics on the port which is _not_ the dns port
uint16_t metric_port{0};
if (pcpp::DnsLayer::isDnsPort(tcpData.getConnectionData().dstPort)) {
if (isDnsPort(tcpData.getConnectionData().dstPort)) {
metric_port = tcpData.getConnectionData().srcPort;
} else if (pcpp::DnsLayer::isDnsPort(tcpData.getConnectionData().srcPort)) {
} else if (isDnsPort(tcpData.getConnectionData().srcPort)) {
metric_port = tcpData.getConnectionData().dstPort;
}
if (metric_port) {
Expand Down Expand Up @@ -444,9 +444,9 @@ void DnsStreamHandler::tcp_connection_start_cb(const pcpp::ConnectionData &conne
// note we want to capture metrics only when one of the ports is dns,
// but metrics on the port which is _not_ the dns port
uint16_t metric_port{0};
if (pcpp::DnsLayer::isDnsPort(connectionData.dstPort)) {
if (isDnsPort(connectionData.dstPort)) {
metric_port = connectionData.srcPort;
} else if (pcpp::DnsLayer::isDnsPort(connectionData.srcPort)) {
} else if (isDnsPort(connectionData.srcPort)) {
metric_port = connectionData.dstPort;
}
if (iter == _tcp_connections.end() && metric_port) {
Expand Down

0 comments on commit 4ac8fcd

Please sign in to comment.