dropbear: common-session.c annotate

annotate common-session.c @ 131:9c372a039532 private-rez

strdup() variables correctly for the PAM conversation function

author	Matt Johnston <matt@ucc.asn.au>
date	Tue, 21 Sep 2004 11:42:03 +0000
parents	10f4d3319780
children	d663445c1533

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 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	4 * Copyright (c) 2002,2003 Matt Johnston
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"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	33 #include "random.h"
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"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	36 #include "atomicio.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	37
108 10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	38 static void checktimeouts();
10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	39 static int ident_readln(int fd, char* buf, int count);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	40
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	41 struct sshsession ses; /* GLOBAL */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	42
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	43 /* 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	44 * cleanest, but works OK */
24 469950e86d0f switching to global vars Matt Johnston <matt@ucc.asn.au> parents: 22 diff changeset	45 int sessinitdone = 0; /* GLOBAL */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	46
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	47 /* 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	48 int exitflag = 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
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	51
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	52 /* called only at the start of a session, set up initial state */
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	53 void common_session_init(int sock, char* remotehost) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	54
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	55 TRACE(("enter session_init"));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	56
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	57 ses.remotehost = remotehost;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	58
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	59 ses.sock = sock;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	60 ses.maxfd = sock;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	61
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	62 ses.connecttimeout = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	63
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 26 diff changeset	64 kexfirstinitialise(); /* initialise the kex state */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	65 chaninitialise(); /* initialise the channel state */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	66
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	67 ses.writepayload = buf_new(MAX_TRANS_PAYLOAD_LEN);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	68 ses.transseq = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	69
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	70 ses.readbuf = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	71 ses.decryptreadbuf = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	72 ses.payload = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	73 ses.recvseq = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	74
22 c1e5d9195402 merge of abac2150ee4f4031a98016241fbd136d24fed127 Matt Johnston <matt@ucc.asn.au> parents: 21 diff changeset	75 ses.requirenext = SSH_MSG_KEXINIT;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	76 ses.dataallowed = 0; /* don't send data yet, we'll wait until after kex */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	77 ses.ignorenext = 0;
34 e2a1eaa19f22 Client mostly works up to password auth Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	78 ses.lastpacket = 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	79
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	80 /* set all the algos to none */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	81 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	82 ses.newkeys = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	83 ses.keys->recv_algo_crypt = &dropbear_nocipher;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	84 ses.keys->trans_algo_crypt = &dropbear_nocipher;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	85
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	86 ses.keys->recv_algo_mac = &dropbear_nohash;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	87 ses.keys->trans_algo_mac = &dropbear_nohash;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	88
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	89 ses.keys->algo_kex = -1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	90 ses.keys->algo_hostkey = -1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	91 ses.keys->recv_algo_comp = DROPBEAR_COMP_NONE;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	92 ses.keys->trans_algo_comp = DROPBEAR_COMP_NONE;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	93
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	94 #ifndef DISABLE_ZLIB
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	95 ses.keys->recv_zstream = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	96 ses.keys->trans_zstream = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	97 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	98
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	99 /* key exchange buffers */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	100 ses.session_id = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	101 ses.kexhashbuf = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	102 ses.transkexinit = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	103 ses.dh_K = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	104 ses.remoteident = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	105
6 ab00ef513e97 Sorted out the first channel init issues. Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	106 ses.chantypes = NULL;
ab00ef513e97 Sorted out the first channel init issues. Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	107
21 d7cc5b484a2e - Port restriction code back in Matt Johnston <matt@ucc.asn.au> parents: 6 diff changeset	108 ses.allowprivport = 0;
d7cc5b484a2e - Port restriction code back in Matt Johnston <matt@ucc.asn.au> parents: 6 diff changeset	109
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 TRACE(("leave session_init"));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	112 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	113
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	114 void session_loop(void(*loophandler)()) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	115
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	116 fd_set readfd, writefd;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	117 struct timeval timeout;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	118 int val;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	119
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	120 /* main loop, select()s for all sockets in use */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	121 for(;;) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	122
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	123 timeout.tv_sec = SELECT_TIMEOUT;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	124 timeout.tv_usec = 0;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	125 FD_ZERO(&writefd);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	126 FD_ZERO(&readfd);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	127 assert(ses.payload == NULL);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	128 if (ses.sock != -1) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	129 FD_SET(ses.sock, &readfd);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	130 if (!isempty(&ses.writequeue)) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	131 FD_SET(ses.sock, &writefd);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	132 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	133 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	134
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	135 /* set up for channels which require reading/writing */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	136 if (ses.dataallowed) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	137 setchannelfds(&readfd, &writefd);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	138 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	139 val = select(ses.maxfd+1, &readfd, &writefd, NULL, &timeout);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	140
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	141 if (exitflag) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	142 dropbear_exit("Terminated by signal");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	143 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	144
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	145 if (val < 0) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	146 if (errno == EINTR) {
41 18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	147 /* This must happen even if we've been interrupted, so that
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	148 * changed signal-handler vars can take effect etc */
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	149 if (loophandler) {
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	150 loophandler();
18eccbfb9641 added window-size change handling Matt Johnston <matt@ucc.asn.au> parents: 34 diff changeset	151 }
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	152 continue;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	153 } else {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	154 dropbear_exit("Error in select");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	155 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	156 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	157
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	158 /* check for auth timeout, rekeying required etc */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	159 checktimeouts();
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	160
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	161 if (val == 0) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	162 /* timeout */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	163 TRACE(("select timeout"));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	164 continue;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	165 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	166
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	167 /* process session socket's incoming/outgoing data */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	168 if (ses.sock != -1) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	169 if (FD_ISSET(ses.sock, &writefd) && !isempty(&ses.writequeue)) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	170 write_packet();
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	171 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	172
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	173 if (FD_ISSET(ses.sock, &readfd)) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	174 read_packet();
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	175 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	176
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	177 /* Process the decrypted packet. After this, the read buffer
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	178 * will be ready for a new packet */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	179 if (ses.payload != NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	180 process_packet();
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	181 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	182 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	183
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	184 /* process pipes etc for the channels, ses.dataallowed == 0
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	185 * during rekeying ) */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	186 if (ses.dataallowed) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	187 channelio(&readfd, &writefd);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	188 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	189
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	190 if (loophandler) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	191 loophandler();
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
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	194 } /* for(;;) */
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 /* Not reached */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	197 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	198
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	199 /* clean up a session on exit */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	200 void common_session_cleanup() {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	201
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	202 TRACE(("enter session_cleanup"));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	203
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	204 /* 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	205 if (!sessinitdone) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	206 TRACE(("leave session_cleanup: !sessinitdone"));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	207 return;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	208 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	209
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	210 m_free(ses.session_id);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	211 m_burn(ses.keys, sizeof(struct key_context));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	212 m_free(ses.keys);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	213
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	214 chancleanup();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	215
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	216 TRACE(("leave session_cleanup"));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	217 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	218
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	219
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	220 void session_identification() {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	221
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	222 /* max length of 255 chars */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	223 char linebuf[256];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	224 int len = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	225 char done = 0;
103 8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	226 int i;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	227
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	228 /* write our version string, this blocks */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	229 if (atomicio(write, ses.sock, LOCAL_IDENT "\r\n",
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	230 strlen(LOCAL_IDENT "\r\n")) == DROPBEAR_FAILURE) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	231 dropbear_exit("Error writing ident string");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	232 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	233
103 8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	234 /* We allow up to 9 lines before the actual version string, to
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	235 * account for wrappers/cruft etc. According to the spec only the client
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	236 * needs to handle this, but no harm in letting the server handle it too */
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	237 for (i = 0; i < 10; i++) {
107 d3eb1fa8484e Nasty. Matt Johnston <matt@ucc.asn.au> parents: 103 diff changeset	238 len = ident_readln(ses.sock, linebuf, sizeof(linebuf));
103 8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	239
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	240 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	241 /* It failed */
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	242 break;
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	243 }
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	244
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	245 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	246 /* start of line matches */
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	247 done = 1;
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	248 break;
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	249 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	250 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	251
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	252 if (!done) {
103 8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	253 TRACE(("err: %s for '%s'\n", strerror(errno), linebuf));
8aeac62a968f Allow leading lines before the ident banner when connecting Matt Johnston <matt@ucc.asn.au> parents: 41 diff changeset	254 dropbear_exit("Failed to get remote version");
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	255 } else {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	256 /* linebuf is already null terminated */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	257 ses.remoteident = m_malloc(len);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	258 memcpy(ses.remoteident, linebuf, len);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	259 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	260
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	261 TRACE(("remoteident: %s", ses.remoteident));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	262
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	263 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	264
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	265 /* 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	266 * or -1 on failure */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	267 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	268
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	269 char in;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	270 int pos = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	271 int num = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	272 fd_set fds;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	273 struct timeval timeout;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	274
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	275 TRACE(("enter ident_readln"));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	276
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	277 if (count < 1) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	278 return -1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	279 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	280
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	281 FD_ZERO(&fds);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	282
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	283 /* select since it's a non-blocking fd */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	284
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	285 /* leave space to null-terminate */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	286 while (pos < count-1) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	287
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	288 FD_SET(fd, &fds);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	289
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	290 timeout.tv_sec = 1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	291 timeout.tv_usec = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	292 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	293 if (errno == EINTR) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	294 continue;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	295 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	296 TRACE(("leave ident_readln: select error"));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	297 return -1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	298 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	299
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	300 checktimeouts();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	301
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	302 /* 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	303 * 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	304 * packet reader */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	305 if (FD_ISSET(fd, &fds)) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	306 num = read(fd, &in, 1);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	307 /* 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	308 * 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	309 if (num < 0) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	310 /* error */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	311 if (errno == EINTR) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	312 continue; /* not a real error */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	313 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	314 TRACE(("leave ident_readln: read error"));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	315 return -1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	316 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	317 if (num == 0) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	318 /* EOF */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	319 TRACE(("leave ident_readln: EOF"));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	320 return -1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	321 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	322 if (in == '\n') {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	323 /* end of ident string */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	324 break;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	325 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	326 /* we don't want to include '\r's */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	327 if (in != '\r') {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	328 buf[pos] = in;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	329 pos++;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	330 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	331 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	332 }
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 buf[pos] = '\0';
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	335 TRACE(("leave ident_readln: return %d", pos+1));
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	336 return pos+1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	337 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	338
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	339 /* 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	340 * user authentication, and the automatic rekeying. */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	341 static void checktimeouts() {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	342
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	343 struct timeval tv;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	344 long secs;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	345
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	346 if (gettimeofday(&tv, 0) < 0) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	347 dropbear_exit("Error getting time");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	348 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	349
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	350 secs = tv.tv_sec;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	351
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	352 if (ses.connecttimeout != 0 && secs > ses.connecttimeout) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	353 dropbear_close("Timeout before auth");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	354 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	355
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	356 /* 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	357 if (ses.remoteident == NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	358 return;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	359 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	360
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	361 if (!ses.kexstate.sentkexinit
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	362 && (secs - ses.kexstate.lastkextime >= KEX_REKEY_TIMEOUT
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	363 \|\| ses.kexstate.datarecv+ses.kexstate.datatrans >= KEX_REKEY_DATA)){
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	364 TRACE(("rekeying after timeout or max data reached"));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	365 send_msg_kexinit();
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	366 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	367 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 24 diff changeset	368

Mercurial > dropbear

annotate common-session.c @ 131:9c372a039532 private-rez