reduced max outbound connections from 15 to 8 --version 0.3 rc4

6 files changed, 6 insertions, 5 deletions

diff --git a/init.cpp b/init.cpp
index ecb1709c11..1630534553 100644
--- a/init.cpp
+++ b/init.cpp
@@ -383,7 +383,7 @@ bool CMyApp::OnInit2()
     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());

 

diff --git a/irc.cpp b/irc.cpp
index c63ba47761..46c53bd1d1 100644
--- a/irc.cpp
+++ b/irc.cpp
@@ -204,7 +204,6 @@ void ThreadIRCSeed(void* parg)
         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());

 

diff --git a/main.cpp b/main.cpp
index e3b04741de..2b08744d4e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1862,6 +1862,8 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
         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())

diff --git a/net.cpp b/net.cpp
index 3c5c9bd3cb..dc1debd2fb 100644
--- a/net.cpp
+++ b/net.cpp
@@ -882,7 +882,7 @@ void ThreadOpenConnections2(void* parg)
         // Wait

         vnThreadsRunning[1]--;

         Sleep(500);

-        const int nMaxConnections = 15;

+        const int nMaxConnections = 8;

         while (vNodes.size() >= nMaxConnections)

         {

             Sleep(2000);

diff --git a/serialize.h b/serialize.h
index b0529a0c3e..57ac5e34bb 100644
--- a/serialize.h
+++ b/serialize.h
@@ -20,7 +20,7 @@ class CDataStream;
 class CAutoFile;

 

 static const int VERSION = 300;

-static const char* pszSubVer = " rc2";

+static const char* pszSubVer = "";

 

 

 

diff --git a/ui.cpp b/ui.cpp
index 42da9ca38a..973cb0c6d2 100644
--- a/ui.cpp
+++ b/ui.cpp
@@ -1598,7 +1598,7 @@ void COptionsDialog::OnButtonApply(wxCommandEvent& event)
 

 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();