Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 08:04:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Initial attempt to fix issue #179.

Browse source
This commit is contained in:
Paul Kronenwetter 2022-04-24 11:05:11 -04:00
parent 107daa1b47
commit aefee60bad
1 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
tnc/data_handler.py
View file

@ -1009,8 +1009,8 @@ class DATA():
time.sleep(0.01) time.sleep(0.01)
static.ARQ_SESSION_STATE = 'connecting' static.ARQ_SESSION_STATE = 'connecting'
if static.ARQ_SESSION: if static.ARQ_SESSION and static.ARQ_SESSION_STATE == 'connected':
static.ARQ_SESSION_STATE = 'connected' # static.ARQ_SESSION_STATE = 'connected'
return True return True
else: else:
static.ARQ_SESSION_STATE = 'failed' static.ARQ_SESSION_STATE = 'failed'
@ -1057,15 +1057,18 @@ class DATA():
# break if data channel is opened # break if data channel is opened
if static.ARQ_SESSION: if static.ARQ_SESSION:
# eventuell einfach nur return true um die nächste break ebene zu vermeiden? # eventuell einfach nur return true um die nächste break ebene zu vermeiden?
break return True
if static.ARQ_SESSION: # if static.ARQ_SESSION:
break # break
# Session connect timeout, send close_session frame to
if not static.ARQ_SESSION and attempt == self.session_connect_max_retries: # attempt to cleanup the far-side, if it received the
if not TESTMODE: # open_session frame and can still hear us.
self.arq_cleanup() if not static.ARQ_SESSION:
return False # if not TESTMODE:
# self.arq_cleanup()
self.close_session()
return False
def received_session_opener(self, data_in:bytes): def received_session_opener(self, data_in:bytes):
@ -1137,9 +1140,9 @@ class DATA():
def transmit_session_heartbeat(self): def transmit_session_heartbeat(self):
""" """ """ """
static.ARQ_SESSION = True # static.ARQ_SESSION = True
static.TNC_STATE = 'BUSY' # static.TNC_STATE = 'BUSY'
static.ARQ_SESSION_STATE = 'connected' # static.ARQ_SESSION_STATE = 'connected'
frametype = bytes([222]) frametype = bytes([222])
@ -1293,6 +1296,9 @@ class DATA():
if not TESTMODE: if not TESTMODE:
self.arq_cleanup() self.arq_cleanup()
# attempt to cleanup the far-side, if it received the
# open_session frame and can still hear us.
self.close_session()
return False return False
#sys.exit() # close thread and so connection attempts #sys.exit() # close thread and so connection attempts
@ -1942,7 +1948,7 @@ class DATA():
""" """
# IRS SIDE # IRS SIDE
if static.ARQ_STATE and static.TNC_STATE == 'BUSY' and self.is_IRS: if static.ARQ_STATE and static.ARQ_SESSION_STATE == 'connected' and static.TNC_STATE == 'BUSY' and self.is_IRS:
if self.data_channel_last_received + self.time_list[self.speed_level] > time.time(): if self.data_channel_last_received + self.time_list[self.speed_level] > time.time():
#print((self.data_channel_last_received + self.time_list[self.speed_level])-time.time()) #print((self.data_channel_last_received + self.time_list[self.speed_level])-time.time())
pass pass
@ -2028,7 +2034,7 @@ class DATA():
""" """
while 1: while 1:
time.sleep(0.01) time.sleep(0.01)
if static.ARQ_SESSION and self.IS_ARQ_SESSION_MASTER and not self.arq_file_transfer: if static.ARQ_SESSION and self.IS_ARQ_SESSION_MASTER and static.ARQ_SESSION_STATE == "connected" and not self.arq_file_transfer:
time.sleep(1) time.sleep(1)
self.transmit_session_heartbeat() self.transmit_session_heartbeat()
time.sleep(2) time.sleep(2)