diff --git a/gostcoin-qt.pro b/gostcoin-qt.pro index e255ebb..2d4cb78 100644 --- a/gostcoin-qt.pro +++ b/gostcoin-qt.pro @@ -211,7 +211,6 @@ HEADERS += src/qt/bitcoingui.h \ src/allocators.h \ src/ui_interface.h \ src/qt/rpcconsole.h \ - src/irc.h \ src/i2p.h \ src/Gost.h \ src/version.h \ @@ -292,7 +291,6 @@ SOURCES += src/qt/gostcoin.cpp \ src/qt/notificator.cpp \ src/qt/paymentserver.cpp \ src/qt/rpcconsole.cpp \ - src/irc.cpp \ src/i2p.cpp \ src/Gost.cpp \ src/noui.cpp \ diff --git a/src/init.cpp b/src/init.cpp index 6ac0946..4bfaa6b 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -344,7 +344,6 @@ std::string HelpMessage() " -listen " + _("Accept connections from outside (default: 1 if no -proxy or -connect)") + "\n" + " -bind= " + _("Bind to given address and always listen on it. Use [host]:port notation for IPv6") + "\n" + " -dnsseed " + _("Find peers using DNS lookup (default: 1 unless -connect)") + "\n" + - " -irc " + _("Find peers using internet relay chat (default: 0)") + "\n" + " -banscore= " + _("Threshold for disconnecting misbehaving peers (default: 100)") + "\n" + " -bantime= " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)") + "\n" + " -maxreceivebuffer= " + _("Maximum per-connection receive buffer, *1000 bytes (default: 5000)") + "\n" + @@ -576,7 +575,6 @@ bool AppInit2(boost::thread_group& threadGroup) if (fBloomFilters) nLocalServices |= NODE_BLOOM; - SoftSetBoolArg("-irc", true); SoftSetBoolArg("-stfu", false); // STFU mode stops complaining about darknets. if (mapArgs.count("-bind")) { @@ -806,12 +804,11 @@ bool AppInit2(boost::thread_group& threadGroup) enum Network net = ParseNetwork(snet); if (net == NET_NATIVE_I2P) { - // Disable upnp and IRC and listen on I2P only. + // Disable upnp and listen on I2P only. #ifdef USE_UPNP SoftSetBoolArg("-upnp", false); #endif SoftSetBoolArg("-listen",true); - SoftSetBoolArg("-irc",false); SoftSetBoolArg("-discover",false); } if (net == NET_UNROUTABLE) diff --git a/src/irc.cpp b/src/irc.cpp deleted file mode 100644 index 4b2090a..0000000 --- a/src/irc.cpp +++ /dev/null @@ -1,455 +0,0 @@ -// Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2012 The Bitcoin developers -// Distributed under the MIT/X11 software license, see the accompanying -// file COPYING or http://www.opensource.org/licenses/mit-license.php. - -#include "irc.h" -#include "net.h" -#include "base58.h" - -#include // for startswith() and endswith() -#ifndef _WIN32 -#include -#endif -using namespace std; -using namespace boost; - -int nGotIRCAddresses = 0; - -#pragma pack(push, 1) -struct ircaddr -{ - struct in_addr ip; - short port; -}; -#pragma pack(pop) - -string EncodeAddress(const CService& addr) -{ - struct ircaddr tmp; - if (addr.GetInAddr(&tmp.ip)) - { - tmp.port = htons(addr.GetPort()); - - vector vch(UBEGIN(tmp), UEND(tmp)); - return string("u") + EncodeBase58Check(vch); - } - return ""; -} - -bool DecodeAddress(string str, CService& addr) -{ - vector vch; - if (!DecodeBase58Check(str.substr(1), vch)) - return false; - - struct ircaddr tmp; - if (vch.size() != sizeof(tmp)) - return false; - memcpy(&tmp, &vch[0], sizeof(tmp)); - - addr = CService(tmp.ip, ntohs(tmp.port)); - return true; -} - - - - - - -static bool Send(SOCKET hSocket, const char* pszSend) -{ - if (strstr(pszSend, "PONG") != pszSend) - printf("IRC SENDING: %s\n", pszSend); - const char* psz = pszSend; - const char* pszEnd = psz + strlen(psz); - while (psz < pszEnd) - { - boost::this_thread::interruption_point(); - int ret = send(hSocket, psz, pszEnd - psz, MSG_NOSIGNAL); - if (ret < 0) - return false; - psz += ret; - } - return true; -} - -int SocketCanRead(int fd) -{ -#ifdef _WIN32 - unsigned long opt; - if (ioctlsocket(fd, FIONREAD, &opt) < 0) { return 0; } - return opt; -#else - int opt; - if (ioctl(fd, FIONREAD, &opt) < 0) { return 0; } - return opt; -#endif -} - -bool RecvLineFixed(SOCKET hSocket, string& strLine) -{ - strLine = ""; - loop - { - char c; - bool stop = false; - while(!stop) - { - boost::this_thread::interruption_point(); - if (SocketCanRead(hSocket) >= 1) { stop = true; } - else { MilliSleep(10); } - } - - int nBytes = recv(hSocket, &c, 1, 0); - if (nBytes > 0) - { - if (c == '\n') - continue; - if (c == '\r') - return true; - strLine += c; - if (strLine.size() >= 9000) - return true; - } - else if (nBytes <= 0) - { - boost::this_thread::interruption_point(); - if (nBytes < 0) - { - int nErr = WSAGetLastError(); - if (nErr == WSAEMSGSIZE) - continue; - if (nErr == WSAEWOULDBLOCK || nErr == WSAEINTR || nErr == WSAEINPROGRESS) - { - MilliSleep(10); - continue; - } - } - if (!strLine.empty()) - return true; - if (nBytes == 0) - { - // socket closed - printf("socket closed\n"); - return false; - } - else - { - // socket error - int nErr = WSAGetLastError(); - printf("recv failed: %d\n", nErr); - return false; - } - } - } -} - -bool RecvLineIRC(SOCKET hSocket, string& strLine) -{ - loop - { - boost::this_thread::interruption_point(); - bool fRet = RecvLineFixed(hSocket, strLine); - if (fRet) - { - boost::this_thread::interruption_point(); - vector vWords; - ParseString(strLine, ' ', vWords); - if (vWords.size() >= 1 && vWords[0] == "PING") - { - strLine[1] = 'O'; - strLine += '\r'; - Send(hSocket, strLine.c_str()); - continue; - } - } - return fRet; - } -} - -int RecvUntil(SOCKET hSocket, const char* psz1, const char* psz2=NULL, const char* psz3=NULL, const char* psz4=NULL) -{ - loop - { - boost::this_thread::interruption_point(); - - string strLine; - strLine.reserve(10000); - if (!RecvLineIRC(hSocket, strLine)) - return 0; - printf("IRC %s\n", strLine.c_str()); - if (psz1 && strLine.find(psz1) != string::npos) - return 1; - if (psz2 && strLine.find(psz2) != string::npos) - return 2; - if (psz3 && strLine.find(psz3) != string::npos) - return 3; - if (psz4 && strLine.find(psz4) != string::npos) - return 4; - } -} - -bool Wait(int nSeconds) -{ - boost::this_thread::interruption_point(); - printf("IRC waiting %d seconds to reconnect\n", nSeconds); - for (int i = 0; i < nSeconds; i++) - { - boost::this_thread::interruption_point(); - MilliSleep(1000); - } - return true; -} - -bool RecvCodeLine(SOCKET hSocket, const char* psz1, string& strRet) -{ - strRet.clear(); - loop - { - boost::this_thread::interruption_point(); - string strLine; - if (!RecvLineIRC(hSocket, strLine)) - return false; - - vector vWords; - ParseString(strLine, ' ', vWords); - if (vWords.size() < 2) - continue; - - if (vWords[1] == psz1) - { - printf("IRC %s\n", strLine.c_str()); - strRet = strLine; - return true; - } - } -} - -bool GetIPFromIRC(SOCKET hSocket, string strMyName, CNetAddr& ipRet) -{ - Send(hSocket, strprintf("USERHOST %s\r", strMyName.c_str()).c_str()); - - string strLine; - if (!RecvCodeLine(hSocket, "302", strLine)) - return false; - - vector vWords; - ParseString(strLine, ' ', vWords); - if (vWords.size() < 4) - return false; - - string str = vWords[3]; - if (str.rfind("@") == string::npos) - return false; - string strHost = str.substr(str.rfind("@")+1); - - // Hybrid IRC used by lfnet always returns IP when you userhost yourself, - // but in case another IRC is ever used this should work. - printf("GetIPFromIRC() got userhost %s\n", strHost.c_str()); - CNetAddr addr(strHost, true); - if (!addr.IsValid()) - return false; - ipRet = addr; - - return true; -} - -void ThreadIRCSeed() -{ - // Don't connect to IRC if we won't use IPv4 connections. - if (IsLimited(NET_IPV4)) - return; - - // ... or if we won't make outbound connections and won't accept inbound ones. - if (mapArgs.count("-connect") && fNoListen) - return; - - // ... or if IRC is not enabled. - if (!GetBoolArg("-irc", false)) - return; - - printf("ThreadIRCSeed trying to connect...\n"); - - int nErrorWait = 10; - int nRetryWait = 10; - int nNameRetry = 0; - - while (true) - { - boost::this_thread::interruption_point(); - CService addrConnect("92.243.23.21", 6667); // irc.lfnet.org - - CService addrIRC("irc.lfnet.org", 6667, true); - if (addrIRC.IsValid()) - addrConnect = addrIRC; - - SOCKET hSocket; - if (!ConnectSocket(addrConnect, hSocket)) - { - printf("IRC connect failed\n"); - nErrorWait = nErrorWait * 11 / 10; - if (Wait(nErrorWait += 60)) - continue; - else - return; - } - - if (!RecvUntil(hSocket, "Found your hostname", "using your IP address instead", "Couldn't look up your hostname", "ignoring hostname")) - { - closesocket(hSocket); - hSocket = INVALID_SOCKET; - nErrorWait = nErrorWait * 11 / 10; - if (Wait(nErrorWait += 60)) - continue; - else - return; - } - - CNetAddr addrIPv4("1.2.3.4"); // arbitrary IPv4 address to make GetLocal prefer IPv4 addresses - CService addrLocal; - string strMyName; - // Don't use our IP as our nick if we're not listening - // or if it keeps failing because the nick is already in use. - if (!fNoListen && GetLocal(addrLocal, &addrIPv4) && nNameRetry<3) - strMyName = EncodeAddress(GetLocalAddress(&addrConnect)); - if (strMyName == "") - strMyName = strprintf("x%" PRI64u "", GetRand(1000000000)); - - Send(hSocket, strprintf("NICK %s\r", strMyName.c_str()).c_str()); - Send(hSocket, strprintf("USER %s 8 * : %s\r", strMyName.c_str(), strMyName.c_str()).c_str()); - - int nRet = RecvUntil(hSocket, " 004 ", " 433 "); - if (nRet != 1) - { - closesocket(hSocket); - hSocket = INVALID_SOCKET; - if (nRet == 2) - { - printf("IRC name already in use\n"); - nNameRetry++; - Wait(10); - continue; - } - nErrorWait = nErrorWait * 11 / 10; - if (Wait(nErrorWait += 60)) - continue; - else - return; - } - nNameRetry = 0; - MilliSleep(500); - - // Get our external IP from the IRC server and re-nick before joining the channel - CNetAddr addrFromIRC; - if (GetIPFromIRC(hSocket, strMyName, addrFromIRC)) - { - printf("GetIPFromIRC() returned %s\n", addrFromIRC.ToString().c_str()); - // Don't use our IP as our nick if we're not listening - if (!fNoListen && addrFromIRC.IsRoutable()) - { - // IRC lets you to re-nick - AddLocal(addrFromIRC, LOCAL_IRC); - strMyName = EncodeAddress(GetLocalAddress(&addrConnect)); - Send(hSocket, strprintf("NICK %s\r", strMyName.c_str()).c_str()); - } - } - - if (fTestNet) { - Send(hSocket, "JOIN #anoncoinTEST3\r"); - Send(hSocket, "WHO #anoncoinTEST3\r"); - } else { - // randomly join #M3GAC01N00-#M3GAC01N99 - int channel_number = GetRandInt(100); - channel_number = 0; // For now, just use one channel - Send(hSocket, strprintf("JOIN #anoncoin%02d\r", channel_number).c_str()); - Send(hSocket, strprintf("WHO #anoncoin%02d\r", channel_number).c_str()); - } - - int64 nStart = GetTime(); - string strLine; - strLine.reserve(10000); - while (RecvLineIRC(hSocket, strLine)) - { - boost::this_thread::interruption_point(); - if (strLine.empty() || strLine.size() > 900 || strLine[0] != ':') - continue; - - vector vWords; - ParseString(strLine, ' ', vWords); - if (vWords.size() < 2) - continue; - - 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 - 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 - strName = vWords[0].substr(1, vWords[0].find('!', 1) - 1); - printf("IRC got join\n"); - } - - if (boost::algorithm::starts_with(strName, "u")) - { - CAddress addr; - if (DecodeAddress(strName, addr)) - { - addr.nTime = GetAdjustedTime(); - if (addrman.Add(addr, addrConnect, 51 * 60)) - printf("IRC got new address: %s\n", addr.ToString().c_str()); - nGotIRCAddresses++; - } - else - { - printf("IRC decode failed\n"); - } - } - } - closesocket(hSocket); - hSocket = INVALID_SOCKET; - - if (GetTime() - nStart > 20 * 60) - { - nErrorWait /= 3; - nRetryWait /= 3; - } - - nRetryWait = nRetryWait * 11 / 10; - if (!Wait(nRetryWait += 60)) - return; - } -} - - - - - - - - - - -#ifdef TEST -int main(int argc, char *argv[]) -{ - WSADATA wsadata; - if (WSAStartup(MAKEWORD(2,2), &wsadata) != NO_ERROR) - { - printf("Error at WSAStartup()\n"); - return false; - } - - ThreadIRCSeed(NULL); - - WSACleanup(); - return 0; -} -#endif diff --git a/src/irc.h b/src/irc.h deleted file mode 100644 index 0ff48ee..0000000 --- a/src/irc.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2009-2010 Satoshi Nakamoto -// Copyright (c) 2009-2012 The Bitcoin developers -// Distributed under the MIT/X11 software license, see the accompanying -// file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef ANONCOIN_IRC_H -#define ANONCOIN_IRC_H - -void ThreadIRCSeed(); - -extern int nGotIRCAddresses; - -#endif diff --git a/src/makefile.unix b/src/makefile.unix index d1a3c36..b12e72f 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -126,7 +126,6 @@ OBJS= \ obj/db.o \ obj/init.o \ obj/keystore.o \ - obj/irc.o \ obj/i2p.o \ obj/Gost.o \ obj/main.o \ diff --git a/src/net.cpp b/src/net.cpp index e8ee7b4..87606da 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -9,7 +9,6 @@ #include "addrman.h" #include "ui_interface.h" #include "script.h" -#include "irc.h" #include "i2p.h" #ifdef WIN32 @@ -1992,10 +1991,6 @@ void StartNode(boost::thread_group& threadGroup) MapPort(GetBoolArg("-upnp", USE_UPNP)); #endif - // Get addresses from IRC and advertise ours - if (!IsI2POnly()) - threadGroup.create_thread(boost::bind(&TraceThread, "irc", &ThreadIRCSeed)); - // Send and receive from sockets, accept connections threadGroup.create_thread(boost::bind(&TraceThread, "net", &ThreadSocketHandler));