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

Remove patty_ax25_sock_send_sabme()

Browse source 
Remove patty_ax25_sock_send_sabme() in favor of making send_sabm() check
the socket for SABM or SABME mode and send the correct frame accordingly
This commit is contained in:
XANTRONIX Development 2020-07-27 00:37:04 -04:00 • committed by XANTRONIX Industrial
parent 9463e22481
commit 578c9183e8
3 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -139,8 +139,6 @@ ssize_t patty_ax25_sock_send_srej(patty_ax25_sock *sock,
ssize_t patty_ax25_sock_send_sabm(patty_ax25_sock *sock, int pf); ssize_t patty_ax25_sock_send_sabm(patty_ax25_sock *sock, int pf);
ssize_t patty_ax25_sock_send_sabme(patty_ax25_sock *sock, int pf);
ssize_t patty_ax25_sock_send_disc(patty_ax25_sock *sock, int pf); ssize_t patty_ax25_sock_send_disc(patty_ax25_sock *sock, int pf);
ssize_t patty_ax25_sock_send_xid(patty_ax25_sock *sock, ssize_t patty_ax25_sock_send_xid(patty_ax25_sock *sock,

5
src/server.c
View file

@ -1434,14 +1434,11 @@ static int handle_xid(patty_ax25_server *server,
*/ */
if (params.hdlc & PATTY_AX25_PARAM_HDLC_MODULO_128) { if (params.hdlc & PATTY_AX25_PARAM_HDLC_MODULO_128) {
remote->mode = PATTY_AX25_SOCK_SABME; remote->mode = PATTY_AX25_SOCK_SABME;
}
return patty_ax25_sock_send_sabme(remote, PATTY_AX25_FRAME_POLL);
} else {
remote->mode = PATTY_AX25_SOCK_SABM;
return patty_ax25_sock_send_sabm(remote, PATTY_AX25_FRAME_POLL); return patty_ax25_sock_send_sabm(remote, PATTY_AX25_FRAME_POLL);
} }
}
/* /*
* Second, check if this XID packet is for a listening socket. * Second, check if this XID packet is for a listening socket.

12
src/sock.c
View file

@ -538,17 +538,13 @@ ssize_t patty_ax25_sock_send_srej(patty_ax25_sock *sock,
} }
ssize_t patty_ax25_sock_send_sabm(patty_ax25_sock *sock, int pf) { ssize_t patty_ax25_sock_send_sabm(patty_ax25_sock *sock, int pf) {
return patty_ax25_sock_send(sock, enum patty_ax25_frame_type type = (sock->mode == PATTY_AX25_SOCK_SABME)?
PATTY_AX25_FRAME_COMMAND, PATTY_AX25_FRAME_SABME:
control_u(PATTY_AX25_FRAME_SABM, pf), PATTY_AX25_FRAME_SABM;
NULL,
0);
}
ssize_t patty_ax25_sock_send_sabme(patty_ax25_sock *sock, int pf) {
return patty_ax25_sock_send(sock, return patty_ax25_sock_send(sock,
PATTY_AX25_FRAME_COMMAND, PATTY_AX25_FRAME_COMMAND,
control_u(PATTY_AX25_FRAME_SABME, pf), control_u(type, pf),
NULL, NULL,
0); 0);
} }