removed option from previous commit which allowed user-settable maximum network message size pending further discussion

This commit is contained in:
Jonathan Warren 2013-08-24 20:23:49 -04:00
parent a5c65f11e8
commit 82db79ca39
2 changed files with 1 additions and 16 deletions

View File

@ -45,17 +45,6 @@ class receiveDataThread(threading.Thread):
self.peer = shared.Peer(HOST, port) self.peer = shared.Peer(HOST, port)
self.streamNumber = streamNumber self.streamNumber = streamNumber
self.payloadLength = 0 # This is the protocol payload length thus it doesn't include the 24 byte message header self.payloadLength = 0 # This is the protocol payload length thus it doesn't include the 24 byte message header
self.maxMessageLength = 180000000 # maximum length of a message in bytes, default 180MB
# get the maximum message length from the settings
try:
maxMsgLen = shared.config.getint(
'bitmessagesettings', 'maxmessagelength')
if maxMsgLen > 32768: # minimum of 32K
self.maxMessageLength = maxMsgLen
except Exception:
pass
self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave = {} self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave = {}
self.selfInitiatedConnections = selfInitiatedConnections self.selfInitiatedConnections = selfInitiatedConnections
shared.connectedHostsList[ shared.connectedHostsList[
@ -149,7 +138,7 @@ class receiveDataThread(threading.Thread):
shared.knownNodesLock.acquire() shared.knownNodesLock.acquire()
shared.knownNodes[self.streamNumber][self.peer] = int(time.time()) shared.knownNodes[self.streamNumber][self.peer] = int(time.time())
shared.knownNodesLock.release() shared.knownNodesLock.release()
if self.payloadLength <= self.maxMessageLength: # If the size of the message is greater than the maximum, ignore it. if self.payloadLength <= 180000000: # If the size of the message is greater than 180MB, ignore it. (I get memory errors when processing messages much larger than this though it is concievable that this value will have to be lowered if some systems are less tolarant of large messages.)
remoteCommand = self.data[4:16] remoteCommand = self.data[4:16]
with shared.printLock: with shared.printLock:
print 'remoteCommand', repr(remoteCommand.replace('\x00', '')), ' from', self.peer print 'remoteCommand', repr(remoteCommand.replace('\x00', '')), ' from', self.peer

View File

@ -69,11 +69,7 @@ def loadConfig():
shared.config.set( shared.config.set(
'bitmessagesettings', 'maxacceptablepayloadlengthextrabytes', '0') 'bitmessagesettings', 'maxacceptablepayloadlengthextrabytes', '0')
shared.config.set('bitmessagesettings', 'dontconnect', 'true') shared.config.set('bitmessagesettings', 'dontconnect', 'true')
<<<<<<< HEAD
ensureNamecoinOptions() ensureNamecoinOptions()
=======
shared.config.set('bitmessagesettings', 'maxMessageLength', '180000000')
>>>>>>> 3ff76875aa5d8b8dbadef48e28cc7e919b9042b3
if storeConfigFilesInSameDirectoryAsProgramByDefault: if storeConfigFilesInSameDirectoryAsProgramByDefault:
# Just use the same directory as the program and forget about # Just use the same directory as the program and forget about