dropbear: dbutil.c annotate

annotate dbutil.c @ 86:ace512d2ad5d

Small fixes

author	Matt Johnston <matt@ucc.asn.au>
date	Tue, 17 Aug 2004 10:40:31 +0000
parents	0bf5cebe622c
children	c85c88500ea6

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 * strlcat() is copyright as follows:
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	26 * Copyright (c) 1998 Todd C. Miller <[email protected]>
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	27 * All rights reserved.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	28 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	29 * Redistribution and use in source and binary forms, with or without
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	30 * modification, are permitted provided that the following conditions
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	31 * are met:
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	32 * 1. Redistributions of source code must retain the above copyright
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	33 * notice, this list of conditions and the following disclaimer.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	34 * 2. Redistributions in binary form must reproduce the above copyright
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	35 * notice, this list of conditions and the following disclaimer in the
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	36 * documentation and/or other materials provided with the distribution.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	37 * 3. The name of the author may not be used to endorse or promote products
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	38 * derived from this software without specific prior written permission.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	39 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	40 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	41 * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	42 * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	43 * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	44 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	45 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	46 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	47 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	48 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	49 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	50
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	51 #include "includes.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	52 #include "dbutil.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	53 #include "buffer.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	54 #include "session.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	55 #include "atomicio.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	56
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	57 #define MAX_FMT 100
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	58
73 0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	59 static void generic_dropbear_exit(int exitcode, const char* format,
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	60 va_list param);
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	61 static void generic_dropbear_log(int priority, const char* format,
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	62 va_list param);
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	63
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	64 void (_dropbear_exit)(int exitcode, const char format, va_list param)
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	65 = generic_dropbear_exit;
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	66 void (_dropbear_log)(int priority, const char format, va_list param)
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	67 = generic_dropbear_log;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	68
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	69 int usingsyslog = 0; /* set by runopts, but required externally to sessions */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	70 #ifndef DISABLE_SYSLOG
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	71 void startsyslog() {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	72
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	73 openlog(PROGNAME, LOG_PID, LOG_AUTHPRIV);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	74
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	75 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	76 #endif /* DISABLE_SYSLOG */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	77
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	78 /* the "format" string must be <= 100 characters */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	79 void dropbear_close(const char* format, ...) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	80
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	81 va_list param;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	82
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	83 va_start(param, format);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	84 _dropbear_exit(EXIT_SUCCESS, format, param);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	85 va_end(param);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	86
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	87 }
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 void dropbear_exit(const char* format, ...) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	90
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	91 va_list param;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	92
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	93 va_start(param, format);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	94 _dropbear_exit(EXIT_FAILURE, format, param);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	95 va_end(param);
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
73 0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	98 static void generic_dropbear_exit(int exitcode, const char* format,
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	99 va_list param) {
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	100
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	101 char fmtbuf[300];
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	102
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	103 snprintf(fmtbuf, sizeof(fmtbuf), "Exited: %s", format);
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	104
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	105 _dropbear_log(LOG_INFO, fmtbuf, param);
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	106
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	107 exit(exitcode);
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	108 }
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	109
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	110 static void generic_dropbear_log(int priority, const char* format,
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	111 va_list param) {
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	112
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	113 char printbuf[1024];
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	114
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	115 vsnprintf(printbuf, sizeof(printbuf), format, param);
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	116
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	117 fprintf(stderr, "%s\n", printbuf);
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	118
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	119 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	120
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	121 /* this is what can be called to write arbitrary log messages */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	122 void dropbear_log(int priority, const char* format, ...) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	123
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	124 va_list param;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	125
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	126 va_start(param, format);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	127 _dropbear_log(priority, format, param);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	128 va_end(param);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	129 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	130
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 #ifdef DEBUG_TRACE
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	133 void dropbear_trace(const char* format, ...) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	134
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	135 va_list param;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	136
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	137 va_start(param, format);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	138 fprintf(stderr, "TRACE: ");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	139 vfprintf(stderr, format, param);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	140 fprintf(stderr, "\n");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	141 va_end(param);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	142 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	143 #endif /* DEBUG_TRACE */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	144
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	145 /* Listen on address:port. Unless address is NULL, in which case listen on
63 dcc43965928f - A nice cleaner structure for tcp (acceptor) forwarding. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	146 * everything. If called with address == "", we'll listen on localhost/loopback.
dcc43965928f - A nice cleaner structure for tcp (acceptor) forwarding. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	147 * Returns the number of sockets bound on success, or -1 on failure. On
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	148 * failure, if errstring wasn't NULL, it'll be a newly malloced error
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	149 * string.*/
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	150 int dropbear_listen(const char* address, const char* port,
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	151 int socks, unsigned int sockcount, char errstring, int maxfd) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	152
70 b0316ce64e4b Merging in the changes from 0.41-0.43 main Dropbear tree Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	153 struct addrinfo hints, res = NULL, res0 = NULL;
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	154 int err;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	155 unsigned int nsock;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	156 struct linger linger;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	157 int val;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	158 int sock;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	159
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	160 TRACE(("enter dropbear_listen"));
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	161
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	162 memset(&hints, 0, sizeof(hints));
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	163 hints.ai_family = AF_UNSPEC; /* TODO: let them flag v4 only etc */
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	164 hints.ai_socktype = SOCK_STREAM;
63 dcc43965928f - A nice cleaner structure for tcp (acceptor) forwarding. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	165
dcc43965928f - A nice cleaner structure for tcp (acceptor) forwarding. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	166 if (address && address[0] == '\0') {
dcc43965928f - A nice cleaner structure for tcp (acceptor) forwarding. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	167 TRACE(("dropbear_listen: local loopback"));
dcc43965928f - A nice cleaner structure for tcp (acceptor) forwarding. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	168 address = NULL;
dcc43965928f - A nice cleaner structure for tcp (acceptor) forwarding. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	169 } else {
dcc43965928f - A nice cleaner structure for tcp (acceptor) forwarding. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	170 TRACE(("dropbear_listen: not local loopback"));
dcc43965928f - A nice cleaner structure for tcp (acceptor) forwarding. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	171 hints.ai_flags = AI_PASSIVE;
dcc43965928f - A nice cleaner structure for tcp (acceptor) forwarding. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	172 }
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	173 err = getaddrinfo(address, port, &hints, &res0);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	174
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	175 if (err) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	176 if (errstring != NULL && *errstring == NULL) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	177 int len;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	178 len = 20 + strlen(gai_strerror(err));
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	179 errstring = (char)m_malloc(len);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	180 snprintf(*errstring, len, "Error resolving: %s", gai_strerror(err));
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	181 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	182 TRACE(("leave dropbear_listen: failed resolving"));
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	183 return -1;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	184 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	185
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	186
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	187 nsock = 0;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	188 for (res = res0; res != NULL && nsock < sockcount;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	189 res = res->ai_next) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	190
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	191 /* Get a socket */
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	192 socks[nsock] = socket(res->ai_family, res->ai_socktype,
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	193 res->ai_protocol);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	194
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	195 sock = socks[nsock]; /* For clarity */
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	196
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	197 if (sock < 0) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	198 err = errno;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	199 TRACE(("socket() failed"));
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	200 continue;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	201 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	202
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	203 /* Various useful socket options */
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	204 val = 1;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	205 /* set to reuse, quick timeout */
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	206 setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*) &val, sizeof(val));
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	207 linger.l_onoff = 1;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	208 linger.l_linger = 5;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	209 setsockopt(sock, SOL_SOCKET, SO_LINGER, (void*)&linger, sizeof(linger));
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	210
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	211 /* disable nagle */
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	212 setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (void*)&val, sizeof(val));
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	213
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	214 if (bind(sock, res->ai_addr, res->ai_addrlen) < 0) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	215 err = errno;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	216 close(sock);
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	217 TRACE(("bind(%s) failed", port));
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	218 continue;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	219 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	220
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	221 if (listen(sock, 20) < 0) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	222 err = errno;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	223 close(sock);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	224 TRACE(("listen() failed"));
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	225 continue;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	226 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	227
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	228 maxfd = MAX(maxfd, sock);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	229
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	230 nsock++;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	231 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	232
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	233 if (nsock == 0) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	234 if (errstring != NULL && *errstring == NULL) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	235 int len;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	236 len = 20 + strlen(strerror(err));
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	237 errstring = (char)m_malloc(len);
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	238 snprintf(*errstring, len, "Error listening: %s", strerror(err));
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	239 TRACE(("leave dropbear_listen: failure, %s", strerror(err)));
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	240 return -1;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	241 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	242 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	243
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	244 TRACE(("leave dropbear_listen: success, %d socks bound", nsock));
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	245 return nsock;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	246 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	247
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	248 /* Connect via TCP to a host. Connection will try ipv4 or ipv6, will
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	249 * return immediately if nonblocking is set. On failure, if errstring
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	250 * wasn't null, it will be a newly malloced error message */
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	251
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	252 /* TODO: maxfd */
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	253 int connect_remote(const char* remotehost, const char* remoteport,
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	254 int nonblocking, char ** errstring) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	255
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	256 struct addrinfo res0 = NULL, res = NULL, hints;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	257 int sock;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	258 int err;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	259
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	260 TRACE(("enter connect_remote"));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	261
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	262 if (errstring != NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	263 *errstring = NULL;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	264 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	265
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	266 memset(&hints, 0, sizeof(hints));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	267 hints.ai_socktype = SOCK_STREAM;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	268 hints.ai_family = PF_UNSPEC;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	269
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	270 err = getaddrinfo(remotehost, remoteport, &hints, &res0);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	271 if (err) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	272 if (errstring != NULL && *errstring == NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	273 int len;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	274 len = 20 + strlen(gai_strerror(err));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	275 errstring = (char)m_malloc(len);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	276 snprintf(*errstring, len, "Error resolving: %s", gai_strerror(err));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	277 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	278 TRACE(("Error resolving: %s", gai_strerror(err)));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	279 return -1;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	280 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	281
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	282 sock = -1;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	283 err = EADDRNOTAVAIL;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	284 for (res = res0; res; res = res->ai_next) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	285
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	286 sock = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	287 if (sock < 0) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	288 err = errno;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	289 continue;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	290 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	291
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	292 if (nonblocking) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	293 if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	294 close(sock);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	295 sock = -1;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	296 if (errstring != NULL && *errstring == NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	297 *errstring = m_strdup("Failed non-blocking");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	298 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	299 TRACE(("Failed non-blocking: %s", strerror(errno)));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	300 continue;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	301 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	302 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	303
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	304 if (connect(sock, res->ai_addr, res->ai_addrlen) < 0) {
70 b0316ce64e4b Merging in the changes from 0.41-0.43 main Dropbear tree Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	305 if (errno == EINPROGRESS && nonblocking) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	306 TRACE(("Connect in progress"));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	307 break;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	308 } else {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	309 err = errno;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	310 close(sock);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	311 sock = -1;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	312 continue;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	313 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	314 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	315
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	316 break; /* Success */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	317 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	318
70 b0316ce64e4b Merging in the changes from 0.41-0.43 main Dropbear tree Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	319 if (sock < 0 && !(errno == EINPROGRESS && nonblocking)) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	320 /* Failed */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	321 if (errstring != NULL && *errstring == NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	322 int len;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	323 len = 20 + strlen(strerror(err));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	324 errstring = (char)m_malloc(len);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	325 snprintf(*errstring, len, "Error connecting: %s", strerror(err));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	326 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	327 TRACE(("Error connecting: %s", strerror(err)));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	328 } else {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	329 /* Success */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	330 /* (err is used as a dummy var here) */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	331 setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (void*)&err, sizeof(err));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	332 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	333
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	334 freeaddrinfo(res0);
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	335 if (sock > 0 && errstring != NULL && *errstring != NULL) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	336 m_free(*errstring);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	337 }
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	338
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	339 TRACE(("leave connect_remote: sock %d\n", sock));
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	340 return sock;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	341 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	342
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	343 /* Return a string representation of the socket address passed. The return
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	344 * value is allocated with malloc() */
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	345 unsigned char * getaddrstring(struct sockaddr_storage* addr, int withport) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	346
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	347 char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	348 char *retstring = NULL;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	349 int ret;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	350 unsigned int len;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	351
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	352 len = sizeof(struct sockaddr_storage);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	353
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	354 ret = getnameinfo((struct sockaddr*)addr, len, hbuf, sizeof(hbuf),
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	355 sbuf, sizeof(sbuf), NI_NUMERICSERV \| NI_NUMERICHOST);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	356
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	357 if (ret != 0) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	358 /* This is a fairly bad failure - it'll fallback to IP if it
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	359 * just can't resolve */
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	360 dropbear_exit("failed lookup (%d, %d)", ret, errno);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	361 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	362
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	363 if (withport) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	364 len = strlen(hbuf) + 2 + strlen(sbuf);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	365 retstring = (char*)m_malloc(len);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	366 snprintf(retstring, len, "%s:%s", hbuf, sbuf);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	367 } else {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	368 retstring = m_strdup(hbuf);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	369 }
4 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 return retstring;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	372
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	373 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	374
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	375 /* Get the hostname corresponding to the address addr. On failure, the IP
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	376 * address is returned. The return value is allocated with strdup() */
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	377 char* getaddrhostname(struct sockaddr_storage * addr) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	378
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	379 char hbuf[NI_MAXHOST];
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	380 char sbuf[NI_MAXSERV];
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	381 int ret;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	382 unsigned int len;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	383
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	384 len = sizeof(struct sockaddr_storage);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	385
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	386 ret = getnameinfo((struct sockaddr*)addr, len, hbuf, sizeof(hbuf),
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	387 sbuf, sizeof(sbuf), NI_NUMERICSERV);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	388
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	389 if (ret != 0) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	390 /* On some systems (Darwin does it) we get EINTR from getnameinfo
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	391 * somehow. Eew. So we'll just return the IP, since that doesn't seem
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	392 * to exhibit that behaviour. */
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	393 return getaddrstring(addr, 0);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	394 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	395
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	396 return m_strdup(hbuf);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	397 }
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	398
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	399 #ifdef DEBUG_TRACE
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	400 void printhex(unsigned char* buf, int len) {
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 int i;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	403
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	404 for (i = 0; i < len; i++) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	405 fprintf(stderr, "%02x", buf[i]);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	406 if (i % 16 == 15) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	407 fprintf(stderr, "\n");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	408 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	409 else if (i % 2 == 1) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	410 fprintf(stderr, " ");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	411 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	412 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	413 fprintf(stderr, "\n");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	414 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	415 #endif
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 /* Strip all control characters from text (a null-terminated string), except
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	418 * for '\n', '\r' and '\t'.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	419 * The result returned is a newly allocated string, this must be free()d after
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	420 * use */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	421 char * stripcontrol(const char * text) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	422
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	423 char * ret;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	424 int len, pos;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	425 int i;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	426
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	427 len = strlen(text);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	428 ret = m_malloc(len+1);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	429
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	430 pos = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	431 for (i = 0; i < len; i++) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	432 if ((text[i] <= '~' && text[i] >= ' ') /* normal printable range */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	433 \|\| text[i] == '\n' \|\| text[i] == '\r' \|\| text[i] == '\t') {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	434 ret[pos] = text[i];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	435 pos++;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	436 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	437 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	438 ret[pos] = 0x0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	439 return ret;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	440 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	441
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 /* reads the contents of filename into the buffer buf, from the current
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	444 * position, either to the end of the file, or the buffer being full.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	445 * Returns DROPBEAR_SUCCESS or DROPBEAR_FAILURE */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	446 int buf_readfile(buffer* buf, const char* filename) {
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 int fd;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	449 int len;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	450 int maxlen;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	451
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	452 fd = open(filename, O_RDONLY);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	453
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	454 if (fd < 0) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	455 close(fd);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	456 return DROPBEAR_FAILURE;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	457 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	458
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	459 do {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	460 maxlen = buf->size - buf->pos;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	461 len = read(fd, buf_getwriteptr(buf, maxlen),
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	462 maxlen);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	463 buf_incrwritepos(buf, len);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	464 } while (len < maxlen && len > 0);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	465
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	466 close(fd);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	467 return DROPBEAR_SUCCESS;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	468 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	469
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	470 /* get a line from the file into buffer in the style expected for an
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	471 * authkeys file.
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	472 * Will return DROPBEAR_SUCCESS if data is read, or DROPBEAR_FAILURE on EOF.*/
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	473 /* Only used for ~/.ssh/known_hosts and ~/.ssh/authorized_keys */
68 eee77ac31ccc cleaning up the pubkey defines Matt Johnston <matt@ucc.asn.au> parents: 64 diff changeset	474 #if defined(DROPBEAR_CLIENT) \|\| defined(ENABLE_SVR_PUBKEY_AUTH)
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	475 int buf_getline(buffer * line, FILE * authfile) {
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	476
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	477 int c = EOF;
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	478
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	479 TRACE(("enter buf_getline"));
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	480
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	481 buf_setpos(line, 0);
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	482 buf_setlen(line, 0);
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	483
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	484 while (line->pos < line->size) {
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	485
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	486 c = fgetc(authfile); /getc() is weird with some uClibc systems/
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	487 if (c == EOF \|\| c == '\n' \|\| c == '\r') {
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	488 goto out;
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	489 }
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	490
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	491 buf_putbyte(line, (unsigned char)c);
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	492 }
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	493
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	494 TRACE(("leave getauthline: line too long"));
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	495 /* We return success, but the line length will be zeroed - ie we just
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	496 * ignore that line */
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	497 buf_setlen(line, 0);
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	498
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	499 out:
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	500
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	501 buf_setpos(line, 0);
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	502
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	503 /* if we didn't read anything before EOF or error, exit */
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	504 if (c == EOF && line->pos == 0) {
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	505 TRACE(("leave getauthline: failure"));
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	506 return DROPBEAR_FAILURE;
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	507 } else {
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	508 TRACE(("leave getauthline: success"));
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	509 return DROPBEAR_SUCCESS;
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	510 }
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	511
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	512 TRACE(("leave buf_getline"));
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	513 }
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	514 #endif
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	515
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	516 /* loop until the socket is closed (in case of EINTR) or
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	517 * we get and error.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	518 * Returns DROPBEAR_SUCCESS or DROPBEAR_FAILURE */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	519 int m_close(int fd) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	520
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	521 int val;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	522 do {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	523 val = close(fd);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	524 } while (val < 0 && errno == EINTR);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	525
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	526 if (val == 0 \|\| errno == EBADF) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	527 return DROPBEAR_SUCCESS;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	528 } else {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	529 return DROPBEAR_FAILURE;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	530 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	531 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	532
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	533 void * m_malloc(size_t size) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	534
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	535 void* ret;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	536
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	537 if (size == 0) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	538 dropbear_exit("m_malloc failed");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	539 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	540 ret = malloc(size);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	541 if (ret == NULL) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	542 dropbear_exit("m_malloc failed");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	543 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	544 return ret;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	545
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	546 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	547
11 f76c9389e9e0 Mostly done with the listener changeover Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	548 void * m_strdup(const char * str) {
f76c9389e9e0 Mostly done with the listener changeover Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	549 char* ret;
f76c9389e9e0 Mostly done with the listener changeover Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	550
f76c9389e9e0 Mostly done with the listener changeover Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	551 ret = strdup(str);
f76c9389e9e0 Mostly done with the listener changeover Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	552 if (ret == NULL) {
f76c9389e9e0 Mostly done with the listener changeover Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	553 dropbear_exit("m_strdup failed");
f76c9389e9e0 Mostly done with the listener changeover Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	554 }
f76c9389e9e0 Mostly done with the listener changeover Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	555 return ret;
f76c9389e9e0 Mostly done with the listener changeover Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	556 }
f76c9389e9e0 Mostly done with the listener changeover Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	557
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	558 void __m_free(void* ptr) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	559 if (ptr != NULL) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	560 free(ptr);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	561 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	562 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	563
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	564 void * m_realloc(void* ptr, size_t size) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	565
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	566 void *ret;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	567
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	568 if (size == 0) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	569 dropbear_exit("m_realloc failed");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	570 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	571 ret = realloc(ptr, size);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	572 if (ret == NULL) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	573 dropbear_exit("m_realloc failed");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	574 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	575 return ret;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	576 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	577
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	578 /* Clear the data, based on the method in David Wheeler's
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	579 * "Secure Programming for Linux and Unix HOWTO" */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	580 void m_burn(void *data, unsigned int len) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	581 volatile char *p = data;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	582
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	583 if (data == NULL)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	584 return;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	585 while (len--) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	586 *p++ = 0x66;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	587 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	588 }
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	589

Mercurial > dropbear

annotate dbutil.c @ 86:ace512d2ad5d