github-repos/rinetd
1
0
Fork 0
mirror of https://github.com/samhocevar/rinetd.git synced 2025-03-22 15:50:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove deprecated getAddress() function now that we use getaddrinfo() ubiquitously.

Browse Source
This commit is contained in:
Sam Hocevar 2021-02-14 09:18:49 +01:00
parent 79bafee414
commit 7781e97734
1 changed files with 0 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/rinetd.c
View File

@ -119,7 +119,6 @@ static void handleClose(ConnectionInfo *cnx, Socket *socket, Socket *other_socke
static void handleAccept(ServerInfo const *srv); static void handleAccept(ServerInfo const *srv);
static ConnectionInfo *findAvailableConnection(void); static ConnectionInfo *findAvailableConnection(void);
static void setConnectionCount(int newCount); static void setConnectionCount(int newCount);
static int getAddress(char const *host, struct in_addr *iaddr);
static int checkConnectionAllowed(ConnectionInfo const *cnx); static int checkConnectionAllowed(ConnectionInfo const *cnx);
static int readArgs (int argc, char **argv, RinetdOptions *options); static int readArgs (int argc, char **argv, RinetdOptions *options);
@ -872,59 +871,6 @@ static int checkConnectionAllowed(ConnectionInfo const *cnx)
return logAllowed; return logAllowed;
} }
static int getAddress(char const *host, struct in_addr *iaddr)
{
/* If this is an IP address, use inet_addr() */
int is_ipv4 = 1, is_ipv6 = 0;
for (char const *p = host; *p; ++p) {
is_ipv6 |= (*p == ':' || *p == '[' || *p == ']');
is_ipv4 &= (isdigit(*p) || *p == '.');
}
if (is_ipv6) {
fprintf(stderr, "IPv6 addresses are not supported yet: %s\n", host);
return -1;
}
if (is_ipv4) {
iaddr->s_addr = inet_addr(host);
return 0;
}
/* Otherwise, use gethostbyname() */
struct hostent *h = gethostbyname(host);
if (h) {
#ifdef h_addr
memcpy(&iaddr->s_addr, h->h_addr, 4);
#else
memcpy(&iaddr->s_addr, h->h_addr_list[0], 4);
#endif
return 0;
}
char const *msg = "(unknown DNS error)";
switch (h_errno)
{
case HOST_NOT_FOUND:
msg = "The specified host is unknown.";
break;
#ifdef NO_DATA
case NO_DATA:
#else
case NO_ADDRESS:
#endif
msg = "The requested name is valid but does not have an IP address.";
break;
case NO_RECOVERY:
msg = "A non-recoverable name server error occurred.";
break;
case TRY_AGAIN:
msg = "A temporary error occurred on an authoritative name server. Try again later.";
break;
}
syslog(LOG_ERR, "While resolving `%s' got: %s\n", host, msg);
return -1;
}
#if !HAVE_SIGACTION && !_WIN32 #if !HAVE_SIGACTION && !_WIN32
RETSIGTYPE plumber(int s) RETSIGTYPE plumber(int s)
{ {