Browse Source

Merge branch 'master' of https://github.com/GOSTSec/gostcoin

pull/5/head
orignal 8 years ago
parent
commit
026c36e216
  1. 0
      .gitmodules
  2. 2
      gostcoin-qt.pro
  3. 192
      i2psam/makefile.mingw
  4. 5
      src/Gost.cpp
  5. 5
      src/init.cpp
  6. 455
      src/irc.cpp
  7. 12
      src/irc.h
  8. 4
      src/main.cpp
  9. 19
      src/makefile.mingw
  10. 1
      src/makefile.unix
  11. 11
      src/net.cpp

0
.gitmodules vendored

2
gostcoin-qt.pro

@ -211,7 +211,6 @@ HEADERS += src/qt/bitcoingui.h \ @@ -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 \ @@ -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 \

192
i2psam/makefile.mingw

@ -1,78 +1,114 @@ @@ -1,78 +1,114 @@
#############################################################################
# Makefile for building: libi2psam
# Generated by qmake (2.01a) (Qt 4.8.3) on: ?? ????. 10 02:43:02 2013
# Project: i2psam.pro
# Template: lib
#############################################################################
####### Compiler, tools and options
CC = i686-w64-mingw32-gcc
CXX = i686-w64-mingw32-g++
DEFINES = -D_MT -DWIN32 -D_WINDOWS
CFLAGS = -pipe -isystem /usr/i686-w64-mingw32/include/ -O2 -Wall -Wextra $(DEFINES)
CXXFLAGS = -O2 -fexceptions -Wall -Wextra $(DEFINES)
INCPATH = -I'../../dependencies/mingw32/qt/include' -I'../../dependencies/mingw32' -I'../../dependencies/mingw32/qt/include/ActiveQt' -I'../../dependencies/mingw32/qt/mkspecs/unsupported/win32-g++-cross'
LIB = i686-w64-mingw32-ar -ru
COPY = cp
SED = sed
COPY_FILE = $(COPY)
COPY_DIR = cp -R
DEL_FILE = rm -f
DEL_DIR = rmdir
MOVE = mv
CHK_DIR_EXISTS= test -d
MKDIR = mkdir -p
INSTALL_FILE = $(COPY_FILE)
INSTALL_PROGRAM = $(COPY_FILE)
INSTALL_DIR = $(COPY_DIR)
####### Files
SOURCES = i2psam.cpp
OBJECTS = i2psam.o
TARGET = libi2psam.a
####### Implicit rules
.SUFFIXES: .cpp .cc .cxx .C .c
.cpp.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
.cc.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
.cxx.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
.C.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
.c.o:
$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
####### Build rules
first: all
all: $(TARGET)
$(TARGET): $(OBJECTS)
$(LIB) $(TARGET) $(OBJECTS)
clean:
-$(DEL_FILE) release/$(TARGET)
-$(DEL_FILE) release/i2psam.o
distclean: clean
-$(DEL_FILE) $(TARGET)
####### Compile
release/i2psam.o: i2psam.cpp i2psam.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o release/i2psam.o i2psam.cpp
####### Install
FORCE:
#############################################################################
# Makefile for building: libi2psam.a
# make -f makefile.unix
#############################################################################
####### Compiler, tools and options
CC = gcc
CXX = g++
DEFINES = -D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
CFLAGS = -pipe -O2 -fPIC -Wall -W -D_REENTRANT $(DEFINES)
CXXFLAGS = -pipe -O2 -std=c++11 -fPIC -Wall -W -D_REENTRANT $(DEFINES)
AR = ar cqs
RANLIB =
TAR = tar -cf
COMPRESS = gzip -9f
COPY = cp -f
SED = sed
COPY_FILE = $(COPY)
COPY_DIR = $(COPY) -r
STRIP = strip
INSTALL_FILE = install -m 644 -p
INSTALL_DIR = $(COPY_DIR)
INSTALL_PROGRAM = install -m 755 -p
DEL_FILE = rm -f
SYMLINK = ln -f -s
DEL_DIR = rmdir
MOVE = mv -f
CHK_DIR_EXISTS= test -d
MKDIR = mkdir -p
####### Output directory
OBJECTS_DIR = ./
####### Files
SOURCES = i2psam.cpp
OBJECTS = i2psam.o
DESTDIR =
TARGET = libi2psam.a
first: all
####### Implicit rules
.SUFFIXES: .o .c .cpp .cc .cxx .C
.cpp.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
.cc.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
.cxx.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
.C.o:
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
.c.o:
$(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
####### Build rules
all: $(TARGET)
staticlib: $(TARGET)
$(TARGET): $(OBJECTS) $(OBJCOMP)
-$(DEL_FILE) $(TARGET)
$(AR) $(TARGET) $(OBJECTS)
dist:
@$(CHK_DIR_EXISTS) .tmp/i2psam1.0.0 || $(MKDIR) .tmp/i2psam1.0.0
$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/i2psam1.0.0/ && $(COPY_FILE) --parents i2psam.h .tmp/i2psam1.0.0/ && $(COPY_FILE) --parents i2psam.cpp .tmp/i2psam1.0.0/ && (cd `dirname .tmp/i2psam1.0.0` && $(TAR) i2psam1.0.0.tar i2psam1.0.0 && $(COMPRESS) i2psam1.0.0.tar) && $(MOVE) `dirname .tmp/i2psam1.0.0`/i2psam1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/i2psam1.0.0
clean:
-$(DEL_FILE) $(TARGET)
-$(DEL_FILE) $(OBJECTS)
####### Sub-libraries
distclean: clean
-$(DEL_FILE) $(TARGET)
check: first
####### Compile
i2psam.o: i2psam.cpp i2psam.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o i2psam.o i2psam.cpp
####### Install
install_target: first FORCE
@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/lib/ || $(MKDIR) $(INSTALL_ROOT)/usr/lib/
-$(INSTALL_FILE) "$(TARGET)" "$(INSTALL_ROOT)/usr/lib/$(TARGET)"
uninstall_target: FORCE
-$(DEL_FILE) "$(INSTALL_ROOT)/usr/lib/$(TARGET)"
-$(DEL_DIR) $(INSTALL_ROOT)/usr/lib/
install: install_target FORCE
uninstall: uninstall_target FORCE
FORCE:

5
src/Gost.cpp

@ -356,7 +356,12 @@ namespace crypto @@ -356,7 +356,12 @@ namespace crypto
bit >>= 1;
}
}
#ifdef WIN32
for (int k = 0; k < 8; k++)
buf[k] = ((uint8_t *)&c)[7-k];
#else
ll[i] = htobe64 (c); // TODO:
#endif
}
}

