Attachment #1709 for bug #1424

Lines 63-68 void client_register_global_confirm(global_confirm_cb , void ); Link Here

(-)a/clientloop.h (+1 lines)
63	#define SSHMUX_COMMAND_ALIVE_CHECK 2 /* Check master is alive */	63	#define SSHMUX_COMMAND_ALIVE_CHECK 2 /* Check master is alive */
64	#define SSHMUX_COMMAND_TERMINATE 3 /* Ask master to exit */	64	#define SSHMUX_COMMAND_TERMINATE 3 /* Ask master to exit */
65	#define SSHMUX_COMMAND_PS 4 /* Get list of slaves */	65	#define SSHMUX_COMMAND_PS 4 /* Get list of slaves */
		66	#define SSHMUX_COMMAND_KILL 5 /* Send signal to remote process */
66		67
67	#define SSHMUX_FLAG_TTY (1) /* Request tty on open */	68	#define SSHMUX_FLAG_TTY (1) /* Request tty on open */
68	#define SSHMUX_FLAG_SUBSYS (1<<1) /* Subsystem request on open */	69	#define SSHMUX_FLAG_SUBSYS (1<<1) /* Subsystem request on open */




#include "sshpty.h"
#include "key.h"
#include "readconf.h"
#include "compat.h"
#include "clientloop.h"

/* from ssh.c */

	socklen_t addrlen;
	struct sockaddr_storage addr;
	struct mux_session_confirm_ctx *cctx;
	char *cmd, *tag, *signal;
	u_int i, j, len, env_len, mux_command, flags, escape_char;
	uid_t euid;
	gid_t egid;

			allowed = ask_permission("Terminate shared connection "
						 "to %s? ", host);
		break;
	case  SSHMUX_COMMAND_KILL:
		signal = buffer_get_string(&m, &len);
		tag = buffer_get_string(&m, &len);
		c = NULL;
		if (tag && signal && compat20) {
			/* channel lookup by tag */
			while (c = channel_next(c))
				if (c->tag && (strcmp(tag, c->tag) == 0))
					break;
		}
		if (c) {
			if (ask)
				allowed = ask_permission("Send signal %s to "
							 "session %s in %s? ",
							 signal, tag, host);
		} else {
			allowed = 0;
		}
		break;
	}

	/* Build response */

			if (c->tag)
				buffer_put_cstring(&m, c->tag);
		break;
	case SSHMUX_COMMAND_KILL:
		if (allowed) {
			int id = c->self;
			channel_request_start(id, "signal", 0);
			packet_put_cstring(signal);
			packet_send();
 		}
		break;
	default:
		error("Unsupported command %d", mux_command);
		goto cleanup;

		muxclient_command = SSHMUX_COMMAND_OPEN;
	case SSHMUX_COMMAND_OPEN:
		break;
	case  SSHMUX_COMMAND_KILL:
		if (ac != 2)
			fatal("Bad number of arguments for control command kill");
		break;
	default:
		if (ac != 0)
			fatal("Bad number of arguments for control command");


	/* Add command specific data */
	switch (muxclient_command) {
	case SSHMUX_COMMAND_KILL:
		buffer_put_cstring(&m, av[0]);
		buffer_put_cstring(&m, av[1]);
		break;	
	default:
		break;
	}

			xfree(tag);
		}
		exit(0);
	case SSHMUX_COMMAND_KILL:
		fprintf(stderr, "Signal request sent.\r\n");
		exit(0);
	case SSHMUX_COMMAND_OPEN:
		buffer_clear(&m);
		buffer_put_cstring(&m, term ? term : "");

Lines 307-312 main(int ac, char **av) Link Here

(-)a/ssh.c (+2 lines)
307	muxclient_command = SSHMUX_COMMAND_TERMINATE;	307	muxclient_command = SSHMUX_COMMAND_TERMINATE;
308	else if (strcmp(optarg, "ps") == 0)	308	else if (strcmp(optarg, "ps") == 0)
309	muxclient_command = SSHMUX_COMMAND_PS;	309	muxclient_command = SSHMUX_COMMAND_PS;
		310	else if (strcmp(optarg, "kill") == 0)
		311	muxclient_command = SSHMUX_COMMAND_KILL;
310	else	312	else
311	fatal("Invalid multiplex command.");	313	fatal("Invalid multiplex command.");
312	break;	314	break;

Return to bug 1424

Lines 67-72 Link Here

