dropbear: cli-tcpfwd.c annotate

annotate cli-tcpfwd.c @ 535:21490eea261d

Remove extraneous debugging

author	Matt Johnston <matt@ucc.asn.au>
date	Tue, 03 Mar 2009 13:20:00 +0000
parents	805e557fdff7
children	c3f2ec71e3d4 69e98c45db7c

rev	line source
74 e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	1 /*
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	2 * Dropbear SSH
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	3 *
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	4 * Copyright (c) 2002,2003 Matt Johnston
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	5 * All rights reserved.
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	6 *
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	7 * Permission is hereby granted, free of charge, to any person obtaining a copy
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	8 * of this software and associated documentation files (the "Software"), to deal
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	9 * in the Software without restriction, including without limitation the rights
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	10 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	11 * copies of the Software, and to permit persons to whom the Software is
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	12 * furnished to do so, subject to the following conditions:
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	13 *
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	14 * The above copyright notice and this permission notice shall be included in
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	15 * all copies or substantial portions of the Software.
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	16 *
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	17 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	18 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	19 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	20 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	21 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	22 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	23 * SOFTWARE. */
e3adf4cf5465 License boilerplate etc, add Mihnea as an author to some of the files Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	24
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	25 #include "includes.h"
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	26 #include "options.h"
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	27 #include "dbutil.h"
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	28 #include "tcpfwd.h"
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	29 #include "channel.h"
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	30 #include "runopts.h"
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	31 #include "session.h"
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	32 #include "ssh.h"
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	33
156 8c2b3506f112 Rearrange preprocessor parts so that compilation with various options Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	34 #ifdef ENABLE_CLI_REMOTETCPFWD
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	35 static int newtcpforwarded(struct Channel * channel);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	36
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	37 const struct ChanType cli_chan_tcpremote = {
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	38 1, /* sepfds */
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	39 "forwarded-tcpip",
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	40 newtcpforwarded,
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	41 NULL,
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	42 NULL,
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	43 NULL
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	44 };
156 8c2b3506f112 Rearrange preprocessor parts so that compilation with various options Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	45 #endif
8c2b3506f112 Rearrange preprocessor parts so that compilation with various options Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	46
8c2b3506f112 Rearrange preprocessor parts so that compilation with various options Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	47 #ifdef ENABLE_CLI_LOCALTCPFWD
8c2b3506f112 Rearrange preprocessor parts so that compilation with various options Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	48 static int cli_localtcp(unsigned int listenport, const char* remoteaddr,
8c2b3506f112 Rearrange preprocessor parts so that compilation with various options Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	49 unsigned int remoteport);
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	50 static const struct ChanType cli_chan_tcplocal = {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	51 1, /* sepfds */
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	52 "direct-tcpip",
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	53 NULL,
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	54 NULL,
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	55 NULL,
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	56 NULL
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	57 };
156 8c2b3506f112 Rearrange preprocessor parts so that compilation with various options Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	58 #endif
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	59
156 8c2b3506f112 Rearrange preprocessor parts so that compilation with various options Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	60 #ifdef ENABLE_CLI_LOCALTCPFWD
63 dcc43965928f - A nice cleaner structure for tcp (acceptor) forwarding. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	61 void setup_localtcp() {
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	62
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	63 int ret;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	64
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 156 diff changeset	65 TRACE(("enter setup_localtcp"))
66 38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	66
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	67 if (cli_opts.localfwds == NULL) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 156 diff changeset	68 TRACE(("cli_opts.localfwds == NULL"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	69 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	70
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	71 while (cli_opts.localfwds != NULL) {
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	72 ret = cli_localtcp(cli_opts.localfwds->listenport,
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	73 cli_opts.localfwds->connectaddr,
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	74 cli_opts.localfwds->connectport);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	75 if (ret == DROPBEAR_FAILURE) {
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	76 dropbear_log(LOG_WARNING, "Failed local port forward %d:%s:%d",
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	77 cli_opts.localfwds->listenport,
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	78 cli_opts.localfwds->connectaddr,
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	79 cli_opts.localfwds->connectport);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	80 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	81
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	82 cli_opts.localfwds = cli_opts.localfwds->next;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	83 }
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 156 diff changeset	84 TRACE(("leave setup_localtcp"))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	85
63 dcc43965928f - A nice cleaner structure for tcp (acceptor) forwarding. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	86 }
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	87
63 dcc43965928f - A nice cleaner structure for tcp (acceptor) forwarding. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	88 static int cli_localtcp(unsigned int listenport, const char* remoteaddr,
dcc43965928f - A nice cleaner structure for tcp (acceptor) forwarding. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	89 unsigned int remoteport) {
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	90
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	91 struct TCPListener* tcpinfo = NULL;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	92 int ret;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	93
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	94 TRACE(("enter cli_localtcp: %d %s %d", listenport, remoteaddr,
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	95 remoteport));
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	96
184 ca55377e4f7e - allocate correct buffer size for channel info, rather than sizeof(pointer). Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	97 tcpinfo = (struct TCPListener*)m_malloc(sizeof(struct TCPListener));
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	98
108 10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 74 diff changeset	99 tcpinfo->sendaddr = m_strdup(remoteaddr);
63 dcc43965928f - A nice cleaner structure for tcp (acceptor) forwarding. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	100 tcpinfo->sendport = remoteport;
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	101
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	102 if (opts.listen_fwd_all) {
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	103 tcpinfo->listenaddr = m_strdup("");
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	104 } else {
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	105 tcpinfo->listenaddr = m_strdup("localhost");
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	106 }
63 dcc43965928f - A nice cleaner structure for tcp (acceptor) forwarding. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	107 tcpinfo->listenport = listenport;
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	108
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	109 tcpinfo->chantype = &cli_chan_tcplocal;
259 c049490e43fe * fix -L forwarding on the client, broke last rev Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	110 tcpinfo->tcp_type = direct;
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	111
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	112 ret = listen_tcpfwd(tcpinfo);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	113
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	114 if (ret == DROPBEAR_FAILURE) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	115 m_free(tcpinfo);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	116 }
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 156 diff changeset	117 TRACE(("leave cli_localtcp: %d", ret))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	118 return ret;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	119 }
156 8c2b3506f112 Rearrange preprocessor parts so that compilation with various options Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	120 #endif /* ENABLE_CLI_LOCALTCPFWD */
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	121
156 8c2b3506f112 Rearrange preprocessor parts so that compilation with various options Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	122 #ifdef ENABLE_CLI_REMOTETCPFWD
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	123 static void send_msg_global_request_remotetcp(int port) {
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	124
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	125 char* listenspec = NULL;
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 156 diff changeset	126 TRACE(("enter send_msg_global_request_remotetcp"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	127
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	128 CHECKCLEARTOWRITE();
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	129 buf_putbyte(ses.writepayload, SSH_MSG_GLOBAL_REQUEST);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	130 buf_putstring(ses.writepayload, "tcpip-forward", 13);
505 805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	131 buf_putbyte(ses.writepayload, 1); /* want_reply */
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	132 if (opts.listen_fwd_all) {
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	133 listenspec = "";
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	134 } else {
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	135 listenspec = "localhost";
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	136 }
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	137 /* TODO: IPv6? */;
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	138 buf_putstring(ses.writepayload, listenspec, strlen(listenspec));
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	139 buf_putint(ses.writepayload, port);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	140
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	141 encrypt_packet();
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	142
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 156 diff changeset	143 TRACE(("leave send_msg_global_request_remotetcp"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	144 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	145
505 805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	146 /* The only global success/failure messages are for remotetcp.
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	147 * Since there isn't any identifier in these messages, we have to rely on them
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	148 * being in the same order as we sent the requests. This is the ordering
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	149 * of the cli_opts.remotefwds list */
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	150 void cli_recv_msg_request_success() {
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	151
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	152 /* Nothing in the packet. We just mark off that we have received the reply,
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	153 * so that we can report failure for later ones. */
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	154 struct TCPFwdList * iter = NULL;
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	155
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	156 iter = cli_opts.remotefwds;
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	157 while (iter != NULL) {
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	158 if (!iter->have_reply)
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	159 {
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	160 iter->have_reply = 1;
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	161 return;
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	162 }
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	163 iter = iter->next;
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	164 }
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	165 }
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	166
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	167 void cli_recv_msg_request_failure() {
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	168 struct TCPFwdList * iter = NULL;
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	169
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	170 iter = cli_opts.remotefwds;
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	171 while (iter != NULL) {
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	172 if (!iter->have_reply)
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	173 {
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	174 iter->have_reply = 1;
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	175 dropbear_log(LOG_WARNING, "Remote TCP forward request failed (port %d -> %s:%d)", iter->listenport, iter->connectaddr, iter->connectport);
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	176 return;
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	177 }
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	178 iter = iter->next;
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	179 }
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	180 }
805e557fdff7 Report errors if a remote request fails Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	181
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	182 void setup_remotetcp() {
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	183
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	184 struct TCPFwdList * iter = NULL;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	185
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 156 diff changeset	186 TRACE(("enter setup_remotetcp"))
66 38c3146aa23d Some more sanity-checking of args, and just warn and ignore OpenSSH args Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	187
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	188 if (cli_opts.remotefwds == NULL) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 156 diff changeset	189 TRACE(("cli_opts.remotefwds == NULL"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	190 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	191
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	192 iter = cli_opts.remotefwds;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	193
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	194 while (iter != NULL) {
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	195 send_msg_global_request_remotetcp(iter->listenport);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	196 iter = iter->next;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	197 }
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 156 diff changeset	198 TRACE(("leave setup_remotetcp"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	199 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	200
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	201 static int newtcpforwarded(struct Channel * channel) {
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	202
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	203 unsigned int origport;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	204 struct TCPFwdList * iter = NULL;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	205 char portstring[NI_MAXSERV];
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	206 int sock;
70 b0316ce64e4b Merging in the changes from 0.41-0.43 main Dropbear tree Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	207 int err = SSH_OPEN_ADMINISTRATIVELY_PROHIBITED;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	208
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	209 /* We don't care what address they connected to */
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	210 buf_eatstring(ses.payload);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	211
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	212 origport = buf_getint(ses.payload);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	213
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	214 /* Find which port corresponds */
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	215 iter = cli_opts.remotefwds;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	216
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	217 while (iter != NULL) {
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	218 if (origport == iter->listenport) {
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	219 break;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	220 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	221 iter = iter->next;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	222 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	223
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	224 if (iter == NULL) {
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	225 /* We didn't request forwarding on that port */
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	226 dropbear_log(LOG_INFO, "Server send unrequested port, from port %d",
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	227 origport);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	228 goto out;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	229 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	230
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	231 snprintf(portstring, sizeof(portstring), "%d", iter->connectport);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	232 sock = connect_remote(iter->connectaddr, portstring, 1, NULL);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	233 if (sock < 0) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 156 diff changeset	234 TRACE(("leave newtcpdirect: sock failed"))
70 b0316ce64e4b Merging in the changes from 0.41-0.43 main Dropbear tree Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	235 err = SSH_OPEN_CONNECT_FAILED;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	236 goto out;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	237 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	238
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	239 ses.maxfd = MAX(ses.maxfd, sock);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	240
253 84925eceeb13 * rename infd/outfd to writefd/readfd, to avoid confusion Matt Johnston <matt@ucc.asn.au> parents: 184 diff changeset	241 /* We don't set readfd, that will get set after the connection's
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	242 * progress succeeds */
253 84925eceeb13 * rename infd/outfd to writefd/readfd, to avoid confusion Matt Johnston <matt@ucc.asn.au> parents: 184 diff changeset	243 channel->writefd = sock;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	244 channel->initconn = 1;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	245
70 b0316ce64e4b Merging in the changes from 0.41-0.43 main Dropbear tree Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	246 err = SSH_OPEN_IN_PROGRESS;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	247
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	248 out:
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 156 diff changeset	249 TRACE(("leave newtcpdirect: err %d", err))
70 b0316ce64e4b Merging in the changes from 0.41-0.43 main Dropbear tree Matt Johnston <matt@ucc.asn.au> parents: 66 diff changeset	250 return err;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	251 }
156 8c2b3506f112 Rearrange preprocessor parts so that compilation with various options Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	252 #endif /* ENABLE_CLI_REMOTETCPFWD */

Mercurial > dropbear

annotate cli-tcpfwd.c @ 535:21490eea261d