9641653210

Committed 24 Jun 2024 07:54AM UTC coverage: 64.668% (-0.005%) from 64.673%

Build # 9641653210

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #14373 from omoerbeek/rec-dns64-double-soa

rec: don't send double SOA record in the case of a dns64 CNAME that does not resolve

Run Details

37195 of 88268 branches covered (42.14%)

Branch coverage included in aggregate %.

16 of 16 new or added lines in 1 file covered. (100.0%)

42 existing lines in 12 files now uncovered.

124675 of 162040 relevant lines covered (76.94%)

4842731.93 hits per line

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

72.94

/pdns/recursordist/sortlist.cc

#include "sortlist.hh"
#include "dnsrecords.hh"

void SortList::clear()
{
  d_sortlist.clear();
}

int SortList::getMaxOrder(const Netmask& formask) const
{
  int order = 0;

  const auto* place = d_sortlist.lookup(formask);
  if (place != nullptr && place->first == formask) {
    for (const auto& node_order : place->second.d_orders) {
      order = std::max(order, node_order.second);
    }
  }

  return order;
}

void SortList::addEntry(const Netmask& covers, const Netmask& answermask, int order)
{
  if (order < 0) {
    order = getMaxOrder(covers);
    ++order;
  }
  //  cout<<"Adding for netmask "<<formask.toString()<<" the order instruction that "<<valmask.toString()<<" is order "<<order<<endl;
  d_sortlist.insert(covers).second.d_orders.insert(answermask).second = order;
}

std::unique_ptr<SortListOrderCmp> SortList::getOrderCmp(const ComboAddress& who) const
{
  if (!d_sortlist.match(who)) {
    return {};
  }
  const auto* fnd = d_sortlist.lookup(who);
  //  cerr<<"Returning sort order for "<<who.toString()<<", have "<<fnd->second.d_orders.size()<<" entries"<<endl;
  return make_unique<SortListOrderCmp>(fnd->second);
}

// call this with **stable_sort**
bool SortListOrderCmp::operator()(const DNSRecord& lhs, const DNSRecord& rhs) const
{
  bool aAddr = (lhs.d_type == QType::A || lhs.d_type == QType::AAAA);
  bool bAddr = (rhs.d_type == QType::A || rhs.d_type == QType::AAAA);

  // anything address related is always 'larger', rest is equal
  if (aAddr && !bAddr) {
    return false;
  }
  if (!aAddr && bAddr) {
    return true;
  }
  if (!aAddr && !bAddr) {
    return false;
  }

  int aOrder = std::numeric_limits<int>::max();
  int bOrder = aOrder;

  ComboAddress laddr = getAddr(lhs);
  ComboAddress raddr = getAddr(rhs);

  if (d_slo.d_orders.match(laddr)) {
    aOrder = d_slo.d_orders.lookup(laddr)->second;
  }
  if (d_slo.d_orders.match(raddr)) {
    bOrder = d_slo.d_orders.lookup(raddr)->second;
  }
  return aOrder < bOrder;
}

1	#include "sortlist.hh"
2	#include "dnsrecords.hh"
3
4	void SortList::clear()
5	{	×
6	d_sortlist.clear();	×
7	}	×
8
9	int SortList::getMaxOrder(const Netmask& formask) const
10	{	1✔
11	int order = 0;	1✔
12
13	const auto* place = d_sortlist.lookup(formask);	1✔
14	if (place != nullptr && place->first == formask) {	1!
15	for (const auto& node_order : place->second.d_orders) {	×
16	order = std::max(order, node_order.second);	×
17	}	×
18	}	×
19
20	return order;	1✔
21	}	1✔
22
23	void SortList::addEntry(const Netmask& covers, const Netmask& answermask, int order)
24	{	8✔
25	if (order < 0) {	8!
26	order = getMaxOrder(covers);	×
27	++order;	×
28	}	×
29	// cout<<"Adding for netmask "<<formask.toString()<<" the order instruction that "<<valmask.toString()<<" is order "<<order<<endl;
30	d_sortlist.insert(covers).second.d_orders.insert(answermask).second = order;	8✔
31	}	8✔
32
33	std::unique_ptr<SortListOrderCmp> SortList::getOrderCmp(const ComboAddress& who) const
34	{	2,055✔
35	if (!d_sortlist.match(who)) {	2,055✔
36	return {};	2,054✔
37	}	2,054✔
38	const auto* fnd = d_sortlist.lookup(who);	1✔
39	// cerr<<"Returning sort order for "<<who.toString()<<", have "<<fnd->second.d_orders.size()<<" entries"<<endl;
40	return make_unique<SortListOrderCmp>(fnd->second);	1✔
41	}	2,055✔
42
43	// call this with stable_sort
44	bool SortListOrderCmp::operator()(const DNSRecord& lhs, const DNSRecord& rhs) const
45	{	8✔
46	bool aAddr = (lhs.d_type == QType::A \|\| lhs.d_type == QType::AAAA);	8!
47	bool bAddr = (rhs.d_type == QType::A \|\| rhs.d_type == QType::AAAA);	8!
48
49	// anything address related is always 'larger', rest is equal
50	if (aAddr && !bAddr) {	8✔
51	return false;	4✔
52	}	4✔
53	if (!aAddr && bAddr) {	4!
UNCOV 54	return true;	×
UNCOV 55	}	×
56	if (!aAddr && !bAddr) {	4!
57	return false;	2✔
58	}	2✔
59
60	int aOrder = std::numeric_limits<int>::max();	2✔
61	int bOrder = aOrder;	2✔
62
63	ComboAddress laddr = getAddr(lhs);	2✔
64	ComboAddress raddr = getAddr(rhs);	2✔
65
66	if (d_slo.d_orders.match(laddr)) {	2!
67	aOrder = d_slo.d_orders.lookup(laddr)->second;	2✔
68	}	2✔
69	if (d_slo.d_orders.match(raddr)) {	2✔
70	bOrder = d_slo.d_orders.lookup(raddr)->second;	1✔
71	}	1✔
72	return aOrder < bOrder;	2✔
73	}	4✔

PowerDNS / pdns / 9641653210

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