diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-10-28 23:14:15 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-10-28 23:14:15 +0000 |
| commit | f4514f5c603ccffb4741e1009624537b06658a3b (patch) | |
| tree | e4fe56c166edecff23b8b679630e6da6091e710d /server-client.c | |
| parent | a5acabd9230eb70e802ece13542ec647c52b7ee2 (diff) | |
| download | rtmux-f4514f5c603ccffb4741e1009624537b06658a3b.tar.gz rtmux-f4514f5c603ccffb4741e1009624537b06658a3b.tar.bz2 rtmux-f4514f5c603ccffb4741e1009624537b06658a3b.zip | |
Sync OpenBSD patchset 468:
Move the poll registration functions into the server-*.c files.
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/server-client.c b/server-client.c index 254766a1..9acfa4c9 100644 --- a/server-client.c +++ b/server-client.c @@ -1,4 +1,4 @@ -/* $Id: server-client.c,v 1.9 2009-10-28 23:12:38 tcunha Exp $ */ +/* $Id: server-client.c,v 1.10 2009-10-28 23:14:15 tcunha Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> @@ -146,6 +146,36 @@ server_client_lost(struct client *c) recalculate_sizes(); } +/* Register clients for poll. */ +void +server_client_prepare(void) +{ + struct client *c; + u_int i; + int events; + + for (i = 0; i < ARRAY_LENGTH(&clients); i++) { + if ((c = ARRAY_ITEM(&clients, i)) == NULL) + continue; + + events = 0; + if (!(c->flags & CLIENT_BAD)) + events |= POLLIN; + if (c->ibuf.w.queued > 0) + events |= POLLOUT; + server_poll_add(c->ibuf.fd, events, server_client_callback, c); + + if (c->tty.fd == -1) + continue; + if (c->flags & CLIENT_SUSPENDED || c->session == NULL) + continue; + events = POLLIN; + if (BUFFER_USED(c->tty.out) > 0) + events |= POLLOUT; + server_poll_add(c->tty.fd, events, server_client_callback, c); + } +} + /* Process a single client event. */ void server_client_callback(int fd, int events, void *data) |