dropbear: common-session.c annotate

annotate common-session.c @ 1416:33d90d219e03

Compile with -fno-strict-overflow if possible. Needed for curve25519-donna https://github.com/agl/curve25519-donna/issues/31

author	Matt Johnston <matt@ucc.asn.au>
date	Fri, 23 Jun 2017 21:31:25 +0800
parents	2c9dac2d6707
children	08f4fa4dc6a0 0c16b4ccbd54

rev	line source
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1 /*
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	2 * Dropbear - a SSH2 server
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	3 *
1079 acf444bcb115 Fix no-writev fallback Matt Johnston <matt@ucc.asn.au> parents: 1074 diff changeset	4 * Copyright (c) Matt Johnston
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	5 * All rights reserved.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	6 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	7 * Permission is hereby granted, free of charge, to any person obtaining a copy
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	8 * of this software and associated documentation files (the "Software"), to deal
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	9 * in the Software without restriction, including without limitation the rights
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	10 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	11 * copies of the Software, and to permit persons to whom the Software is
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	12 * furnished to do so, subject to the following conditions:
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	13 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	14 * The above copyright notice and this permission notice shall be included in
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	15 * all copies or substantial portions of the Software.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	16 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	17 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	18 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	19 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	20 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	21 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	22 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	23 * SOFTWARE. */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	24
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	25 #include "includes.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	26 #include "session.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	27 #include "dbutil.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	28 #include "packet.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	29 #include "algo.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	30 #include "buffer.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	31 #include "dss.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	32 #include "ssh.h"
858 220f55d540ae rename random.h to dbrandom.h since some OSes have a system random.h Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	33 #include "dbrandom.h"
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	34 #include "kex.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	35 #include "channel.h"
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 452 diff changeset	36 #include "runopts.h"
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: 1031 diff changeset	37 #include "netio.h"
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	38
1276 9169e4e7cbee fix empty C prototypes Francois Perrad <francois.perrad@gadz.org> parents: 1191 diff changeset	39 static void checktimeouts(void);
9169e4e7cbee fix empty C prototypes Francois Perrad <francois.perrad@gadz.org> parents: 1191 diff changeset	40 static long select_timeout(void);
108 10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	41 static int ident_readln(int fd, char* buf, int count);
1276 9169e4e7cbee fix empty C prototypes Francois Perrad <francois.perrad@gadz.org> parents: 1191 diff changeset	42 static void read_session_identification(void);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	43
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	44 struct sshsession ses; /* GLOBAL */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	45
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	46 /* need to know if the session struct has been initialised, this way isn't the
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	47 * cleanest, but works OK */
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	48 int sessinitdone = 0; /* GLOBAL */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	49
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	50 /* this is set when we get SIGINT or SIGTERM, the handler is in main.c */
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	51 int exitflag = 0; /* GLOBAL */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	52
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	53 /* called only at the start of a session, set up initial state */
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 537 diff changeset	54 void common_session_init(int sock_in, int sock_out) {
939 a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	55 time_t now;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	56
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1292 diff changeset	57 #if DEBUG_TRACE
1021 24135c8e1d46 Add envirnonment variable for debug timestamps to roughly match Matt Johnston <matt@ucc.asn.au> parents: 1020 diff changeset	58 debug_start_net();
24135c8e1d46 Add envirnonment variable for debug timestamps to roughly match Matt Johnston <matt@ucc.asn.au> parents: 1020 diff changeset	59 #endif
24135c8e1d46 Add envirnonment variable for debug timestamps to roughly match Matt Johnston <matt@ucc.asn.au> parents: 1020 diff changeset	60
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 135 diff changeset	61 TRACE(("enter session_init"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	62
479 e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	63 ses.sock_in = sock_in;
e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	64 ses.sock_out = sock_out;
e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	65 ses.maxfd = MAX(sock_in, sock_out);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	66
1074 10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1060 diff changeset	67 if (sock_in >= 0) {
10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1060 diff changeset	68 setnonblocking(sock_in);
10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1060 diff changeset	69 }
10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1060 diff changeset	70 if (sock_out >= 0) {
10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1060 diff changeset	71 setnonblocking(sock_out);
10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1060 diff changeset	72 }
10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1060 diff changeset	73
941 5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	74 ses.socket_prio = DROPBEAR_PRIO_DEFAULT;
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	75 /* Sets it to lowdelay */
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	76 update_channel_prio();
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	77
939 a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	78 now = monotonic_now();
1139 43a8ea69b24c Fix problem where auth timeout wasn't checked when waiting for ident Matt Johnston <matt@ucc.asn.au> parents: 1124 diff changeset	79 ses.connect_time = now;
939 a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	80 ses.last_packet_time_keepalive_recv = now;
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	81 ses.last_packet_time_idle = now;
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	82 ses.last_packet_time_any_sent = 0;
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	83 ses.last_packet_time_keepalive_sent = 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	84
416 a01c0c8e543a Improve behaviour when flushing out after a process has exited. Matt Johnston <matt@ucc.asn.au> parents: 373 diff changeset	85 if (pipe(ses.signal_pipe) < 0) {
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	86 dropbear_exit("Signal pipe failed");
416 a01c0c8e543a Improve behaviour when flushing out after a process has exited. Matt Johnston <matt@ucc.asn.au> parents: 373 diff changeset	87 }
a01c0c8e543a Improve behaviour when flushing out after a process has exited. Matt Johnston <matt@ucc.asn.au> parents: 373 diff changeset	88 setnonblocking(ses.signal_pipe[0]);
a01c0c8e543a Improve behaviour when flushing out after a process has exited. Matt Johnston <matt@ucc.asn.au> parents: 373 diff changeset	89 setnonblocking(ses.signal_pipe[1]);
537 7de2f22ea759 - Add the signal pipe to maxfd Matt Johnston <matt@ucc.asn.au> parents: 534 diff changeset	90
7de2f22ea759 - Add the signal pipe to maxfd Matt Johnston <matt@ucc.asn.au> parents: 534 diff changeset	91 ses.maxfd = MAX(ses.maxfd, ses.signal_pipe[0]);
7de2f22ea759 - Add the signal pipe to maxfd Matt Johnston <matt@ucc.asn.au> parents: 534 diff changeset	92 ses.maxfd = MAX(ses.maxfd, ses.signal_pipe[1]);
416 a01c0c8e543a Improve behaviour when flushing out after a process has exited. Matt Johnston <matt@ucc.asn.au> parents: 373 diff changeset	93
448 9c61e7af0156 Rearrange the channel buffer sizes into three neat use-editable values in Matt Johnston <matt@ucc.asn.au> parents: 416 diff changeset	94 ses.writepayload = buf_new(TRANS_MAX_PAYLOAD_LEN);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	95 ses.transseq = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	96
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	97 ses.readbuf = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	98 ses.payload = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	99 ses.recvseq = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	100
135 d663445c1533 Initialise the outgoing packet queue Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	101 initqueue(&ses.writequeue);
d663445c1533 Initialise the outgoing packet queue Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	102
886 cbc73a5aefb0 requirenext doesn't need two values Matt Johnston <matt@ucc.asn.au> parents: 858 diff changeset	103 ses.requirenext = SSH_MSG_KEXINIT;
452 4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	104 ses.dataallowed = 1; /* we can send data until we actually
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	105 send the SSH_MSG_KEXINIT */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	106 ses.ignorenext = 0;
34 e2a1eaa19f22 Client mostly works up to password auth Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	107 ses.lastpacket = 0;
452 4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	108 ses.reply_queue_head = NULL;
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	109 ses.reply_queue_tail = NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	110
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	111 /* set all the algos to none */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	112 ses.keys = (struct key_context*)m_malloc(sizeof(struct key_context));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	113 ses.newkeys = NULL;
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 531 diff changeset	114 ses.keys->recv.algo_crypt = &dropbear_nocipher;
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 531 diff changeset	115 ses.keys->trans.algo_crypt = &dropbear_nocipher;
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 531 diff changeset	116 ses.keys->recv.crypt_mode = &dropbear_mode_none;
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 531 diff changeset	117 ses.keys->trans.crypt_mode = &dropbear_mode_none;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	118
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 531 diff changeset	119 ses.keys->recv.algo_mac = &dropbear_nohash;
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 531 diff changeset	120 ses.keys->trans.algo_mac = &dropbear_nohash;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	121
761 ac2158e3e403 ecc kind of works, needs fixing/testing Matt Johnston <matt@ucc.asn.au> parents: 705 diff changeset	122 ses.keys->algo_kex = NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	123 ses.keys->algo_hostkey = -1;
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 531 diff changeset	124 ses.keys->recv.algo_comp = DROPBEAR_COMP_NONE;
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 531 diff changeset	125 ses.keys->trans.algo_comp = DROPBEAR_COMP_NONE;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	126
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	127 #ifndef DISABLE_ZLIB
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 531 diff changeset	128 ses.keys->recv.zstream = NULL;
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 531 diff changeset	129 ses.keys->trans.zstream = NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	130 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	131
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	132 /* key exchange buffers */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	133 ses.session_id = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	134 ses.kexhashbuf = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	135 ses.transkexinit = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	136 ses.dh_K = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	137 ses.remoteident = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	138
6 ab00ef513e97 Sorted out the first channel init issues. Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	139 ses.chantypes = NULL;
ab00ef513e97 Sorted out the first channel init issues. Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	140
21 d7cc5b484a2e - Port restriction code back in Matt Johnston <matt@ucc.asn.au> parents: 6 diff changeset	141 ses.allowprivport = 0;
d7cc5b484a2e - Port restriction code back in Matt Johnston <matt@ucc.asn.au> parents: 6 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: 135 diff changeset	143 TRACE(("leave session_init"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	144 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	145
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	146 void session_loop(void(*loophandler)()) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	147
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	148 fd_set readfd, writefd;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	149 struct timeval timeout;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	150 int val;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	151
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	152 /* main loop, select()s for all sockets in use */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	153 for(;;) {
1074 10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1060 diff changeset	154 const int writequeue_has_space = (ses.writequeue_len <= 2*TRANS_MAX_PAYLOAD_LEN);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	155
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 452 diff changeset	156 timeout.tv_sec = select_timeout();
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	157 timeout.tv_usec = 0;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	158 FD_ZERO(&writefd);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	159 FD_ZERO(&readfd);
241 c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	160 dropbear_assert(ses.payload == NULL);
726 78eda530c000 send out our kexinit packet before blocking to read the SSH version string Matt Johnston <matt@ucc.asn.au> parents: 705 diff changeset	161
1151 a550e1e2e2a9 make sure that the test for queued packets to write occurs after Matt Johnston <matt@ucc.asn.au> parents: 1143 diff changeset	162 /* We get woken up when signal handlers write to this pipe.
a550e1e2e2a9 make sure that the test for queued packets to write occurs after Matt Johnston <matt@ucc.asn.au> parents: 1143 diff changeset	163 SIGCHLD in svr-chansession is the only one currently. */
a550e1e2e2a9 make sure that the test for queued packets to write occurs after Matt Johnston <matt@ucc.asn.au> parents: 1143 diff changeset	164 FD_SET(ses.signal_pipe[0], &readfd);
1191 b370b4b172d0 Fix ses.channel_signal_pending race Matt Johnston <matt@ucc.asn.au> parents: 1151 diff changeset	165 ses.channel_signal_pending = 0;
1151 a550e1e2e2a9 make sure that the test for queued packets to write occurs after Matt Johnston <matt@ucc.asn.au> parents: 1143 diff changeset	166
a550e1e2e2a9 make sure that the test for queued packets to write occurs after Matt Johnston <matt@ucc.asn.au> parents: 1143 diff changeset	167 /* set up for channels which can be read/written */
a550e1e2e2a9 make sure that the test for queued packets to write occurs after Matt Johnston <matt@ucc.asn.au> parents: 1143 diff changeset	168 setchannelfds(&readfd, &writefd, writequeue_has_space);
a550e1e2e2a9 make sure that the test for queued packets to write occurs after Matt Johnston <matt@ucc.asn.au> parents: 1143 diff changeset	169
a550e1e2e2a9 make sure that the test for queued packets to write occurs after Matt Johnston <matt@ucc.asn.au> parents: 1143 diff changeset	170 /* Pending connections to test */
a550e1e2e2a9 make sure that the test for queued packets to write occurs after Matt Johnston <matt@ucc.asn.au> parents: 1143 diff changeset	171 set_connect_fds(&writefd);
a550e1e2e2a9 make sure that the test for queued packets to write occurs after Matt Johnston <matt@ucc.asn.au> parents: 1143 diff changeset	172
1060 4c733310c21d reword comment for clarity Matt Johnston <matt@ucc.asn.au> parents: 1050 diff changeset	173 /* We delay reading from the input socket during initial setup until
4c733310c21d reword comment for clarity Matt Johnston <matt@ucc.asn.au> parents: 1050 diff changeset	174 after we have written out our initial KEXINIT packet (empty writequeue).
4c733310c21d reword comment for clarity Matt Johnston <matt@ucc.asn.au> parents: 1050 diff changeset	175 This means our initial packet can be in-flight while we're doing a blocking
1074 10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1060 diff changeset	176 read for the remote ident.
10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1060 diff changeset	177 We also avoid reading from the socket if the writequeue is full, that avoids
10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1060 diff changeset	178 replies backing up */
10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1060 diff changeset	179 if (ses.sock_in != -1
10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1060 diff changeset	180 && (ses.remoteident \|\| isempty(&ses.writequeue))
10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1060 diff changeset	181 && writequeue_has_space) {
479 e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	182 FD_SET(ses.sock_in, &readfd);
e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	183 }
1151 a550e1e2e2a9 make sure that the test for queued packets to write occurs after Matt Johnston <matt@ucc.asn.au> parents: 1143 diff changeset	184
a550e1e2e2a9 make sure that the test for queued packets to write occurs after Matt Johnston <matt@ucc.asn.au> parents: 1143 diff changeset	185 /* Ordering is important, this test must occur after any other function
a550e1e2e2a9 make sure that the test for queued packets to write occurs after Matt Johnston <matt@ucc.asn.au> parents: 1143 diff changeset	186 might have queued packets (such as connection handlers) */
479 e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	187 if (ses.sock_out != -1 && !isempty(&ses.writequeue)) {
e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	188 FD_SET(ses.sock_out, &writefd);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	189 }
1025 02baa0b334e8 async connections working Matt Johnston <matt@ucc.asn.au> parents: 1021 diff changeset	190
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	191 val = select(ses.maxfd+1, &readfd, &writefd, NULL, &timeout);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	192
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	193 if (exitflag) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	194 dropbear_exit("Terminated by signal");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	195 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	196
373 70caa99bfe3a Tidy up behaviour when select() is interrupted. We follow normal Matt Johnston <matt@ucc.asn.au> parents: 344 diff changeset	197 if (val < 0 && errno != EINTR) {
70caa99bfe3a Tidy up behaviour when select() is interrupted. We follow normal Matt Johnston <matt@ucc.asn.au> parents: 344 diff changeset	198 dropbear_exit("Error in select");
70caa99bfe3a Tidy up behaviour when select() is interrupted. We follow normal Matt Johnston <matt@ucc.asn.au> parents: 344 diff changeset	199 }
70caa99bfe3a Tidy up behaviour when select() is interrupted. We follow normal Matt Johnston <matt@ucc.asn.au> parents: 344 diff changeset	200
70caa99bfe3a Tidy up behaviour when select() is interrupted. We follow normal Matt Johnston <matt@ucc.asn.au> parents: 344 diff changeset	201 if (val <= 0) {
70caa99bfe3a Tidy up behaviour when select() is interrupted. We follow normal Matt Johnston <matt@ucc.asn.au> parents: 344 diff changeset	202 /* If we were interrupted or the select timed out, we still
70caa99bfe3a Tidy up behaviour when select() is interrupted. We follow normal Matt Johnston <matt@ucc.asn.au> parents: 344 diff changeset	203 * want to iterate over channels etc for reading, to handle
70caa99bfe3a Tidy up behaviour when select() is interrupted. We follow normal Matt Johnston <matt@ucc.asn.au> parents: 344 diff changeset	204 * server processes exiting etc.
70caa99bfe3a Tidy up behaviour when select() is interrupted. We follow normal Matt Johnston <matt@ucc.asn.au> parents: 344 diff changeset	205 * We don't want to read/write FDs. */
70caa99bfe3a Tidy up behaviour when select() is interrupted. We follow normal Matt Johnston <matt@ucc.asn.au> parents: 344 diff changeset	206 FD_ZERO(&writefd);
70caa99bfe3a Tidy up behaviour when select() is interrupted. We follow normal Matt Johnston <matt@ucc.asn.au> parents: 344 diff changeset	207 FD_ZERO(&readfd);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	208 }
416 a01c0c8e543a Improve behaviour when flushing out after a process has exited. Matt Johnston <matt@ucc.asn.au> parents: 373 diff changeset	209
a01c0c8e543a Improve behaviour when flushing out after a process has exited. Matt Johnston <matt@ucc.asn.au> parents: 373 diff changeset	210 /* We'll just empty out the pipe if required. We don't do
a01c0c8e543a Improve behaviour when flushing out after a process has exited. Matt Johnston <matt@ucc.asn.au> parents: 373 diff changeset	211 any thing with the data, since the pipe's purpose is purely to
a01c0c8e543a Improve behaviour when flushing out after a process has exited. Matt Johnston <matt@ucc.asn.au> parents: 373 diff changeset	212 wake up the select() above. */
a01c0c8e543a Improve behaviour when flushing out after a process has exited. Matt Johnston <matt@ucc.asn.au> parents: 373 diff changeset	213 if (FD_ISSET(ses.signal_pipe[0], &readfd)) {
a01c0c8e543a Improve behaviour when flushing out after a process has exited. Matt Johnston <matt@ucc.asn.au> parents: 373 diff changeset	214 char x;
1191 b370b4b172d0 Fix ses.channel_signal_pending race Matt Johnston <matt@ucc.asn.au> parents: 1151 diff changeset	215 TRACE(("signal pipe set"))
416 a01c0c8e543a Improve behaviour when flushing out after a process has exited. Matt Johnston <matt@ucc.asn.au> parents: 373 diff changeset	216 while (read(ses.signal_pipe[0], &x, 1) > 0) {}
1191 b370b4b172d0 Fix ses.channel_signal_pending race Matt Johnston <matt@ucc.asn.au> parents: 1151 diff changeset	217 ses.channel_signal_pending = 1;
416 a01c0c8e543a Improve behaviour when flushing out after a process has exited. Matt Johnston <matt@ucc.asn.au> parents: 373 diff changeset	218 }
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	219
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	220 /* check for auth timeout, rekeying required etc */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	221 checktimeouts();
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	222
929 9d40ed1da686 Experiment of always writing data if available. Might waste a writev() with Matt Johnston <matt@ucc.asn.au> parents: 928 diff changeset	223 /* process session socket's incoming data */
479 e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	224 if (ses.sock_in != -1) {
e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	225 if (FD_ISSET(ses.sock_in, &readfd)) {
726 78eda530c000 send out our kexinit packet before blocking to read the SSH version string Matt Johnston <matt@ucc.asn.au> parents: 705 diff changeset	226 if (!ses.remoteident) {
78eda530c000 send out our kexinit packet before blocking to read the SSH version string Matt Johnston <matt@ucc.asn.au> parents: 705 diff changeset	227 /* blocking read of the version string */
78eda530c000 send out our kexinit packet before blocking to read the SSH version string Matt Johnston <matt@ucc.asn.au> parents: 705 diff changeset	228 read_session_identification();
78eda530c000 send out our kexinit packet before blocking to read the SSH version string Matt Johnston <matt@ucc.asn.au> parents: 705 diff changeset	229 } else {
78eda530c000 send out our kexinit packet before blocking to read the SSH version string Matt Johnston <matt@ucc.asn.au> parents: 705 diff changeset	230 read_packet();
78eda530c000 send out our kexinit packet before blocking to read the SSH version string Matt Johnston <matt@ucc.asn.au> parents: 705 diff changeset	231 }
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	232 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	233
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	234 /* Process the decrypted packet. After this, the read buffer
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	235 * will be ready for a new packet */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	236 if (ses.payload != NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	237 process_packet();
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	238 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	239 }
1025 02baa0b334e8 async connections working Matt Johnston <matt@ucc.asn.au> parents: 1021 diff changeset	240
452 4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	241 /* if required, flush out any queued reply packets that
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	242 were being held up during a KEX */
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	243 maybe_flush_reply_queue();
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	244
1025 02baa0b334e8 async connections working Matt Johnston <matt@ucc.asn.au> parents: 1021 diff changeset	245 handle_connect_fds(&writefd);
02baa0b334e8 async connections working Matt Johnston <matt@ucc.asn.au> parents: 1021 diff changeset	246
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	247 /* process pipes etc for the channels, ses.dataallowed == 0
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	248 * during rekeying ) */
896 a1a97e98b0c1 Read (and enqueue) packets from interactive input even when Matt Johnston <matt@ucc.asn.au> parents: 891 diff changeset	249 channelio(&readfd, &writefd);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	250
929 9d40ed1da686 Experiment of always writing data if available. Might waste a writev() with Matt Johnston <matt@ucc.asn.au> parents: 928 diff changeset	251 /* process session socket's outgoing data */
9d40ed1da686 Experiment of always writing data if available. Might waste a writev() with Matt Johnston <matt@ucc.asn.au> parents: 928 diff changeset	252 if (ses.sock_out != -1) {
9d40ed1da686 Experiment of always writing data if available. Might waste a writev() with Matt Johnston <matt@ucc.asn.au> parents: 928 diff changeset	253 if (!isempty(&ses.writequeue)) {
9d40ed1da686 Experiment of always writing data if available. Might waste a writev() with Matt Johnston <matt@ucc.asn.au> parents: 928 diff changeset	254 write_packet();
9d40ed1da686 Experiment of always writing data if available. Might waste a writev() with Matt Johnston <matt@ucc.asn.au> parents: 928 diff changeset	255 }
9d40ed1da686 Experiment of always writing data if available. Might waste a writev() with Matt Johnston <matt@ucc.asn.au> parents: 928 diff changeset	256 }
9d40ed1da686 Experiment of always writing data if available. Might waste a writev() with Matt Johnston <matt@ucc.asn.au> parents: 928 diff changeset	257
9d40ed1da686 Experiment of always writing data if available. Might waste a writev() with Matt Johnston <matt@ucc.asn.au> parents: 928 diff changeset	258
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	259 if (loophandler) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	260 loophandler();
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	261 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	262
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	263 } /* for(;;) */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	264
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	265 /* Not reached */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	266 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	267
1040 2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	268 static void cleanup_buf(buffer **buf) {
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	269 if (!*buf) {
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	270 return;
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	271 }
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	272 buf_burn(*buf);
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	273 buf_free(*buf);
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	274 *buf = NULL;
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	275 }
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	276
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	277 /* clean up a session on exit */
733 70811267715c Run the cleanup handler also when we close due to TCP connection being closed Matt Johnston <matt@ucc.asn.au> parents: 726 diff changeset	278 void session_cleanup() {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	279
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 135 diff changeset	280 TRACE(("enter session_cleanup"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	281
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	282 /* we can't cleanup if we don't know the session state */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	283 if (!sessinitdone) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 135 diff changeset	284 TRACE(("leave session_cleanup: !sessinitdone"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	285 return;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	286 }
733 70811267715c Run the cleanup handler also when we close due to TCP connection being closed Matt Johnston <matt@ucc.asn.au> parents: 726 diff changeset	287
1079 acf444bcb115 Fix no-writev fallback Matt Johnston <matt@ucc.asn.au> parents: 1074 diff changeset	288 /* BEWARE of changing order of functions here. */
1041 3fb883a6aa81 Some additional cleanup functions Matt Johnston <matt@ucc.asn.au> parents: 1040 diff changeset	289
3fb883a6aa81 Some additional cleanup functions Matt Johnston <matt@ucc.asn.au> parents: 1040 diff changeset	290 /* Must be before extra_session_cleanup() */
3fb883a6aa81 Some additional cleanup functions Matt Johnston <matt@ucc.asn.au> parents: 1040 diff changeset	291 chancleanup();
3fb883a6aa81 Some additional cleanup functions Matt Johnston <matt@ucc.asn.au> parents: 1040 diff changeset	292
733 70811267715c Run the cleanup handler also when we close due to TCP connection being closed Matt Johnston <matt@ucc.asn.au> parents: 726 diff changeset	293 if (ses.extra_session_cleanup) {
70811267715c Run the cleanup handler also when we close due to TCP connection being closed Matt Johnston <matt@ucc.asn.au> parents: 726 diff changeset	294 ses.extra_session_cleanup();
70811267715c Run the cleanup handler also when we close due to TCP connection being closed Matt Johnston <matt@ucc.asn.au> parents: 726 diff changeset	295 }
891 e78f5ce6e7bb cleanup before clearing keys Matt Johnston <matt@ucc.asn.au> parents: 886 diff changeset	296
1079 acf444bcb115 Fix no-writev fallback Matt Johnston <matt@ucc.asn.au> parents: 1074 diff changeset	297 /* After these are freed most functions will fail */
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1292 diff changeset	298 #if DROPBEAR_CLEANUP
1040 2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	299 /* listeners call cleanup functions, this should occur before
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	300 other session state is freed. */
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	301 remove_all_listeners();
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	302
1050 c2a50c9f509e Add cleanup Matt Johnston <matt@ucc.asn.au> parents: 1049 diff changeset	303 remove_connect_pending();
c2a50c9f509e Add cleanup Matt Johnston <matt@ucc.asn.au> parents: 1049 diff changeset	304
1040 2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	305 while (!isempty(&ses.writequeue)) {
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	306 buf_free(dequeue(&ses.writequeue));
761 ac2158e3e403 ecc kind of works, needs fixing/testing Matt Johnston <matt@ucc.asn.au> parents: 705 diff changeset	307 }
1040 2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	308
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	309 m_free(ses.remoteident);
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	310 m_free(ses.authstate.pw_dir);
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	311 m_free(ses.authstate.pw_name);
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	312 m_free(ses.authstate.pw_shell);
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	313 m_free(ses.authstate.pw_passwd);
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	314 m_free(ses.authstate.username);
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	315 #endif
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	316
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	317 cleanup_buf(&ses.session_id);
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	318 cleanup_buf(&ses.hash);
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	319 cleanup_buf(&ses.payload);
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	320 cleanup_buf(&ses.readbuf);
2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	321 cleanup_buf(&ses.writepayload);
1041 3fb883a6aa81 Some additional cleanup functions Matt Johnston <matt@ucc.asn.au> parents: 1040 diff changeset	322 cleanup_buf(&ses.kexhashbuf);
3fb883a6aa81 Some additional cleanup functions Matt Johnston <matt@ucc.asn.au> parents: 1040 diff changeset	323 cleanup_buf(&ses.transkexinit);
3fb883a6aa81 Some additional cleanup functions Matt Johnston <matt@ucc.asn.au> parents: 1040 diff changeset	324 if (ses.dh_K) {
3fb883a6aa81 Some additional cleanup functions Matt Johnston <matt@ucc.asn.au> parents: 1040 diff changeset	325 mp_clear(ses.dh_K);
3fb883a6aa81 Some additional cleanup functions Matt Johnston <matt@ucc.asn.au> parents: 1040 diff changeset	326 }
3fb883a6aa81 Some additional cleanup functions Matt Johnston <matt@ucc.asn.au> parents: 1040 diff changeset	327 m_free(ses.dh_K);
1040 2b4fd440399d Free memory before exiting. Based on patch from Thorsten Horstmann. Matt Johnston <matt@ucc.asn.au> parents: 1038 diff changeset	328
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	329 m_burn(ses.keys, sizeof(struct key_context));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	330 m_free(ses.keys);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	331
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 135 diff changeset	332 TRACE(("leave session_cleanup"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	333 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	334
726 78eda530c000 send out our kexinit packet before blocking to read the SSH version string Matt Johnston <matt@ucc.asn.au> parents: 705 diff changeset	335 void send_session_identification() {
751 685d05f1cc5c Just put the version string on the queue, don't use atomicio Matt Johnston <matt@ucc.asn.au> parents: 733 diff changeset	336 buffer *writebuf = buf_new(strlen(LOCAL_IDENT "\r\n") + 1);
1094 c45d65392c1a Fix pointer differ in signess warnings [-Werror=pointer-sign] Gaël PORTAY <gael.portay@gmail.com> parents: 1079 diff changeset	337 buf_putbytes(writebuf, (const unsigned char *) LOCAL_IDENT "\r\n", strlen(LOCAL_IDENT "\r\n"));
1074 10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1060 diff changeset	338 writebuf_enqueue(writebuf, 0);
726 78eda530c000 send out our kexinit packet before blocking to read the SSH version string Matt Johnston <matt@ucc.asn.au> parents: 705 diff changeset	339 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	340
726 78eda530c000 send out our kexinit packet before blocking to read the SSH version string Matt Johnston <matt@ucc.asn.au> parents: 705 diff changeset	341 static void read_session_identification() {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	342 /* max length of 255 chars */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	343 char linebuf[256];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	344 int len = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	345 char done = 0;
103 8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	346 int i;
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	347 /* If they send more than 50 lines, something is wrong */
275 7f9adaf85fca Exit with a message if the ssh protocol version is incompatible Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	348 for (i = 0; i < 50; i++) {
479 e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	349 len = ident_readln(ses.sock_in, linebuf, sizeof(linebuf));
103 8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	350
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	351 if (len < 0 && errno != EINTR) {
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	352 /* It failed */
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	353 break;
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	354 }
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	355
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	356 if (len >= 4 && memcmp(linebuf, "SSH-", 4) == 0) {
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	357 /* start of line matches */
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	358 done = 1;
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	359 break;
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	360 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	361 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	362
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	363 if (!done) {
1302 6a14b1f6dc04 better TRACE of failed remote ident Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	364 TRACE(("error reading remote ident: %s\n", strerror(errno)))
344 bf29e6659fb9 Just use the normal "remote closed" handler when reading ident stings Matt Johnston <matt@ucc.asn.au> parents: 275 diff changeset	365 ses.remoteclosed();
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	366 } else {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	367 /* linebuf is already null terminated */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	368 ses.remoteident = m_malloc(len);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	369 memcpy(ses.remoteident, linebuf, len);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	370 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	371
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	372 /* Shall assume that 2.x will be backwards compatible. */
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	373 if (strncmp(ses.remoteident, "SSH-2.", 6) != 0
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	374 && strncmp(ses.remoteident, "SSH-1.99-", 9) != 0) {
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	375 dropbear_exit("Incompatible remote version '%s'", ses.remoteident);
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	376 }
275 7f9adaf85fca Exit with a message if the ssh protocol version is incompatible Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	377
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 135 diff changeset	378 TRACE(("remoteident: %s", ses.remoteident))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	379
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	380 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	381
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	382 /* returns the length including null-terminating zero on success,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	383 * or -1 on failure */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	384 static int ident_readln(int fd, char* buf, int count) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	385
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	386 char in;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	387 int pos = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	388 int num = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	389 fd_set fds;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	390 struct timeval timeout;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	391
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 135 diff changeset	392 TRACE(("enter ident_readln"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	393
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	394 if (count < 1) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	395 return -1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	396 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	397
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	398 FD_ZERO(&fds);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	399
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	400 /* select since it's a non-blocking fd */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	401
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	402 /* leave space to null-terminate */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	403 while (pos < count-1) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	404
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	405 FD_SET(fd, &fds);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	406
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	407 timeout.tv_sec = 1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	408 timeout.tv_usec = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	409 if (select(fd+1, &fds, NULL, NULL, &timeout) < 0) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	410 if (errno == EINTR) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	411 continue;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	412 }
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 135 diff changeset	413 TRACE(("leave ident_readln: select error"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	414 return -1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	415 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	416
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	417 checktimeouts();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	418
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	419 /* Have to go one byte at a time, since we don't want to read past
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	420 * the end, and have to somehow shove bytes back into the normal
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	421 * packet reader */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	422 if (FD_ISSET(fd, &fds)) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	423 num = read(fd, &in, 1);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	424 /* a "\n" is a newline, "\r" we want to read in and keep going
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	425 * so that it won't be read as part of the next line */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	426 if (num < 0) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	427 /* error */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	428 if (errno == EINTR) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	429 continue; /* not a real error */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	430 }
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 135 diff changeset	431 TRACE(("leave ident_readln: read error"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	432 return -1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	433 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	434 if (num == 0) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	435 /* EOF */
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 135 diff changeset	436 TRACE(("leave ident_readln: EOF"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	437 return -1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	438 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	439 if (in == '\n') {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	440 /* end of ident string */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	441 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	442 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	443 /* we don't want to include '\r's */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	444 if (in != '\r') {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	445 buf[pos] = in;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	446 pos++;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	447 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	448 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	449 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	450
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	451 buf[pos] = '\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: 135 diff changeset	452 TRACE(("leave ident_readln: return %d", pos+1))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	453 return pos+1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	454 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	455
970 0bb16232e7c4 Make keepalive handling more robust, this should now match what OpenSSH does Matt Johnston <matt@ucc.asn.au> parents: 968 diff changeset	456 void ignore_recv_response() {
1038 d3925ed45a85 Fix for old compilers, variable declarations at beginning of functions Thorsten Horstmann <thorsten.horstmann@web.de> parents: 1021 diff changeset	457 /* Do nothing */
970 0bb16232e7c4 Make keepalive handling more robust, this should now match what OpenSSH does Matt Johnston <matt@ucc.asn.au> parents: 968 diff changeset	458 TRACE(("Ignored msg_request_response"))
968 f7f6c15b0ec3 Don't send SSH_MSG_UNIMPLEMENTED for keepalive responses Matt Johnston <matt@ucc.asn.au> parents: 941 diff changeset	459 }
f7f6c15b0ec3 Don't send SSH_MSG_UNIMPLEMENTED for keepalive responses Matt Johnston <matt@ucc.asn.au> parents: 941 diff changeset	460
939 a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	461 static void send_msg_keepalive() {
1038 d3925ed45a85 Fix for old compilers, variable declarations at beginning of functions Thorsten Horstmann <thorsten.horstmann@web.de> parents: 1021 diff changeset	462 time_t old_time_idle = ses.last_packet_time_idle;
d3925ed45a85 Fix for old compilers, variable declarations at beginning of functions Thorsten Horstmann <thorsten.horstmann@web.de> parents: 1021 diff changeset	463 struct Channel *chan = get_any_ready_channel();
d3925ed45a85 Fix for old compilers, variable declarations at beginning of functions Thorsten Horstmann <thorsten.horstmann@web.de> parents: 1021 diff changeset	464
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 452 diff changeset	465 CHECKCLEARTOWRITE();
970 0bb16232e7c4 Make keepalive handling more robust, this should now match what OpenSSH does Matt Johnston <matt@ucc.asn.au> parents: 968 diff changeset	466
0bb16232e7c4 Make keepalive handling more robust, this should now match what OpenSSH does Matt Johnston <matt@ucc.asn.au> parents: 968 diff changeset	467 if (chan) {
0bb16232e7c4 Make keepalive handling more robust, this should now match what OpenSSH does Matt Johnston <matt@ucc.asn.au> parents: 968 diff changeset	468 /* Channel requests are preferable, more implementations
0bb16232e7c4 Make keepalive handling more robust, this should now match what OpenSSH does Matt Johnston <matt@ucc.asn.au> parents: 968 diff changeset	469 handle them than SSH_MSG_GLOBAL_REQUEST */
0bb16232e7c4 Make keepalive handling more robust, this should now match what OpenSSH does Matt Johnston <matt@ucc.asn.au> parents: 968 diff changeset	470 TRACE(("keepalive channel request %d", chan->index))
0bb16232e7c4 Make keepalive handling more robust, this should now match what OpenSSH does Matt Johnston <matt@ucc.asn.au> parents: 968 diff changeset	471 start_send_channel_request(chan, DROPBEAR_KEEPALIVE_STRING);
0bb16232e7c4 Make keepalive handling more robust, this should now match what OpenSSH does Matt Johnston <matt@ucc.asn.au> parents: 968 diff changeset	472 } else {
0bb16232e7c4 Make keepalive handling more robust, this should now match what OpenSSH does Matt Johnston <matt@ucc.asn.au> parents: 968 diff changeset	473 TRACE(("keepalive global request"))
0bb16232e7c4 Make keepalive handling more robust, this should now match what OpenSSH does Matt Johnston <matt@ucc.asn.au> parents: 968 diff changeset	474 /* Some peers will reply with SSH_MSG_REQUEST_FAILURE,
0bb16232e7c4 Make keepalive handling more robust, this should now match what OpenSSH does Matt Johnston <matt@ucc.asn.au> parents: 968 diff changeset	475 some will reply with SSH_MSG_UNIMPLEMENTED, some will exit. */
0bb16232e7c4 Make keepalive handling more robust, this should now match what OpenSSH does Matt Johnston <matt@ucc.asn.au> parents: 968 diff changeset	476 buf_putbyte(ses.writepayload, SSH_MSG_GLOBAL_REQUEST);
0bb16232e7c4 Make keepalive handling more robust, this should now match what OpenSSH does Matt Johnston <matt@ucc.asn.au> parents: 968 diff changeset	477 buf_putstring(ses.writepayload, DROPBEAR_KEEPALIVE_STRING,
0bb16232e7c4 Make keepalive handling more robust, this should now match what OpenSSH does Matt Johnston <matt@ucc.asn.au> parents: 968 diff changeset	478 strlen(DROPBEAR_KEEPALIVE_STRING));
0bb16232e7c4 Make keepalive handling more robust, this should now match what OpenSSH does Matt Johnston <matt@ucc.asn.au> parents: 968 diff changeset	479 }
939 a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	480 buf_putbyte(ses.writepayload, 1); /* want_reply */
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 452 diff changeset	481 encrypt_packet();
939 a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	482
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	483 ses.last_packet_time_keepalive_sent = monotonic_now();
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	484
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	485 /* keepalives shouldn't update idle timeout, reset it back */
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	486 ses.last_packet_time_idle = old_time_idle;
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 452 diff changeset	487 }
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 452 diff changeset	488
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	489 /* Check all timeouts which are required. Currently these are the time for
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	490 * user authentication, and the automatic rekeying. */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	491 static void checktimeouts() {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	492
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 452 diff changeset	493 time_t now;
928 7cd89d4e0335 Add new monotonic_now() wrapper so that timeouts are unaffected by Matt Johnston <matt@ucc.asn.au> parents: 927 diff changeset	494 now = monotonic_now();
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	495
1139 43a8ea69b24c Fix problem where auth timeout wasn't checked when waiting for ident Matt Johnston <matt@ucc.asn.au> parents: 1124 diff changeset	496 if (IS_DROPBEAR_SERVER && ses.connect_time != 0
43a8ea69b24c Fix problem where auth timeout wasn't checked when waiting for ident Matt Johnston <matt@ucc.asn.au> parents: 1124 diff changeset	497 && now - ses.connect_time >= AUTH_TIMEOUT) {
43a8ea69b24c Fix problem where auth timeout wasn't checked when waiting for ident Matt Johnston <matt@ucc.asn.au> parents: 1124 diff changeset	498 dropbear_close("Timeout before auth");
43a8ea69b24c Fix problem where auth timeout wasn't checked when waiting for ident Matt Johnston <matt@ucc.asn.au> parents: 1124 diff changeset	499 }
43a8ea69b24c Fix problem where auth timeout wasn't checked when waiting for ident Matt Johnston <matt@ucc.asn.au> parents: 1124 diff changeset	500
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	501 /* we can't rekey if we haven't done remote ident exchange yet */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	502 if (ses.remoteident == NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	503 return;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	504 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	505
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	506 if (!ses.kexstate.sentkexinit
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 452 diff changeset	507 && (now - ses.kexstate.lastkextime >= KEX_REKEY_TIMEOUT
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 452 diff changeset	508 \|\| ses.kexstate.datarecv+ses.kexstate.datatrans >= KEX_REKEY_DATA)) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 135 diff changeset	509 TRACE(("rekeying after timeout or max data reached"))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	510 send_msg_kexinit();
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	511 }
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 452 diff changeset	512
970 0bb16232e7c4 Make keepalive handling more robust, this should now match what OpenSSH does Matt Johnston <matt@ucc.asn.au> parents: 968 diff changeset	513 if (opts.keepalive_secs > 0 && ses.authstate.authdone) {
0bb16232e7c4 Make keepalive handling more robust, this should now match what OpenSSH does Matt Johnston <matt@ucc.asn.au> parents: 968 diff changeset	514 /* Avoid sending keepalives prior to auth - those are
0bb16232e7c4 Make keepalive handling more robust, this should now match what OpenSSH does Matt Johnston <matt@ucc.asn.au> parents: 968 diff changeset	515 not valid pre-auth packet types */
0bb16232e7c4 Make keepalive handling more robust, this should now match what OpenSSH does Matt Johnston <matt@ucc.asn.au> parents: 968 diff changeset	516
939 a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	517 /* Send keepalives if we've been idle */
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	518 if (now - ses.last_packet_time_any_sent >= opts.keepalive_secs) {
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	519 send_msg_keepalive();
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	520 }
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	521
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	522 /* Also send an explicit keepalive message to trigger a response
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	523 if the remote end hasn't sent us anything */
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	524 if (now - ses.last_packet_time_keepalive_recv >= opts.keepalive_secs
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	525 && now - ses.last_packet_time_keepalive_sent >= opts.keepalive_secs) {
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	526 send_msg_keepalive();
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	527 }
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	528
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	529 if (now - ses.last_packet_time_keepalive_recv
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	530 >= opts.keepalive_secs * DEFAULT_KEEPALIVE_LIMIT) {
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	531 dropbear_exit("Keepalive timeout");
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	532 }
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 452 diff changeset	533 }
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	534
939 a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	535 if (opts.idle_timeout_secs > 0
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 929 diff changeset	536 && now - ses.last_packet_time_idle >= opts.idle_timeout_secs) {
513 a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	537 dropbear_close("Idle timeout");
a3748e54273c Idle timeout patch from Farrell Aultman. Needs testing, unsure if server Matt Johnston <matt@ucc.asn.au> parents: 502 diff changeset	538 }
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	539 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	540
1140 f6d3a16ecc71 set timeouts to time remaining rather than timeout duration Matt Johnston <matt@ucc.asn.au> parents: 1139 diff changeset	541 static void update_timeout(long limit, long now, long last_event, long * timeout) {
1143 924ff1b959a2 only update keepalive timeout post-auth (when keepalives are sent) Matt Johnston <matt@ucc.asn.au> parents: 1140 diff changeset	542 TRACE2(("update_timeout limit %ld, now %ld, last %ld, timeout %ld",
1140 f6d3a16ecc71 set timeouts to time remaining rather than timeout duration Matt Johnston <matt@ucc.asn.au> parents: 1139 diff changeset	543 limit, now, last_event, *timeout))
f6d3a16ecc71 set timeouts to time remaining rather than timeout duration Matt Johnston <matt@ucc.asn.au> parents: 1139 diff changeset	544 if (last_event > 0 && limit > 0) {
f6d3a16ecc71 set timeouts to time remaining rather than timeout duration Matt Johnston <matt@ucc.asn.au> parents: 1139 diff changeset	545 timeout = MIN(timeout, last_event+limit-now);
1143 924ff1b959a2 only update keepalive timeout post-auth (when keepalives are sent) Matt Johnston <matt@ucc.asn.au> parents: 1140 diff changeset	546 TRACE2(("new timeout %ld", *timeout))
1140 f6d3a16ecc71 set timeouts to time remaining rather than timeout duration Matt Johnston <matt@ucc.asn.au> parents: 1139 diff changeset	547 }
f6d3a16ecc71 set timeouts to time remaining rather than timeout duration Matt Johnston <matt@ucc.asn.au> parents: 1139 diff changeset	548 }
f6d3a16ecc71 set timeouts to time remaining rather than timeout duration Matt Johnston <matt@ucc.asn.au> parents: 1139 diff changeset	549
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 452 diff changeset	550 static long select_timeout() {
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 452 diff changeset	551 /* determine the minimum timeout that might be required, so
7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 452 diff changeset	552 as to avoid waking when unneccessary */
1310 090033317ca1 Avoid busy loop while waiting for rekey response Matt Johnston <matt@ucc.asn.au> parents: 1302 diff changeset	553 long timeout = KEX_REKEY_TIMEOUT;
1140 f6d3a16ecc71 set timeouts to time remaining rather than timeout duration Matt Johnston <matt@ucc.asn.au> parents: 1139 diff changeset	554 long now = monotonic_now();
f6d3a16ecc71 set timeouts to time remaining rather than timeout duration Matt Johnston <matt@ucc.asn.au> parents: 1139 diff changeset	555
1310 090033317ca1 Avoid busy loop while waiting for rekey response Matt Johnston <matt@ucc.asn.au> parents: 1302 diff changeset	556 if (!ses.kexstate.sentkexinit) {
090033317ca1 Avoid busy loop while waiting for rekey response Matt Johnston <matt@ucc.asn.au> parents: 1302 diff changeset	557 update_timeout(KEX_REKEY_TIMEOUT, now, ses.kexstate.lastkextime, &timeout);
090033317ca1 Avoid busy loop while waiting for rekey response Matt Johnston <matt@ucc.asn.au> parents: 1302 diff changeset	558 }
1140 f6d3a16ecc71 set timeouts to time remaining rather than timeout duration Matt Johnston <matt@ucc.asn.au> parents: 1139 diff changeset	559
f6d3a16ecc71 set timeouts to time remaining rather than timeout duration Matt Johnston <matt@ucc.asn.au> parents: 1139 diff changeset	560 if (ses.authstate.authdone != 1 && IS_DROPBEAR_SERVER) {
f6d3a16ecc71 set timeouts to time remaining rather than timeout duration Matt Johnston <matt@ucc.asn.au> parents: 1139 diff changeset	561 /* AUTH_TIMEOUT is only relevant before authdone */
f6d3a16ecc71 set timeouts to time remaining rather than timeout duration Matt Johnston <matt@ucc.asn.au> parents: 1139 diff changeset	562 update_timeout(AUTH_TIMEOUT, now, ses.connect_time, &timeout);
f6d3a16ecc71 set timeouts to time remaining rather than timeout duration Matt Johnston <matt@ucc.asn.au> parents: 1139 diff changeset	563 }
f6d3a16ecc71 set timeouts to time remaining rather than timeout duration Matt Johnston <matt@ucc.asn.au> parents: 1139 diff changeset	564
1143 924ff1b959a2 only update keepalive timeout post-auth (when keepalives are sent) Matt Johnston <matt@ucc.asn.au> parents: 1140 diff changeset	565 if (ses.authstate.authdone) {
924ff1b959a2 only update keepalive timeout post-auth (when keepalives are sent) Matt Johnston <matt@ucc.asn.au> parents: 1140 diff changeset	566 update_timeout(opts.keepalive_secs, now,
924ff1b959a2 only update keepalive timeout post-auth (when keepalives are sent) Matt Johnston <matt@ucc.asn.au> parents: 1140 diff changeset	567 MAX(ses.last_packet_time_keepalive_recv, ses.last_packet_time_keepalive_sent),
924ff1b959a2 only update keepalive timeout post-auth (when keepalives are sent) Matt Johnston <matt@ucc.asn.au> parents: 1140 diff changeset	568 &timeout);
924ff1b959a2 only update keepalive timeout post-auth (when keepalives are sent) Matt Johnston <matt@ucc.asn.au> parents: 1140 diff changeset	569 }
1140 f6d3a16ecc71 set timeouts to time remaining rather than timeout duration Matt Johnston <matt@ucc.asn.au> parents: 1139 diff changeset	570
f6d3a16ecc71 set timeouts to time remaining rather than timeout duration Matt Johnston <matt@ucc.asn.au> parents: 1139 diff changeset	571 update_timeout(opts.idle_timeout_secs, now, ses.last_packet_time_idle,
f6d3a16ecc71 set timeouts to time remaining rather than timeout duration Matt Johnston <matt@ucc.asn.au> parents: 1139 diff changeset	572 &timeout);
f6d3a16ecc71 set timeouts to time remaining rather than timeout duration Matt Johnston <matt@ucc.asn.au> parents: 1139 diff changeset	573
f6d3a16ecc71 set timeouts to time remaining rather than timeout duration Matt Johnston <matt@ucc.asn.au> parents: 1139 diff changeset	574 /* clamp negative timeouts to zero - event has already triggered */
f6d3a16ecc71 set timeouts to time remaining rather than timeout duration Matt Johnston <matt@ucc.asn.au> parents: 1139 diff changeset	575 return MAX(timeout, 0);
454 7e43f5e473b9 - Add -K keepalive flag for dropbear and dbclient Matt Johnston <matt@ucc.asn.au> parents: 452 diff changeset	576 }
482 7ad49f34a122 - Add run_shell_command() function to run a "sh -c" command, handling Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	577
7ad49f34a122 - Add run_shell_command() function to run a "sh -c" command, handling Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	578 const char* get_user_shell() {
7ad49f34a122 - Add run_shell_command() function to run a "sh -c" command, handling Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	579 /* an empty shell should be interpreted as "/bin/sh" */
7ad49f34a122 - Add run_shell_command() function to run a "sh -c" command, handling Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	580 if (ses.authstate.pw_shell[0] == '\0') {
7ad49f34a122 - Add run_shell_command() function to run a "sh -c" command, handling Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	581 return "/bin/sh";
7ad49f34a122 - Add run_shell_command() function to run a "sh -c" command, handling Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	582 } else {
7ad49f34a122 - Add run_shell_command() function to run a "sh -c" command, handling Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	583 return ses.authstate.pw_shell;
7ad49f34a122 - Add run_shell_command() function to run a "sh -c" command, handling Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	584 }
7ad49f34a122 - Add run_shell_command() function to run a "sh -c" command, handling Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	585 }
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	586 void fill_passwd(const char* username) {
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	587 struct passwd *pw = NULL;
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	588 if (ses.authstate.pw_name)
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	589 m_free(ses.authstate.pw_name);
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	590 if (ses.authstate.pw_dir)
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	591 m_free(ses.authstate.pw_dir);
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	592 if (ses.authstate.pw_shell)
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	593 m_free(ses.authstate.pw_shell);
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	594 if (ses.authstate.pw_passwd)
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	595 m_free(ses.authstate.pw_passwd);
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	596
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	597 pw = getpwnam(username);
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	598 if (!pw) {
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	599 return;
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	600 }
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	601 ses.authstate.pw_uid = pw->pw_uid;
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	602 ses.authstate.pw_gid = pw->pw_gid;
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	603 ses.authstate.pw_name = m_strdup(pw->pw_name);
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	604 ses.authstate.pw_dir = m_strdup(pw->pw_dir);
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	605 ses.authstate.pw_shell = m_strdup(pw->pw_shell);
676 0edf08895a33 Return immediate success for blank passwords if allowed Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	606 {
0edf08895a33 Return immediate success for blank passwords if allowed Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	607 char *passwd_crypt = pw->pw_passwd;
0edf08895a33 Return immediate success for blank passwords if allowed Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	608 #ifdef HAVE_SHADOW_H
0edf08895a33 Return immediate success for blank passwords if allowed Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	609 /* get the shadow password if possible */
0edf08895a33 Return immediate success for blank passwords if allowed Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	610 struct spwd *spasswd = getspnam(ses.authstate.pw_name);
0edf08895a33 Return immediate success for blank passwords if allowed Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	611 if (spasswd && spasswd->sp_pwdp) {
0edf08895a33 Return immediate success for blank passwords if allowed Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	612 passwd_crypt = spasswd->sp_pwdp;
0edf08895a33 Return immediate success for blank passwords if allowed Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	613 }
0edf08895a33 Return immediate success for blank passwords if allowed Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	614 #endif
705 2e573f39b88e Android returns NULL for pw_crypt, set it to something else Matt Johnston <matt@ucc.asn.au> parents: 676 diff changeset	615 if (!passwd_crypt) {
2e573f39b88e Android returns NULL for pw_crypt, set it to something else Matt Johnston <matt@ucc.asn.au> parents: 676 diff changeset	616 /* android supposedly returns NULL */
2e573f39b88e Android returns NULL for pw_crypt, set it to something else Matt Johnston <matt@ucc.asn.au> parents: 676 diff changeset	617 passwd_crypt = "!!";
2e573f39b88e Android returns NULL for pw_crypt, set it to something else Matt Johnston <matt@ucc.asn.au> parents: 676 diff changeset	618 }
676 0edf08895a33 Return immediate success for blank passwords if allowed Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	619 ses.authstate.pw_passwd = m_strdup(passwd_crypt);
0edf08895a33 Return immediate success for blank passwords if allowed Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	620 }
483 738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	621 }
738313e73b1c - "-J 'nc localhost 22'" kind of works, needs fixing hostkeys, ptys etc. Matt Johnston <matt@ucc.asn.au> parents: 482 diff changeset	622
941 5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	623 /* Called when channels are modified */
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	624 void update_channel_prio() {
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	625 enum dropbear_prio new_prio;
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	626 int any = 0;
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	627 unsigned int i;
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	628
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	629 TRACE(("update_channel_prio"))
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	630
1031 64c0aa01e2b6 Update priority once the socket is open Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	631 if (ses.sock_out < 0) {
64c0aa01e2b6 Update priority once the socket is open Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	632 TRACE(("leave update_channel_prio: no socket"))
64c0aa01e2b6 Update priority once the socket is open Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	633 return;
64c0aa01e2b6 Update priority once the socket is open Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	634 }
64c0aa01e2b6 Update priority once the socket is open Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	635
941 5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	636 new_prio = DROPBEAR_PRIO_BULK;
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	637 for (i = 0; i < ses.chansize; i++) {
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	638 struct Channel *channel = ses.channels[i];
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	639 if (!channel \|\| channel->prio == DROPBEAR_CHANNEL_PRIO_EARLY) {
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	640 if (channel && channel->prio == DROPBEAR_CHANNEL_PRIO_EARLY) {
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	641 TRACE(("update_channel_prio: early %d", channel->index))
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	642 }
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	643 continue;
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	644 }
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	645 any = 1;
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	646 if (channel->prio == DROPBEAR_CHANNEL_PRIO_INTERACTIVE)
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	647 {
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	648 TRACE(("update_channel_prio: lowdelay %d", channel->index))
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	649 new_prio = DROPBEAR_PRIO_LOWDELAY;
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	650 break;
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	651 } else if (channel->prio == DROPBEAR_CHANNEL_PRIO_UNKNOWABLE
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	652 && new_prio == DROPBEAR_PRIO_BULK)
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	653 {
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	654 TRACE(("update_channel_prio: unknowable %d", channel->index))
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	655 new_prio = DROPBEAR_PRIO_DEFAULT;
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	656 }
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	657 }
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	658
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	659 if (any == 0) {
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	660 /* lowdelay during setup */
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	661 TRACE(("update_channel_prio: not any"))
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	662 new_prio = DROPBEAR_PRIO_LOWDELAY;
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	663 }
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	664
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	665 if (new_prio != ses.socket_prio) {
1020 363c0feca5d4 Fix print that no longer works since we're not using fourCCs Matt Johnston <matt@ucc.asn.au> parents: 970 diff changeset	666 TRACE(("Dropbear priority transitioning %d -> %d", ses.socket_prio, new_prio))
941 5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	667 set_sock_priority(ses.sock_out, new_prio);
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	668 ses.socket_prio = new_prio;
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	669 }
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	670 }
5daedffd0769 Set tcp priority as follows: Matt Johnston <matt@ucc.asn.au> parents: 940 diff changeset	671

Mercurial > dropbear

annotate common-session.c @ 1416:33d90d219e03