5
src/init.cpp

@ -344,7 +344,6 @@ std::string HelpMessage() @@ -344,7 +344,6 @@ std::string HelpMessage()
" -listen " + _("Accept connections from outside (default: 1 if no -proxy or -connect)") + "\n" +
" -bind=<addr> " + _("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=<n> " + _("Threshold for disconnecting misbehaving peers (default: 100)") + "\n" +
" -bantime=<n> " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)") + "\n" +
" -maxreceivebuffer=<n> " + _("Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)") + "\n" +
@ -579,7 +578,6 @@ bool AppInit2(boost::thread_group& threadGroup) @@ -579,7 +578,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")) {
@ -809,12 +807,11 @@ bool AppInit2(boost::thread_group& threadGroup) @@ -809,12 +807,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)

455
src/irc.cpp

@ -1,455 +0,0 @@ @@ -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 <boost/algorithm/string/predicate.hpp> // for startswith() and endswith()
#ifndef _WIN32
#include <sys/ioctl.h>
#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<unsigned char> vch(UBEGIN(tmp), UEND(tmp));
return string("u") + EncodeBase58Check(vch);
}
return "";
}
bool DecodeAddress(string str, CService& addr)
{
vector<unsigned char> 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<string> 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<string> 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<string> 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<string> 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

12
src/irc.h

@ -1,12 +0,0 @@ @@ -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

4
src/main.cpp

@ -4349,7 +4349,7 @@ public: @@ -4349,7 +4349,7 @@ public:
CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
{
// Create new block
auto_ptr<CBlockTemplate> pblocktemplate(new CBlockTemplate());
unique_ptr<CBlockTemplate> pblocktemplate(new CBlockTemplate());
if(!pblocktemplate.get())
return NULL;
CBlock *pblock = &pblocktemplate->block; // pointer for convenience
@ -4718,7 +4718,7 @@ void static GostcoinMiner(CWallet *pwallet) @@ -4718,7 +4718,7 @@ void static GostcoinMiner(CWallet *pwallet)
unsigned int nTransactionsUpdatedLast = nTransactionsUpdated;
CBlockIndex* pindexPrev = pindexBest;
auto_ptr<CBlockTemplate> pblocktemplate(CreateNewBlockWithKey(reservekey));
unique_ptr<CBlockTemplate> pblocktemplate(CreateNewBlockWithKey(reservekey));
if (!pblocktemplate.get())
return;
CBlock *pblock = &pblocktemplate->block;

19
src/makefile.mingw

@ -21,7 +21,7 @@ USE_UPNP:=- @@ -21,7 +21,7 @@ USE_UPNP:=-
USE_IPV6:=1
DEPSDIR?=/usr/local
BOOST_SUFFIX?=-mgw46-mt-sd-1_52
BOOST_SUFFIX?=-mt
INCLUDEPATHS= \
-I"$(CURDIR)" \
@ -87,7 +87,6 @@ OBJS= \ @@ -87,7 +87,6 @@ OBJS= \
obj/db.o \
obj/init.o \
obj/keystore.o \
obj/irc.o \
obj/i2p.o \
obj/main.o \
obj/net.o \
@ -100,7 +99,6 @@ OBJS= \ @@ -100,7 +99,6 @@ OBJS= \
obj/rpcblockchain.o \
obj/rpcrawtransaction.o \
obj/script.o \
obj/scrypt.o \
obj/sync.o \
obj/util.o \
obj/wallet.o \
@ -109,7 +107,8 @@ OBJS= \ @@ -109,7 +107,8 @@ OBJS= \
obj/bloom.o \
obj/noui.o \
obj/leveldb.o \
obj/txdb.o
obj/txdb.o \
obj/Gost.o
ifdef USE_SSE2
DEFS += -DUSE_SSE2
@ -117,10 +116,10 @@ OBJS_SSE2= obj/scrypt-sse2.o @@ -117,10 +116,10 @@ OBJS_SSE2= obj/scrypt-sse2.o
OBJS += $(OBJS_SSE2)
endif
all: anoncoind.exe
all: gostcoind.exe
test check: test_anoncoin.exe FORCE
test_anoncoin.exe
test check: test_gostcoin.exe FORCE
test_gostcoin.exe
#
# LevelDB support
@ -137,7 +136,7 @@ obj/%-sse2.o: %-sse2.cpp @@ -137,7 +136,7 @@ obj/%-sse2.o: %-sse2.cpp
obj/%.o: %.cpp $(HEADERS)
$(CXX) -c $(CFLAGS) -o $@ $<
anoncoind.exe: $(OBJS:obj/%=obj/%)
gostcoind.exe: $(OBJS:obj/%=obj/%)
$(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
@ -145,11 +144,11 @@ TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) @@ -145,11 +144,11 @@ TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
obj-test/%.o: test/%.cpp $(HEADERS)
$(CXX) -c $(TESTDEFS) $(CFLAGS) -o $@ $<
test_anoncoin.exe: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
test_gostcoin.exe: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
$(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework$(BOOST_SUFFIX) $(LIBS)
clean:
rm -f anoncoind.exe test_anoncoin.exe
rm -f gostcoind.exe test_gostcoin.exe
rm -f obj/*
rm -f obj-test/*
cd leveldb && $(MAKE) TARGET_OS=NATIVE_WINDOWS clean && cd ..

1
src/makefile.unix

@ -126,7 +126,6 @@ OBJS= \ @@ -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 \

11
src/net.cpp

@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
#include "addrman.h"
#include "ui_interface.h"
#include "script.h"
#include "irc.h"
#include "i2p.h"
#ifdef WIN32
@ -1869,15 +1868,15 @@ bool BindListenPort(const CService &addrBind, string& strError) @@ -1869,15 +1868,15 @@ bool BindListenPort(const CService &addrBind, string& strError)
// some systems don't have IPV6_V6ONLY but are always v6only; others do have the option
// and enable it by default or not. Try to enable it, if possible.
if (addrBind.IsIPv6()) {
#ifdef IPV6_V6ONLY
setsockopt(hListenSocket, IPPROTO_IPV6, IPV6_V6ONLY, (void*)&nOne, sizeof(int));
#endif
#ifdef WIN32
int nProtLevel = 10 /* PROTECTION_LEVEL_UNRESTRICTED */;
int nParameterId = 23 /* IPV6_PROTECTION_LEVEl */;
// this call is allowed to fail
setsockopt(hListenSocket, IPPROTO_IPV6, nParameterId, (const char*)&nProtLevel, sizeof(int));
#elif IPV6_V6ONLY
setsockopt(hListenSocket, IPPROTO_IPV6, IPV6_V6ONLY, (void*)&nOne, sizeof(int));
#endif
}
#endif
@ -1992,10 +1991,6 @@ void StartNode(boost::thread_group& threadGroup) @@ -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<void (*)()>, "irc", &ThreadIRCSeed));
// Send and receive from sockets, accept connections
threadGroup.create_thread(boost::bind(&TraceThread<void (*)()>, "net", &ThreadSocketHandler));

Loading…
Cancel
Save