(-)a/mux.c (-1 / +40 lines)
67	#include "sshpty.h"	67	#include "sshpty.h"
68	#include "key.h"	68	#include "key.h"
69	#include "readconf.h"	69	#include "readconf.h"
		70	#include "compat.h"
70	#include "clientloop.h"	71	#include "clientloop.h"
71		72
72	/* from ssh.c */	73	/* from ssh.c */
Lines 212-218 muxserver_accept_control(void) Link Here
212	socklen_t addrlen;	213	socklen_t addrlen;
213	struct sockaddr_storage addr;	214	struct sockaddr_storage addr;
214	struct mux_session_confirm_ctx *cctx;	215	struct mux_session_confirm_ctx *cctx;
215	char cmd, tag;	216	char cmd, tag, *signal;
216	u_int i, j, len, env_len, mux_command, flags, escape_char;	217	u_int i, j, len, env_len, mux_command, flags, escape_char;
217	uid_t euid;	218	uid_t euid;
218	gid_t egid;	219	gid_t egid;
Lines 278-283 muxserver_accept_control(void) Link Here
278	allowed = ask_permission("Terminate shared connection "	279	allowed = ask_permission("Terminate shared connection "
279	"to %s? ", host);	280	"to %s? ", host);
280	break;	281	break;
		282	case SSHMUX_COMMAND_KILL:
		283	signal = buffer_get_string(&m, &len);
		284	tag = buffer_get_string(&m, &len);
		285	c = NULL;
		286	if (tag && signal && compat20) {
		287	/* channel lookup by tag */
		288	while (c = channel_next(c))
		289	if (c->tag && (strcmp(tag, c->tag) == 0))
		290	break;
		291	}
		292	if (c) {
		293	if (ask)
		294	allowed = ask_permission("Send signal %s to "
		295	"session %s in %s? ",
		296	signal, tag, host);
		297	} else {
		298	allowed = 0;
		299	}
		300	break;
281	}	301	}
282		302
283	/* Build response */	303	/* Build response */
Lines 305-310 muxserver_accept_control(void) Link Here
305	if (c->tag)	325	if (c->tag)
306	buffer_put_cstring(&m, c->tag);	326	buffer_put_cstring(&m, c->tag);
307	break;	327	break;
		328	case SSHMUX_COMMAND_KILL:
		329	if (allowed) {
		330	int id = c->self;
		331	channel_request_start(id, "signal", 0);
		332	packet_put_cstring(signal);
		333	packet_send();
		334	}
		335	break;
308	default:	336	default:
309	error("Unsupported command %d", mux_command);	337	error("Unsupported command %d", mux_command);
310	goto cleanup;	338	goto cleanup;
Lines 513-518 muxclient(const char path, int ac, char *av) Link Here
513	muxclient_command = SSHMUX_COMMAND_OPEN;	541	muxclient_command = SSHMUX_COMMAND_OPEN;
514	case SSHMUX_COMMAND_OPEN:	542	case SSHMUX_COMMAND_OPEN:
515	break;	543	break;
		544	case SSHMUX_COMMAND_KILL:
		545	if (ac != 2)
		546	fatal("Bad number of arguments for control command kill");
		547	break;
516	default:	548	default:
517	if (ac != 0)	549	if (ac != 0)
518	fatal("Bad number of arguments for control command");	550	fatal("Bad number of arguments for control command");
Lines 587-592 muxclient(const char path, int ac, char *av) Link Here
587		619
588	/* Add command specific data */	620	/* Add command specific data */
589	switch (muxclient_command) {	621	switch (muxclient_command) {
		622	case SSHMUX_COMMAND_KILL:
		623	buffer_put_cstring(&m, av[0]);
		624	buffer_put_cstring(&m, av[1]);
		625	break;
590	default:	626	default:
591	break;	627	break;
592	}	628	}
Lines 649-654 muxclient(const char path, int ac, char *av) Link Here
649	xfree(tag);	685	xfree(tag);
650	}	686	}
651	exit(0);	687	exit(0);
		688	case SSHMUX_COMMAND_KILL:
		689	fprintf(stderr, "Signal request sent.\r\n");
		690	exit(0);
652	case SSHMUX_COMMAND_OPEN:	691	case SSHMUX_COMMAND_OPEN:
653	buffer_clear(&m);	692	buffer_clear(&m);
654	buffer_put_cstring(&m, term ? term : "");	693	buffer_put_cstring(&m, term ? term : "");