mirror of
https://github.com/NLnetLabs/unbound.git
synced 2026-01-04 13:59:35 -05:00
ported 1.1 to windows.
git-svn-id: file:///svn/unbound/trunk@1316 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
parent
64959c8097
commit
8fb41f5c00
5 changed files with 16 additions and 0 deletions
|
|
@ -233,6 +233,12 @@ add_open(char* ip, int nr, struct listen_port** list, int noproto_is_err)
|
|||
hints.ai_socktype = SOCK_STREAM;
|
||||
hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST;
|
||||
if((r = getaddrinfo(ip, port, &hints, &res)) != 0 || !res) {
|
||||
#ifdef USE_WINSOCK
|
||||
if(!noproto_is_err && r == EAI_NONAME) {
|
||||
/* tried to lookup the address as name */
|
||||
return 1; /* return success, but do nothing */
|
||||
}
|
||||
#endif /* USE_WINSOCK */
|
||||
log_err("control interface %s:%s getaddrinfo: %s %s",
|
||||
ip?ip:"default", port, gai_strerror(r),
|
||||
#ifdef EAI_SYSTEM
|
||||
|
|
@ -1207,6 +1213,11 @@ handle_req(struct daemon_remote* rc, struct rc_state* s, SSL* ssl)
|
|||
int r;
|
||||
char magic[5];
|
||||
char buf[1024];
|
||||
#ifdef USE_WINSOCK
|
||||
/* makes it possible to set the socket blocking again. */
|
||||
/* basically removes it from winsock_event ... */
|
||||
WSAEventSelect(s->c->fd, NULL, 0);
|
||||
#endif
|
||||
fd_set_block(s->c->fd);
|
||||
|
||||
/* try to read magic UBCT string */
|
||||
|
|
|
|||
|
|
@ -1,6 +1,9 @@
|
|||
21 October 2008: Wouter
|
||||
- fix update-anchors.sh, so it does not report different RR order
|
||||
as an update. Sorts the keys in the file. Updated copyright.
|
||||
- fixup testbound on windows, the command control pipe doesn't exist.
|
||||
- skip 08hostlib test on windows, no fork() available.
|
||||
- made unbound-remote work on windows.
|
||||
|
||||
20 October 2008: Wouter
|
||||
- quench a log message that is debug only.
|
||||
|
|
|
|||
BIN
testdata/08-host-lib.tpkg
vendored
BIN
testdata/08-host-lib.tpkg
vendored
Binary file not shown.
BIN
testdata/09-unbound-control.tpkg
vendored
BIN
testdata/09-unbound-control.tpkg
vendored
Binary file not shown.
|
|
@ -647,6 +647,8 @@ int tube_setup_bg_listen(struct tube* tube, struct comm_base* base,
|
|||
{
|
||||
tube->listen_cb = cb;
|
||||
tube->listen_arg = arg;
|
||||
if(!comm_base_internal(base))
|
||||
return 1; /* ignore when no comm base - testing */
|
||||
return winsock_register_wsaevent(comm_base_internal(base),
|
||||
&tube->ev_listen, tube->event, &tube_handle_signal, tube);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue