From b619fffb3200bcc7bdeaa4ecd8589d337d368ffd Mon Sep 17 00:00:00 2001 From: XANTRONIX Development Date: Sat, 22 Aug 2020 21:49:15 -0500 Subject: [PATCH] Always send RR when Timer T3 runs out Always send RR when Timer T3 runs out, as we are not likely (with modern hardware with MMUs) to be unable to receive; furthermore, RNR would have only been sent erroneously if the outward flow of traffic had been stopped --- src/server.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/server.c b/src/server.c index d57cb35..10f261c 100644 --- a/src/server.c +++ b/src/server.c @@ -2178,16 +2178,12 @@ static int handle_sock(uint32_t key, /* * AX.25 v.2.2 Section 6.7.1.3 "Inactive Link Timer T3" */ - int ret = FD_ISSET(sock->fd, &server->fds_watch)? - patty_ax25_sock_send_rr(sock, PATTY_AX25_FRAME_COMMAND, 1): - patty_ax25_sock_send_rnr(sock, PATTY_AX25_FRAME_COMMAND, 1); - sock->retries = sock->n_retry; patty_timer_stop(&sock->timer_t3); patty_timer_start(&sock->timer_t1); - return ret; + return patty_ax25_sock_send_rr(sock, PATTY_AX25_FRAME_COMMAND, 1); } default: