X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd_io.cpp;h=13dfcd1b602b28a1f4ccce4ac4ca92135a02e3f5;hb=6b43da7511ca875b64e58b84f72dd89485c0e7fd;hp=f1be7bc2276b9bc3cec7b26c70c99b989e6446e5;hpb=484cb43c21aafa489634f9137428da8c5a8461b1;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp index f1be7bc22..13dfcd1b6 100644 --- a/src/inspircd_io.cpp +++ b/src/inspircd_io.cpp @@ -49,11 +49,9 @@ ServerConfig::ServerConfig() *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; - HideSplits = false; - dns_timeout = 5; + dns_timeout = DieDelay = 5; MaxTargets = 20; NetBufferSize = 10240; SoftLimit = MAXCLIENTS; @@ -61,7 +59,7 @@ ServerConfig::ServerConfig() MaxWhoResults = 100; debugging = 0; LogLevel = DEFAULT; - DieDelay = 5; + maxbans.clear(); } void ServerConfig::ClearStack() @@ -160,7 +158,7 @@ void ServerConfig::Read(bool bail, userrec* user) */ 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]; + char localmax[MAXBUF],globalmax[MAXBUF],HS[MAXBUF],HB[MAXBUF],ServName[MAXBUF]; ConnectClass c; std::stringstream errstr; include_stack.clear(); @@ -202,8 +200,7 @@ void ServerConfig::Read(bool bail, userrec* user) /* 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("dns",bail,user) || !CheckOnce("pid",bail,user)) + || !CheckOnce("power",bail,user) || !CheckOnce("options",bail,user) || !CheckOnce("pid",bail,user)) { return; } @@ -237,12 +234,16 @@ void ServerConfig::Read(bool bail, userrec* user) 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); @@ -265,7 +266,7 @@ void ServerConfig::Read(bool bail, userrec* user) if (!strchr(Config->ServerName,'.')) { log(DEFAULT,"WARNING: '%s' is not a fully-qualified domain name. Changed to '%s%c'",Config->ServerName,Config->ServerName,'.'); - strlcat(Config->ServerName,".",MAXBUF); + charlcat(Config->ServerName,'.',MAXBUF); } if (!Config->dns_timeout) Config->dns_timeout = 5; @@ -408,6 +409,24 @@ void ServerConfig::Read(bool bail, userrec* user) } } + 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..."); @@ -541,9 +560,8 @@ void Start (void) { 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"); } @@ -579,13 +597,15 @@ int DaemonSeed (void) 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; @@ -882,9 +902,10 @@ int ServerConfig::EnumConf(std::stringstream *config, const char* tag) 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; @@ -1051,7 +1072,8 @@ int ServerConfig::ReadConf(std::stringstream *config, const char* tag, const cha 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(); @@ -1169,7 +1191,7 @@ int BindSocket (int sockfd, struct sockaddr_in client, struct sockaddr_in server 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); } @@ -1223,9 +1245,16 @@ int BindPorts() Config->ConfValue("bind","type",count,Type,&Config->config_f); 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); @@ -1237,12 +1266,12 @@ int BindPorts() { 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 */ {