mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 12:02:48 +01:00
Get local host IP on Linux, Shutdown() a little cleaner -- linux-0.1.6-test1 waypoint
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@37 1a98c847-1fd6-4fd8-948a-caf3550aa51b
This commit is contained in:
parent
b4e235f9f2
commit
956468c29a
@ -72,6 +72,8 @@
|
|||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
#include <net/if.h>
|
||||||
|
#include <ifaddrs.h>
|
||||||
#include <boost/filesystem.hpp>
|
#include <boost/filesystem.hpp>
|
||||||
#include <boost/thread/thread.hpp>
|
#include <boost/thread/thread.hpp>
|
||||||
#include <boost/algorithm/string.hpp>
|
#include <boost/algorithm/string.hpp>
|
||||||
|
4
main.cpp
4
main.cpp
@ -1215,7 +1215,7 @@ bool CBlock::AcceptBlock()
|
|||||||
return error("AcceptBlock() : block's timestamp is too early");
|
return error("AcceptBlock() : block's timestamp is too early");
|
||||||
|
|
||||||
// Check that all transactions are finalized (starting around Dec 2009)
|
// Check that all transactions are finalized (starting around Dec 2009)
|
||||||
if (nBestHeight > 31000) // 25620 + 5320
|
if (nBestHeight > 31000)
|
||||||
foreach(const CTransaction& tx, vtx)
|
foreach(const CTransaction& tx, vtx)
|
||||||
if (!tx.IsFinal(nTime))
|
if (!tx.IsFinal(nTime))
|
||||||
return error("AcceptBlock() : contains a non-final transaction");
|
return error("AcceptBlock() : contains a non-final transaction");
|
||||||
@ -1802,7 +1802,7 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
|
|||||||
{
|
{
|
||||||
if (fShutdown)
|
if (fShutdown)
|
||||||
return true;
|
return true;
|
||||||
addr.nTime = GetAdjustedTime();
|
addr.nTime = GetAdjustedTime() - 2 * 60 * 60;
|
||||||
if (pfrom->fGetAddr)
|
if (pfrom->fGetAddr)
|
||||||
addr.nTime -= 5 * 24 * 60 * 60;
|
addr.nTime -= 5 * 24 * 60 * 60;
|
||||||
AddAddress(addrdb, addr, false);
|
AddAddress(addrdb, addr, false);
|
||||||
|
@ -15,21 +15,24 @@ endif
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
INCLUDEPATHS=-I"/usr/include" \
|
INCLUDEPATHS= \
|
||||||
-I"/usr/local/boost_1_40_0" \
|
-I"/usr/include" \
|
||||||
-I"/usr/local/db-4.7.25.NC/build_unix" \
|
-I"/usr/local/boost_1_40_0" \
|
||||||
-I"/usr/local/include/wx-2.8" \
|
-I"/usr/local/db-4.7.25.NC/build_unix" \
|
||||||
-I"/usr/local/lib/wx/include/gtk2-ansi-debug-static-2.8"
|
-I"/usr/local/include/wx-2.8" \
|
||||||
|
-I"/usr/local/lib/wx/include/gtk2-ansi-debug-static-2.8"
|
||||||
|
|
||||||
LIBPATHS=-L"/usr/lib" \
|
LIBPATHS= \
|
||||||
-L"/usr/local/lib" \
|
-L"/usr/lib" \
|
||||||
-L"/usr/local/db-4.7.25.NC/build_unix"
|
-L"/usr/local/lib" \
|
||||||
|
-L"/usr/local/db-4.7.25.NC/build_unix"
|
||||||
|
|
||||||
LIBS= \
|
LIBS= \
|
||||||
-Wl,-Bstatic -l boost_thread -l boost_system -l boost_filesystem -Wl,-Bdynamic \
|
-Wl,-Bstatic -l boost_thread -l boost_system -l boost_filesystem -Wl,-Bdynamic \
|
||||||
-Wl,-Bstatic -l db_cxx -l wx_gtk2$(D)-2.8 -Wl,-Bdynamic \
|
-Wl,-Bstatic -l db_cxx -l wx_gtk2$(D)-2.8 -Wl,-Bdynamic \
|
||||||
-l crypto \
|
-l crypto \
|
||||||
-l gtk-x11-2.0 -l gthread-2.0 -l SM
|
-l gtk-x11-2.0 -l gthread-2.0 -l SM
|
||||||
|
|
||||||
WXDEFS=-D__WXGTK__ -DNOPCH
|
WXDEFS=-D__WXGTK__ -DNOPCH
|
||||||
CFLAGS=-O0 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS)
|
CFLAGS=-O0 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(INCLUDEPATHS)
|
||||||
HEADERS=headers.h util.h main.h serialize.h uint256.h key.h bignum.h script.h db.h base58.h
|
HEADERS=headers.h util.h main.h serialize.h uint256.h key.h bignum.h script.h db.h base58.h
|
||||||
@ -76,7 +79,7 @@ obj/irc.o: irc.cpp $(HEADERS)
|
|||||||
|
|
||||||
|
|
||||||
OBJS=obj/util.o obj/script.o obj/db.o obj/net.o obj/main.o obj/market.o \
|
OBJS=obj/util.o obj/script.o obj/db.o obj/net.o obj/main.o obj/market.o \
|
||||||
obj/ui.o obj/uibase.o obj/sha.o obj/irc.o
|
obj/ui.o obj/uibase.o obj/sha.o obj/irc.o
|
||||||
|
|
||||||
bitcoin: headers.h.gch $(OBJS)
|
bitcoin: headers.h.gch $(OBJS)
|
||||||
g++ $(CFLAGS) -o $@ $(LIBPATHS) $(OBJS) $(LIBS)
|
g++ $(CFLAGS) -o $@ $(LIBPATHS) $(OBJS) $(LIBS)
|
||||||
|
58
net.cpp
58
net.cpp
@ -842,20 +842,20 @@ void ThreadOpenConnections2(void* parg)
|
|||||||
if (!addr.IsIPv4() || !addr.IsValid() || setConnected.count(addr.ip))
|
if (!addr.IsIPv4() || !addr.IsValid() || setConnected.count(addr.ip))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
// Randomize the order in a deterministic way, putting the standard port first
|
||||||
|
int64 nRandomizer = (uint64)(addr.nLastFailed * 9567851 + addr.ip * 7789) % (1 * 60 * 60);
|
||||||
|
if (addr.port != DEFAULT_PORT)
|
||||||
|
nRandomizer += 1 * 60 * 60;
|
||||||
|
|
||||||
// Limit retry frequency
|
// Limit retry frequency
|
||||||
if (GetAdjustedTime() < addr.nLastFailed + nDelay)
|
if (GetAdjustedTime() < addr.nLastFailed + nDelay + nRandomizer)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
// Try again only after all addresses had a first attempt
|
// Try again only after all addresses had a first attempt
|
||||||
int64 nTime = addr.nTime;
|
int64 nTime = addr.nTime - nRandomizer;
|
||||||
if (addr.nLastFailed > addr.nTime)
|
if (addr.nLastFailed > addr.nTime)
|
||||||
nTime -= 365 * 24 * 60 * 60;
|
nTime -= 365 * 24 * 60 * 60;
|
||||||
|
|
||||||
// Randomize the order a little, putting the standard port first
|
|
||||||
nTime += GetRand(1 * 60 * 60);
|
|
||||||
if (addr.port != DEFAULT_PORT)
|
|
||||||
nTime -= 1 * 60 * 60;
|
|
||||||
|
|
||||||
if (nTime > nBestTime)
|
if (nTime > nBestTime)
|
||||||
{
|
{
|
||||||
nBestTime = nTime;
|
nBestTime = nTime;
|
||||||
@ -1069,6 +1069,7 @@ bool StartNode(string& strError)
|
|||||||
if (pnodeLocalHost == NULL)
|
if (pnodeLocalHost == NULL)
|
||||||
pnodeLocalHost = new CNode(INVALID_SOCKET, CAddress("127.0.0.1", nLocalServices));
|
pnodeLocalHost = new CNode(INVALID_SOCKET, CAddress("127.0.0.1", nLocalServices));
|
||||||
|
|
||||||
|
#ifdef __WXMSW__
|
||||||
// Get local host ip
|
// Get local host ip
|
||||||
char pszHostName[255];
|
char pszHostName[255];
|
||||||
if (gethostname(pszHostName, sizeof(pszHostName)) == SOCKET_ERROR)
|
if (gethostname(pszHostName, sizeof(pszHostName)) == SOCKET_ERROR)
|
||||||
@ -1090,10 +1091,49 @@ bool StartNode(string& strError)
|
|||||||
printf("host ip %d: %s\n", i, CAddress(*(unsigned int*)phostent->h_addr_list[i]).ToStringIP().c_str());
|
printf("host ip %d: %s\n", i, CAddress(*(unsigned int*)phostent->h_addr_list[i]).ToStringIP().c_str());
|
||||||
for (int i = 0; phostent->h_addr_list[i] != NULL; i++)
|
for (int i = 0; phostent->h_addr_list[i] != NULL; i++)
|
||||||
{
|
{
|
||||||
addrLocalHost = CAddress(*(unsigned int*)phostent->h_addr_list[i], DEFAULT_PORT, nLocalServices);
|
CAddress addr(*(unsigned int*)phostent->h_addr_list[i], DEFAULT_PORT, nLocalServices);
|
||||||
if (addrLocalHost.IsValid() && addrLocalHost.GetByte(3) != 127)
|
if (addr.IsValid() && addr.GetByte(3) != 127)
|
||||||
|
{
|
||||||
|
addrLocalHost = addr;
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
// Get local host ip
|
||||||
|
struct ifaddrs* myaddrs;
|
||||||
|
if (getifaddrs(&myaddrs) == 0)
|
||||||
|
{
|
||||||
|
for (struct ifaddrs* ifa = myaddrs; ifa != NULL; ifa = ifa->ifa_next)
|
||||||
|
{
|
||||||
|
if (ifa->ifa_addr == NULL) continue;
|
||||||
|
if ((ifa->ifa_flags & IFF_UP) == 0) continue;
|
||||||
|
if (strcmp(ifa->ifa_name, "lo") == 0) continue;
|
||||||
|
if (strcmp(ifa->ifa_name, "lo0") == 0) continue;
|
||||||
|
char pszIP[100];
|
||||||
|
if (ifa->ifa_addr->sa_family == AF_INET)
|
||||||
|
{
|
||||||
|
struct sockaddr_in* s4 = (struct sockaddr_in*)(ifa->ifa_addr);
|
||||||
|
if (inet_ntop(ifa->ifa_addr->sa_family, (void*)&(s4->sin_addr), pszIP, sizeof(pszIP)) != NULL)
|
||||||
|
printf("ipv4 %s: %s\n", ifa->ifa_name, pszIP);
|
||||||
|
|
||||||
|
// Take the first IP that isn't loopback 127.x.x.x
|
||||||
|
CAddress addr(*(unsigned int*)&s4->sin_addr, DEFAULT_PORT, nLocalServices);
|
||||||
|
if (addr.IsValid() && addr.GetByte(3) != 127)
|
||||||
|
{
|
||||||
|
addrLocalHost = addr;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (ifa->ifa_addr->sa_family == AF_INET6)
|
||||||
|
{
|
||||||
|
struct sockaddr_in6* s6 = (struct sockaddr_in6*)(ifa->ifa_addr);
|
||||||
|
if (inet_ntop(ifa->ifa_addr->sa_family, (void*)&(s6->sin6_addr), pszIP, sizeof(pszIP)) != NULL)
|
||||||
|
printf("ipv6 %s: %s\n", ifa->ifa_name, pszIP);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
freeifaddrs(myaddrs);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
printf("addrLocalHost = %s\n", addrLocalHost.ToString().c_str());
|
printf("addrLocalHost = %s\n", addrLocalHost.ToString().c_str());
|
||||||
|
|
||||||
// Get our external IP address for incoming connections
|
// Get our external IP address for incoming connections
|
||||||
|
13
ui.cpp
13
ui.cpp
@ -387,17 +387,28 @@ CMainFrame::~CMainFrame()
|
|||||||
void Shutdown(void* parg)
|
void Shutdown(void* parg)
|
||||||
{
|
{
|
||||||
static CCriticalSection cs_Shutdown;
|
static CCriticalSection cs_Shutdown;
|
||||||
|
static bool fTaken;
|
||||||
|
bool fFirstThread;
|
||||||
CRITICAL_BLOCK(cs_Shutdown)
|
CRITICAL_BLOCK(cs_Shutdown)
|
||||||
|
{
|
||||||
|
fFirstThread = !fTaken;
|
||||||
|
fTaken = true;
|
||||||
|
}
|
||||||
|
if (fFirstThread)
|
||||||
{
|
{
|
||||||
fShutdown = true;
|
fShutdown = true;
|
||||||
nTransactionsUpdated++;
|
nTransactionsUpdated++;
|
||||||
DBFlush(false);
|
DBFlush(false);
|
||||||
StopNode();
|
StopNode();
|
||||||
DBFlush(true);
|
DBFlush(true);
|
||||||
|
|
||||||
printf("Bitcoin exiting\n\n");
|
printf("Bitcoin exiting\n\n");
|
||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
loop
|
||||||
|
Sleep(100000);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CMainFrame::OnClose(wxCloseEvent& event)
|
void CMainFrame::OnClose(wxCloseEvent& event)
|
||||||
|
Loading…
Reference in New Issue
Block a user