Slight lines-of-code reduction
Slight lines-of-code reduction without any functional changes
This commit is contained in:
parent
fcef17a8b1
commit
5a61a3057a
1 changed files with 7 additions and 15 deletions
22
src/server.c
22
src/server.c
|
@ -2125,13 +2125,10 @@ static int handle_sock(uint32_t key,
|
||||||
switch (sock->state) {
|
switch (sock->state) {
|
||||||
case PATTY_AX25_SOCK_PENDING_ACCEPT:
|
case PATTY_AX25_SOCK_PENDING_ACCEPT:
|
||||||
if (patty_timer_expired(&sock->timer_t1)) {
|
if (patty_timer_expired(&sock->timer_t1)) {
|
||||||
if (sock->retries) {
|
if (sock->retries--) {
|
||||||
int ret = patty_ax25_sock_send_xid(sock, PATTY_AX25_FRAME_RESPONSE);
|
|
||||||
|
|
||||||
sock->retries--;
|
|
||||||
patty_timer_start(&sock->timer_t1);
|
patty_timer_start(&sock->timer_t1);
|
||||||
|
|
||||||
return ret;
|
return patty_ax25_sock_send_xid(sock, PATTY_AX25_FRAME_RESPONSE);
|
||||||
} else {
|
} else {
|
||||||
(void)sock_close(server, sock);
|
(void)sock_close(server, sock);
|
||||||
}
|
}
|
||||||
|
@ -2141,13 +2138,10 @@ static int handle_sock(uint32_t key,
|
||||||
|
|
||||||
case PATTY_AX25_SOCK_PENDING_CONNECT:
|
case PATTY_AX25_SOCK_PENDING_CONNECT:
|
||||||
if (patty_timer_expired(&sock->timer_t1)) {
|
if (patty_timer_expired(&sock->timer_t1)) {
|
||||||
if (sock->retries) {
|
if (sock->retries--) {
|
||||||
int ret = patty_ax25_sock_send_sabm(sock, PATTY_AX25_FRAME_POLL);
|
|
||||||
|
|
||||||
sock->retries--;
|
|
||||||
patty_timer_start(&sock->timer_t1);
|
patty_timer_start(&sock->timer_t1);
|
||||||
|
|
||||||
return ret;
|
return patty_ax25_sock_send_sabm(sock, PATTY_AX25_FRAME_POLL);
|
||||||
} else {
|
} else {
|
||||||
int client;
|
int client;
|
||||||
|
|
||||||
|
@ -2166,14 +2160,12 @@ static int handle_sock(uint32_t key,
|
||||||
|
|
||||||
case PATTY_AX25_SOCK_ESTABLISHED:
|
case PATTY_AX25_SOCK_ESTABLISHED:
|
||||||
if (patty_timer_expired(&sock->timer_t1)) {
|
if (patty_timer_expired(&sock->timer_t1)) {
|
||||||
if (sock->retries) {
|
if (sock->retries--) {
|
||||||
int ret = patty_ax25_sock_send_rr(sock, PATTY_AX25_FRAME_COMMAND, 1);
|
|
||||||
|
|
||||||
sock->retries--;
|
|
||||||
patty_timer_start(&sock->timer_t1);
|
patty_timer_start(&sock->timer_t1);
|
||||||
patty_timer_start(&sock->timer_t3);
|
patty_timer_start(&sock->timer_t3);
|
||||||
|
|
||||||
return ret;
|
return patty_ax25_sock_send_rr(sock, PATTY_AX25_FRAME_COMMAND, 1);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
(void)sock_shutdown(server, sock);
|
(void)sock_shutdown(server, sock);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue