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

added error handling for when client auto-resends a message but user has deleted keys from keys.dat file

Browse Source
This commit is contained in:
Jonathan Warren 2013-01-25 13:29:31 -05:00
parent 94cc8742c7
commit 12f03fc891
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bitmessagemain.py
View File

@ -1726,7 +1726,9 @@ class receiveDataThread(QThread):
#Sends a verack message #Sends a verack message
def sendverack(self): def sendverack(self):
printLock.acquire()
print 'Sending verack' print 'Sending verack'
printLock.release()
self.sock.sendall('\xE9\xBE\xB4\xD9\x76\x65\x72\x61\x63\x6B\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xcf\x83\xe1\x35') self.sock.sendall('\xE9\xBE\xB4\xD9\x76\x65\x72\x61\x63\x6B\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xcf\x83\xe1\x35')
#cf 83 e1 35 #cf 83 e1 35
self.verackSent = True self.verackSent = True
@ -2441,7 +2443,13 @@ class singleWorker(QThread):
payload += encodeVarint(fromAddressVersionNumber) payload += encodeVarint(fromAddressVersionNumber)
payload += encodeVarint(fromStreamNumber) payload += encodeVarint(fromStreamNumber)
sendersN = convertIntToString(config.getint(fromaddress, 'n')) try:
sendersN = convertIntToString(config.getint(fromaddress, 'n'))
except:
printLock.acquire()
print 'Error: Could not find', fromaddress, 'in our keys.dat file. You must have deleted it. Aborting the send.'
printLock.release()
return
payload += encodeVarint(len(sendersN)) payload += encodeVarint(len(sendersN))
payload += sendersN payload += sendersN