extern int openSockfd[MAXSOCKS];
extern time_t TIME;
+extern int MODCOUNT;
+extern std::vector<Module*> modules;
+extern std::vector<ircd_module*> factory;
ServerConfig::ServerConfig()
{
this->ClearStack();
- *ServerName = *Network = *ServerDesc = *AdminName = '\0';
- *AdminEmail = *AdminNick = *diepass = *restartpass = '\0';
+ *TempDir = *ServerName = *Network = *ServerDesc = *AdminName = '\0';
+ *HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = '\0';
*CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0';
*OperOnlyStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0';
log_file = NULL;
- nofork = false;
- unlimitcore = false;
+ nofork = HideBans = HideSplits = unlimitcore = false;
AllowHalfop = true;
- dns_timeout = 5;
+ dns_timeout = DieDelay = 5;
+ MaxTargets = 20;
NetBufferSize = 10240;
SoftLimit = MAXCLIENTS;
MaxConn = SOMAXCONN;
MaxWhoResults = 100;
debugging = 0;
LogLevel = DEFAULT;
- DieDelay = 5;
+ maxbans.clear();
}
void ServerConfig::ClearStack()
IOHookModule[port] = iomod;
return true;
}
- return false;
+ else
+ {
+ ModuleException err("Port already hooked by another module");
+ throw(err);
+ return false;
+ }
}
bool ServerConfig::DelIOHook(int port)
return false;
}
+bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user)
+{
+ int count = ConfValueEnum(tag,&Config->config_f);
+ if (count > 1)
+ {
+ if (bail)
+ {
+ printf("There were errors in your configuration:\nYou have more than one <%s> tag, this is not permitted.\n",tag);
+ Exit(0);
+ }
+ else
+ {
+ if (user)
+ {
+ WriteServ(user->fd,"There were errors in your configuration:");
+ WriteServ(user->fd,"You have more than one <%s> tag, this is not permitted.\n",tag);
+ }
+ else
+ {
+ WriteOpers("There were errors in the configuration file:");
+ WriteOpers("You have more than one <%s> tag, this is not permitted.\n",tag);
+ }
+ }
+ return false;
+ }
+ if (count < 1)
+ {
+ if (bail)
+ {
+ printf("There were errors in your configuration:\nYou have not defined a <%s> tag, this is required.\n",tag);
+ Exit(0);
+ }
+ else
+ {
+ if (user)
+ {
+ WriteServ(user->fd,"There were errors in your configuration:");
+ WriteServ(user->fd,"You have not defined a <%s> tag, this is required.",tag);
+ }
+ else
+ {
+ WriteOpers("There were errors in the configuration file:");
+ WriteOpers("You have not defined a <%s> tag, this is required.",tag);
+ }
+ }
+ return false;
+ }
+ return true;
+}
+
void ServerConfig::Read(bool bail, userrec* user)
{
- char dbg[MAXBUF],pauseval[MAXBUF],Value[MAXBUF],timeout[MAXBUF],NB[MAXBUF],flood[MAXBUF],MW[MAXBUF],MCON[MAXBUF];
+ /** Yes yes, i know, this function is craq worthy of
+ * sirv. Its a mess, and some day i will tidy it.
+ * ...But that day will not be today. or probaby not
+ * tomorrow even, because it works fine.
+ */
+ char dbg[MAXBUF],pauseval[MAXBUF],Value[MAXBUF],timeout[MAXBUF],NB[MAXBUF],flood[MAXBUF],MW[MAXBUF],MCON[MAXBUF],MT[MAXBUF];
char AH[MAXBUF],AP[MAXBUF],AF[MAXBUF],DNT[MAXBUF],pfreq[MAXBUF],thold[MAXBUF],sqmax[MAXBUF],rqmax[MAXBUF],SLIMT[MAXBUF];
+ char localmax[MAXBUF],globalmax[MAXBUF],HS[MAXBUF],HB[MAXBUF],ServName[MAXBUF];
ConnectClass c;
std::stringstream errstr;
include_stack.clear();
}
}
+ /* Check we dont have more than one of singular tags
+ */
+ if (!CheckOnce("server",bail,user) || !CheckOnce("admin",bail,user) || !CheckOnce("files",bail,user)
+ || !CheckOnce("power",bail,user) || !CheckOnce("options",bail,user) || !CheckOnce("pid",bail,user))
+ {
+ return;
+ }
+
ConfValue("server","name",0,Config->ServerName,&Config->config_f);
ConfValue("server","description",0,Config->ServerDesc,&Config->config_f);
ConfValue("server","network",0,Config->Network,&Config->config_f);
ConfValue("options","softlimit",0,SLIMT,&Config->config_f);
ConfValue("options","operonlystats",0,Config->OperOnlyStats,&Config->config_f);
ConfValue("options","customversion",0,Config->CustomVersion,&Config->config_f);
-
+ ConfValue("options","maxtargets",0,MT,&Config->config_f);
+ ConfValue("options","hidesplits",0,HS,&Config->config_f);
+ ConfValue("options","hidebans",0,HB,&Config->config_f);
+ ConfValue("options","hidewhois",0,Config->HideWhoisServer,&Config->config_f);
+ ConfValue("options","tempdir",0,Config->TempDir,&Config->config_f);
+
+ strlower(Config->ServerName);
+
+ if (!*Config->TempDir)
+ strlcpy(Config->TempDir,"/tmp",1024);
+ Config->HideSplits = ((*HS == 'y') || (*HS == 'Y') || (*HS == '1') || (*HS == 't') || (*HS == 'T'));
+ Config->HideBans = ((*HB == 'y') || (*HB == 'Y') || (*HB == '1') || (*HB == 't') || (*HB == 'T'));
Config->SoftLimit = atoi(SLIMT);
+ if (*MT)
+ Config->MaxTargets = atoi(MT);
+ if ((Config->MaxTargets < 0) || (Config->MaxTargets > 31))
+ {
+ log(DEFAULT,"WARNING: <options:maxtargets> value is greater than 31 or less than 0, set to 20.");
+ Config->MaxTargets = 20;
+ }
if ((Config->SoftLimit < 1) || (Config->SoftLimit > MAXCLIENTS))
{
log(DEFAULT,"WARNING: <options:softlimit> value is greater than %d or less than 0, set to %d.",MAXCLIENTS,MAXCLIENTS);
Config->NetBufferSize = atoi(NB);
Config->MaxWhoResults = atoi(MW);
Config->dns_timeout = atoi(DNT);
+ if (!strchr(Config->ServerName,'.'))
+ {
+ log(DEFAULT,"WARNING: <server:name> '%s' is not a fully-qualified domain name. Changed to '%s%c'",Config->ServerName,Config->ServerName,'.');
+ charlcat(Config->ServerName,'.',MAXBUF);
+ }
if (!Config->dns_timeout)
Config->dns_timeout = 5;
if (!Config->MaxConn)
Config->MaxConn = SOMAXCONN;
if (!*Config->DNSServer)
- strlcpy(Config->DNSServer,"127.0.0.1",MAXBUF);
+ {
+ // attempt to look up their nameserver from /etc/resolv.conf
+ log(DEFAULT,"WARNING: <dns:server> not defined, attempting to find working server in /etc/resolv.conf...");
+ ifstream resolv("/etc/resolv.conf");
+ std::string nameserver;
+ bool found_server = false;
+ if (resolv.is_open())
+ {
+ while (resolv >> nameserver)
+ {
+ if ((nameserver == "nameserver") && (!found_server))
+ {
+ resolv >> nameserver;
+ strlcpy(Config->DNSServer,nameserver.c_str(),MAXBUF);
+ found_server = true;
+ log(DEFAULT,"<dns:server> set to '%s' as first resolver in /etc/resolv.conf.",nameserver.c_str());
+ }
+ }
+ if (!found_server)
+ {
+ log(DEFAULT,"/etc/resolv.conf contains no viable nameserver entries! Defaulting to nameserver '127.0.0.1'!");
+ strlcpy(Config->DNSServer,"127.0.0.1",MAXBUF);
+ }
+ }
+ else
+ {
+ log(DEFAULT,"/etc/resolv.conf can't be opened! Defaulting to nameserver '127.0.0.1'!");
+ strlcpy(Config->DNSServer,"127.0.0.1",MAXBUF);
+ }
+ }
if (!*Config->ModPath)
strlcpy(Config->ModPath,MOD_PATH,MAXBUF);
Config->AllowHalfop = ((!strcasecmp(AH,"true")) || (!strcasecmp(AH,"1")) || (!strcasecmp(AH,"yes")));
ConfValue("connect","threshold",i,thold,&Config->config_f);
ConfValue("connect","sendq",i,sqmax,&Config->config_f);
ConfValue("connect","recvq",i,rqmax,&Config->config_f);
+ ConfValue("connect","localmax",i,localmax,&Config->config_f);
+ ConfValue("connect","globalmax",i,globalmax,&Config->config_f);
if (*Value)
{
c.host = Value;
c.threshold = 5;
c.sendqmax = 262144; // 256k
c.recvqmax = 4096; // 4k
+ c.maxlocal = 3;
+ c.maxglobal = 3;
+ if (atoi(localmax)>0)
+ {
+ c.maxlocal = atoi(localmax);
+ }
+ if (atoi(globalmax)>0)
+ {
+ c.maxglobal = atoi(globalmax);
+ }
if (atoi(thold)>0)
{
c.threshold = atoi(thold);
}
+ else
+ {
+ c.threshold = 1;
+ c.flood = 999;
+ log(DEFAULT,"Warning: Connect allow line '%s' has no flood/threshold settings. Setting this tag to 999 lines in 1 second.",c.host.c_str());
+ }
if (atoi(sqmax)>0)
{
c.sendqmax = atoi(sqmax);
}
}
+ Config->ulines.clear();
+ for (int i = 0; i < ConfValueEnum("uline",&Config->config_f); i++)
+ {
+ ConfValue("uline","server",i,ServName,&Config->config_f);
+ {
+ log(DEBUG,"Read ULINE '%s'",ServName);
+ Config->ulines.push_back(ServName);
+ }
+ }
+ maxbans.clear();
+ char CM1[MAXBUF],CM2[MAXBUF];
+ for (int count = 0; count < Config->ConfValueEnum("banlist",&Config->config_f); count++)
+ {
+ Config->ConfValue("banlist","chan",count,CM1,&Config->config_f);
+ Config->ConfValue("banlist","limit",count,CM2,&Config->config_f);
+ maxbans[CM1] = atoi(CM2);
+ }
+ ReadClassesAndTypes();
log(DEFAULT,"Reading K lines,Q lines and Z lines from config...");
read_xline_defaults();
log(DEFAULT,"Applying K lines, Q lines and Z lines...");
if (ServerInstance->UnloadModule(removing->c_str()))
{
WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str());
- WriteServ(user->fd,"973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str());
+ if (user)
+ WriteServ(user->fd,"973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str());
rem++;
}
else
{
- WriteServ(user->fd,"972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError());
+ if (user)
+ WriteServ(user->fd,"972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError());
}
}
if (!added_modules.empty())
if (ServerInstance->LoadModule(adding->c_str()))
{
WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str());
- WriteServ(user->fd,"975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str());
+ if (user)
+ WriteServ(user->fd,"975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str());
add++;
}
else
{
- WriteServ(user->fd,"974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError());
+ if (user)
+ WriteServ(user->fd,"974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError());
}
}
log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),
exit(status);
}
+char* CleanFilename(char* name)
+{
+ char* p = name + strlen(name);
+ while ((p != name) && (*p != '/')) p--;
+ return (p != name ? ++p : p);
+}
+
+
void Rehash(int status)
{
- WriteOpers("Rehashing config file %s due to SIGHUP",CONFIG_FILE);
+ WriteOpers("Rehashing config file %s due to SIGHUP",CleanFilename(CONFIG_FILE));
fclose(Config->log_file);
- OpenLog(NULL,NULL);
+ OpenLog(NULL,0);
Config->Read(false,NULL);
+ FOREACH_MOD(I_OnRehash,OnRehash(""));
}
{
printf("\033[1;32mInspire Internet Relay Chat Server, compiled %s at %s\n",__DATE__,__TIME__);
printf("(C) ChatSpike Development team.\033[0m\n\n");
- printf("Developers:\033[1;32m Brain, FrostyCoolSlug\033[0m\n");
- printf("Documentation:\033[1;32m FrostyCoolSlug, w00t\033[0m\n");
- printf("Testers:\033[1;32m typobox43, piggles, Lord_Zathras, CC\033[0m\n");
+ printf("Developers:\033[1;32m Brain, FrostyCoolSlug, w00t, Om\033[0m\n");
+ printf("Others:\033[1;32m See /INFO Output\033[0m\n");
printf("Name concept:\033[1;32m Lord_Zathras\033[0m\n\n");
}
if ((childpid = fork ()) < 0)
return (ERROR);
else if (childpid > 0)
+ {
+ /* We wait a few seconds here, so that the shell prompt doesnt come back over the output */
+ sleep(6);
exit (0);
+ }
setsid ();
umask (007);
printf("InspIRCd Process ID: \033[1;32m%lu\033[0m\n",(unsigned long)getpid());
- setpriority(PRIO_PROCESS,(int)getpid(),15);
-
if (Config->unlimitcore)
{
rlimit rl;
return "";
}
// firstly clean up the line by stripping spaces from the start and end and converting tabs to spaces
- for (unsigned int d = 0; d < strlen(buffer); d++)
- if ((buffer[d]) == 9)
- buffer[d] = ' ';
- while ((buffer[0] == ' ') && (strlen(buffer)>0)) buffer++;
- while ((buffer[strlen(buffer)-1] == ' ') && (strlen(buffer)>0)) buffer[strlen(buffer)-1] = '\0';
+ for (char* d = buffer; *d; d++)
+ if (*d == 9)
+ *d = ' ';
+ while (*buffer == ' ') buffer++;
+ while ((buffer[strlen(buffer)-1] == ' ') && (*buffer)) buffer[strlen(buffer)-1] = '\0';
// empty lines are syntactically valid, as are comments
if (!(*buffer) || buffer[0] == '#')
break;
}
}
- log(DEFAULT,"Opening included file '%s'",buf);
+ log(DEBUG,"Opening included file '%s'",buf);
if (*buf != '/')
{
strlcpy(confpath,CONFIG_FILE,10240);
char buffer[MAXBUF], c_tag[MAXBUF], c, lastc;
int in_token, in_quotes, tptr, idx = 0;
- const char* buf = config->str().c_str();
+ std::string x = config->str();
+ const char* buf = x.c_str();
long bptr = 0;
- long len = strlen(buf);
+ long len = config->str().length();
ptr = 0;
in_token = 0;
int in_token, in_quotes, tptr, idx = 0;
char* key;
- const char* buf = config->str().c_str();
+ std::string x = config->str();
+ const char* buf = x.c_str();
long bptr = 0;
long len = config->str().length();
struct in_addr addy;
inet_aton(addr,&addy);
server.sin_family = AF_INET;
- if (!strcmp(addr,""))
+ if (!*addr)
{
server.sin_addr.s_addr = htonl(INADDR_ANY);
}
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"))
+ if ((!*Type) || (!strcmp(Type,"clients")))
{
- // modules handle server bind types now,
- // its not a typo in the strcmp.
+ // modules handle server bind types now
Config->ports[clientportcount] = atoi(configToken);
+
+ // If the client put bind "*", this is an unrealism.
+ // We don't actually support this as documented, but
+ // i got fed up of people trying it, so now it converts
+ // it to an empty string meaning the same 'bind to all'.
+ if (*Addr == '*')
+ *Addr = 0;
+
strlcpy(Config->addrs[clientportcount],Addr,256);
clientportcount++;
log(DEBUG,"InspIRCd: startup: read binding %s:%s [%s] from config",Addr,configToken, Type);
{
if ((openSockfd[BoundPortCount] = OpenTCPSocket()) == ERROR)
{
- log(DEBUG,"InspIRCd: startup: bad fd %lu",(unsigned long)openSockfd[BoundPortCount]);
+ log(DEBUG,"InspIRCd: startup: bad fd %lu binding port [%s:%d]",(unsigned long)openSockfd[BoundPortCount],Config->addrs[count],(unsigned long)Config->ports[count]);
return(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)Config->ports[count]);
+ log(DEFAULT,"InspIRCd: startup: failed to bind port [%s:%lu]: %s",Config->addrs[count],(unsigned long)Config->ports[count],strerror(errno));
}
else /* well we at least bound to one socket so we'll continue */
{
projects / user / henk / code / inspircd.git / blobdiff