The unified diff between revisions [22bbe895..] and [b02ba662..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'cli-chansession.c'

#
#
# patch "cli-chansession.c"
#  from [ef81672b45f5f564130f3cdd8e409631cceaf551]
#    to [1f0824bd1ac6cf957bd31aebbd82b50027aef995]
#
============================================================
--- cli-chansession.c	ef81672b45f5f564130f3cdd8e409631cceaf551
+++ cli-chansession.c	1f0824bd1ac6cf957bd31aebbd82b50027aef995
@@ -338,9 +338,8 @@ static void send_chansess_shell_req(stru
 	TRACE(("leave send_chansess_shell_req"))
 }

-static int cli_initchansess(struct Channel *channel) {
-
-
+/* Shared for normal client channel and netcat-alike */
+static int cli_init_stdpipe_sess(struct Channel *channel) {
 	channel->writefd = STDOUT_FILENO;
 	setnonblocking(STDOUT_FILENO);

@@ -351,7 +350,13 @@ static int cli_initchansess(struct Chann
 	setnonblocking(STDERR_FILENO);

 	channel->extrabuf = cbuf_new(opts.recv_window);
+	return 0;
+}

+static int cli_initchansess(struct Channel *channel) {
+
+	cli_init_stdpipe_sess(channel);
+
 	if (cli_opts.wantpty) {
 		send_chansess_pty_req(channel);
 	}
@@ -363,52 +368,60 @@ static int cli_initchansess(struct Chann
 	}

 	return 0; /* Success */
-
 }

-void cli_send_chansess_request() {
+#ifdef ENABLE_CLI_NETCAT

-	unsigned int port = 0;
-	unsigned char* addr = NULL;
-	unsigned char* ipstring = "127.0.0.1";
-	unsigned char* portstring = "22";
+void cli_send_netcat_request() {

-	/* hack hack */
-	static const struct ChanType cli_chan_tcphack = {
+	const unsigned char* source_host = "127.0.0.1";
+	const int source_port = 22;
+
+	const struct ChanType cli_chan_netcat = {
 		0, /* sepfds */
 		"direct-tcpip",
+		cli_init_stdpipe_sess, /* inithandler */
 		NULL,
 		NULL,
-		NULL,
 		cli_closechansess
 	};

-	TRACE(("enter cli_send_chansess_request"))
-	if (send_msg_channel_open_init(STDIN_FILENO, &cli_chan_tcphack)
+	cli_opts.wantpty = 0;
+
+	if (send_msg_channel_open_init(STDIN_FILENO, &cli_chan_netcat)
 			== DROPBEAR_FAILURE) {
 		dropbear_exit("Couldn't open initial channel");
 	}

-	if (cli_opts.localfwds == NULL) {
-		dropbear_exit("You need to give a \"-L ignored:host:port\" option with this hacked up dbclient.");
-	}
+	buf_putstring(ses.writepayload, cli_opts.netcat_host,
+			strlen(cli_opts.netcat_host));
+	buf_putint(ses.writepayload, cli_opts.netcat_port);

-	addr = cli_opts.localfwds->connectaddr;
-	port = cli_opts.localfwds->connectport;
+	/* originator ip - localhost is accurate enough */
+	buf_putstring(ses.writepayload, source_host, strlen(source_host));
+	buf_putint(ses.writepayload, source_port);

-	buf_putstring(ses.writepayload, addr, strlen(addr));
-	buf_putint(ses.writepayload, port);
+	encrypt_packet();
+	TRACE(("leave cli_send_chansess_request"))
+}
+#endif

-	/* originator ip */
-	buf_putstring(ses.writepayload, ipstring, strlen(ipstring));
-	/* originator port */
-	buf_putint(ses.writepayload, atol(portstring));
+void cli_send_chansess_request() {

+	TRACE(("enter cli_send_chansess_request"))
+
+	if (send_msg_channel_open_init(STDIN_FILENO, &clichansess)
+			== DROPBEAR_FAILURE) {
+		dropbear_exit("Couldn't open initial channel");
+	}
+
+	/* No special channel request data */
 	encrypt_packet();
 	TRACE(("leave cli_send_chansess_request"))

 }

+
 #if 0
 	while (cli_opts.localfwds != NULL) {
 		ret = cli_localtcp(cli_opts.localfwds->listenport,