Don't send unnecessary ACKs

In some situations, it's not necessary to send an ACK. For example, when
the sender is blacklisted, when the message has no content, or when the
address has ACK sending disabled.

Also it's not necessary to rebroadcast empty messages into a mailing
This commit is contained in:
Peter Šurda 2016-02-12 23:35:28 +01:00
parent 80c174e417
commit 0bd89103a7
1 changed files with 7 additions and 3 deletions

View File

@ -524,7 +524,7 @@ class objectProcessor(threading.Thread):
# Let us now check and see whether our receiving address is
# behaving as a mailing list
if shared.safeConfigGetBoolean(toAddress, 'mailinglist'):
if shared.safeConfigGetBoolean(toAddress, 'mailinglist') and messageEncodingType != 0:
mailingListName = shared.config.get(
toAddress, 'mailinglistname')
@ -567,7 +567,11 @@ class objectProcessor(threading.Thread):
toAddress, '[Broadcast subscribers]', fromAddress, subject, message, ackdataForBroadcast)))
shared.workerQueue.put(('sendbroadcast', ''))
if self.ackDataHasAVaildHeader(ackData):
# Don't send ACK if invalid, blacklisted senders, invisible messages or disabled
if self.ackDataHasAValidHeader(ackData) and \
not blockMessage and \
messageEncodingType != 0 and \
not shared.safeConfigGetBoolean(toAddress, 'dontsendack'):
# Display timing data
@ -814,7 +818,7 @@ class objectProcessor(threading.Thread):
shared.workerQueue.put(('sendmessage', ''))
def ackDataHasAVaildHeader(self, ackData):
def ackDataHasAValidHeader(self, ackData):
if len(ackData) < shared.Header.size:'The length of ackData is unreasonably short. Not sending ackData.')
return False