11493824233

Committed 24 Oct 2024 06:26AM UTC coverage: 66.368% (-0.01%) from 66.379%

Build # 11493824233

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #14773 from omoerbeek/backport-14628-to-rec-5.1.x

rec: Backport 14628 to rec 5.1.x: rec: avoid duplicated waiter ids for chained requests

Run Details

16624 of 35010 branches covered (47.48%)

Branch coverage included in aggregate %.

5 of 5 new or added lines in 2 files covered. (100.0%)

6526 existing lines in 95 files now uncovered.

56873 of 75732 relevant lines covered (75.1%)

4732786.95 hits per line

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

100.0

/pdns/zoneparser-tng.hh

/*
 * 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.
 */
#pragma once
#include <string>
#include <cstdio>
#include <stdexcept>
#include <stack>
#include <deque>

#include "namespaces.hh"

class ZoneParserTNG
{
public:
  ZoneParserTNG(const string& fname, DNSName  zname=g_rootdnsname, string  reldir="", bool upgradeContent=false);
  ZoneParserTNG(const vector<string>& zonedata, DNSName  zname, bool upgradeContent=false);

  ~ZoneParserTNG();
  bool get(DNSResourceRecord& rr, std::string* comment=0);
  typedef runtime_error exception;
  typedef std::deque<pair<string::size_type, string::size_type> > parts_t;
  DNSName getZoneName();
  string getLineOfFile(); // for error reporting purposes
  pair<string,int> getLineNumAndFile(); // idem
  void disableGenerate()
  {
    d_generateEnabled = false;
  }
  void setMaxGenerateSteps(size_t max)
  {
    d_maxGenerateSteps = max;
  }
  void setMaxIncludes(size_t max)
  {
    d_maxIncludes = max;
  }
private:
  bool getLine();
  bool getTemplateLine();
  void stackFile(const std::string& fname);
  unsigned makeTTLFromZone(const std::string& str);

  struct filestate {
    filestate(FILE* fp, string filename) : d_fp(fp), d_filename(std::move(filename)), d_lineno(0){}
    FILE *d_fp;
    string d_filename;
    int d_lineno;
  };

  parts_t d_parts;
  string d_reldir;
  string d_line;
  DNSName d_prevqname;
  DNSName d_zonename;
  string d_templateline;
  vector<string> d_zonedata;
  vector<string>::iterator d_zonedataline;
  std::stack<filestate> d_filestates;
  parts_t d_templateparts;
  size_t d_maxGenerateSteps{0};
  size_t d_maxIncludes{20};
  int d_defaultttl;
  uint32_t d_templatecounter, d_templatestop, d_templatestep;
  bool d_havedollarttl;
  bool d_fromfile;
  bool d_generateEnabled{true};
  bool d_upgradeContent;
  bool d_templateCounterWrapped{false};
};

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	#pragma once
23	#include <string>
24	#include <cstdio>
25	#include <stdexcept>
26	#include <stack>
27	#include <deque>
28
29	#include "namespaces.hh"
30
31	class ZoneParserTNG
32	{
33	public:
34	ZoneParserTNG(const string& fname, DNSName zname=g_rootdnsname, string reldir="", bool upgradeContent=false);
35	ZoneParserTNG(const vector<string>& zonedata, DNSName zname, bool upgradeContent=false);
36
37	~ZoneParserTNG();
38	bool get(DNSResourceRecord& rr, std::string* comment=0);
39	typedef runtime_error exception;
40	typedef std::deque<pair<string::size_type, string::size_type> > parts_t;
41	DNSName getZoneName();
42	string getLineOfFile(); // for error reporting purposes
43	pair<string,int> getLineNumAndFile(); // idem
44	void disableGenerate()
UNCOV 45	{	1✔
UNCOV 46	d_generateEnabled = false;	1✔
UNCOV 47	}	1✔
48	void setMaxGenerateSteps(size_t max)
49	{	419✔
50	d_maxGenerateSteps = max;	419✔
51	}	419✔
52	void setMaxIncludes(size_t max)
53	{	419✔
54	d_maxIncludes = max;	419✔
55	}	419✔
56	private:
57	bool getLine();
58	bool getTemplateLine();
59	void stackFile(const std::string& fname);
60	unsigned makeTTLFromZone(const std::string& str);
61
62	struct filestate {
63	filestate(FILE* fp, string filename) : d_fp(fp), d_filename(std::move(filename)), d_lineno(0){}	392✔
64	FILE *d_fp;
65	string d_filename;
66	int d_lineno;
67	};
68
69	parts_t d_parts;
70	string d_reldir;
71	string d_line;
72	DNSName d_prevqname;
73	DNSName d_zonename;
74	string d_templateline;
75	vector<string> d_zonedata;
76	vector<string>::iterator d_zonedataline;
77	std::stack<filestate> d_filestates;
78	parts_t d_templateparts;
79	size_t d_maxGenerateSteps{0};
80	size_t d_maxIncludes{20};
81	int d_defaultttl;
82	uint32_t d_templatecounter, d_templatestop, d_templatestep;
83	bool d_havedollarttl;
84	bool d_fromfile;
85	bool d_generateEnabled{true};
86	bool d_upgradeContent;
87	bool d_templateCounterWrapped{false};
88	};

PowerDNS / pdns / 11493824233

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