Mercurial > hg > bitcoin
changeset 83:3fe7b7d72e44 draft
reduced max outbound connections from 15 to 8 --version 0.3 rc4
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@96 1a98c847-1fd6-4fd8-948a-caf3550aa51b
author | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> |
---|---|
date | Fri, 02 Jul 2010 23:43:29 +0000 |
parents | 1f4277a7fe3e |
children | 26a0b8e324b5 |
files | init.cpp irc.cpp main.cpp net.cpp serialize.h ui.cpp |
diffstat | 6 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/init.cpp +++ b/init.cpp @@ -383,7 +383,7 @@ if (!fDebug && !pszSetDataDir[0]) ShrinkDebugFile(); printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"); - printf("Bitcoin version 0.%d.%d%s beta, OS version %s\n", VERSION/100, VERSION%100, pszSubVer, ((string)wxGetOsDescription()).c_str()); + printf("Bitcoin version %d.%d.%d%s, OS version %s\n", VERSION/10000, (VERSION/100)%100, VERSION%100, pszSubVer, ((string)wxGetOsDescription()).c_str()); printf("System default language is %d %s\n", m_locale.GetSystemLanguage(), ((string)m_locale.GetSysName()).c_str()); printf("Language file %s (%s)\n", (string("locale/") + (string)m_locale.GetCanonicalName() + "/LC_MESSAGES/bitcoin.mo").c_str(), ((string)m_locale.GetLocale()).c_str());
--- a/irc.cpp +++ b/irc.cpp @@ -204,7 +204,6 @@ else strMyName = strprintf("x%u", 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());
--- a/main.cpp +++ b/main.cpp @@ -1862,6 +1862,8 @@ uint64 nNonce = 1; string strSubVer; vRecv >> pfrom->nVersion >> pfrom->nServices >> nTime >> addrMe; + if (pfrom->nVersion == 10300) + pfrom->nVersion = 300; if (pfrom->nVersion >= 106 && !vRecv.empty()) vRecv >> addrFrom >> nNonce; if (pfrom->nVersion >= 106 && !vRecv.empty())
--- a/net.cpp +++ b/net.cpp @@ -882,7 +882,7 @@ // Wait vnThreadsRunning[1]--; Sleep(500); - const int nMaxConnections = 15; + const int nMaxConnections = 8; while (vNodes.size() >= nMaxConnections) { Sleep(2000);
--- a/serialize.h +++ b/serialize.h @@ -20,7 +20,7 @@ class CAutoFile; static const int VERSION = 300; -static const char* pszSubVer = " rc2"; +static const char* pszSubVer = "";
--- a/ui.cpp +++ b/ui.cpp @@ -1598,7 +1598,7 @@ CAboutDialog::CAboutDialog(wxWindow* parent) : CAboutDialogBase(parent) { - m_staticTextVersion->SetLabel(strprintf(_("version 0.%d.%d beta"), VERSION/100, VERSION%100)); + m_staticTextVersion->SetLabel(strprintf(_("version %d.%d.%d"), VERSION/10000, (VERSION/100)%100, VERSION%100)); // Change (c) into UTF-8 or ANSI copyright symbol wxString str = m_staticTextMain->GetLabel();