From 09afa5085614e0224a296abd082fce205003c3fe Mon Sep 17 00:00:00 2001 From: brain Date: Wed, 9 Aug 2006 11:33:10 +0000 Subject: ServerConfig extern moved into class InspIRCd git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4808 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/socket.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/socket.cpp') diff --git a/src/socket.cpp b/src/socket.cpp index 58e2c5bad..693685428 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -25,7 +25,6 @@ #include "message.h" extern InspIRCd* ServerInstance; -extern ServerConfig* Config; extern time_t TIME; /* Used when comparing CIDR masks for the modulus bits left over. @@ -273,7 +272,7 @@ bool BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server, int port else { log(DEBUG,"Bound port %s:%d",*addr ? addr : "*",port); - if (listen(sockfd, Config->MaxConn) == -1) + if (listen(sockfd, ServerInstance->Config->MaxConn) == -1) { log(DEFAULT,"ERROR in listen(): %s",strerror(errno)); return false; @@ -312,6 +311,7 @@ int OpenTCPSocket() bool HasPort(int port, char* addr) { + ServerConfig* Config = ServerInstance->Config; for (unsigned long count = 0; count < ServerInstance->stats->BoundPortCount; count++) { if ((port == Config->ports[count]) && (!strcasecmp(Config->addrs[count],addr))) @@ -328,6 +328,7 @@ int BindPorts(bool bail) insp_sockaddr client, server; int clientportcount = 0; int BoundPortCount = 0; + ServerConfig* Config = ServerInstance->Config; if (!bail) { -- cgit v1.3.1-10-gc9f91