extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2024-11-27 02:23:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2015-10-22 12:01:09 +01:00
commit 6bc3902f5d
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
server.c
View File

@ -43,7 +43,7 @@
struct clients clients;
int server_fd;
int server_shutdown;
int server_exit;
struct event server_ev_accept;
struct session *marked_session;
@ -54,8 +54,8 @@ struct layout_cell *marked_layout_cell;
int server_create_socket(void);
void server_loop(void);
int server_should_shutdown(void);
void server_send_shutdown(void);
int server_should_exit(void);
void server_send_exit(void);
void server_accept_callback(int, short, void *);
void server_signal_callback(int, short, void *);
void server_child_signal(void);
@ -233,7 +233,7 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
void
server_loop(void)
{
while (!server_should_shutdown()) {
while (!server_should_exit()) {
log_debug("event dispatch enter");
event_loop(EVLOOP_ONCE);
log_debug("event dispatch exit");
@ -244,7 +244,7 @@ server_loop(void)
/* Check if the server should exit (no more clients or sessions). */
int
server_should_shutdown(void)
server_should_exit(void)
{
struct client *c;
@ -269,9 +269,9 @@ server_should_shutdown(void)
return (1);
}
/* Shutdown the server by killing all clients and windows. */
/* Exit the server by killing all clients and windows. */
void
server_send_shutdown(void)
server_send_exit(void)
{
struct client *c, *c1;
struct session *s, *s1;
@ -282,7 +282,7 @@ server_send_shutdown(void)
if (c->flags & (CLIENT_BAD|CLIENT_SUSPENDED))
server_client_lost(c);
else
server_write_client(c, MSG_SHUTDOWN, NULL, 0);
server_write_client(c, MSG_EXIT, NULL, 0);
c->session = NULL;
}
@ -349,7 +349,7 @@ server_accept_callback(int fd, short events, unused void *data)
}
fatal("accept failed");
}
if (server_shutdown) {
if (server_exit) {
close(newfd);
return;
}
@ -387,8 +387,8 @@ server_signal_callback(int sig, unused short events, unused void *data)
switch (sig) {
case SIGTERM:
server_shutdown = 1;
server_send_shutdown();
server_exit = 1;
server_send_exit();
break;
case SIGCHLD:
server_child_signal();