1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2025-07-12 22:53:24 +00:00

Removed dependency on gethostbyname()

This commit is contained in:
Gerhard Rieger 2019-02-24 23:17:17 +01:00
parent 2bd582713d
commit a3c688210f
6 changed files with 35 additions and 33 deletions

View file

@ -11,6 +11,7 @@
#include "xioopen.h"
#include "xio-socket.h"
#include "xio-ip.h"
#include "xio-ipapp.h"
#include "xio-ascii.h" /* for base64 encoding of authentication */
@ -231,7 +232,9 @@ static int xioopen_proxy_connect(int argc, const char *argv[], struct opt *opts,
int _xioopen_proxy_prepare(struct proxyvars *proxyvars, struct opt *opts,
const char *targetname, const char *targetport) {
struct hostent *host;
union sockaddr_union host;
socklen_t socklen = sizeof(host);
int rc;
retropt_bool(opts, OPT_IGNORECR, &proxyvars->ignorecr);
retropt_bool(opts, OPT_PROXY_RESOLVE, &proxyvars->doresolve);
@ -241,14 +244,10 @@ int _xioopen_proxy_prepare(struct proxyvars *proxyvars, struct opt *opts,
/* currently we only resolve to IPv4 addresses. This is in accordance to
RFC 2396; however once it becomes clear how IPv6 addresses should be
represented in CONNECT commands this code might be extended */
host = Gethostbyname(targetname);
if (host == NULL) {
int level = E_WARN;
/* note: cast is req on AIX: */
Msg2(level, "gethostbyname(\"%s\"): %s", targetname,
h_errno == NETDB_INTERNAL ? strerror(errno) :
(char *)hstrerror(h_errno)/*0 h_messages[h_errno-1]*/);
rc = xiogetaddrinfo(targetname, targetport, PF_UNSPEC,
SOCK_STREAM, IPPROTO_TCP,
&host, &socklen, 0, 0);
if (rc != STAT_OK) {
proxyvars->targetaddr = strdup(targetname);
} else {
#define LEN 16 /* www.xxx.yyy.zzz\0 */
@ -256,10 +255,10 @@ int _xioopen_proxy_prepare(struct proxyvars *proxyvars, struct opt *opts,
return STAT_RETRYLATER;
}
snprintf(proxyvars->targetaddr, LEN, "%u.%u.%u.%u",
(unsigned char)host->h_addr_list[0][0],
(unsigned char)host->h_addr_list[0][1],
(unsigned char)host->h_addr_list[0][2],
(unsigned char)host->h_addr_list[0][3]);
((unsigned char *)&host.ip4.sin_addr.s_addr)[0],
((unsigned char *)&host.ip4.sin_addr.s_addr)[1],
((unsigned char *)&host.ip4.sin_addr.s_addr)[2],
((unsigned char *)&host.ip4.sin_addr.s_addr)[3]);
#undef LEN
}
} else {