Attachment #201722 for bug #235392

Lines 2-8 Link Here

(-)Makefile (-3 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= recursor	4	PORTNAME= recursor
5	DISTVERSION= 4.1.10	5	DISTVERSION= 4.1.11
6	CATEGORIES= dns ipv6	6	CATEGORIES= dns ipv6
7	MASTER_SITES= http://downloads.powerdns.com/releases/	7	MASTER_SITES= http://downloads.powerdns.com/releases/
8	PKGNAMEPREFIX= powerdns-	8	PKGNAMEPREFIX= powerdns-
Lines 22-29 Link Here
22	LIB_DEPENDS= libboost_context.so:devel/boost-libs \	22	LIB_DEPENDS= libboost_context.so:devel/boost-libs \
23	libprotobuf.so:devel/protobuf	23	libprotobuf.so:devel/protobuf
24		24
25	CONFLICTS_INSTALL= powerdns-recursor40
26
27	USES= compiler:c++11-lib cpe gmake localbase:ldflags pkgconfig ssl tar:bzip2	25	USES= compiler:c++11-lib cpe gmake localbase:ldflags pkgconfig ssl tar:bzip2
28	GNU_CONFIGURE= YES	26	GNU_CONFIGURE= YES
29	CXXFLAGS+= -D_GLIBCXX_USE_C99	27	CXXFLAGS+= -D_GLIBCXX_USE_C99

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1548341968	1	TIMESTAMP = 1549022270
2	SHA256 (pdns-recursor-4.1.10.tar.bz2) = f22dc09dae32fbf394a80831f7e7a2fde2e5a2a5ac572e134de9935629817f01	2	SHA256 (pdns-recursor-4.1.11.tar.bz2) = 9ec7d52b545d3ea4498b17ea5433a686aa0d82e882608dcdcea9a116a3f4d670
3	SIZE (pdns-recursor-4.1.10.tar.bz2) = 1238148	3	SIZE (pdns-recursor-4.1.11.tar.bz2) = 1239986

Lines 1-4 Link Here

(-)files/patch-dnsname.hh (-2 / +2 lines)
1	--- dnsname.hh.orig 2017-01-17 03:18:41 UTC	1	--- dnsname.hh.orig 2019-01-31 19:43:44 UTC
2	+++ dnsname.hh	2	+++ dnsname.hh
3	@@ -30,7 +30,7 @@	3	@@ -30,7 +30,7 @@
4	#include <boost/version.hpp>	4	#include <boost/version.hpp>
Lines 9-15 Link Here
9	#include <boost/container/string.hpp>	9	#include <boost/container/string.hpp>
10	#endif	10	#endif
11		11
12	@@ -133,7 +133,7 @@ public:	12	@@ -135,7 +135,7 @@ class DNSName (public)
13	inline bool canonCompare(const DNSName& rhs) const;	13	inline bool canonCompare(const DNSName& rhs) const;
14	bool slowCanonCompare(const DNSName& rhs) const;	14	bool slowCanonCompare(const DNSName& rhs) const;
15		15




$OpenBSD: patch-rec_channel_cc,v 1.1.1.1 2018/12/29 14:29:08 sthen Exp $

Index: rec_channel.cc
--- rec_channel.cc.orig	2019-01-31 19:43:44 UTC
+++ rec_channel.cc
@@ -54,6 +54,10 @@ int RecursorControlChannel::listen(const string& fname
   if(bind(d_fd, (sockaddr*)&d_local,sizeof(d_local))<0) 
     throw PDNSException("Unable to bind to controlsocket '"+fname+"': "+stringerror());
 
+  int bufsz = 60*1024;
+  setsockopt(d_fd, SOL_SOCKET, SO_SNDBUF, &bufsz, sizeof(bufsz));
+  bufsz = 64*1024;
+  setsockopt(d_fd, SOL_SOCKET, SO_RCVBUF, &bufsz, sizeof(bufsz));
   return d_fd;
 }
 
@@ -99,6 +103,10 @@ void RecursorControlChannel::connect(const string& pat
 	unlink(d_local.sun_path);
       throw PDNSException("Unable to connect to remote '"+string(remote.sun_path)+"': "+stringerror());
     }
+    int bufsz = 60*1024;
+    setsockopt(d_fd, SOL_SOCKET, SO_SNDBUF, &bufsz, sizeof(bufsz));
+    bufsz = 64*1024;
+    setsockopt(d_fd, SOL_SOCKET, SO_RCVBUF, &bufsz, sizeof(bufsz));
 
   } catch (...) {
     close(d_fd);

Return to bug 235392

Line 0 Link Here

(-)files/patch-rec__channel.cc (+27 lines)
	1	$OpenBSD: patch-rec_channel_cc,v 1.1.1.1 2018/12/29 14:29:08 sthen Exp $
	2
	3	Index: rec_channel.cc
	4	--- rec_channel.cc.orig 2019-01-31 19:43:44 UTC
	5	+++ rec_channel.cc
	6	@@ -54,6 +54,10 @@ int RecursorControlChannel::listen(const string& fname
	7	if(bind(d_fd, (sockaddr*)&d_local,sizeof(d_local))<0)
	8	throw PDNSException("Unable to bind to controlsocket '"+fname+"': "+stringerror());
	9
	10	+ int bufsz = 60*1024;
	11	+ setsockopt(d_fd, SOL_SOCKET, SO_SNDBUF, &bufsz, sizeof(bufsz));
	12	+ bufsz = 64*1024;
	13	+ setsockopt(d_fd, SOL_SOCKET, SO_RCVBUF, &bufsz, sizeof(bufsz));
	14	return d_fd;
	15	}
	16
	17	@@ -99,6 +103,10 @@ void RecursorControlChannel::connect(const string& pat
	18	unlink(d_local.sun_path);
	19	throw PDNSException("Unable to connect to remote '"+string(remote.sun_path)+"': "+stringerror());
	20	}
	21	+ int bufsz = 60*1024;
	22	+ setsockopt(d_fd, SOL_SOCKET, SO_SNDBUF, &bufsz, sizeof(bufsz));
	23	+ bufsz = 64*1024;
	24	+ setsockopt(d_fd, SOL_SOCKET, SO_RCVBUF, &bufsz, sizeof(bufsz));
	25
	26	} catch (...) {
	27	close(d_fd);