dropbear: svr-tcpfwd.c annotate

annotate svr-tcpfwd.c @ 1140:f6d3a16ecc71

set timeouts to time remaining rather than timeout duration

author	Matt Johnston <matt@ucc.asn.au>
date	Mon, 03 Aug 2015 23:05:43 +0800
parents	aaf576b27a10
children	888e3d17e962 2bb4c662d1c2

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 * Copyright (c) 2004 by Mihnea Stoenescu
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 * 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	7 *
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 * 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	9 * 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	10 * 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	11 * 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	12 * 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	13 * 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	14 *
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 * 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	16 * 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	17 *
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 * 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	19 * 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	20 * 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	21 * 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	22 * 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	23 * 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	24 * 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	25
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	26 #include "includes.h"
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	27 #include "ssh.h"
64 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 "dbutil.h"
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	30 #include "session.h"
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	31 #include "buffer.h"
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	32 #include "packet.h"
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	33 #include "listener.h"
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	34 #include "runopts.h"
475 52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 410 diff changeset	35 #include "auth.h"
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	36 #include "netio.h"
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	37
673 c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	38 #ifndef ENABLE_SVR_REMOTETCPFWD
c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	39
c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	40 /* This is better than SSH_MSG_UNIMPLEMENTED */
c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	41 void recv_msg_global_request_remotetcp() {
c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	42 TRACE(("recv_msg_global_request_remotetcp: remote tcp forwarding not compiled in"))
c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	43 send_msg_request_failure();
c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	44 }
c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	45
c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	46 /* */
c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	47 #endif /* !ENABLE_SVR_REMOTETCPFWD */
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	48
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	49 static int svr_cancelremotetcp();
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	50 static int svr_remotetcpreq();
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	51 static int newtcpdirect(struct Channel * channel);
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	52
673 c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	53 #ifdef ENABLE_SVR_REMOTETCPFWD
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	54 static const struct ChanType svr_chan_tcpremote = {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	55 1, /* sepfds */
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	56 "forwarded-tcpip",
941 5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 937 diff changeset	57 tcp_prio_inithandler,
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	58 NULL,
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	59 NULL,
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	60 NULL
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	61 };
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	62
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	63 /* At the moment this is completely used for tcp code (with the name reflecting
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	64 * that). If new request types are added, this should be replaced with code
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	65 * similar to the request-switching in chansession.c */
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	66 void recv_msg_global_request_remotetcp() {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	67
1114 db7963049308 Turn many local variables into char * Gaël PORTAY <gael.portay@gmail.com> parents: 1094 diff changeset	68 char* reqname = NULL;
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	69 unsigned int namelen;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	70 unsigned int wantreply = 0;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	71 int ret = DROPBEAR_FAILURE;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	72
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	73 TRACE(("enter recv_msg_global_request_remotetcp"))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	74
475 52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 410 diff changeset	75 if (svr_opts.noremotetcp \|\| !svr_pubkey_allows_tcpfwd()) {
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	76 TRACE(("leave recv_msg_global_request_remotetcp: remote tcp forwarding disabled"))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	77 goto out;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	78 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	79
1122 aaf576b27a10 Merge pull request #13 from gazoo74/fix-warnings Matt Johnston <matt@ucc.asn.au> parents: 1114 diff changeset	80 reqname = buf_getstring(ses.payload, &namelen);
179 161557a9dde8 * fix longstanding bug with connections being closed on failure to Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	81 wantreply = buf_getbool(ses.payload);
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	82
267 7ce577234a10 * svr-tcpfwd.c: should be MAX_NAME_LEN not MAXNAMLEN Matt Johnston <matt@ucc.asn.au> parents: 259 diff changeset	83 if (namelen > MAX_NAME_LEN) {
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(("name len is wrong: %d", namelen))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	85 goto out;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	86 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	87
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	88 if (strcmp("tcpip-forward", reqname) == 0) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	89 ret = svr_remotetcpreq();
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	90 } else if (strcmp("cancel-tcpip-forward", reqname) == 0) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	91 ret = svr_cancelremotetcp();
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	92 } else {
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	93 TRACE(("reqname isn't tcpip-forward: '%s'", reqname))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	94 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	95
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	96 out:
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	97 if (wantreply) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	98 if (ret == DROPBEAR_SUCCESS) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	99 send_msg_request_success();
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	100 } else {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	101 send_msg_request_failure();
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	102 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	103 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	104
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	105 m_free(reqname);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	106
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	107 TRACE(("leave recv_msg_global_request"))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	108 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	109
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	110 static int matchtcp(void* typedata1, void* typedata2) {
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 const struct TCPListener info1 = (struct TCPListener)typedata1;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	113 const struct TCPListener info2 = (struct TCPListener)typedata2;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	114
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	115 return (info1->listenport == info2->listenport)
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	116 && (info1->chantype == info2->chantype)
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	117 && (strcmp(info1->listenaddr, info2->listenaddr) == 0);
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	118 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	119
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	120 static int svr_cancelremotetcp() {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	121
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	122 int ret = DROPBEAR_FAILURE;
1114 db7963049308 Turn many local variables into char * Gaël PORTAY <gael.portay@gmail.com> parents: 1094 diff changeset	123 char * bindaddr = NULL;
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	124 unsigned int addrlen;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	125 unsigned int port;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	126 struct Listener * listener = NULL;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	127 struct TCPListener tcpinfo;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	128
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	129 TRACE(("enter cancelremotetcp"))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	130
1122 aaf576b27a10 Merge pull request #13 from gazoo74/fix-warnings Matt Johnston <matt@ucc.asn.au> parents: 1114 diff changeset	131 bindaddr = buf_getstring(ses.payload, &addrlen);
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	132 if (addrlen > MAX_IP_LEN) {
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	133 TRACE(("addr len too long: %d", addrlen))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	134 goto out;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	135 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	136
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	137 port = buf_getint(ses.payload);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	138
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	139 tcpinfo.sendaddr = NULL;
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	140 tcpinfo.sendport = 0;
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	141 tcpinfo.listenaddr = bindaddr;
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	142 tcpinfo.listenport = port;
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	143 listener = get_listener(CHANNEL_ID_TCPFORWARDED, &tcpinfo, matchtcp);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	144 if (listener) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	145 remove_listener( listener );
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	146 ret = DROPBEAR_SUCCESS;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	147 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	148
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	149 out:
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	150 m_free(bindaddr);
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	151 TRACE(("leave cancelremotetcp"))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	152 return ret;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	153 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	154
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	155 static int svr_remotetcpreq() {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	156
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	157 int ret = DROPBEAR_FAILURE;
1114 db7963049308 Turn many local variables into char * Gaël PORTAY <gael.portay@gmail.com> parents: 1094 diff changeset	158 char * request_addr = NULL;
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	159 unsigned int addrlen;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	160 struct TCPListener *tcpinfo = NULL;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	161 unsigned int port;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	162
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	163 TRACE(("enter remotetcpreq"))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	164
1122 aaf576b27a10 Merge pull request #13 from gazoo74/fix-warnings Matt Johnston <matt@ucc.asn.au> parents: 1114 diff changeset	165 request_addr = buf_getstring(ses.payload, &addrlen);
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	166 if (addrlen > MAX_IP_LEN) {
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	167 TRACE(("addr len too long: %d", addrlen))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	168 goto out;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	169 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	170
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	171 port = buf_getint(ses.payload);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	172
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	173 if (port == 0) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	174 dropbear_log(LOG_INFO, "Server chosen tcpfwd ports are unsupported");
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	175 goto out;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	176 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	177
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	178 if (port < 1 \|\| port > 65535) {
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	179 TRACE(("invalid port: %d", port))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	180 goto out;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	181 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	182
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	183 if (!ses.allowprivport && port < IPPORT_RESERVED) {
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	184 TRACE(("can't assign port < 1024 for non-root"))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	185 goto out;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	186 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	187
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	188 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	189 tcpinfo->sendaddr = NULL;
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	190 tcpinfo->sendport = 0;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	191 tcpinfo->listenport = port;
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	192 tcpinfo->chantype = &svr_chan_tcpremote;
259 c049490e43fe * fix -L forwarding on the client, broke last rev Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	193 tcpinfo->tcp_type = forwarded;
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	194
675 dfdb9d9189ff Server shouldn't return "localhost" in response to -R forward connections Matt Johnston <matt@ucc.asn.au> parents: 673 diff changeset	195 tcpinfo->request_listenaddr = request_addr;
dfdb9d9189ff Server shouldn't return "localhost" in response to -R forward connections Matt Johnston <matt@ucc.asn.au> parents: 673 diff changeset	196 if (!opts.listen_fwd_all \|\| (strcmp(request_addr, "localhost") == 0) ) {
857 c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 675 diff changeset	197 /* NULL means "localhost only" */
675 dfdb9d9189ff Server shouldn't return "localhost" in response to -R forward connections Matt Johnston <matt@ucc.asn.au> parents: 673 diff changeset	198 tcpinfo->listenaddr = NULL;
577 69e98c45db7c - Progress for allowing specifying a listenaddr for tcp forwards Matt Johnston <matt@ucc.asn.au> parents: 475 diff changeset	199 }
675 dfdb9d9189ff Server shouldn't return "localhost" in response to -R forward connections Matt Johnston <matt@ucc.asn.au> parents: 673 diff changeset	200 else
dfdb9d9189ff Server shouldn't return "localhost" in response to -R forward connections Matt Johnston <matt@ucc.asn.au> parents: 673 diff changeset	201 {
dfdb9d9189ff Server shouldn't return "localhost" in response to -R forward connections Matt Johnston <matt@ucc.asn.au> parents: 673 diff changeset	202 tcpinfo->listenaddr = request_addr;
dfdb9d9189ff Server shouldn't return "localhost" in response to -R forward connections Matt Johnston <matt@ucc.asn.au> parents: 673 diff changeset	203 }
577 69e98c45db7c - Progress for allowing specifying a listenaddr for tcp forwards Matt Johnston <matt@ucc.asn.au> parents: 475 diff changeset	204
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	205 ret = listen_tcpfwd(tcpinfo);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	206
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	207 out:
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	208 if (ret == DROPBEAR_FAILURE) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	209 /* we only free it if a listener wasn't created, since the listener
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	210 * has to remember it if it's to be cancelled */
675 dfdb9d9189ff Server shouldn't return "localhost" in response to -R forward connections Matt Johnston <matt@ucc.asn.au> parents: 673 diff changeset	211 m_free(request_addr);
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	212 m_free(tcpinfo);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	213 }
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	214 TRACE(("leave remotetcpreq"))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	215 return ret;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: diff changeset	216 }
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	217
673 c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	218 #endif /* ENABLE_SVR_REMOTETCPFWD */
c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	219
c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	220 #ifdef ENABLE_SVR_LOCALTCPFWD
c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	221
c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	222 const struct ChanType svr_chan_tcpdirect = {
c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	223 1, /* sepfds */
c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	224 "direct-tcpip",
c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	225 newtcpdirect, /* init */
c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	226 NULL, /* checkclose */
c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	227 NULL, /* reqhandler */
c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	228 NULL /* closehandler */
c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	229 };
c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	230
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	231 /* Called upon creating a new direct tcp channel (ie we connect out to an
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	232 * address */
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	233 static int newtcpdirect(struct Channel * channel) {
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	234
1114 db7963049308 Turn many local variables into char * Gaël PORTAY <gael.portay@gmail.com> parents: 1094 diff changeset	235 char* desthost = NULL;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	236 unsigned int destport;
1114 db7963049308 Turn many local variables into char * Gaël PORTAY <gael.portay@gmail.com> parents: 1094 diff changeset	237 char* orighost = NULL;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	238 unsigned int origport;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	239 char portstring[NI_MAXSERV];
1094 c45d65392c1a Fix pointer differ in signess warnings [-Werror=pointer-sign] Gaël PORTAY <gael.portay@gmail.com> parents: 1032 diff changeset	240 unsigned int len;
70 b0316ce64e4b Merging in the changes from 0.41-0.43 main Dropbear tree Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	241 int err = SSH_OPEN_ADMINISTRATIVELY_PROHIBITED;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	242
941 5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 937 diff changeset	243 TRACE(("newtcpdirect channel %d", channel->index))
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 937 diff changeset	244
475 52a644e7b8e1 * Patch from Frédéric Moulins adding options to authorized_keys. Matt Johnston <matt@ucc.asn.au> parents: 410 diff changeset	245 if (svr_opts.nolocaltcp \|\| !svr_pubkey_allows_tcpfwd()) {
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	246 TRACE(("leave newtcpdirect: local tcp forwarding disabled"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	247 goto out;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	248 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	249
1122 aaf576b27a10 Merge pull request #13 from gazoo74/fix-warnings Matt Johnston <matt@ucc.asn.au> parents: 1114 diff changeset	250 desthost = buf_getstring(ses.payload, &len);
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	251 if (len > MAX_HOST_LEN) {
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	252 TRACE(("leave newtcpdirect: desthost too long"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	253 goto out;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	254 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	255
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	256 destport = buf_getint(ses.payload);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	257
1122 aaf576b27a10 Merge pull request #13 from gazoo74/fix-warnings Matt Johnston <matt@ucc.asn.au> parents: 1114 diff changeset	258 orighost = buf_getstring(ses.payload, &len);
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	259 if (len > MAX_HOST_LEN) {
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	260 TRACE(("leave newtcpdirect: orighost too long"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	261 goto out;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	262 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	263
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	264 origport = buf_getint(ses.payload);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	265
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	266 /* best be sure */
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	267 if (origport > 65535 \|\| destport > 65535) {
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	268 TRACE(("leave newtcpdirect: port > 65535"))
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	269 goto out;
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	270 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	271
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	272 snprintf(portstring, sizeof(portstring), "%d", destport);
1025 02baa0b334e8 async connections working Matt Johnston <matt@ucc.asn.au> parents: 1022 diff changeset	273 channel->conn_pending = connect_remote(desthost, portstring, channel_connect_done, channel);
941 5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 937 diff changeset	274
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 937 diff changeset	275 channel->prio = DROPBEAR_CHANNEL_PRIO_UNKNOWABLE;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	276
70 b0316ce64e4b Merging in the changes from 0.41-0.43 main Dropbear tree Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	277 err = SSH_OPEN_IN_PROGRESS;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	278
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	279 out:
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	280 m_free(desthost);
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	281 m_free(orighost);
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	282 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: 64 diff changeset	283 return err;
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	284 }
efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	285
673 c519b78b6d1a - Don't sent SSH_MSG_UNIMPLEMENTED if we don't have ENABLE_SVR_REMOTETCPFWD Matt Johnston <matt@ucc.asn.au> parents: 620 diff changeset	286 #endif /* ENABLE_SVR_LOCALTCPFWD */

Mercurial > dropbear

annotate svr-tcpfwd.c @ 1140:f6d3a16ecc71