diff options
| author | Peter Retzlaff <peter.retzlaff@student.hpi.uni-potsdam.de> | 2013-05-27 19:16:43 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-08-02 09:35:24 -0400 |
| commit | ebd4ab1506517b32ee3bd5bd1597b4373aa56ee7 (patch) | |
| tree | 1f77b8d30fe92462837693b821bb9eb836720591 /src/ext | |
| parent | 83a859e24ced67663ea46f3bd05d53b29f6797c0 (diff) | |
| download | tor-ebd4ab1506517b32ee3bd5bd1597b4373aa56ee7.tar tor-ebd4ab1506517b32ee3bd5bd1597b4373aa56ee7.tar.gz | |
Prepare patch for ticket 5129 for merging.
- Preserve old eventdns code.
- Add function to close sockets cross-platform, without accounting.
- Add changes/ file.
Diffstat (limited to 'src/ext')
| -rw-r--r-- | src/ext/eventdns.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/ext/eventdns.c b/src/ext/eventdns.c index 66280cccd..8b934c443 100644 --- a/src/ext/eventdns.c +++ b/src/ext/eventdns.c @@ -2298,6 +2298,10 @@ _evdns_nameserver_add_impl(const struct sockaddr *address, evtimer_set(&ns->timeout_event, nameserver_prod_callback, ns); +#if 1 + ns->socket = tor_open_socket_nonblocking(address->sa_family, SOCK_DGRAM, 0); + if (!SOCKET_OK(ns->socket)) { err = 1; goto out1; } +#else ns->socket = tor_open_socket(address->sa_family, SOCK_DGRAM, 0); if (ns->socket < 0) { err = 1; goto out1; } #ifdef _WIN32 @@ -2314,6 +2318,7 @@ _evdns_nameserver_add_impl(const struct sockaddr *address, } #endif +#endif /* 1 */ if (global_bind_addr_is_set && !sockaddr_is_loopback((struct sockaddr*)&global_bind_address)) { if (bind(ns->socket, (struct sockaddr *)&global_bind_address, @@ -3473,8 +3478,12 @@ main(int c, char **v) { if (servertest) { int sock; struct sockaddr_in my_addr; +#if 1 + sock = tor_open_socket_nonblocking(PF_INET, SOCK_DGRAM, 0) +#else sock = tor_open_socket(PF_INET, SOCK_DGRAM, 0); fcntl(sock, F_SETFL, O_NONBLOCK); +#endif my_addr.sin_family = AF_INET; my_addr.sin_port = htons(10053); my_addr.sin_addr.s_addr = INADDR_ANY; |