aboutsummaryrefslogtreecommitdiff
path: root/server-fn.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-11-08 23:09:36 +0000
committerTiago Cunha <tcunha@gmx.com>2009-11-08 23:09:36 +0000
commitbee17719d8212fa3ff87b4059727849bd3c807b2 (patch)
treef39a9402a6d1d3d89e2bca3eda02d3e6f84b31b8 /server-fn.c
parent0cd4f4e321476a1e5e437241a9ed394474de3aee (diff)
downloadrtmux-bee17719d8212fa3ff87b4059727849bd3c807b2.tar.gz
rtmux-bee17719d8212fa3ff87b4059727849bd3c807b2.tar.bz2
rtmux-bee17719d8212fa3ff87b4059727849bd3c807b2.zip
Sync OpenBSD patchset 503:
Don't reenlist the client imsg event every loop, instead have a small function to it and call it after the event triggers or after a imsg is added.
Diffstat (limited to 'server-fn.c')
-rw-r--r--server-fn.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/server-fn.c b/server-fn.c
index e7077335..6dc810a2 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -1,4 +1,4 @@
-/* $Id: server-fn.c,v 1.94 2009-10-12 00:37:41 tcunha Exp $ */
+/* $Id: server-fn.c,v 1.95 2009-11-08 23:09:36 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -59,6 +59,7 @@ server_write_client(
return;
log_debug("writing %d to client %d", type, c->ibuf.fd);
imsg_compose(ibuf, type, PROTOCOL_VERSION, -1, -1, (void *) buf, len);
+ server_update_event(c);
}
void
@@ -371,3 +372,18 @@ server_clear_identify(struct client *c)
server_redraw_client(c);
}
}
+
+void
+server_update_event(struct client *c)
+{
+ short events;
+
+ events = 0;
+ if (!(c->flags & CLIENT_BAD))
+ events |= EV_READ;
+ if (c->ibuf.w.queued > 0)
+ events |= EV_WRITE;
+ event_del(&c->event);
+ event_set(&c->event, c->ibuf.fd, events, server_client_callback, c);
+ event_add(&c->event, NULL);
+}