Bitmessage/PyBitmessage-2024-11-28
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

v0.3.0 #132

Merged
Atheros1 merged 34 commits from master into master 2013-05-06 07:03:38 +02:00
Conversation 0 Commits 34 Files Changed 21 +11 -9
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ddf347ecc5 - Show all commits

20
src/bitmessagemain.py
View File

@ -284,11 +284,11 @@ class receiveDataThread(QThread):
try: """try:
#self.sock.shutdown(socket.SHUT_RDWR) #self.sock.shutdown(socket.SHUT_RDWR)
self.sock.close() self.sock.close()
except Exception, err: except Exception, err:
print 'Within receiveDataThread run(), self.sock.shutdown or .close() failed.', err print 'Within receiveDataThread run(), self.sock.shutdown or .close() failed.', err"""
try: try:
del selfInitiatedConnections[self.streamNumber][self] del selfInitiatedConnections[self.streamNumber][self]
@ -452,8 +452,9 @@ class receiveDataThread(QThread):
printLock.acquire() printLock.acquire()
print 'We are connected to too many people. Closing connection.' print 'We are connected to too many people. Closing connection.'
printLock.release() printLock.release()
self.sock.shutdown(socket.SHUT_RDWR) #self.sock.shutdown(socket.SHUT_RDWR)
self.sock.close() #self.sock.close()
broadcastToSendDataQueues((0, 'shutdown', self.HOST))
return return
self.sendBigInv() self.sendBigInv()
@ -1917,8 +1918,9 @@ class receiveDataThread(QThread):
print 'Remote node useragent:', useragent, ' stream number:', self.streamNumber print 'Remote node useragent:', useragent, ' stream number:', self.streamNumber
printLock.release() printLock.release()
if self.streamNumber != 1: if self.streamNumber != 1:
self.sock.shutdown(socket.SHUT_RDWR) #self.sock.shutdown(socket.SHUT_RDWR)
self.sock.close() #self.sock.close()
broadcastToSendDataQueues((0, 'shutdown', self.HOST))
printLock.acquire() printLock.acquire()
print 'Closed connection to', self.HOST, 'because they are interested in stream', self.streamNumber,'.' print 'Closed connection to', self.HOST, 'because they are interested in stream', self.streamNumber,'.'
printLock.release() printLock.release()
@ -1927,8 +1929,9 @@ class receiveDataThread(QThread):
if not self.initiatedConnection: if not self.initiatedConnection:
broadcastToSendDataQueues((0,'setStreamNumber',(self.HOST,self.streamNumber))) broadcastToSendDataQueues((0,'setStreamNumber',(self.HOST,self.streamNumber)))
if data[72:80] == eightBytesOfRandomDataUsedToDetectConnectionsToSelf: if data[72:80] == eightBytesOfRandomDataUsedToDetectConnectionsToSelf:
self.sock.shutdown(socket.SHUT_RDWR) #self.sock.shutdown(socket.SHUT_RDWR)
self.sock.close() #self.sock.close()
broadcastToSendDataQueues((0, 'shutdown', self.HOST))
printLock.acquire() printLock.acquire()
print 'Closing connection to myself: ', self.HOST print 'Closing connection to myself: ', self.HOST
printLock.release() printLock.release()
@ -2020,7 +2023,6 @@ class sendDataThread(QThread):
printLock.release() printLock.release()
self.sock.shutdown(socket.SHUT_RDWR) self.sock.shutdown(socket.SHUT_RDWR)
self.sock.close() self.sock.close()
print 'sendDataThread closed socket.'
sendDataQueues.remove(self.mailbox) sendDataQueues.remove(self.mailbox)
printLock.acquire() printLock.acquire()
print 'len of sendDataQueues', len(sendDataQueues) print 'len of sendDataQueues', len(sendDataQueues)