diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-11-13 16:51:49 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-11-13 16:51:49 +0000 |
| commit | 1b4a76d58fc513b53ec86c8226621c012de62e5f (patch) | |
| tree | 0e95d76349790a3da9a54049ce57c4b43a4f7231 /server.c | |
| parent | 7230fe1648831a17165201b6f02e0365f7b5f938 (diff) | |
| download | rtmux-1b4a76d58fc513b53ec86c8226621c012de62e5f.tar.gz rtmux-1b4a76d58fc513b53ec86c8226621c012de62e5f.tar.bz2 rtmux-1b4a76d58fc513b53ec86c8226621c012de62e5f.zip | |
Sync OpenBSD patchset 527:
Only need to chmod +x or -x the socket when a client is created, lost or
attached, rather than every event loop.
Diffstat (limited to 'server.c')
| -rw-r--r-- | server.c | 11 |
1 files changed, 4 insertions, 7 deletions
@@ -1,4 +1,4 @@ -/* $Id: server.c,v 1.226 2009-11-11 09:54:07 nicm Exp $ */ +/* $Id: server.c,v 1.227 2009-11-13 16:51:49 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -58,7 +58,6 @@ void server_loop(void); int server_should_shutdown(void); void server_send_shutdown(void); void server_clean_dead(void); -int server_update_socket(void); void server_accept_callback(int, short, void *); void server_signal_callback(int, short, void *); void server_child_signal(void); @@ -104,6 +103,8 @@ server_create_socket(void) if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) fatal("fcntl failed"); + server_update_socket(); + return (fd); } @@ -226,8 +227,6 @@ void server_loop(void) { while (!server_should_shutdown()) { - server_update_socket(); - event_loop(EVLOOP_ONCE); server_window_loop(); @@ -306,7 +305,7 @@ server_clean_dead(void) } /* Update socket execute permissions based on whether sessions are attached. */ -int +void server_update_socket(void) { struct session *s; @@ -330,8 +329,6 @@ server_update_socket(void) else chmod(socket_path, S_IRUSR|S_IWUSR); } - - return (n); } /* Callback for server socket. */ |