From 810361647a230a5a727f07ce7291868b241ad825 Mon Sep 17 00:00:00 2001 From: XANTRONIX Development Date: Sat, 25 Jul 2020 01:54:59 -0400 Subject: [PATCH] Switch to struct timeval for sock timers --- include/patty/ax25.h | 1 + include/patty/ax25/sock.h | 6 +++--- src/sock.c | 27 ++++++++++++++------------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/include/patty/ax25.h b/include/patty/ax25.h index 41ffe02..e37f67e 100644 --- a/include/patty/ax25.h +++ b/include/patty/ax25.h @@ -3,6 +3,7 @@ #include #include +#include #include #include diff --git a/include/patty/ax25/sock.h b/include/patty/ax25/sock.h index a128dc0..319b386 100644 --- a/include/patty/ax25/sock.h +++ b/include/patty/ax25/sock.h @@ -55,9 +55,9 @@ typedef struct _patty_ax25_sock { enum patty_ax25_sock_status status; enum patty_ax25_sock_mode mode; - time_t timer_ack, - timer_response, - timer_keepalive; + struct timeval timer_ack, + timer_response, + timer_keepalive; size_t n_maxlen_tx, n_maxlen_rx, diff --git a/src/sock.c b/src/sock.c index 9c26dfa..7e483b5 100644 --- a/src/sock.c +++ b/src/sock.c @@ -138,19 +138,20 @@ error_malloc_sock: } void patty_ax25_sock_reset(patty_ax25_sock *sock) { - sock->status = PATTY_AX25_SOCK_CLOSED; - sock->mode = PATTY_AX25_SOCK_DM; - sock->n_maxlen_tx = PATTY_AX25_SOCK_DEFAULT_MAXLEN; - sock->n_maxlen_rx = PATTY_AX25_SOCK_DEFAULT_MAXLEN; - sock->n_window_tx = PATTY_AX25_SOCK_DEFAULT_WINDOW; - sock->n_window_rx = PATTY_AX25_SOCK_DEFAULT_WINDOW; - sock->n_ack = PATTY_AX25_SOCK_DEFAULT_ACK; - sock->n_retry = PATTY_AX25_SOCK_DEFAULT_RETRY; - sock->timer_ack = 0; - sock->timer_response = 0; - sock->timer_keepalive = 0; - sock->seq_send = 0; - sock->seq_recv = 0; + sock->status = PATTY_AX25_SOCK_CLOSED; + sock->mode = PATTY_AX25_SOCK_DM; + sock->n_maxlen_tx = PATTY_AX25_SOCK_DEFAULT_MAXLEN; + sock->n_maxlen_rx = PATTY_AX25_SOCK_DEFAULT_MAXLEN; + sock->n_window_tx = PATTY_AX25_SOCK_DEFAULT_WINDOW; + sock->n_window_rx = PATTY_AX25_SOCK_DEFAULT_WINDOW; + sock->n_ack = PATTY_AX25_SOCK_DEFAULT_ACK; + sock->n_retry = PATTY_AX25_SOCK_DEFAULT_RETRY; + sock->seq_send = 0; + sock->seq_recv = 0; + + timerclear(&sock->timer_ack); + timerclear(&sock->timer_response); + timerclear(&sock->timer_keepalive); } void patty_ax25_sock_destroy(patty_ax25_sock *sock) {