bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed the DNS API calls and replaced them with the standard

Browse Source 
gethostbyname() and gethostbyaddr() functions.  This is possible
because tinyproxy now uses a standard pre-forked() method.
This commit is contained in:
Robert James Kaes 2002-05-26 18:51:17 +00:00
parent 71046cd407
commit 523f2003fa
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/sock.c
View File

@ -1,4 +1,4 @@
/* $Id: sock.c,v 1.35 2002-05-24 04:44:36 rjkaes Exp $ /* $Id: sock.c,v 1.36 2002-05-26 18:51:17 rjkaes Exp $
* *
* Sockets are created and destroyed here. When a new connection comes in from * Sockets are created and destroyed here. When a new connection comes in from
* a client, we need to copy the socket and the create a second socket to the * a client, we need to copy the socket and the create a second socket to the
@ -23,7 +23,6 @@
#include "tinyproxy.h" #include "tinyproxy.h"
#include "dnsclient.h"
#include "log.h" #include "log.h"
#include "heap.h" #include "heap.h"
#include "sock.h" #include "sock.h"
@ -38,23 +37,16 @@
static int static int
lookup_domain(struct in_addr *addr, const char *domain) lookup_domain(struct in_addr *addr, const char *domain)
{ {
struct in_addr *addresses; struct hostent* result;
int dns;
dns = dns_connect(); assert(domain != NULL);
if (dns < 0)
result = gethostbyname(domain);
if (result) {
memcpy(addr, result->h_addr_list[0], result->h_length);
return 0;
} else
return -1; return -1;
if (dns_getaddrbyname(dns, domain, &addresses) < 0) {
dns_disconnect(dns);
return -1;
}
memcpy(addr, addresses, sizeof(addr));
dns_disconnect(dns);
safefree(addresses);
return 0;
} }
/* This routine is so old I can't even remember writing it. But I do /* This routine is so old I can't even remember writing it. But I do
@ -207,7 +199,7 @@ getpeer_information(int fd, char* ipaddr, char* string_addr)
{ {
struct sockaddr_in name; struct sockaddr_in name;
size_t namelen = sizeof(name); size_t namelen = sizeof(name);
int dns; struct hostent* result;
assert(fd >= 0); assert(fd >= 0);
assert(ipaddr != NULL); assert(ipaddr != NULL);
@ -229,11 +221,10 @@ getpeer_information(int fd, char* ipaddr, char* string_addr)
PEER_IP_LENGTH); PEER_IP_LENGTH);
} }
dns = dns_connect(); result = gethostbyaddr(ipaddr, strlen(ipaddr), AF_INET);
if (dns < 0) if (result) {
strlcpy(string_addr, result->h_name, PEER_STRING_LENGTH);
return 0;
} else
return -1; return -1;
dns_gethostbyaddr(dns, ipaddr, &string_addr, PEER_STRING_LENGTH);
dns_disconnect(dns);
return 0;
} }