Making check_callsign evaluation more consistent.

This commit is contained in:
Paul Kronenwetter 2022-05-03 20:08:26 -04:00
parent bcc15287c9
commit 6e17caf3cf

View file

@ -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') + "]<<X>>[" + 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)