1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
$NetBSD: patch-pdns_tcpreceiver.cc,v 1.3 2015/03/27 23:37:52 rodent Exp $
Resolve boost symbol ambiguity.
--- pdns/tcpreceiver.cc.orig 2015-03-02 13:17:13.000000000 +0000
+++ pdns/tcpreceiver.cc
@@ -173,7 +173,7 @@ void connectWithTimeout(int fd, struct s
;
}
-void TCPNameserver::sendPacket(shared_ptr<DNSPacket> p, int outsock)
+void TCPNameserver::sendPacket(boost::shared_ptr<DNSPacket> p, int outsock)
{
/* Query statistics */
@@ -203,7 +203,7 @@ catch(NetworkError& ae) {
throw NetworkError("Error reading DNS data from TCP client "+remote.toString()+": "+ae.what());
}
-static void proxyQuestion(shared_ptr<DNSPacket> packet)
+static void proxyQuestion(boost::shared_ptr<DNSPacket> packet)
{
int sock=socket(AF_INET, SOCK_STREAM, 0);
@@ -247,7 +247,7 @@ static void proxyQuestion(shared_ptr<DNS
void *TCPNameserver::doConnection(void *data)
{
- shared_ptr<DNSPacket> packet;
+ boost::shared_ptr<DNSPacket> packet;
// Fix gcc-4.0 error (on AMD64)
int fd=(int)(long)data; // gotta love C (generates a harmless warning on opteron)
pthread_detach(pthread_self());
@@ -286,7 +286,7 @@ void *TCPNameserver::doConnection(void *
getQuestion(fd, mesg, pktlen, remote);
S.inc("tcp-queries");
- packet=shared_ptr<DNSPacket>(new DNSPacket);
+ packet=boost::shared_ptr<DNSPacket>(new DNSPacket);
packet->setRemote(&remote);
packet->d_tcp=true;
packet->setSocket(fd);
@@ -305,8 +305,8 @@ void *TCPNameserver::doConnection(void *
continue;
}
- shared_ptr<DNSPacket> reply;
- shared_ptr<DNSPacket> cached= shared_ptr<DNSPacket>(new DNSPacket);
+ boost::shared_ptr<DNSPacket> reply;
+ boost::shared_ptr<DNSPacket> cached= boost::shared_ptr<DNSPacket>(new DNSPacket);
if(logDNSQueries) {
string remote;
if(packet->hasEDNSSubnet())
@@ -340,7 +340,7 @@ void *TCPNameserver::doConnection(void *
}
bool shouldRecurse;
- reply=shared_ptr<DNSPacket>(s_P->questionOrRecurse(packet.get(), &shouldRecurse)); // we really need to ask the backend :-)
+ reply=boost::shared_ptr<DNSPacket>(s_P->questionOrRecurse(packet.get(), &shouldRecurse)); // we really need to ask the backend :-)
if(shouldRecurse) {
proxyQuestion(packet);
@@ -387,7 +387,7 @@ void *TCPNameserver::doConnection(void *
// call this method with s_plock held!
-bool TCPNameserver::canDoAXFR(shared_ptr<DNSPacket> q)
+bool TCPNameserver::canDoAXFR(boost::shared_ptr<DNSPacket> q)
{
if(::arg().mustDo("disable-axfr"))
return false;
@@ -498,9 +498,9 @@ namespace {
return soa;
}
- shared_ptr<DNSPacket> getFreshAXFRPacket(shared_ptr<DNSPacket> q)
+ boost::shared_ptr<DNSPacket> getFreshAXFRPacket(boost::shared_ptr<DNSPacket> q)
{
- shared_ptr<DNSPacket> ret = shared_ptr<DNSPacket>(q->replyPacket());
+ boost::shared_ptr<DNSPacket> ret = boost::shared_ptr<DNSPacket>(q->replyPacket());
ret->setCompress(false);
ret->d_dnssecOk=false; // RFC 5936, 2.2.5
ret->d_tcp = true;
@@ -510,7 +510,7 @@ namespace {
/** do the actual zone transfer. Return 0 in case of error, 1 in case of success */
-int TCPNameserver::doAXFR(const string &target, shared_ptr<DNSPacket> q, int outsock)
+int TCPNameserver::doAXFR(const string &target, boost::shared_ptr<DNSPacket> q, int outsock)
{
bool noAXFRBecauseOfNSEC3Narrow=false;
NSEC3PARAMRecordContent ns3pr;
@@ -530,7 +530,7 @@ int TCPNameserver::doAXFR(const string &
}
}
- shared_ptr<DNSPacket> outpacket= getFreshAXFRPacket(q);
+ boost::shared_ptr<DNSPacket> outpacket= getFreshAXFRPacket(q);
if(q->d_dnssecOk)
outpacket->d_dnssecOk=true; // RFC 5936, 2.2.5 'SHOULD'
@@ -926,9 +926,9 @@ int TCPNameserver::doAXFR(const string &
return 1;
}
-int TCPNameserver::doIXFR(shared_ptr<DNSPacket> q, int outsock)
+int TCPNameserver::doIXFR(boost::shared_ptr<DNSPacket> q, int outsock)
{
- shared_ptr<DNSPacket> outpacket=getFreshAXFRPacket(q);
+ boost::shared_ptr<DNSPacket> outpacket=getFreshAXFRPacket(q);
if(q->d_dnssecOk)
outpacket->d_dnssecOk=true; // RFC 5936, 2.2.5 'SHOULD'
|
