From b860dc75bac298220acce510733ccfe5e23146fd Mon Sep 17 00:00:00 2001 From: KF7EEL Date: Fri, 5 Mar 2021 07:15:58 -0800 Subject: [PATCH] pass on blank addrersse messages --- scripts/aprs_receive/receive.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/scripts/aprs_receive/receive.py b/scripts/aprs_receive/receive.py index 9dc93f5..58a4780 100644 --- a/scripts/aprs_receive/receive.py +++ b/scripts/aprs_receive/receive.py @@ -39,18 +39,21 @@ def aprs_filter(packet): #print(aprslib.parse(packet)) recipient = re.sub('-.*','', aprslib.parse(packet)['addresse']) recipient_ssid = re.sub('.*-','', aprslib.parse(packet)['addresse']) + if recipient == '': + pass + elif: + for i in user_settings.items(): + ssid = i[1][1]['ssid'] + if i[1][1]['ssid'] == '': + ssid = user_aprs_ssid + if recipient in i[1][0]['call'] and recipient_ssid in ssid: + mailbox_write(re.sub('-.*','', aprslib.parse(packet)['addresse']), aprslib.parse(packet)['from'], time.time(), aprslib.parse(packet)['message_text'], recipient) + if 'msgNo' in aprslib.parse(packet): + time.sleep(1) + AIS.sendall(aprslib.parse(packet)['addresse'] + '>APHBL3,TCPIP*:' + ':' + aprslib.parse(packet)['from'].ljust(9) +':ack'+aprslib.parse(packet)['msgNo']) + print('Send ACK') + print(aprslib.parse(packet)['addresse'] + '>APHBL3,TCPIP*:' + ':' + aprslib.parse(packet)['from'].ljust(9) +':ack'+aprslib.parse(packet)['msgNo']) - for i in user_settings.items(): - ssid = i[1][1]['ssid'] - if i[1][1]['ssid'] == '': - ssid = user_aprs_ssid - if recipient in i[1][0]['call'] and recipient_ssid in ssid: - mailbox_write(re.sub('-.*','', aprslib.parse(packet)['addresse']), aprslib.parse(packet)['from'], time.time(), aprslib.parse(packet)['message_text'], recipient) - if 'msgNo' in aprslib.parse(packet): - time.sleep(1) - AIS.sendall(aprslib.parse(packet)['addresse'] + '>APHBL3,TCPIP*:' + ':' + aprslib.parse(packet)['from'].ljust(9) +':ack'+aprslib.parse(packet)['msgNo']) - print('Send ACK') - print(aprslib.parse(packet)['addresse'] + '>APHBL3,TCPIP*:' + ':' + aprslib.parse(packet)['from'].ljust(9) +':ack'+aprslib.parse(packet)['msgNo']) ## else: ## print(aprslib.parse(packet)['from'])