diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-12-13 16:01:13 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-12-13 16:01:13 +0000 |
| commit | ae5ddfdc1ae471f13c6d0e94ff4029d4fb29e1f4 (patch) | |
| tree | 72ebffc1c0617c28ddc421f24045f148b7d59e36 /cmd-lock-server.c | |
| parent | 92f187d1c2d84322860dc595da604260999a52f0 (diff) | |
| parent | ff599f4004aaa6aae325ece5cbc996e2dc6f0b4f (diff) | |
| download | rtmux-ae5ddfdc1ae471f13c6d0e94ff4029d4fb29e1f4.tar.gz rtmux-ae5ddfdc1ae471f13c6d0e94ff4029d4fb29e1f4.tar.bz2 rtmux-ae5ddfdc1ae471f13c6d0e94ff4029d4fb29e1f4.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-lock-server.c')
| -rw-r--r-- | cmd-lock-server.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/cmd-lock-server.c b/cmd-lock-server.c index a0204129..5d20ebd4 100644 --- a/cmd-lock-server.c +++ b/cmd-lock-server.c @@ -38,7 +38,7 @@ const struct cmd_entry cmd_lock_session_entry = { "lock-session", "locks", "t:", 0, 0, CMD_TARGET_SESSION_USAGE, - 0, + CMD_SESSION_T, cmd_lock_server_exec }; @@ -46,30 +46,20 @@ const struct cmd_entry cmd_lock_client_entry = { "lock-client", "lockc", "t:", 0, 0, CMD_TARGET_CLIENT_USAGE, - 0, + CMD_CLIENT_T, cmd_lock_server_exec }; enum cmd_retval cmd_lock_server_exec(struct cmd *self, __unused struct cmd_q *cmdq) { - struct args *args = self->args; - struct client *c; - struct session *s; - if (self->entry == &cmd_lock_server_entry) server_lock(); - else if (self->entry == &cmd_lock_session_entry) { - s = cmd_find_session(cmdq, args_get(args, 't'), 0); - if (s == NULL) - return (CMD_RETURN_ERROR); - server_lock_session(s); - } else { - c = cmd_find_client(cmdq, args_get(args, 't'), 0); - if (c == NULL) - return (CMD_RETURN_ERROR); - server_lock_client(c); - } + else if (self->entry == &cmd_lock_session_entry) + server_lock_session(cmdq->state.tflag.s); + else + server_lock_client(cmdq->state.c); + recalculate_sizes(); return (CMD_RETURN_NORMAL); |