summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-12-14 18:00:59 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-12-14 18:00:59 +0000
commit665d01855ea1b54e48c0acdf9db44a8dbf0f3dc6 (patch)
tree8d93afff2c44402dac0ce9a1f5f4407aef40e75b
parent6de0aaaef692aa6a30e77cc76cf6e80bbc6e4500 (diff)
Fixed to use MAXSOCKS
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@2431 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--include/inspircd_io.h4
-rw-r--r--src/inspircd.cpp1
-rw-r--r--src/inspircd_io.cpp6
3 files changed, 7 insertions, 4 deletions
diff --git a/include/inspircd_io.h b/include/inspircd_io.h
index 58c018c25..f07666747 100644
--- a/include/inspircd_io.h
+++ b/include/inspircd_io.h
@@ -246,6 +246,10 @@ class ServerConfig : public classbase
*/
std::vector<std::string> module_names;
+ /** A list of ports which the server is listening on
+ */
+ int ports[MAXSOCKS];
+
ServerConfig();
/** Clears the include stack in preperation for
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index cb2360c41..cc4964ca8 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -99,7 +99,6 @@ command_table cmdlist;
address_cache IP;
servernamelist servernames;
int boundPortCount = 0;
-int portCount = 0, ports[MAXSOCKS];
std::vector<userrec*> all_opers;
char lowermap[255];
diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp
index 631cf397a..2b5a880cb 100644
--- a/src/inspircd_io.cpp
+++ b/src/inspircd_io.cpp
@@ -1037,7 +1037,7 @@ int BindPorts()
{
// modules handle server bind types now,
// its not a typo in the strcmp.
- ports[clientportcount] = atoi(configToken);
+ Config->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);
@@ -1052,9 +1052,9 @@ int BindPorts()
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)
+ if (BindSocket(openSockfd[boundPortCount],client,server,Config->ports[count],Config->addrs[count]) == ERROR)
{
- log(DEFAULT,"InspIRCd: startup: failed to bind port %lu",(unsigned long)ports[count]);
+ log(DEFAULT,"InspIRCd: startup: failed to bind port %lu",(unsigned long)Config->ports[count]);
}
else /* well we at least bound to one socket so we'll continue */
{