dropbear: dbutil.c annotate

annotate dbutil.c @ 258:306499676384

* add -g (dbclient) and -a (dropbear) options for allowing non-local hosts to connect to forwarded ports. Rearranged various some of the tcp listening code. * changed to /* */ style brackets in svr-authpam.c

author	Matt Johnston <matt@ucc.asn.au>
date	Sun, 04 Dec 2005 16:13:11 +0000
parents	b02e8eef3c3a
children	044bc108b9b3 740e782679be

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
94 c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 73 diff changeset	69 #ifdef DEBUG_TRACE
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 73 diff changeset	70 int debug_trace = 0;
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 73 diff changeset	71 #endif
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 73 diff changeset	72
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	73 #ifndef DISABLE_SYSLOG
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	74 void startsyslog() {
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 openlog(PROGNAME, LOG_PID, LOG_AUTHPRIV);
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 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	79 #endif /* DISABLE_SYSLOG */
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 /* the "format" string must be <= 100 characters */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	82 void dropbear_close(const char* format, ...) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	83
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	84 va_list param;
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 va_start(param, format);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	87 _dropbear_exit(EXIT_SUCCESS, format, param);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	88 va_end(param);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	89
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
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	92 void dropbear_exit(const char* format, ...) {
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 va_list param;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	95
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	96 va_start(param, format);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	97 _dropbear_exit(EXIT_FAILURE, format, param);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	98 va_end(param);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	99 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	100
73 0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	101 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	102 va_list param) {
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	103
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	104 char fmtbuf[300];
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	105
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	106 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	107
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	108 _dropbear_log(LOG_INFO, fmtbuf, param);
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 exit(exitcode);
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	111 }
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	112
241 c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 198 diff changeset	113 void fail_assert(const char* expr, const char* file, int line) {
c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 198 diff changeset	114 dropbear_exit("failed assertion (%s:%d): `%s'", file, line, expr);
c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 198 diff changeset	115 }
c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 198 diff changeset	116
108 10f4d3319780 - added circular buffering for channels Matt Johnston <matt@ucc.asn.au> parents: 107 diff changeset	117 static void generic_dropbear_log(int UNUSED(priority), const char* format,
73 0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	118 va_list param) {
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	119
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	120 char printbuf[1024];
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	121
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	122 vsnprintf(printbuf, sizeof(printbuf), format, param);
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	123
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	124 fprintf(stderr, "%s\n", printbuf);
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	125
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 70 diff changeset	126 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	127
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	128 /* 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	129 void dropbear_log(int priority, const char* format, ...) {
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 va_list param;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	132
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	133 va_start(param, format);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	134 _dropbear_log(priority, format, param);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	135 va_end(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
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	138
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	139 #ifdef DEBUG_TRACE
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	140 void dropbear_trace(const char* format, ...) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	141
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	142 va_list param;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	143
94 c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 73 diff changeset	144 if (!debug_trace) {
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 73 diff changeset	145 return;
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 73 diff changeset	146 }
c85c88500ea6 DEBUG_TRACE now only triggers with -v on the cmdline Matt Johnston <matt@ucc.asn.au> parents: 73 diff changeset	147
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	148 va_start(param, format);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	149 fprintf(stderr, "TRACE: ");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	150 vfprintf(stderr, format, param);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	151 fprintf(stderr, "\n");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	152 va_end(param);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	153 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	154 #endif /* DEBUG_TRACE */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	155
251 b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	156 static void set_sock_priority(int sock) {
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	157
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	158 int val;
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	159
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	160 /* disable nagle */
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	161 val = 1;
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	162 setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (void*)&val, sizeof(val));
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	163
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	164 /* set the TOS bit. note that this will fail for ipv6, I can't find any
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	165 * equivalent. */
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	166 #ifdef IPTOS_LOWDELAY
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	167 val = IPTOS_LOWDELAY;
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	168 setsockopt(sock, IPPROTO_IP, IP_TOS, (void*)&val, sizeof(val));
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	169 #endif
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	170
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	171 #ifdef SO_PRIORITY
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	172 /* linux specific, sets QoS class.
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	173 * 6 looks to be optimal for interactive traffic (see tc-prio(8) ). */
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	174 val = 6;
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	175 setsockopt(sock, SOL_SOCKET, SO_PRIORITY, (void*) &val, sizeof(val));
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	176 #endif
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	177
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	178 }
b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	179
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 251 diff changeset	180 /* Listen on address:port.
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 251 diff changeset	181 * Special cases are address of "" listening on everything,
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 251 diff changeset	182 * and address of NULL listening on localhost only.
63 dcc43965928f - A nice cleaner structure for tcp (acceptor) forwarding. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	183 * 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	184 * 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	185 * string.*/
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	186 int dropbear_listen(const char* address, const char* port,
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	187 int socks, unsigned int sockcount, char errstring, int maxfd) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	188
70 b0316ce64e4b Merging in the changes from 0.41-0.43 main Dropbear tree Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	189 struct addrinfo hints, res = NULL, res0 = NULL;
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	190 int err;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	191 unsigned int nsock;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	192 struct linger linger;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	193 int val;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	194 int sock;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	195
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 161 diff changeset	196 TRACE(("enter dropbear_listen"))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	197
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	198 memset(&hints, 0, sizeof(hints));
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	199 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	200 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	201
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 251 diff changeset	202 // for calling getaddrinfo:
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 251 diff changeset	203 // address == NULL and !AI_PASSIVE: local loopback
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 251 diff changeset	204 // address == NULL and AI_PASSIVE: all interfaces
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 251 diff changeset	205 // address != NULL: whatever the address says
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 251 diff changeset	206 if (!address) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 161 diff changeset	207 TRACE(("dropbear_listen: local loopback"))
63 dcc43965928f - A nice cleaner structure for tcp (acceptor) forwarding. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	208 } else {
258 306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 251 diff changeset	209 if (address[0] == '\0') {
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 251 diff changeset	210 TRACE(("dropbear_listen: all interfaces"))
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 251 diff changeset	211 address = NULL;
306499676384 * add -g (dbclient) and -a (dropbear) options for allowing non-local Matt Johnston <matt@ucc.asn.au> parents: 251 diff changeset	212 }
63 dcc43965928f - A nice cleaner structure for tcp (acceptor) forwarding. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	213 hints.ai_flags = AI_PASSIVE;
dcc43965928f - A nice cleaner structure for tcp (acceptor) forwarding. Matt Johnston <matt@ucc.asn.au> parents: 62 diff changeset	214 }
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	215 err = getaddrinfo(address, port, &hints, &res0);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	216
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	217 if (err) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	218 if (errstring != NULL && *errstring == NULL) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	219 int len;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	220 len = 20 + strlen(gai_strerror(err));
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	221 errstring = (char)m_malloc(len);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	222 snprintf(*errstring, len, "Error resolving: %s", gai_strerror(err));
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	223 }
239 e5ad9fa8b1fa add a missing freeaddrinfo() Matt Johnston <matt@ucc.asn.au> parents: 198 diff changeset	224 if (res0) {
e5ad9fa8b1fa add a missing freeaddrinfo() Matt Johnston <matt@ucc.asn.au> parents: 198 diff changeset	225 freeaddrinfo(res0);
e5ad9fa8b1fa add a missing freeaddrinfo() Matt Johnston <matt@ucc.asn.au> parents: 198 diff changeset	226 res0 = NULL;
e5ad9fa8b1fa add a missing freeaddrinfo() Matt Johnston <matt@ucc.asn.au> parents: 198 diff changeset	227 }
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 161 diff changeset	228 TRACE(("leave dropbear_listen: failed resolving"))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	229 return -1;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	230 }
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 nsock = 0;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	234 for (res = res0; res != NULL && nsock < sockcount;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	235 res = res->ai_next) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	236
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	237 /* Get a socket */
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	238 socks[nsock] = socket(res->ai_family, res->ai_socktype,
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	239 res->ai_protocol);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	240
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	241 sock = socks[nsock]; /* For clarity */
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 if (sock < 0) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	244 err = errno;
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 161 diff changeset	245 TRACE(("socket() failed"))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	246 continue;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	247 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	248
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	249 /* Various useful socket options */
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	250 val = 1;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	251 /* set to reuse, quick timeout */
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	252 setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*) &val, sizeof(val));
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	253 linger.l_onoff = 1;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	254 linger.l_linger = 5;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	255 setsockopt(sock, SOL_SOCKET, SO_LINGER, (void*)&linger, sizeof(linger));
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	256
251 b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	257 set_sock_priority(sock);
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	258
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	259 if (bind(sock, res->ai_addr, res->ai_addrlen) < 0) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	260 err = errno;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	261 close(sock);
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 161 diff changeset	262 TRACE(("bind(%s) failed", port))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	263 continue;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	264 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	265
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	266 if (listen(sock, 20) < 0) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	267 err = errno;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	268 close(sock);
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 161 diff changeset	269 TRACE(("listen() failed"))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	270 continue;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	271 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	272
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	273 maxfd = MAX(maxfd, sock);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	274
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	275 nsock++;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	276 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	277
239 e5ad9fa8b1fa add a missing freeaddrinfo() Matt Johnston <matt@ucc.asn.au> parents: 198 diff changeset	278 if (res0) {
e5ad9fa8b1fa add a missing freeaddrinfo() Matt Johnston <matt@ucc.asn.au> parents: 198 diff changeset	279 freeaddrinfo(res0);
e5ad9fa8b1fa add a missing freeaddrinfo() Matt Johnston <matt@ucc.asn.au> parents: 198 diff changeset	280 res0 = NULL;
e5ad9fa8b1fa add a missing freeaddrinfo() Matt Johnston <matt@ucc.asn.au> parents: 198 diff changeset	281 }
e5ad9fa8b1fa add a missing freeaddrinfo() Matt Johnston <matt@ucc.asn.au> parents: 198 diff changeset	282
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	283 if (nsock == 0) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	284 if (errstring != NULL && *errstring == NULL) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	285 int len;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	286 len = 20 + strlen(strerror(err));
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	287 errstring = (char)m_malloc(len);
64 efb5e0b335cf TCP forwarding works. Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	288 snprintf(*errstring, len, "Error listening: %s", strerror(err));
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 161 diff changeset	289 TRACE(("leave dropbear_listen: failure, %s", strerror(err)))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	290 return -1;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	291 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	292 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	293
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 161 diff changeset	294 TRACE(("leave dropbear_listen: success, %d socks bound", nsock))
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	295 return nsock;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	296 }
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	297
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	298 /* 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	299 * return immediately if nonblocking is set. On failure, if errstring
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	300 * wasn't null, it will be a newly malloced error message */
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	301
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	302 /* TODO: maxfd */
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	303 int connect_remote(const char* remotehost, const char* remoteport,
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	304 int nonblocking, char ** errstring) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	305
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	306 struct addrinfo res0 = NULL, res = NULL, hints;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	307 int sock;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	308 int err;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	309
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 161 diff changeset	310 TRACE(("enter connect_remote"))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	311
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	312 if (errstring != NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	313 *errstring = NULL;
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 memset(&hints, 0, sizeof(hints));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	317 hints.ai_socktype = SOCK_STREAM;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	318 hints.ai_family = PF_UNSPEC;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	319
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	320 err = getaddrinfo(remotehost, remoteport, &hints, &res0);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	321 if (err) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	322 if (errstring != NULL && *errstring == NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	323 int len;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	324 len = 20 + strlen(gai_strerror(err));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	325 errstring = (char)m_malloc(len);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	326 snprintf(*errstring, len, "Error resolving: %s", gai_strerror(err));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	327 }
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 161 diff changeset	328 TRACE(("Error resolving: %s", gai_strerror(err)))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	329 return -1;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	330 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	331
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	332 sock = -1;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	333 err = EADDRNOTAVAIL;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	334 for (res = res0; res; res = res->ai_next) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	335
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	336 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	337 if (sock < 0) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	338 err = errno;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	339 continue;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	340 }
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 if (nonblocking) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	343 if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	344 close(sock);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	345 sock = -1;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	346 if (errstring != NULL && *errstring == NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	347 *errstring = m_strdup("Failed non-blocking");
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	348 }
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 161 diff changeset	349 TRACE(("Failed non-blocking: %s", strerror(errno)))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	350 continue;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	351 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	352 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	353
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	354 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	355 if (errno == EINPROGRESS && nonblocking) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 161 diff changeset	356 TRACE(("Connect in progress"))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	357 break;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	358 } else {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	359 err = errno;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	360 close(sock);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	361 sock = -1;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	362 continue;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	363 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	364 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	365
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	366 break; /* Success */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	367 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	368
70 b0316ce64e4b Merging in the changes from 0.41-0.43 main Dropbear tree Matt Johnston <matt@ucc.asn.au> parents: 68 diff changeset	369 if (sock < 0 && !(errno == EINPROGRESS && nonblocking)) {
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	370 /* Failed */
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	371 if (errstring != NULL && *errstring == NULL) {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	372 int len;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	373 len = 20 + strlen(strerror(err));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	374 errstring = (char)m_malloc(len);
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	375 snprintf(*errstring, len, "Error connecting: %s", strerror(err));
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	376 }
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 161 diff changeset	377 TRACE(("Error connecting: %s", strerror(err)))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	378 } else {
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	379 /* Success */
251 b02e8eef3c3a - new function to set "low delay" for a packet, set the ip TOS bit Matt Johnston <matt@ucc.asn.au> parents: 242 diff changeset	380 set_sock_priority(sock);
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	381 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	382
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	383 freeaddrinfo(res0);
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	384 if (sock > 0 && errstring != NULL && *errstring != NULL) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	385 m_free(*errstring);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	386 }
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	387
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 161 diff changeset	388 TRACE(("leave connect_remote: sock %d\n", sock))
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	389 return sock;
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	390 }
0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	391
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	392 /* 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	393 * value is allocated with malloc() */
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	394 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	395
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	396 char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	397 char *retstring = NULL;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	398 int ret;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	399 unsigned int len;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	400
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	401 len = sizeof(struct sockaddr_storage);
160 7ceceb46d655 Fix so that getnameinfo() is passed the address-specific structure size. This Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	402 /* Some platforms such as Solaris 8 require that len is the length
7ceceb46d655 Fix so that getnameinfo() is passed the address-specific structure size. This Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	403 * of the specific structure. */
7ceceb46d655 Fix so that getnameinfo() is passed the address-specific structure size. This Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	404 if (addr->ss_family == AF_INET) {
7ceceb46d655 Fix so that getnameinfo() is passed the address-specific structure size. This Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	405 len = sizeof(struct sockaddr_in);
7ceceb46d655 Fix so that getnameinfo() is passed the address-specific structure size. This Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	406 }
7ceceb46d655 Fix so that getnameinfo() is passed the address-specific structure size. This Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	407 #ifdef AF_INET6
7ceceb46d655 Fix so that getnameinfo() is passed the address-specific structure size. This Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	408 if (addr->ss_family == AF_INET6) {
7ceceb46d655 Fix so that getnameinfo() is passed the address-specific structure size. This Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	409 len = sizeof(struct sockaddr_in6);
7ceceb46d655 Fix so that getnameinfo() is passed the address-specific structure size. This Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	410 }
7ceceb46d655 Fix so that getnameinfo() is passed the address-specific structure size. This Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	411 #endif
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	412
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	413 ret = getnameinfo((struct sockaddr*)addr, len, hbuf, sizeof(hbuf),
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	414 sbuf, sizeof(sbuf), NI_NUMERICSERV \| NI_NUMERICHOST);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	415
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	416 if (ret != 0) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	417 /* 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	418 * just can't resolve */
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	419 dropbear_exit("failed lookup (%d, %d)", ret, errno);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	420 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	421
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	422 if (withport) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	423 len = strlen(hbuf) + 2 + strlen(sbuf);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	424 retstring = (char*)m_malloc(len);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	425 snprintf(retstring, len, "%s:%s", hbuf, sbuf);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	426 } else {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	427 retstring = m_strdup(hbuf);
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	428 }
4 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 return retstring;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	431
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	432 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	433
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	434 /* 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	435 * address is returned. The return value is allocated with strdup() */
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	436 char* getaddrhostname(struct sockaddr_storage * addr) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	437
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	438 char hbuf[NI_MAXHOST];
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	439 char sbuf[NI_MAXSERV];
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	440 int ret;
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	441 unsigned int len;
172 3e49d8d18005 * respect DO_HOST_LOOKUP config option Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	442 #ifdef DO_HOST_LOOKUP
3e49d8d18005 * respect DO_HOST_LOOKUP config option Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	443 const int flags = NI_NUMERICSERV;
3e49d8d18005 * respect DO_HOST_LOOKUP config option Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	444 #else
3e49d8d18005 * respect DO_HOST_LOOKUP config option Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	445 const int flags = NI_NUMERICHOST \| NI_NUMERICSERV;
3e49d8d18005 * respect DO_HOST_LOOKUP config option Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	446 #endif
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	447
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	448 len = sizeof(struct sockaddr_storage);
160 7ceceb46d655 Fix so that getnameinfo() is passed the address-specific structure size. This Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	449 /* Some platforms such as Solaris 8 require that len is the length
7ceceb46d655 Fix so that getnameinfo() is passed the address-specific structure size. This Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	450 * of the specific structure. */
7ceceb46d655 Fix so that getnameinfo() is passed the address-specific structure size. This Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	451 if (addr->ss_family == AF_INET) {
7ceceb46d655 Fix so that getnameinfo() is passed the address-specific structure size. This Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	452 len = sizeof(struct sockaddr_in);
7ceceb46d655 Fix so that getnameinfo() is passed the address-specific structure size. This Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	453 }
7ceceb46d655 Fix so that getnameinfo() is passed the address-specific structure size. This Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	454 #ifdef AF_INET6
7ceceb46d655 Fix so that getnameinfo() is passed the address-specific structure size. This Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	455 if (addr->ss_family == AF_INET6) {
7ceceb46d655 Fix so that getnameinfo() is passed the address-specific structure size. This Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	456 len = sizeof(struct sockaddr_in6);
7ceceb46d655 Fix so that getnameinfo() is passed the address-specific structure size. This Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	457 }
7ceceb46d655 Fix so that getnameinfo() is passed the address-specific structure size. This Matt Johnston <matt@ucc.asn.au> parents: 150 diff changeset	458 #endif
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	459
172 3e49d8d18005 * respect DO_HOST_LOOKUP config option Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	460
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	461 ret = getnameinfo((struct sockaddr*)addr, len, hbuf, sizeof(hbuf),
172 3e49d8d18005 * respect DO_HOST_LOOKUP config option Matt Johnston <matt@ucc.asn.au> parents: 165 diff changeset	462 sbuf, sizeof(sbuf), flags);
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	463
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	464 if (ret != 0) {
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	465 /* On some systems (Darwin does it) we get EINTR from getnameinfo
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	466 * 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	467 * to exhibit that behaviour. */
20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	468 return getaddrstring(addr, 0);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	469 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	470
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	471 return m_strdup(hbuf);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	472 }
62 20563735e8b5 just checkpointing Matt Johnston <matt@ucc.asn.au> parents: 51 diff changeset	473
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	474 #ifdef DEBUG_TRACE
198 65585699d980 * add a "label" argument to printhex() Matt Johnston <matt@ucc.asn.au> parents: 173 diff changeset	475 void printhex(const char * label, const unsigned char * buf, int len) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	476
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	477 int i;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	478
198 65585699d980 * add a "label" argument to printhex() Matt Johnston <matt@ucc.asn.au> parents: 173 diff changeset	479 fprintf(stderr, "%s\n", label);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	480 for (i = 0; i < len; i++) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	481 fprintf(stderr, "%02x", buf[i]);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	482 if (i % 16 == 15) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	483 fprintf(stderr, "\n");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	484 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	485 else if (i % 2 == 1) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	486 fprintf(stderr, " ");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	487 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	488 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	489 fprintf(stderr, "\n");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	490 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	491 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	492
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	493 /* 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	494 * for '\n', '\r' and '\t'.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	495 * 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	496 * use */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	497 char * stripcontrol(const char * text) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	498
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	499 char * ret;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	500 int len, pos;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	501 int i;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	502
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	503 len = strlen(text);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	504 ret = m_malloc(len+1);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	505
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	506 pos = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	507 for (i = 0; i < len; i++) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	508 if ((text[i] <= '~' && text[i] >= ' ') /* normal printable range */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	509 \|\| 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	510 ret[pos] = text[i];
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	511 pos++;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	512 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	513 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	514 ret[pos] = 0x0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	515 return ret;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	516 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	517
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	518
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	519 /* 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	520 * 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	521 * Returns DROPBEAR_SUCCESS or DROPBEAR_FAILURE */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	522 int buf_readfile(buffer* buf, const char* filename) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	523
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	524 int fd;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	525 int len;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	526 int maxlen;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	527
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	528 fd = open(filename, O_RDONLY);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	529
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	530 if (fd < 0) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	531 close(fd);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	532 return DROPBEAR_FAILURE;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	533 }
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 do {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	536 maxlen = buf->size - buf->pos;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	537 len = read(fd, buf_getwriteptr(buf, maxlen),
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	538 maxlen);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	539 buf_incrwritepos(buf, len);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	540 } while (len < maxlen && len > 0);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	541
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	542 close(fd);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	543 return DROPBEAR_SUCCESS;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	544 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	545
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	546 /* 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	547 * authkeys file.
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	548 * 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	549 /* 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	550 #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	551 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	552
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	553 int c = EOF;
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	554
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 161 diff changeset	555 TRACE(("enter buf_getline"))
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	556
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	557 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	558 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	559
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	560 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	561
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	562 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	563 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	564 goto out;
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	565 }
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	566
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	567 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	568 }
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	569
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 161 diff changeset	570 TRACE(("leave getauthline: line too long"))
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	571 /* 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	572 * ignore that line */
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	573 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	574
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	575 out:
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	576
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	577
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	578 /* 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	579 if (c == EOF && line->pos == 0) {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 161 diff changeset	580 TRACE(("leave buf_getline: failure"))
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	581 return DROPBEAR_FAILURE;
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	582 } else {
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 161 diff changeset	583 TRACE(("leave buf_getline: success"))
117 e0acad552a92 Read the last line of a file without a finishing '\n' correctly Matt Johnston <matt@ucc.asn.au> parents: 109 diff changeset	584 buf_setpos(line, 0);
51 095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	585 return DROPBEAR_SUCCESS;
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	586 }
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	587
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	588 }
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	589 #endif
095d689fed16 - Hostkey checking is mostly there, just aren't appending yet. Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	590
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	591 /* 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	592 * we get and error.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	593 * Returns DROPBEAR_SUCCESS or DROPBEAR_FAILURE */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	594 int m_close(int fd) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	595
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	596 int val;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	597 do {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	598 val = close(fd);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	599 } while (val < 0 && errno == EINTR);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	600
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	601 if (val == 0 \|\| errno == EBADF) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	602 return DROPBEAR_SUCCESS;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	603 } else {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	604 return DROPBEAR_FAILURE;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	605 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	606 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	607
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	608 void * m_malloc(size_t size) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	609
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	610 void* ret;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	611
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	612 if (size == 0) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	613 dropbear_exit("m_malloc failed");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	614 }
123 a0db9a23f6d4 calloc memory rather than mallocing it - can't hurt too much, and is Matt Johnston <matt@ucc.asn.au> parents: 117 diff changeset	615 ret = calloc(1, size);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	616 if (ret == NULL) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	617 dropbear_exit("m_malloc failed");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	618 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	619 return ret;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	620
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	621 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	622
11 f76c9389e9e0 Mostly done with the listener changeover Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	623 void * m_strdup(const char * str) {
f76c9389e9e0 Mostly done with the listener changeover Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	624 char* ret;
f76c9389e9e0 Mostly done with the listener changeover Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	625
f76c9389e9e0 Mostly done with the listener changeover Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	626 ret = strdup(str);
f76c9389e9e0 Mostly done with the listener changeover Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	627 if (ret == NULL) {
f76c9389e9e0 Mostly done with the listener changeover Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	628 dropbear_exit("m_strdup failed");
f76c9389e9e0 Mostly done with the listener changeover Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	629 }
f76c9389e9e0 Mostly done with the listener changeover Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	630 return ret;
f76c9389e9e0 Mostly done with the listener changeover Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	631 }
f76c9389e9e0 Mostly done with the listener changeover Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	632
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	633 void __m_free(void* ptr) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	634 if (ptr != NULL) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	635 free(ptr);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	636 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	637 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	638
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	639 void * m_realloc(void* ptr, size_t size) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	640
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	641 void *ret;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	642
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	643 if (size == 0) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	644 dropbear_exit("m_realloc failed");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	645 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	646 ret = realloc(ptr, size);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	647 if (ret == NULL) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	648 dropbear_exit("m_realloc failed");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	649 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	650 return ret;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	651 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	652
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	653 /* 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	654 * "Secure Programming for Linux and Unix HOWTO" */
161 b9d3f725e00b 0.44 release changes Matt Johnston <matt@ucc.asn.au> parents: 160 diff changeset	655 /* Beware of calling this from within dbutil.c - things might get
b9d3f725e00b 0.44 release changes Matt Johnston <matt@ucc.asn.au> parents: 160 diff changeset	656 * optimised away */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	657 void m_burn(void *data, unsigned int len) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	658 volatile char *p = data;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	659
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	660 if (data == NULL)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	661 return;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	662 while (len--) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	663 *p++ = 0x66;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	664 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	665 }
26 0969767bca0d snapshot of stuff Matt Johnston <matt@ucc.asn.au> parents: 11 diff changeset	666
109 2e9d1f29c50f merge of 50be59810e462f9f44f55e421227d6aa0b31982b Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	667
2e9d1f29c50f merge of 50be59810e462f9f44f55e421227d6aa0b31982b Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	668 void setnonblocking(int fd) {
2e9d1f29c50f merge of 50be59810e462f9f44f55e421227d6aa0b31982b Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	669
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 161 diff changeset	670 TRACE(("setnonblocking: %d", fd))
109 2e9d1f29c50f merge of 50be59810e462f9f44f55e421227d6aa0b31982b Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	671
2e9d1f29c50f merge of 50be59810e462f9f44f55e421227d6aa0b31982b Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	672 if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0) {
173 257f09a63dab * add SSH_ASKPASS support (based on patch from Paul Whittaker Matt Johnston <matt@ucc.asn.au> parents: 172 diff changeset	673 if (errno == ENODEV) {
257f09a63dab * add SSH_ASKPASS support (based on patch from Paul Whittaker Matt Johnston <matt@ucc.asn.au> parents: 172 diff changeset	674 /* Some devices (like /dev/null redirected in)
257f09a63dab * add SSH_ASKPASS support (based on patch from Paul Whittaker Matt Johnston <matt@ucc.asn.au> parents: 172 diff changeset	675 * can't be set to non-blocking */
257f09a63dab * add SSH_ASKPASS support (based on patch from Paul Whittaker Matt Johnston <matt@ucc.asn.au> parents: 172 diff changeset	676 TRACE(("ignoring ENODEV for setnonblocking"))
257f09a63dab * add SSH_ASKPASS support (based on patch from Paul Whittaker Matt Johnston <matt@ucc.asn.au> parents: 172 diff changeset	677 } else {
257f09a63dab * add SSH_ASKPASS support (based on patch from Paul Whittaker Matt Johnston <matt@ucc.asn.au> parents: 172 diff changeset	678 dropbear_exit("Couldn't set nonblocking");
257f09a63dab * add SSH_ASKPASS support (based on patch from Paul Whittaker Matt Johnston <matt@ucc.asn.au> parents: 172 diff changeset	679 }
109 2e9d1f29c50f merge of 50be59810e462f9f44f55e421227d6aa0b31982b Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	680 }
165 0cfba3034be5 Fixed DEBUG_TRACE macro so that we don't get semicolons left about the place Matt Johnston <matt@ucc.asn.au> parents: 161 diff changeset	681 TRACE(("leave setnonblocking"))
109 2e9d1f29c50f merge of 50be59810e462f9f44f55e421227d6aa0b31982b Matt Johnston <matt@ucc.asn.au> parents: 108 diff changeset	682 }

Mercurial > dropbear

annotate dbutil.c @ 258:306499676384