xan/patty
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Initial flow control improvements

Browse source
This commit is contained in:
XANTRONIX Development 2020-08-16 18:15:11 -05:00 • committed by XANTRONIX Industrial
parent 776949b90c
commit a5d74ecf2e
3 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/patty/ax25/sock.h
View file

@ -200,6 +200,8 @@ void patty_ax25_sock_vs_incr(patty_ax25_sock *sock);
void patty_ax25_sock_vr_incr(patty_ax25_sock *sock); void patty_ax25_sock_vr_incr(patty_ax25_sock *sock);
int patty_ax25_sock_flow_full(patty_ax25_sock *sock);
/* /*
* Frame segment reassembly state machine * Frame segment reassembly state machine
*/ */

15
src/server.c
View file

@ -1517,8 +1517,6 @@ static int handle_i(patty_ax25_server *server,
} }
} }
sock->va = frame->nr;
if (++sock->pending == sock->n_window_rx / 2) { if (++sock->pending == sock->n_window_rx / 2) {
sock->pending = 0; sock->pending = 0;
@ -1597,7 +1595,6 @@ static int handle_rr(patty_ax25_server *server,
patty_ax25_sock_send_rnr(sock, PATTY_AX25_FRAME_RESPONSE, 1); patty_ax25_sock_send_rnr(sock, PATTY_AX25_FRAME_RESPONSE, 1);
case PATTY_AX25_FRAME_RESPONSE: case PATTY_AX25_FRAME_RESPONSE:
sock->flow = PATTY_AX25_SOCK_READY;
sock->va = frame->nr; sock->va = frame->nr;
sock->retries = sock->n_retry; sock->retries = sock->n_retry;
@ -1632,8 +1629,8 @@ static int handle_rnr(patty_ax25_server *server,
patty_ax25_sock_send_rnr(sock, PATTY_AX25_FRAME_RESPONSE, 1); patty_ax25_sock_send_rnr(sock, PATTY_AX25_FRAME_RESPONSE, 1);
case PATTY_AX25_FRAME_RESPONSE: case PATTY_AX25_FRAME_RESPONSE:
sock->flow = PATTY_AX25_SOCK_WAIT;
sock->va = frame->nr; sock->va = frame->nr;
sock->flow = PATTY_AX25_SOCK_WAIT;
sock->retries = sock->n_retry; sock->retries = sock->n_retry;
fd_clear(server, sock->fd); fd_clear(server, sock->fd);
@ -1657,6 +1654,8 @@ static int handle_rej(patty_ax25_server *server,
return 0; return 0;
} }
sock->va = frame->nr;
end = sock->vs; end = sock->vs;
if (frame->nr > end) { if (frame->nr > end) {
@ -1682,6 +1681,8 @@ static int handle_srej(patty_ax25_server *server,
return 0; return 0;
} }
sock->va = frame->nr;
/* /*
* TODO: Read the fine print of section 4.3.2.4 * TODO: Read the fine print of section 4.3.2.4
*/ */
@ -2111,7 +2112,9 @@ static int handle_sock(uint32_t key,
/* /*
* AX.25 v2.2, Section 6.4.1, "Sending I Frames" * AX.25 v2.2, Section 6.4.1, "Sending I Frames"
*/ */
if (sock->vs == sock->va + sock->n_window_tx) { if (sock->flow == PATTY_AX25_SOCK_WAIT) {
sock->flow = PATTY_AX25_SOCK_READY;
} else if (patty_ax25_sock_flow_full(sock)) {
sock->flow = PATTY_AX25_SOCK_WAIT; sock->flow = PATTY_AX25_SOCK_WAIT;
fd_clear(server, sock->fd); fd_clear(server, sock->fd);
@ -2119,7 +2122,7 @@ static int handle_sock(uint32_t key,
patty_timer_stop(&sock->timer_t3); patty_timer_stop(&sock->timer_t3);
patty_timer_start(&sock->timer_t1, sock->n_ack); patty_timer_start(&sock->timer_t1, sock->n_ack);
return patty_ax25_sock_send_rr(sock, PATTY_AX25_FRAME_COMMAND, 1); return 0;
} }
if ((len = read(sock->fd, sock->rx_buf, sock->n_maxlen_rx)) < 0) { if ((len = read(sock->fd, sock->rx_buf, sock->n_maxlen_rx)) < 0) {

8
src/sock.c
View file

@ -505,6 +505,14 @@ void *patty_ax25_sock_assembler_read(patty_ax25_sock *sock,
return buf + 1; return buf + 1;
} }
int patty_ax25_sock_flow_full(patty_ax25_sock *sock) {
if (sock->mode == PATTY_AX25_SOCK_SABME) {
return sock->vs == (sock->va + sock->n_window_tx) % 128? 1: 0;
}
return sock->vs == (sock->va + sock->n_window_tx) % 8? 1: 0;
}
static inline int toobig(patty_ax25_sock *sock, static inline int toobig(patty_ax25_sock *sock,
size_t infolen) { size_t infolen) {
return infolen > PATTY_AX25_FRAME_OVERHEAD + sock->n_maxlen_tx; return infolen > PATTY_AX25_FRAME_OVERHEAD + sock->n_maxlen_tx;