11215819689

Committed 07 Oct 2024 12:46PM UTC coverage: 64.71% (-0.05%) from 64.761%

Build # 11215819689

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #14506 from omoerbeek/rec-allow_notify

rec: notify_allowed should be processed for forward_zones and forward_zones_recurse

Run Details

37104 of 88064 branches covered (42.13%)

Branch coverage included in aggregate %.

5 of 9 new or added lines in 1 file covered. (55.56%)

142 existing lines in 15 files now uncovered.

125021 of 162477 relevant lines covered (76.95%)

4690956.0 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

50.79

/pdns/recursordist/rec-tcpout.cc

/*
 * This file is part of PowerDNS or dnsdist.
 * Copyright -- PowerDNS.COM B.V. and its contributors
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of version 2 of the GNU General Public License as
 * published by the Free Software Foundation.
 *
 * In addition, for the avoidance of any doubt, permission is granted to
 * link this program with OpenSSL and to (re)distribute the binaries
 * produced as the result of such linking.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */

#include "rec-tcpout.hh"

// This line from /usr/include/openssl/ssl2.h: # define CERT char
// throws dnsrecords.hh off the rails.
#undef CERT

#include "syncres.hh"

timeval TCPOutConnectionManager::s_maxIdleTime;
size_t TCPOutConnectionManager::s_maxQueries;
size_t TCPOutConnectionManager::s_maxIdlePerAuth;
size_t TCPOutConnectionManager::s_maxIdlePerThread;

void TCPOutConnectionManager::cleanup(const struct timeval& now)
{
  if (s_maxIdleTime.tv_sec == 0 && s_maxIdleTime.tv_usec == 0) {
    // no maximum idle time
    return;
  }

  for (auto it = d_idle_connections.begin(); it != d_idle_connections.end();) {
    timeval idle = now - it->second.d_last_used;
    if (s_maxIdleTime < idle) {
      it = d_idle_connections.erase(it);
    }
    else {
      ++it;
    }
  }
}

void TCPOutConnectionManager::store(const struct timeval& now, const ComboAddress& ip, Connection&& connection)
{
  ++connection.d_numqueries;
  if (s_maxQueries > 0 && connection.d_numqueries >= s_maxQueries) {
    return;
  }

  if (d_idle_connections.size() >= s_maxIdlePerThread || d_idle_connections.count(ip) >= s_maxIdlePerAuth) {
    cleanup(now);
  }

  if (d_idle_connections.size() >= s_maxIdlePerThread) {
    return;
  }
  if (d_idle_connections.count(ip) >= s_maxIdlePerAuth) {
    return;
  }

  gettimeofday(&connection.d_last_used, nullptr);
  d_idle_connections.emplace(ip, std::move(connection));
}

TCPOutConnectionManager::Connection TCPOutConnectionManager::get(const ComboAddress& ip)
{
  if (d_idle_connections.count(ip) > 0) {
    auto h = d_idle_connections.extract(ip);
    return h.mapped();
  }
  return Connection{};
}

uint64_t getCurrentIdleTCPConnections()
{
  return broadcastAccFunction<uint64_t>([] { return t_tcp_manager.getSize(); });
}

1	/*
2	* This file is part of PowerDNS or dnsdist.
3	* Copyright -- PowerDNS.COM B.V. and its contributors
4	*
5	* This program is free software; you can redistribute it and/or modify
6	* it under the terms of version 2 of the GNU General Public License as
7	* published by the Free Software Foundation.
8	*
9	* In addition, for the avoidance of any doubt, permission is granted to
10	* link this program with OpenSSL and to (re)distribute the binaries
11	* produced as the result of such linking.
12	*
13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.
17	*
18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software
20	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
21	*/
22
23	#include "rec-tcpout.hh"
24
25	// This line from /usr/include/openssl/ssl2.h: # define CERT char
26	// throws dnsrecords.hh off the rails.
27	#undef CERT
28
29	#include "syncres.hh"
30
31	timeval TCPOutConnectionManager::s_maxIdleTime;
32	size_t TCPOutConnectionManager::s_maxQueries;
33	size_t TCPOutConnectionManager::s_maxIdlePerAuth;
34	size_t TCPOutConnectionManager::s_maxIdlePerThread;
35
36	void TCPOutConnectionManager::cleanup(const struct timeval& now)
37	{	773✔
38	if (s_maxIdleTime.tv_sec == 0 && s_maxIdleTime.tv_usec == 0) {	773!
39	// no maximum idle time
40	return;	×
41	}	×
42
43	for (auto it = d_idle_connections.begin(); it != d_idle_connections.end();) {	773!
UNCOV 44	timeval idle = now - it->second.d_last_used;	×
UNCOV 45	if (s_maxIdleTime < idle) {	×
46	it = d_idle_connections.erase(it);	×
47	}	×
UNCOV 48	else {	×
UNCOV 49	++it;	×
UNCOV 50	}	×
UNCOV 51	}	×
52	}	773✔
53
54	void TCPOutConnectionManager::store(const struct timeval& now, const ComboAddress& ip, Connection&& connection)
55	{	11✔
56	++connection.d_numqueries;	11✔
57	if (s_maxQueries > 0 && connection.d_numqueries >= s_maxQueries) {	11!
58	return;	×
59	}	×
60
61	if (d_idle_connections.size() >= s_maxIdlePerThread \|\| d_idle_connections.count(ip) >= s_maxIdlePerAuth) {	11!
62	cleanup(now);	×
63	}	×
64
65	if (d_idle_connections.size() >= s_maxIdlePerThread) {	11!
66	return;	×
67	}	×
68	if (d_idle_connections.count(ip) >= s_maxIdlePerAuth) {	11!
69	return;	×
70	}	×
71
72	gettimeofday(&connection.d_last_used, nullptr);	11✔
73	d_idle_connections.emplace(ip, std::move(connection));	11✔
74	}	11✔
75
76	TCPOutConnectionManager::Connection TCPOutConnectionManager::get(const ComboAddress& ip)
77	{	11✔
78	if (d_idle_connections.count(ip) > 0) {	11✔
79	auto h = d_idle_connections.extract(ip);	4✔
80	return h.mapped();	4✔
81	}	4✔
82	return Connection{};	7✔
83	}	11✔
84
85	uint64_t getCurrentIdleTCPConnections()
86	{	155✔
87	return broadcastAccFunction<uint64_t>([] { return t_tcp_manager.getSize(); });	854✔
88	}	155✔

PowerDNS / pdns / 11215819689

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous