diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2010-07-02 02:43:50 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2010-07-02 02:43:50 +0000 |
| commit | 985cd3a4ded7ec319a317bc4fbf5b120675feecb (patch) | |
| tree | 5f5ac08827279af055343b0d77330484f7ee4a91 | |
| parent | 03c1c1cd9f731a8a5a066855077e91e31d2baf34 (diff) | |
| download | rtmux-985cd3a4ded7ec319a317bc4fbf5b120675feecb.tar.gz rtmux-985cd3a4ded7ec319a317bc4fbf5b120675feecb.tar.bz2 rtmux-985cd3a4ded7ec319a317bc4fbf5b120675feecb.zip | |
Sync OpenBSD patchset 728:
Use server_destroy_session() for kill-session.
| -rw-r--r-- | cmd-kill-session.c | 14 | ||||
| -rw-r--r-- | server-fn.c | 3 |
2 files changed, 4 insertions, 13 deletions
diff --git a/cmd-kill-session.c b/cmd-kill-session.c index eb2bde0b..04c0c8f5 100644 --- a/cmd-kill-session.c +++ b/cmd-kill-session.c @@ -1,4 +1,4 @@ -/* $Id: cmd-kill-session.c,v 1.17 2009-12-04 22:14:47 tcunha Exp $ */ +/* $Id: cmd-kill-session.c,v 1.18 2010-07-02 02:43:50 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -45,21 +45,11 @@ cmd_kill_session_exec(struct cmd *self, struct cmd_ctx *ctx) { struct cmd_target_data *data = self->data; struct session *s; - struct client *c; - u_int i; if ((s = cmd_find_session(ctx, data->target)) == NULL) return (-1); - for (i = 0; i < ARRAY_LENGTH(&clients); i++) { - c = ARRAY_ITEM(&clients, i); - if (c != NULL && c->session == s) { - c->session = NULL; - server_write_client(c, MSG_EXIT, NULL, 0); - } - } - recalculate_sizes(); - + server_destroy_session(s); session_destroy(s); return (0); diff --git a/server-fn.c b/server-fn.c index f95fcf3f..503c498e 100644 --- a/server-fn.c +++ b/server-fn.c @@ -1,4 +1,4 @@ -/* $Id: server-fn.c,v 1.106 2010-06-22 23:26:18 tcunha Exp $ */ +/* $Id: server-fn.c,v 1.107 2010-07-02 02:43:50 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -371,6 +371,7 @@ server_destroy_session(struct session *s) c->session = NULL; server_write_client(c, MSG_EXIT, NULL, 0); } + recalculate_sizes(); } void |