diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/inspircd.cpp | 51 | ||||
| -rw-r--r-- | src/inspircd_io.cpp | 50 | ||||
| -rw-r--r-- | src/inspircd_util.cpp | 2 |
3 files changed, 52 insertions, 51 deletions
diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 4cab20c52..cb2360c41 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -469,7 +469,7 @@ InspIRCd::InspIRCd(int argc, char** argv) lowermap[(unsigned)'\\'] = '|'; - OpenLog(argc, argv); + OpenLog(argv, argc); Config->ClearStack(); Config->Read(true,NULL); CheckRoot(); @@ -1519,55 +1519,6 @@ bool LoadModule(const char* filename) return true; } -int BindPorts() -{ - char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF]; - int clientportcount = 0; - for (int count = 0; count < Config->ConfValueEnum("bind",&Config->config_f); count++) - { - Config->ConfValue("bind","port",count,configToken,&Config->config_f); - Config->ConfValue("bind","address",count,Addr,&Config->config_f); - Config->ConfValue("bind","type",count,Type,&Config->config_f); - if (strcmp(Type,"servers")) - { - // modules handle server bind types now, - // its not a typo in the strcmp. - ports[clientportcount] = atoi(configToken); - strlcpy(Config->addrs[clientportcount],Addr,256); - clientportcount++; - log(DEBUG,"InspIRCd: startup: read binding %s:%s [%s] from config",Addr,configToken, Type); - } - } - portCount = clientportcount; - - for (int count = 0; count < portCount; count++) - { - if ((openSockfd[boundPortCount] = OpenTCPSocket()) == ERROR) - { - log(DEBUG,"InspIRCd: startup: bad fd %lu",(unsigned long)openSockfd[boundPortCount]); - return(ERROR); - } - if (BindSocket(openSockfd[boundPortCount],client,server,ports[count],Config->addrs[count]) == ERROR) - { - log(DEFAULT,"InspIRCd: startup: failed to bind port %lu",(unsigned long)ports[count]); - } - else /* well we at least bound to one socket so we'll continue */ - { - boundPortCount++; - } - } - - /* if we didn't bind to anything then abort */ - if (!boundPortCount) - { - log(DEFAULT,"InspIRCd: startup: no ports bound, bailing!"); - printf("\nERROR: Was not able to bind any of %lu ports! Please check your configuration.\n\n", (unsigned long)portCount); - return (ERROR); - } - - return boundPortCount; -} - int InspIRCd::Run() { bool expire_run = false; diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp index c435de383..631cf397a 100644 --- a/src/inspircd_io.cpp +++ b/src/inspircd_io.cpp @@ -1023,3 +1023,53 @@ int OpenTCPSocket (void) return (sockfd); } } + +int BindPorts() +{ + char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF]; + int clientportcount = 0; + for (int count = 0; count < Config->ConfValueEnum("bind",&Config->config_f); count++) + { + Config->ConfValue("bind","port",count,configToken,&Config->config_f); + Config->ConfValue("bind","address",count,Addr,&Config->config_f); + Config->ConfValue("bind","type",count,Type,&Config->config_f); + if (strcmp(Type,"servers")) + { + // modules handle server bind types now, + // its not a typo in the strcmp. + ports[clientportcount] = atoi(configToken); + strlcpy(Config->addrs[clientportcount],Addr,256); + clientportcount++; + log(DEBUG,"InspIRCd: startup: read binding %s:%s [%s] from config",Addr,configToken, Type); + } + } + portCount = clientportcount; + + for (int count = 0; count < portCount; count++) + { + if ((openSockfd[boundPortCount] = OpenTCPSocket()) == ERROR) + { + log(DEBUG,"InspIRCd: startup: bad fd %lu",(unsigned long)openSockfd[boundPortCount]); + return(ERROR); + } + if (BindSocket(openSockfd[boundPortCount],client,server,ports[count],Config->addrs[count]) == ERROR) + { + log(DEFAULT,"InspIRCd: startup: failed to bind port %lu",(unsigned long)ports[count]); + } + else /* well we at least bound to one socket so we'll continue */ + { + boundPortCount++; + } + } + + /* if we didn't bind to anything then abort */ + if (!boundPortCount) + { + log(DEFAULT,"InspIRCd: startup: no ports bound, bailing!"); + printf("\nERROR: Was not able to bind any of %lu ports! Please check your configuration.\n\n", (unsigned long)portCount); + return (ERROR); + } + + return boundPortCount; +} + diff --git a/src/inspircd_util.cpp b/src/inspircd_util.cpp index d75ca0a11..0636c614b 100644 --- a/src/inspircd_util.cpp +++ b/src/inspircd_util.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. + * Inspire is copyright (C) 2002-2005 ChatSpike-Dev. * E-mail: * <brain@chatspike.net> * <Craig@chatspike.net> |