// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "irc.h"
-#include "strlcpy.h"
#include "base58.h"
#include "net.h"
+#include <boost/algorithm/string/predicate.hpp> // for startswith() and endswith()
+
using namespace std;
using namespace boost;
// Make this thread recognisable as the IRC seeding thread
RenameThread("novacoin-ircseed");
+ printf("ThreadIRCSeed started\n");
+
try
{
ThreadIRCSeed2(parg);
if (!GetBoolArg("-irc", true))
return;
- printf("ThreadIRCSeed started\n");
+ printf("ThreadIRCSeed trying to connect...\n");
+
int nErrorWait = 10;
int nRetryWait = 10;
int nNameRetry = 0;
while (!fShutdown)
{
- CService addrConnect("92.243.23.21", 6667); // irc.lfnet.org
+ const uint16_t nIrcPort = 6667;
+ CService addrConnect("92.243.23.21", nIrcPort); // irc.lfnet.org
- CService addrIRC("irc.lfnet.org", 6667, true);
+ CService addrIRC("irc.lfnet.org", nIrcPort, true);
if (addrIRC.IsValid())
addrConnect = addrIRC;
if (vWords.size() < 2)
continue;
- char pszName[10000];
- pszName[0] = '\0';
+ std::string strName;
if (vWords[1] == "352" && vWords.size() >= 8)
{
// index 7 is limited to 16 characters
// could get full length name at index 10, but would be different from join messages
- strlcpy(pszName, vWords[7].c_str(), sizeof(pszName));
+ strName = vWords[7].c_str();
printf("IRC got who\n");
}
if (vWords[1] == "JOIN" && vWords[0].size() > 1)
{
// :username!username@50000007.F000000B.90000002.IP JOIN :#channelname
- strlcpy(pszName, vWords[0].c_str() + 1, sizeof(pszName));
- if (strchr(pszName, '!'))
- *strchr(pszName, '!') = '\0';
+ strName = vWords[0].substr(1, vWords[0].find('!', 1) - 1);
printf("IRC got join\n");
}
- if (pszName[0] == 'u')
+ if (boost::algorithm::starts_with(strName, "u"))
{
CAddress addr;
- if (DecodeAddress(pszName, addr))
+ if (DecodeAddress(strName, addr))
{
addr.nTime = GetAdjustedTime();
if (addrman.Add(addr, addrConnect, 51 * 60))