From 6e17caf3cf92741ad59d3815707d128aefe6a88d Mon Sep 17 00:00:00 2001 From: Paul Kronenwetter Date: Tue, 3 May 2022 20:08:26 -0400 Subject: [PATCH] Making check_callsign evaluation more consistent. --- tnc/data_handler.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tnc/data_handler.py b/tnc/data_handler.py index c3878fc2..4ffa5f6d 100644 --- a/tnc/data_handler.py +++ b/tnc/data_handler.py @@ -1140,7 +1140,8 @@ class DATA(): Returns: """ # Close the session if the DXCALLSIGN_CRC matches the station in static. - if helpers.check_callsign(static.DXCALLSIGN, bytes(data_in[4:7]))[0]: + _valid_crc, _ = helpers.check_callsign(static.DXCALLSIGN, bytes(data_in[4:7])) + if _valid_crc: static.ARQ_SESSION_STATE = 'disconnected' helpers.add_to_heard_stations(static.DXCALLSIGN,static.DXGRID, 'DATA-CHANNEL', static.SNR, static.FREQ_OFFSET, static.HAMLIB_FREQUENCY) structlog.get_logger("structlog").info("SESSION [" + str(self.mycallsign, 'utf-8') + "]<>[" + str(static.DXCALLSIGN, 'utf-8') + "]", state=static.ARQ_SESSION_STATE) @@ -1187,7 +1188,8 @@ class DATA(): """ # Accept session data if the DXCALLSIGN_CRC matches the station in static. - if helpers.check_callsign(static.DXCALLSIGN, bytes(data_in[4:7]))[0]: + _valid_crc, _ = helpers.check_callsign(static.DXCALLSIGN, bytes(data_in[4:7])) + if _valid_crc: structlog.get_logger("structlog").debug("received session heartbeat") helpers.add_to_heard_stations(static.DXCALLSIGN, static.DXGRID, 'SESSION-HB', static.SNR, static.FREQ_OFFSET, static.HAMLIB_FREQUENCY)