Skip to content

Commit 066b419

Browse files
committed
Bugfixes
- typo in dandelion - stealth ackdata fix for broadcasts and mailing lists
1 parent bbb5e5d commit 066b419

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

src/bitmessageqt/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2095,6 +2095,7 @@ def click_pushButtonSend(self):
20952095
# We don't actually need the ackdata for acknowledgement since
20962096
# this is a broadcast message, but we can use it to update the
20972097
# user interface when the POW is done generating.
2098+
streamNumber = decodeAddress(fromAddress)[2]
20982099
ackdata = genAckPayload(streamNumber, 0)
20992100
toAddress = str_broadcast_subscribers
21002101
ripe = ''

src/class_objectProcessor.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,9 @@ def processmsg(self, data):
553553
message = time.strftime("%a, %Y-%m-%d %H:%M:%S UTC", time.gmtime(
554554
)) + ' Message ostensibly from ' + fromAddress + ':\n\n' + body
555555
fromAddress = toAddress # The fromAddress for the broadcast that we are about to send is the toAddress (my address) for the msg message we are currently processing.
556-
# We don't actually need the ackdataForBroadcast for acknowledgement since this is a broadcast message but we can use it to update the user interface when the POW is done generating.
556+
# We don't actually need the ackdata for acknowledgement since this is a broadcast message but we can use it to update the user interface when the POW is done generating.
557+
streamNumber = decodeAddress(fromAddress)[2]
558+
557559
ackdata = genAckPayload(streamNumber, 0)
558560
toAddress = '[Broadcast subscribers]'
559561
ripe = ''
@@ -568,7 +570,7 @@ def processmsg(self, data):
568570
fromAddress,
569571
subject,
570572
message,
571-
ackdataForBroadcast,
573+
ackdata,
572574
int(time.time()), # sentTime (this doesn't change)
573575
int(time.time()), # lastActionTime
574576
0,
@@ -580,7 +582,7 @@ def processmsg(self, data):
580582
helper_sent.insert(t)
581583

582584
queues.UISignalQueue.put(('displayNewSentMessage', (
583-
toAddress, '[Broadcast subscribers]', fromAddress, subject, message, ackdataForBroadcast)))
585+
toAddress, '[Broadcast subscribers]', fromAddress, subject, message, ackdata)))
584586
queues.workerQueue.put(('sendbroadcast', ''))
585587

586588
# Don't send ACK if invalid, blacklisted senders, invisible messages, disabled or chan

src/network/dandelion.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def maybeAddStem(self, connection):
8080
for k in (k for k, v in self.nodeMap.iteritems() if v is None):
8181
self.nodeMap[k] = connection
8282
for k, v in {k: v for k, v in self.hashMap.iteritems() if v.child is None}.iteritems():
83-
self.hashMap[k] = Stem(connection, v.stream, self.poissionTimeout())
83+
self.hashMap[k] = Stem(connection, v.stream, self.poissonTimeout())
8484
invQueue.put((v.stream, k, v.child))
8585

8686

0 commit comments

Comments
 (0)