upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix for unbound-control on Windows and set TCP socket parameters

Browse source 
more closely.


git-svn-id: file:///svn/unbound/trunk@4743 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2018-06-19 09:40:59 +00:00
parent b26257248d
commit 7b092127cb
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/Changelog
View file

@ -1,3 +1,7 @@
19 June 2018: Wouter
- Fix for unbound-control on Windows and set TCP socket parameters
more closely.
18 June 2018: Wouter 18 June 2018: Wouter
- Fix that control-use-cert: no works for 127.0.0.1 to disable certs. - Fix that control-use-cert: no works for 127.0.0.1 to disable certs.
This fix is part of 1.7.3rc2. This fix is part of 1.7.3rc2.

7
smallapp/unbound-control.c
View file

@ -489,7 +489,7 @@ contact_server(const char* svr, struct config_file* cfg, int statuscmd)
{ {
struct sockaddr_storage addr; struct sockaddr_storage addr;
socklen_t addrlen; socklen_t addrlen;
int addrfamily = 0; int addrfamily = 0, proto = IPPROTO_TCP;
int fd, useport = 1; int fd, useport = 1;
/* use svr or the first config entry */ /* use svr or the first config entry */
if(!svr) { if(!svr) {
@ -523,6 +523,7 @@ contact_server(const char* svr, struct config_file* cfg, int statuscmd)
addrlen = (socklen_t)sizeof(struct sockaddr_un); addrlen = (socklen_t)sizeof(struct sockaddr_un);
addrfamily = AF_LOCAL; addrfamily = AF_LOCAL;
useport = 0; useport = 0;
proto = 0;
#endif #endif
} else { } else {
if(!ipstrtoaddr(svr, cfg->control_port, &addr, &addrlen)) if(!ipstrtoaddr(svr, cfg->control_port, &addr, &addrlen))
@ -530,8 +531,8 @@ contact_server(const char* svr, struct config_file* cfg, int statuscmd)
} }
if(addrfamily == 0) if(addrfamily == 0)
addrfamily = addr_is_ip6(&addr, addrlen)?AF_INET6:AF_INET; addrfamily = addr_is_ip6(&addr, addrlen)?PF_INET6:PF_INET;
fd = socket(addrfamily, SOCK_STREAM, 0); fd = socket(addrfamily, SOCK_STREAM, proto);
if(fd == -1) { if(fd == -1) {
#ifndef USE_WINSOCK #ifndef USE_WINSOCK
fatal_exit("socket: %s", strerror(errno)); fatal_exit("socket: %s", strerror(errno));