Merge pull request #625 from Atheros1/master

v0.4.2

Makefile

@@ -1,5 +1,5 @@
 APP=pybitmessage
-VERSION=0.4.1
+VERSION=0.4.2
 RELEASE=1
 ARCH_TYPE=`uname -m`
 PREFIX?=/usr/local

arch.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 APP=pybitmessage
-PREV_VERSION=0.4.1
-VERSION=0.4.1
+PREV_VERSION=0.4.2
+VERSION=0.4.2
 RELEASE=1
 ARCH_TYPE=any
 CURRDIR=`pwd`

archpackage/PKGBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Bob Mottram (4096 bits) <bob@robotics.uk.to>
 pkgname=pybitmessage
-pkgver=0.4.1
+pkgver=0.4.2
 pkgrel=1
 pkgdesc="Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless, meaning that you need-not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide "non-content" data, like the sender and receiver of messages, from passive eavesdroppers like those running warrantless wiretapping programs."
 arch=('any')

debian.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 APP=pybitmessage
-PREV_VERSION=0.4.1
-VERSION=0.4.1
+PREV_VERSION=0.4.2
+VERSION=0.4.2
 RELEASE=1
 ARCH_TYPE=all
 DIR=${APP}-${VERSION}

ebuild.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 APP=pybitmessage
-PREV_VERSION=0.4.1
-VERSION=0.4.1
+PREV_VERSION=0.4.2
+VERSION=0.4.2
 RELEASE=1
 SOURCEDIR=.
 ARCH_TYPE=`uname -m`

generate.sh

@@ -4,7 +4,7 @@
 
 rm -f Makefile rpmpackage/*.spec
 
-packagemonkey -n "PyBitmessage" --version "0.4.1" --dir "." -l "mit" \
+packagemonkey -n "PyBitmessage" --version "0.4.2" --dir "." -l "mit" \
     -e "Bob Mottram (4096 bits) <bob@robotics.uk.to>" \
     --brief "Send encrypted messages" \
     --desc "Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless, meaning that you need-not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide \"non-content\" data, like the sender and receiver of messages, from passive eavesdroppers like those running warrantless wiretapping programs." \

puppy.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 APP=pybitmessage
-PREV_VERSION=0.4.1
-VERSION=0.4.1
+PREV_VERSION=0.4.2
+VERSION=0.4.2
 RELEASE=1
 BUILDDIR=~/petbuild
 CURRDIR=`pwd`

rpm.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 APP=pybitmessage
-PREV_VERSION=0.4.1
-VERSION=0.4.1
+PREV_VERSION=0.4.2
+VERSION=0.4.2
 RELEASE=1
 SOURCEDIR=.
 ARCH_TYPE=`uname -m`

rpmpackage/pybitmessage.spec

@@ -1,5 +1,5 @@
 Name: pybitmessage
-Version: 0.4.1
+Version: 0.4.2
 Release: 1%{?dist}
 Summary: Send encrypted messages
 License: MIT

slack.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 APP=pybitmessage
-PREV_VERSION=0.4.1
-VERSION=0.4.1
+PREV_VERSION=0.4.2
+VERSION=0.4.2
 RELEASE=1
 ARCH_TYPE=`uname -m`
 BUILDDIR=~/slackbuild

src/bitmessagemain.py

@@ -15,7 +15,8 @@ import singleton
 import os
 
 from SimpleXMLRPCServer import SimpleXMLRPCServer
-from api import MySimpleXMLRPCRequestHandler        
+from api import MySimpleXMLRPCRequestHandler
+from helper_startup import isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections
 
 import shared
 from helper_sql import sqlQuery
@@ -59,10 +60,12 @@ def connectToStream(streamNumber):
     for row in queryData:
         shared.inventorySets[streamNumber].add(row[0])
 
-    if sys.platform[0:3] == 'win':
+    
+    if isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections():
+        # Some XP and Vista systems can only have 10 outgoing connections at a time.
         maximumNumberOfHalfOpenConnections = 9
     else:
-        maximumNumberOfHalfOpenConnections = 32
+        maximumNumberOfHalfOpenConnections = 64
     for i in range(maximumNumberOfHalfOpenConnections):
         a = outgoingSynSender()
         a.setup(streamNumber, selfInitiatedConnections)

src/build_osx.py

@@ -1,7 +1,7 @@
 from setuptools import setup
 
 name = "Bitmessage"
-version = "0.4.1"
+version = "0.4.2"
 mainscript = ["bitmessagemain.py"]
 
 setup(

src/helper_startup.py

@@ -5,6 +5,8 @@ import os
 import locale
 import random
 import string
+import platform
+from distutils.version import StrictVersion
 
 from namecoin import ensureNamecoinOptions
 
@@ -119,3 +121,13 @@ def loadConfig():
             os.umask(0o077)
         with open(shared.appdata + 'keys.dat', 'wb') as configfile:
             shared.config.write(configfile)
+
+def isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections():
+    try:
+        VER_THIS=StrictVersion(platform.version())
+        if sys.platform[0:3]=="win":
+            return StrictVersion("5.1.2600")<=VER_THIS and StrictVersion("6.0.6000")>=VER_THIS
+        return False
+    except Exception as err:
+        print 'An Exception occurred within isOurOperatingSystemLimitedToHavingVeryFewHalfOpenConnections:', err
+        return False

src/shared.py

@@ -1,4 +1,4 @@
-softwareVersion = '0.4.1'
+softwareVersion = '0.4.2'
 verbose = 1
 maximumAgeOfAnObjectThatIAmWillingToAccept = 216000  # Equals two days and 12 hours.
 lengthOfTimeToLeaveObjectsInInventory = 237600 # Equals two days and 18 hours. This should be longer than maximumAgeOfAnObjectThatIAmWillingToAccept so that we don't process messages twice.