nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

r8731@Kushana: nickm | 2006-09-06 16:33:19 -0400

Browse Source 
Try to fix eventdns.c build on windows.


svn:r8329
This commit is contained in:
Nick Mathewson 2006-09-06 20:33:28 +00:00
parent e10e921386
commit 1e26233957
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/or/eventdns.c
View File

@ -261,15 +261,12 @@
#include <string.h> #include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/socket.h>
#include <sys/time.h> #include <sys/time.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <assert.h> #include <assert.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <unistd.h> #include <unistd.h>
#include <limits.h> #include <limits.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -277,6 +274,16 @@
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#ifdef WIN32
#include <windows.h>
#include <winsock2.h>
#include <iphlpapi.h>
#else
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#endif
#define EVENTDNS_LOG_DEBUG 0 #define EVENTDNS_LOG_DEBUG 0
#define EVENTDNS_LOG_WARN 1 #define EVENTDNS_LOG_WARN 1
@ -436,6 +443,19 @@ error_is_eagain(int err)
{ {
return err == EAGAIN || err == WSAEWOULDBLOCK; return err == EAGAIN || err == WSAEWOULDBLOCK;
} }
static int
inet_aton(const char *c, struct in_addr *addr)
{
uint32_t r;
if (strcmp(c, "255.255.255.255") == 0) {
addr->s_addr = 0xffffffffu;
} else {
uint32_t r = inet_addr(c);
if (r == INADDR_NONE)
return 0;
addr->a_addr = r;
}
}
#define CLOSE_SOCKET(x) closesocket(x) #define CLOSE_SOCKET(x) closesocket(x)
#else #else
#define last_error(sock) (errno) #define last_error(sock) (errno)
@ -1052,7 +1072,7 @@ nameserver_read(struct nameserver *ns) {
for (;;) { for (;;) {
const int r = recv(ns->socket, packet, sizeof(packet), 0); const int r = recv(ns->socket, packet, sizeof(packet), 0);
if (r < 0) { if (r < 0) {
int err = last_error(ns_socket); int err = last_error(ns->socket);
if (error_is_eagain(err)) return; if (error_is_eagain(err)) return;
nameserver_failed(ns, strerror(err)); nameserver_failed(ns, strerror(err));
return; return;
@ -2115,7 +2135,7 @@ load_nameservers_from_registry(void)
found = 1; \ found = 1; \
} }
if (IS_NT()) { if (((int)GetVersion()) > 0) { /* NT */
HKEY nt_key = 0, interfaces_key = 0; HKEY nt_key = 0, interfaces_key = 0;
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0,