diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2009-09-02 21:36:00 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2009-09-02 21:36:00 +0000 |
| commit | afd0bd7cb0fcc6ee001d678febf6f6bfa6d8dba8 (patch) | |
| tree | d174e7c5f476a81920b3215f004896f9c309a1b1 | |
| parent | a5c17d77bfa022bd81ffda3b51f283181d4857c2 (diff) | |
| download | rtmux-afd0bd7cb0fcc6ee001d678febf6f6bfa6d8dba8.tar.gz rtmux-afd0bd7cb0fcc6ee001d678febf6f6bfa6d8dba8.tar.bz2 rtmux-afd0bd7cb0fcc6ee001d678febf6f6bfa6d8dba8.zip | |
When shutting down the server, expect clients to be polite and exit when asked
with the right message.
| -rw-r--r-- | server.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* $Id: server.c,v 1.177 2009-08-31 22:30:15 tcunha Exp $ */ +/* $Id: server.c,v 1.178 2009-09-02 21:36:00 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -205,8 +205,8 @@ error: server_write_error(c, cause); xfree(cause); + sigterm = 1; server_shutdown(); - c->flags |= CLIENT_BAD; exit(server_main(srv_fd)); } @@ -307,7 +307,7 @@ server_main(int srv_fd) /* Update socket permissions. */ xtimeout = INFTIM; - if (sigterm || server_update_socket() != 0) + if (server_update_socket() != 0) xtimeout = POLL_TIMEOUT; /* Do the poll. */ @@ -423,7 +423,6 @@ server_shutdown(void) server_lost_client(c); else server_write_client(c, MSG_SHUTDOWN, NULL, 0); - c->flags |= CLIENT_BAD; } } } |