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

I like those names better

Browse source
This commit is contained in:
XANTRONIX Development 2020-07-12 19:12:48 -04:00 • committed by XANTRONIX Industrial
parent d4e7933e6b
commit f0c1a0e782
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/server.c
View file

@ -131,7 +131,7 @@ void patty_ax25_server_destroy(patty_ax25_server *server) {
free(server);
}
static inline void watch_fd(patty_ax25_server *server, int fd) {
static inline void fd_watch(patty_ax25_server *server, int fd) {
FD_SET(fd, &server->fds_watch);
if (server->fd_max <= fd) {
@ -139,7 +139,7 @@ static inline void watch_fd(patty_ax25_server *server, int fd) {
}
}
static inline void clear_fd(patty_ax25_server *server, int fd) {
static inline void fd_clear(patty_ax25_server *server, int fd) {
int i;
FD_CLR(fd, &server->fds_watch);
@ -337,7 +337,7 @@ static int sock_close(patty_ax25_server *server,
(void)client_delete_by_sock(server, sock);
clear_fd(server, sock->fd);
fd_clear(server, sock->fd);
patty_ax25_sock_destroy(sock);
@ -356,7 +356,7 @@ int patty_ax25_server_add_if(patty_ax25_server *server,
int fd;
if ((fd = patty_kiss_tnc_fd(iface->tnc)) >= 0) {
watch_fd(server, fd);
fd_watch(server, fd);
}
if (patty_list_append(server->ifaces, iface) == NULL) {
@ -389,7 +389,7 @@ int patty_ax25_server_delete_if(patty_ax25_server *server,
}
if ((fd = patty_kiss_tnc_fd(iface->tnc)) >= 0) {
watch_fd(server, fd);
fd_watch(server, fd);
if (patty_dict_delete(server->socks_by_fd, (uint32_t)fd) < 0) {
goto error_dict_delete;
@ -535,7 +535,7 @@ static int server_setsockopt(patty_ax25_server *server,
goto error_sock_save_by_fd;
}
watch_fd(server, sock->fd);
fd_watch(server, sock->fd);
break;
}
@ -874,7 +874,7 @@ static int listen_unix(patty_ax25_server *server, const char *path) {
goto error_listen;
}
watch_fd(server, server->fd);
fd_watch(server, server->fd);
return 0;
@ -906,7 +906,7 @@ static int accept_client(patty_ax25_server *server) {
goto error_dict_set;
}
watch_fd(server, fd);
fd_watch(server, fd);
done:
return 0;
@ -934,7 +934,7 @@ static int handle_client(uint32_t key,
if ((readlen = read(client, &call, sizeof(call))) < 0) {
goto error_io;
} else if (readlen == 0) {
clear_fd(server, client);
fd_clear(server, client);
if (patty_dict_delete(server->clients, key) < 0) {
goto error_dict_delete;
@ -1113,7 +1113,7 @@ static int handle_sabm(patty_ax25_server *server,
goto error_write;
}
watch_fd(server, remote->fd);
fd_watch(server, remote->fd);
return 0;
@ -1169,7 +1169,7 @@ static int handle_ua(patty_ax25_server *server,
goto error_write;
}
watch_fd(server, sock->fd);
fd_watch(server, sock->fd);
return 0;
@ -1345,7 +1345,7 @@ static int handle_iface(patty_ax25_server *server, patty_ax25_if *iface) {
if ((readlen = patty_ax25_if_recv(iface, &buf)) < 0) {
goto error_io;
} else if (readlen == 0) {
clear_fd(server, fd);
fd_clear(server, fd);
goto done;
}