-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ * Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
+ * Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
+ * Copyright (C) 2013 Adam <Adam@anope.org>
+ * Copyright (C) 2012-2015 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2012-2014, 2017-2018 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2012, 2018 Robby <robby@chatbelgie.be>
+ * Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2007, 2010 Craig Edwards <brain@inspircd.org>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/* $Core: libIRCDhelper */
+
+#ifdef _WIN32
+#define _CRT_RAND_S
+#include <stdlib.h>
+#endif
#include "inspircd.h"
-#include "wildcard.h"
#include "xline.h"
#include "exitcodes.h"
-
-/** Log()
- * Write a line of text `text' to the logfile (and stdout, if in nofork) if the level `level'
- * is greater than the configured loglevel.
- */
-void InspIRCd::Log(int level, const char* text, ...)
-{
- va_list argsPtr;
- char textbuffer[65536];
-
- va_start(argsPtr, text);
- vsnprintf(textbuffer, 65536, text, argsPtr);
- va_end(argsPtr);
-
- this->Log(level, std::string(textbuffer));
-}
-
-void InspIRCd::Log(int level, const std::string &text)
-{
- this->Logs->Log("WARNING", DEFAULT, "Deprecated call to InspIRCd::Log()! - log message follows");
- this->Logs->Log("DEPRECATED", level, text);
-}
-
-std::string InspIRCd::GetServerDescription(const char* servername)
-{
- std::string description;
-
- FOREACH_MOD_I(this,I_OnGetServerDescription,OnGetServerDescription(servername,description));
-
- if (!description.empty())
- {
- return description;
- }
- else
- {
- // not a remote server that can be found, it must be me.
- return Config->ServerDesc;
- }
-}
+#include <iostream>
/* Find a user record by nickname and return a pointer to it */
User* InspIRCd::FindNick(const std::string &nick)
{
if (!nick.empty() && isdigit(*nick.begin()))
return FindUUID(nick);
-
- user_hash::iterator iter = this->Users->clientlist->find(nick);
-
- if (iter == this->Users->clientlist->end())
- /* Couldn't find it */
- return NULL;
-
- return iter->second;
-}
-
-User* InspIRCd::FindNick(const char* nick)
-{
- if (isdigit(*nick))
- return FindUUID(nick);
-
- user_hash::iterator iter = this->Users->clientlist->find(nick);
-
- if (iter == this->Users->clientlist->end())
- return NULL;
-
- return iter->second;
+ return FindNickOnly(nick);
}
User* InspIRCd::FindNickOnly(const std::string &nick)
{
- user_hash::iterator iter = this->Users->clientlist->find(nick);
-
- if (iter == this->Users->clientlist->end())
- return NULL;
-
- return iter->second;
-}
-
-User* InspIRCd::FindNickOnly(const char* nick)
-{
- user_hash::iterator iter = this->Users->clientlist->find(nick);
+ user_hash::iterator iter = this->Users->clientlist.find(nick);
- if (iter == this->Users->clientlist->end())
+ if (iter == this->Users->clientlist.end())
return NULL;
return iter->second;
User *InspIRCd::FindUUID(const std::string &uid)
{
- return FindUUID(uid.c_str());
-}
-
-User *InspIRCd::FindUUID(const char *uid)
-{
- user_hash::iterator finduuid = this->Users->uuidlist->find(uid);
+ user_hash::iterator finduuid = this->Users->uuidlist.find(uid);
- if (finduuid == this->Users->uuidlist->end())
+ if (finduuid == this->Users->uuidlist.end())
return NULL;
return finduuid->second;
}
-
/* find a channel record by channel name and return a pointer to it */
-Channel* InspIRCd::FindChan(const char* chan)
-{
- chan_hash::iterator iter = chanlist->find(chan);
-
- if (iter == chanlist->end())
- /* Couldn't find it */
- return NULL;
-
- return iter->second;
-}
Channel* InspIRCd::FindChan(const std::string &chan)
{
- chan_hash::iterator iter = chanlist->find(chan);
+ chan_hash::iterator iter = chanlist.find(chan);
- if (iter == chanlist->end())
+ if (iter == chanlist.end())
/* Couldn't find it */
return NULL;
return iter->second;
}
-/* Send an error notice to all users, registered or not */
-void InspIRCd::SendError(const std::string &s)
-{
- for (std::vector<User*>::const_iterator i = this->Users->local_users.begin(); i != this->Users->local_users.end(); i++)
- {
- if ((*i)->registered == REG_ALL)
- {
- (*i)->WriteServ("NOTICE %s :%s",(*i)->nick,s.c_str());
- }
- else
- {
- /* Unregistered connections receive ERROR, not a NOTICE */
- (*i)->Write("ERROR :" + s);
- }
- /* This might generate a whole load of EAGAIN, but we dont really
- * care about this, as if we call SendError something catastrophic
- * has occured anyway, and we wont receive the events for these.
- */
- (*i)->FlushWriteBuf();
- }
-}
-
-/* return channel count */
-long InspIRCd::ChannelCount()
-{
- return chanlist->size();
-}
-
bool InspIRCd::IsValidMask(const std::string &mask)
{
- char* dest = (char*)mask.c_str();
+ const char* dest = mask.c_str();
int exclamation = 0;
int atsign = 0;
- for (char* i = dest; *i; i++)
+ for (const char* i = dest; *i; i++)
{
/* out of range character, bad mask */
if (*i < 32 || *i > 126)
if (exclamation != 1 || atsign != 1)
return false;
+ if (mask.length() > ServerInstance->Config->Limits.GetMaxMask())
+ return false;
+
return true;
}
-/* true for valid channel name, false else */
-bool InspIRCd::IsChannel(const char *chname)
+void InspIRCd::StripColor(std::string &sentence)
{
- char *c;
+ /* refactor this completely due to SQUIT bug since the old code would strip last char and replace with \0 --peavey */
+ int seq = 0;
- /* check for no name - don't check for !*chname, as if it is empty, it won't be '#'! */
- if (!chname || *chname != '#')
+ for (std::string::iterator i = sentence.begin(); i != sentence.end();)
{
- return false;
+ if (*i == 3)
+ seq = 1;
+ else if (seq && (( ((*i >= '0') && (*i <= '9')) || (*i == ',') ) ))
+ {
+ seq++;
+ if ( (seq <= 4) && (*i == ',') )
+ seq = 1;
+ else if (seq > 3)
+ seq = 0;
+ }
+ else
+ seq = 0;
+
+ // Strip all control codes too except \001 for CTCP
+ if (seq || ((*i >= 0) && (*i < 32) && (*i != 1)))
+ i = sentence.erase(i);
+ else
+ ++i;
}
+}
+
+void InspIRCd::ProcessColors(file_cache& input)
+{
+ /*
+ * Replace all color codes from the special[] array to actual
+ * color code chars using C++ style escape sequences. You
+ * can append other chars to replace if you like -- Justasic
+ */
+ static struct special_chars
+ {
+ std::string character;
+ std::string replace;
+ special_chars(const std::string& c, const std::string& r)
+ : character(c)
+ , replace(r)
+ {
+ }
+ } special[] = {
+ special_chars("\\b", "\x02"), // Bold
+ special_chars("\\c", "\x03"), // Color
+ special_chars("\\i", "\x1D"), // Italic
+ special_chars("\\m", "\x11"), // Monospace
+ special_chars("\\r", "\x16"), // Reverse
+ special_chars("\\s", "\x1E"), // Strikethrough
+ special_chars("\\u", "\x1F"), // Underline
+ special_chars("\\x", "\x0F"), // Reset
+ special_chars("", "")
+ };
+
+ for(file_cache::iterator it = input.begin(), it_end = input.end(); it != it_end; it++)
+ {
+ std::string ret = *it;
+ for(int i = 0; special[i].character.empty() == false; ++i)
+ {
+ std::string::size_type pos = ret.find(special[i].character);
+ if(pos == std::string::npos) // Couldn't find the character, skip this line
+ continue;
+
+ if((pos > 0) && (ret[pos-1] == '\\') && (ret[pos] == '\\'))
+ continue; // Skip double slashes.
+
+ // Replace all our characters in the array
+ while(pos != std::string::npos)
+ {
+ ret = ret.substr(0, pos) + special[i].replace + ret.substr(pos + special[i].character.size());
+ pos = ret.find(special[i].character, pos + special[i].replace.size());
+ }
+ }
+
+ // Replace double slashes with a single slash before we return
+ std::string::size_type pos = ret.find("\\\\");
+ while(pos != std::string::npos)
+ {
+ ret = ret.substr(0, pos) + "\\" + ret.substr(pos + 2);
+ pos = ret.find("\\\\", pos + 1);
+ }
+ *it = ret;
+ }
+}
+
+/* true for valid channel name, false else */
+bool InspIRCd::DefaultIsChannel(const std::string& chname)
+{
+ if (chname.empty() || chname.length() > ServerInstance->Config->Limits.ChanMax)
+ return false;
+
+ if (chname[0] != '#')
+ return false;
- c = (char *)chname + 1;
- while (*c)
+ for (std::string::const_iterator i = chname.begin()+1; i != chname.end(); ++i)
{
- switch (*c)
+ switch (*i)
{
case ' ':
case ',':
case 7:
return false;
}
-
- c++;
- }
-
- /* too long a name - note funky pointer arithmetic here. */
- if ((c - chname) > CHANMAX)
- {
- return false;
}
return true;
}
/* true for valid nickname, false else */
-bool IsNickHandler::Call(const char* n)
+bool InspIRCd::DefaultIsNick(const std::string& n)
{
- if (!n || !*n)
+ if (n.empty() || n.length() > ServerInstance->Config->Limits.NickMax)
return false;
-
- int p = 0;
- for (char* i = (char*)n; *i; i++, p++)
+
+ for (std::string::const_iterator i = n.begin(); i != n.end(); ++i)
{
if ((*i >= 'A') && (*i <= '}'))
{
continue;
}
- if ((((*i >= '0') && (*i <= '9')) || (*i == '-')) && (i > n))
+ if ((((*i >= '0') && (*i <= '9')) || (*i == '-')) && (i != n.begin()))
{
/* "0"-"9", "-" can occur anywhere BUT the first char of a nickname */
continue;
return false;
}
- /* too long? or not -- pointer arithmetic rocks */
- return (p < NICKMAX - 1);
+ return true;
}
/* return true for good ident, false else */
-bool IsIdentHandler::Call(const char* n)
+bool InspIRCd::DefaultIsIdent(const std::string& n)
{
- if (!n || !*n)
+ if (n.empty())
return false;
- for (char* i = (char*)n; *i; i++)
+ for (std::string::const_iterator i = n.begin(); i != n.end(); ++i)
{
if ((*i >= 'A') && (*i <= '}'))
{
return true;
}
+bool InspIRCd::IsHost(const std::string& host)
+{
+ // Hostnames must be non-empty and shorter than the maximum hostname length.
+ if (host.empty() || host.length() > ServerInstance->Config->Limits.MaxHost)
+ return false;
+
+ unsigned int numdashes = 0;
+ unsigned int numdots = 0;
+ bool seendot = false;
+ const std::string::const_iterator hostend = host.end() - 1;
+ for (std::string::const_iterator iter = host.begin(); iter != host.end(); ++iter)
+ {
+ unsigned char chr = static_cast<unsigned char>(*iter);
+
+ // If the current character is a label separator.
+ if (chr == '.')
+ {
+ numdots++;
+
+ // Consecutive separators are not allowed and dashes can not exist at the start or end
+ // of labels and separators must only exist between labels.
+ if (seendot || numdashes || iter == host.begin() || iter == hostend)
+ return false;
+
+ seendot = true;
+ continue;
+ }
+
+ // If this point is reached then the character is not a dot.
+ seendot = false;
+
+ // If the current character is a dash.
+ if (chr == '-')
+ {
+ // Consecutive separators are not allowed and dashes can not exist at the start or end
+ // of labels and separators must only exist between labels.
+ if (seendot || numdashes >= 2 || iter == host.begin() || iter == hostend)
+ return false;
+
+ numdashes += 1;
+ continue;
+ }
+
+ // If this point is reached then the character is not a dash.
+ numdashes = 0;
+
+ // Alphanumeric characters are allowed at any position.
+ if ((chr >= '0' && chr <= '9') || (chr >= 'A' && chr <= 'Z') || (chr >= 'a' && chr <= 'z'))
+ continue;
+
+ return false;
+ }
+
+ // Whilst simple hostnames (e.g. localhost) are valid we do not allow the server to use
+ // them to prevent issues with clients that differentiate between short client and server
+ // prefixes by checking whether the nickname contains a dot.
+ return numdots;
+}
+
bool InspIRCd::IsSID(const std::string &str)
{
/* Returns true if the string given is exactly 3 characters long,
((str[2] >= 'A' && str[2] <= 'Z') || isdigit(str[2])));
}
-/* open the proper logfile */
-bool InspIRCd::OpenLog(char**, int)
+/** A lookup table of values for multiplier characters used by
+ * InspIRCd::Duration(). In this lookup table, the indexes for
+ * the ascii values 'm' and 'M' have the value '60', the indexes
+ * for the ascii values 'D' and 'd' have a value of '86400', etc.
+ */
+static const unsigned int duration_multi[] =
+{
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 86400, 0, 0, 0, 3600, 0, 0, 0, 0, 60, 0, 0,
+ 0, 0, 0, 1, 0, 0, 0, 604800, 0, 31557600, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 86400, 0, 0, 0, 3600, 0, 0, 0, 0, 60, 0, 0,
+ 0, 0, 0, 1, 0, 0, 0, 604800, 0, 31557600, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+bool InspIRCd::Duration(const std::string& str, unsigned long& duration)
{
- Config->MyDir = Config->GetFullProgDir();
+ unsigned long total = 0;
+ unsigned long subtotal = 0;
- if (!*this->LogFileName)
+ /* Iterate each item in the string, looking for number or multiplier */
+ for (std::string::const_iterator i = str.begin(); i != str.end(); ++i)
{
- if (Config->logpath.empty())
+ /* Found a number, queue it onto the current number */
+ if ((*i >= '0') && (*i <= '9'))
{
- Config->logpath = Config->MyDir + "/ircd.log";
+ subtotal = (subtotal * 10) + (*i - '0');
}
+ else
+ {
+ /* Found something thats not a number, find out how much
+ * it multiplies the built up number by, multiply the total
+ * and reset the built up number.
+ */
+ unsigned int multiplier = duration_multi[static_cast<unsigned char>(*i)];
+ if (multiplier == 0)
+ return false;
- Config->log_file = fopen(Config->logpath.c_str(),"a+");
- }
- else
- {
- Config->log_file = fopen(this->LogFileName,"a+");
- }
+ total += subtotal * multiplier;
- if (!Config->log_file)
- {
- return false;
+ /* Next subtotal please */
+ subtotal = 0;
+ }
}
-
- FileLogStream *f = new FileLogStream(this, Config->log_file);
- this->Logs->AddLogType("*", f);
+ /* Any trailing values built up are treated as raw seconds */
+ duration = total + subtotal;
return true;
}
-void InspIRCd::CheckRoot()
+unsigned long InspIRCd::Duration(const std::string& str)
{
- if (geteuid() == 0)
- {
- printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n");
- this->Log(DEFAULT,"Cant start as root");
- Exit(EXIT_STATUS_ROOT);
- }
+ unsigned long out = 0;
+ InspIRCd::Duration(str, out);
+ return out;
}
-void InspIRCd::CheckDie()
+bool InspIRCd::IsValidDuration(const std::string& duration)
{
- if (*Config->DieValue)
+ for (std::string::const_iterator i = duration.begin(); i != duration.end(); ++i)
{
- printf("WARNING: %s\n\n",Config->DieValue);
- this->Log(DEFAULT,"Died because of <die> tag: %s",Config->DieValue);
- Exit(EXIT_STATUS_DIETAG);
+ unsigned char c = *i;
+ if (((c >= '0') && (c <= '9')))
+ continue;
+
+ if (!duration_multi[c])
+ return false;
}
+ return true;
}
-void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const std::string &text)
+std::string InspIRCd::DurationString(time_t duration)
{
- std::string copy_text = text;
-
- int MOD_RESULT = 0;
- FOREACH_RESULT_I(this, I_OnWhoisLine, OnWhoisLine(user, dest, numeric, copy_text));
-
- if (!MOD_RESULT)
- user->WriteServ("%d %s", numeric, copy_text.c_str());
+ if (duration == 0)
+ return "0s";
+
+ time_t years = duration / 31449600;
+ time_t weeks = (duration / 604800) % 52;
+ time_t days = (duration / 86400) % 7;
+ time_t hours = (duration / 3600) % 24;
+ time_t minutes = (duration / 60) % 60;
+ time_t seconds = duration % 60;
+
+ std::string ret;
+
+ if (years)
+ ret = ConvToStr(years) + "y";
+ if (weeks)
+ ret += ConvToStr(weeks) + "w";
+ if (days)
+ ret += ConvToStr(days) + "d";
+ if (hours)
+ ret += ConvToStr(hours) + "h";
+ if (minutes)
+ ret += ConvToStr(minutes) + "m";
+ if (seconds)
+ ret += ConvToStr(seconds) + "s";
+
+ return ret;
}
-void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const char* format, ...)
+std::string InspIRCd::Format(va_list& vaList, const char* formatString)
{
- char textbuffer[MAXBUF];
- va_list argsPtr;
- va_start (argsPtr, format);
- vsnprintf(textbuffer, MAXBUF, format, argsPtr);
- va_end(argsPtr);
+ static std::vector<char> formatBuffer(1024);
- this->SendWhoisLine(user, dest, numeric, std::string(textbuffer));
-}
+ while (true)
+ {
+ va_list dst;
+ va_copy(dst, vaList);
-/** Refactored by Brain, Jun 2008. Much faster with some clever O(1) array
- * lookups and pointer maths.
- */
-long InspIRCd::Duration(const std::string &str)
-{
- unsigned char multiplier = 0;
- long total = 0;
- long times = 1;
- long subtotal = 0;
+ int vsnret = vsnprintf(&formatBuffer[0], formatBuffer.size(), formatString, dst);
+ va_end(dst);
- /* Iterate each item in the string, looking for number or multiplier */
- for (std::string::const_reverse_iterator i = str.rbegin(); i != str.rend(); ++i)
- {
- /* Found a number, queue it onto the current number */
- if ((*i >= '0') && (*i <= '9'))
+ if (vsnret > 0 && static_cast<unsigned>(vsnret) < formatBuffer.size())
{
- subtotal = subtotal + ((*i - '0') * times);
- times = times * 10;
+ break;
}
- else
- {
- /* Found something thats not a number, find out how much
- * it multiplies the built up number by, multiply the total
- * and reset the built up number.
- */
- if (subtotal)
- total += subtotal * duration_multi[multiplier];
- /* Next subtotal please */
- subtotal = 0;
- multiplier = *i;
- times = 1;
- }
- }
- if (multiplier)
- {
- total += subtotal * duration_multi[multiplier];
- subtotal = 0;
+ formatBuffer.resize(formatBuffer.size() * 2);
}
- /* Any trailing values built up are treated as raw seconds */
- return total + subtotal;
+
+ return std::string(&formatBuffer[0]);
}
-bool InspIRCd::ULine(const char* server)
+std::string InspIRCd::Format(const char* formatString, ...)
{
- if (!server)
- return false;
- if (!*server)
- return true;
+ std::string ret;
+ VAFORMAT(ret, formatString, formatString);
+ return ret;
+}
+
+std::string InspIRCd::TimeString(time_t curtime, const char* format, bool utc)
+{
+#ifdef _WIN32
+ if (curtime < 0)
+ curtime = 0;
+#endif
+
+ struct tm* timeinfo = utc ? gmtime(&curtime) : localtime(&curtime);
+ if (!timeinfo)
+ {
+ curtime = 0;
+ timeinfo = localtime(&curtime);
+ }
+
+ // If the calculated year exceeds four digits or is less than the year 1000,
+ // the behavior of asctime() is undefined
+ if (timeinfo->tm_year + 1900 > 9999)
+ timeinfo->tm_year = 9999 - 1900;
+ else if (timeinfo->tm_year + 1900 < 1000)
+ timeinfo->tm_year = 0;
+
+ // This is the default format used by asctime without the terminating new line.
+ if (!format)
+ format = "%a %b %d %Y %H:%M:%S";
- return (Config->ulines.find(server) != Config->ulines.end());
+ char buffer[512];
+ if (!strftime(buffer, sizeof(buffer), format, timeinfo))
+ buffer[0] = '\0';
+
+ return buffer;
}
-bool InspIRCd::SilentULine(const char* server)
+std::string InspIRCd::GenRandomStr(unsigned int length, bool printable)
{
- std::map<irc::string,bool>::iterator n = Config->ulines.find(server);
- if (n != Config->ulines.end())
- return n->second;
- else return false;
+ char* buf = new char[length];
+ GenRandom(buf, length);
+ std::string rv;
+ rv.resize(length);
+ for(size_t i = 0; i < length; i++)
+ rv[i] = printable ? 0x3F + (buf[i] & 0x3F) : buf[i];
+ delete[] buf;
+ return rv;
}
-std::string InspIRCd::TimeString(time_t curtime)
+// NOTE: this has a slight bias for lower values if max is not a power of 2.
+// Don't use it if that matters.
+unsigned long InspIRCd::GenRandomInt(unsigned long max)
{
- return std::string(ctime(&curtime),24);
+ unsigned long rv;
+ GenRandom((char*)&rv, sizeof(rv));
+ return rv % max;
}
+// This is overridden by a higher-quality algorithm when TLS (SSL) support is loaded
+void InspIRCd::DefaultGenRandom(char* output, size_t max)
+{
+#if defined HAS_ARC4RANDOM_BUF
+ arc4random_buf(output, max);
+#else
+ for (unsigned int i = 0; i < max; ++i)
+# ifdef _WIN32
+ {
+ unsigned int uTemp;
+ if(rand_s(&uTemp) != 0)
+ output[i] = rand();
+ else
+ output[i] = uTemp;
+ }
+# else
+ output[i] = random();
+# endif
+#endif
+}