Get rid of useless refuse() function.

This commit is contained in:
Sam Hocevar 2017-09-06 18:05:25 +02:00
parent 00dec123da
commit ff3974440e

View File

@ -113,7 +113,6 @@ 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 getAddress(char const *host, struct in_addr *iaddr);
static int checkConnectionAllowed(ConnectionInfo const *cnx); static int checkConnectionAllowed(ConnectionInfo const *cnx);
static void refuse(ConnectionInfo *cnx, int logCode);
static int readArgs (int argc, char **argv, RinetdOptions *options); static int readArgs (int argc, char **argv, RinetdOptions *options);
static void clearConfiguration(void); static void clearConfiguration(void);
@ -618,7 +617,11 @@ static void handleAccept(ServerInfo const *srv)
int logCode = checkConnectionAllowed(cnx); int logCode = checkConnectionAllowed(cnx);
if (logCode != logAllowed) { if (logCode != logAllowed) {
refuse(cnx, logCode); /* Local fd is not open yet, so only
close the remote socket. */
closesocket(cnx->remote.fd);
cnx->remote.fd = INVALID_SOCKET;
logEvent(cnx, cnx->server, logCode);
return; return;
} }
@ -759,15 +762,6 @@ static int checkConnectionAllowed(ConnectionInfo const *cnx)
return logAllowed; return logAllowed;
} }
static void refuse(ConnectionInfo *cnx, int logCode)
{
/* Local fd is not open yet when we refuse(), so only
close the remote socket. */
closesocket(cnx->remote.fd);
cnx->remote.fd = INVALID_SOCKET;
logEvent(cnx, cnx->server, logCode);
}
static int getAddress(char const *host, struct in_addr *iaddr) static int getAddress(char const *host, struct in_addr *iaddr)
{ {
/* If this is an IP address, use inet_addr() */ /* If this is an IP address, use inet_addr() */