v0.3.0 #132

Merged
Atheros1 merged 34 commits from master into master 2013-05-06 07:03:38 +02:00
3 changed files with 6 additions and 5 deletions
Showing only changes of commit da4cf1f1cb - Show all commits

View File

@ -6,7 +6,7 @@
#Right now, PyBitmessage only support connecting to stream 1. It doesn't yet contain logic to expand into further streams. #Right now, PyBitmessage only support connecting to stream 1. It doesn't yet contain logic to expand into further streams.
softwareVersion = '0.3.0' #The software version variable is now held in shared.py
verbose = 1 verbose = 1
maximumAgeOfAnObjectThatIAmWillingToAccept = 216000 #Equals two days and 12 hours. 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. lengthOfTimeToLeaveObjectsInInventory = 237600 #Equals two days and 18 hours. This should be longer than maximumAgeOfAnObjectThatIAmWillingToAccept so that we don't process messages twice.
@ -2237,7 +2237,7 @@ def pointMult(secret):
def assembleVersionMessage(remoteHost,remotePort,myStreamNumber): def assembleVersionMessage(remoteHost,remotePort,myStreamNumber):
global softwareVersion shared.softwareVersion
payload = '' payload = ''
payload += pack('>L',2) #protocol version. payload += pack('>L',2) #protocol version.
payload += pack('>q',1) #bitflags of the services I offer. payload += pack('>q',1) #bitflags of the services I offer.
@ -2253,7 +2253,7 @@ def assembleVersionMessage(remoteHost,remotePort,myStreamNumber):
random.seed() random.seed()
payload += eightBytesOfRandomDataUsedToDetectConnectionsToSelf payload += eightBytesOfRandomDataUsedToDetectConnectionsToSelf
userAgent = '/PyBitmessage:' + softwareVersion + '/' #Length of userAgent must be less than 253. userAgent = '/PyBitmessage:' + shared.softwareVersion + '/' #Length of userAgent must be less than 253.
payload += pack('>B',len(userAgent)) #user agent string length. If the user agent is more than 252 bytes long, this code isn't going to work. payload += pack('>B',len(userAgent)) #user agent string length. If the user agent is more than 252 bytes long, this code isn't going to work.
payload += userAgent payload += userAgent
payload += encodeVarint(1) #The number of streams about which I care. PyBitmessage currently only supports 1 per connection. payload += encodeVarint(1) #The number of streams about which I care. PyBitmessage currently only supports 1 per connection.

View File

@ -1732,7 +1732,7 @@ class aboutDialog(QtGui.QDialog):
self.ui = Ui_aboutDialog() self.ui = Ui_aboutDialog()
self.ui.setupUi(self) self.ui.setupUi(self)
self.parent = parent self.parent = parent
self.ui.labelVersion.setText('version ' + softwareVersion) self.ui.labelVersion.setText('version ' + shared.softwareVersion)
class regenerateAddressesDialog(QtGui.QDialog): class regenerateAddressesDialog(QtGui.QDialog):
def __init__(self,parent): def __init__(self,parent):

View File

@ -1,5 +1,6 @@
import threading softwareVersion = '0.3.0'
import threading
import sys import sys
from addresses import * from addresses import *
import highlevelcrypto import highlevelcrypto