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

Remove some deadcode and use tor_inet_aton uniformly.

Browse Source 
svn:r18422
This commit is contained in:
Nick Mathewson 2009-02-09 03:13:05 +00:00
parent 2ebdf91a52
commit fe987d3a17
2 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/common/compat.c
View File

@ -97,12 +97,6 @@
#include "strlcat.c" #include "strlcat.c"
#endif #endif
#ifndef INADDR_NONE
/* This is used by inet_addr, but apparently Solaris doesn't define it
* anyplace. */
#define INADDR_NONE ((unsigned long) -1)
#endif
#ifdef HAVE_SYS_MMAN_H #ifdef HAVE_SYS_MMAN_H
/** Try to create a memory mapping for <b>filename</b> and return it. On /** Try to create a memory mapping for <b>filename</b> and return it. On
* failure, return NULL. Sets errno properly, using ERANGE to mean * failure, return NULL. Sets errno properly, using ERANGE to mean
@ -1274,25 +1268,6 @@ tor_inet_aton(const char *str, struct in_addr* addr)
if (d < 0 || d > 255) return 0; if (d < 0 || d > 255) return 0;
addr->s_addr = htonl((a<<24) | (b<<16) | (c<<8) | d); addr->s_addr = htonl((a<<24) | (b<<16) | (c<<8) | d);
return 1; return 1;
#if 0
#ifdef HAVE_INET_ATON
return inet_aton(c, addr);
#else
uint32_t r;
tor_assert(c);
tor_assert(addr);
if (strcmp(c, "255.255.255.255") == 0) {
addr->s_addr = 0xFFFFFFFFu;
return 1;
}
r = inet_addr(c);
if (r == INADDR_NONE)
return 0;
addr->s_addr = r;
return 1;
#endif
#endif
} }
/** Given <b>af</b>==AF_INET and <b>src</b> a struct in_addr, or /** Given <b>af</b>==AF_INET and <b>src</b> a struct in_addr, or

15
src/or/eventdns.c
View File

@ -355,20 +355,7 @@ error_is_eagain(int err)
{ {
return err == EAGAIN || err == WSAEWOULDBLOCK; return err == EAGAIN || err == WSAEWOULDBLOCK;
} }
static int #define inet_aton(c, addr) tor_inet_aton((c), (addr))
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 {
r = inet_addr(c);
if (r == INADDR_NONE)
return 0;
addr->s_addr = r;
}
return 1;
}
#define CLOSE_SOCKET(x) closesocket(x) #define CLOSE_SOCKET(x) closesocket(x)
#else #else
#define last_error(sock) (errno) #define last_error(sock) (errno)