dropbear: netio.c annotate

annotate netio.c @ 1620:572a7aefa188 bugfix

FIx remote forward listeners

author	Matt Johnston <matt@ucc.asn.au>
date	Fri, 07 Sep 2018 23:02:20 +0800
parents	78d8c3ffdfe1
children	5916af64acd4

rev	line source
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1 #include "netio.h"
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	2 #include "list.h"
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	3 #include "dbutil.h"
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	4 #include "session.h"
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	5 #include "debug.h"
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	6
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	7 struct dropbear_progress_connection {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	8 struct addrinfo *res;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	9 struct addrinfo *res_iter;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	10
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	11 char remotehost, remoteport; /* For error reporting */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	12
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	13 connect_callback cb;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	14 void *cb_data;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	15
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	16 struct Queue writequeue; / A queue of encrypted packets to send with TCP fastopen,
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	17 or NULL. */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	18
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	19 int sock;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	20
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	21 char* errstring;
1466 f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	22 char bind_address, bind_port;
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	23 };
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	24
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	25 /* Deallocate a progress connection. Removes from the pending list if iter!=NULL.
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	26 Does not close sockets */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	27 static void remove_connect(struct dropbear_progress_connection c, m_list_elem iter) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	28 if (c->res) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	29 freeaddrinfo(c->res);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	30 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	31 m_free(c->remotehost);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	32 m_free(c->remoteport);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	33 m_free(c->errstring);
1466 f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	34 m_free(c->bind_address);
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	35 m_free(c->bind_port);
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	36 m_free(c);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	37
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	38 if (iter) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	39 list_remove(iter);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	40 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	41 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	42
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	43 static void cancel_callback(int result, int sock, void* UNUSED(data), const char* UNUSED(errstring)) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	44 if (result == DROPBEAR_SUCCESS)
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	45 {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	46 m_close(sock);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	47 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	48 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	49
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	50 void cancel_connect(struct dropbear_progress_connection *c) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	51 c->cb = cancel_callback;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	52 c->cb_data = NULL;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	53 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	54
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	55 static void connect_try_next(struct dropbear_progress_connection *c) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	56 struct addrinfo *r;
1466 f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	57 int err;
1033 ca71904cf3ee Fixes for backwards compatibility Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	58 int res = 0;
ca71904cf3ee Fixes for backwards compatibility Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	59 int fastopen = 0;
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1152 diff changeset	60 #if DROPBEAR_CLIENT_TCP_FAST_OPEN
1035 8ed1d37e75a6 get rid of some unnecessary code Matt Johnston <matt@ucc.asn.au> parents: 1034 diff changeset	61 struct msghdr message;
1033 ca71904cf3ee Fixes for backwards compatibility Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	62 #endif
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	63
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	64 for (r = c->res_iter; r; r = r->ai_next)
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	65 {
1067 ce21d0bfaf98 dropbear_assert() rather than assert() Matt Johnston <matt@ucc.asn.au> parents: 1066 diff changeset	66 dropbear_assert(c->sock == -1);
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	67
1309 3b624ad2dc5e make sure socket is of the right domain Matt Johnston <matt@ucc.asn.au> parents: 1152 diff changeset	68 c->sock = socket(r->ai_family, r->ai_socktype, r->ai_protocol);
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	69 if (c->sock < 0) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	70 continue;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	71 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	72
1466 f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	73 if (c->bind_address \|\| c->bind_port) {
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	74 /* bind to a source port/address */
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	75 struct addrinfo hints;
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	76 struct addrinfo *bindaddr = NULL;
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	77 memset(&hints, 0, sizeof(hints));
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	78 hints.ai_socktype = SOCK_STREAM;
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	79 hints.ai_family = r->ai_family;
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	80 hints.ai_flags = AI_PASSIVE;
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	81
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	82 err = getaddrinfo(c->bind_address, c->bind_port, &hints, &bindaddr);
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	83 if (err) {
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	84 int len = 100 + strlen(gai_strerror(err));
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	85 m_free(c->errstring);
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	86 c->errstring = (char*)m_malloc(len);
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	87 snprintf(c->errstring, len, "Error resolving bind address '%s' (port %s). %s",
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	88 c->bind_address, c->bind_port, gai_strerror(err));
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	89 TRACE(("Error resolving bind: %s", gai_strerror(err)))
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	90 close(c->sock);
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	91 c->sock = -1;
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	92 continue;
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	93 }
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	94 res = bind(c->sock, bindaddr->ai_addr, bindaddr->ai_addrlen);
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	95 freeaddrinfo(bindaddr);
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	96 bindaddr = NULL;
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	97 if (res < 0) {
1465 f7a53832501d cli_bind_address_connect houseofkodai <karthik@houseofkodai.in> parents: 1464 diff changeset	98 /* failure */
1466 f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	99 int keep_errno = errno;
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	100 int len = 300;
1465 f7a53832501d cli_bind_address_connect houseofkodai <karthik@houseofkodai.in> parents: 1464 diff changeset	101 m_free(c->errstring);
1466 f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	102 c->errstring = m_malloc(len);
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	103 snprintf(c->errstring, len, "Error binding local address '%s' (port %s). %s",
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	104 c->bind_address, c->bind_port, strerror(keep_errno));
1465 f7a53832501d cli_bind_address_connect houseofkodai <karthik@houseofkodai.in> parents: 1464 diff changeset	105 close(c->sock);
f7a53832501d cli_bind_address_connect houseofkodai <karthik@houseofkodai.in> parents: 1464 diff changeset	106 c->sock = -1;
f7a53832501d cli_bind_address_connect houseofkodai <karthik@houseofkodai.in> parents: 1464 diff changeset	107 continue;
f7a53832501d cli_bind_address_connect houseofkodai <karthik@houseofkodai.in> parents: 1464 diff changeset	108 }
f7a53832501d cli_bind_address_connect houseofkodai <karthik@houseofkodai.in> parents: 1464 diff changeset	109 }
f7a53832501d cli_bind_address_connect houseofkodai <karthik@houseofkodai.in> parents: 1464 diff changeset	110
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	111 ses.maxfd = MAX(ses.maxfd, c->sock);
1035 8ed1d37e75a6 get rid of some unnecessary code Matt Johnston <matt@ucc.asn.au> parents: 1034 diff changeset	112 set_sock_nodelay(c->sock);
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	113 setnonblocking(c->sock);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	114
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1152 diff changeset	115 #if DROPBEAR_CLIENT_TCP_FAST_OPEN
1033 ca71904cf3ee Fixes for backwards compatibility Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	116 fastopen = (c->writequeue != NULL);
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	117
1084 2265d7ebfdeb separate client/server fastopen options Matt Johnston <matt@ucc.asn.au> parents: 1078 diff changeset	118 if (fastopen) {
2265d7ebfdeb separate client/server fastopen options Matt Johnston <matt@ucc.asn.au> parents: 1078 diff changeset	119 memset(&message, 0x0, sizeof(message));
2265d7ebfdeb separate client/server fastopen options Matt Johnston <matt@ucc.asn.au> parents: 1078 diff changeset	120 message.msg_name = r->ai_addr;
2265d7ebfdeb separate client/server fastopen options Matt Johnston <matt@ucc.asn.au> parents: 1078 diff changeset	121 message.msg_namelen = r->ai_addrlen;
1072 686cd3e8e13e avoid malloc for iovec Matt Johnston <matt@ucc.asn.au> parents: 1067 diff changeset	122 /* 6 is arbitrary, enough to hold initial packets */
1094 c45d65392c1a Fix pointer differ in signess warnings [-Werror=pointer-sign] Gaël PORTAY <gael.portay@gmail.com> parents: 1078 diff changeset	123 unsigned int iovlen = 6; /* Linux msg_iovlen is a size_t */
1076 d92597ef089e fastopen code was totally broken Matt Johnston <matt@ucc.asn.au> parents: 1073 diff changeset	124 struct iovec iov[6];
1072 686cd3e8e13e avoid malloc for iovec Matt Johnston <matt@ucc.asn.au> parents: 1067 diff changeset	125 packet_queue_to_iovec(c->writequeue, iov, &iovlen);
1076 d92597ef089e fastopen code was totally broken Matt Johnston <matt@ucc.asn.au> parents: 1073 diff changeset	126 message.msg_iov = iov;
1033 ca71904cf3ee Fixes for backwards compatibility Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	127 message.msg_iovlen = iovlen;
ca71904cf3ee Fixes for backwards compatibility Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	128 res = sendmsg(c->sock, &message, MSG_FASTOPEN);
1084 2265d7ebfdeb separate client/server fastopen options Matt Johnston <matt@ucc.asn.au> parents: 1078 diff changeset	129 /* Returns EINPROGRESS if FASTOPEN wasn't available */
2265d7ebfdeb separate client/server fastopen options Matt Johnston <matt@ucc.asn.au> parents: 1078 diff changeset	130 if (res < 0) {
2265d7ebfdeb separate client/server fastopen options Matt Johnston <matt@ucc.asn.au> parents: 1078 diff changeset	131 if (errno != EINPROGRESS) {
2265d7ebfdeb separate client/server fastopen options Matt Johnston <matt@ucc.asn.au> parents: 1078 diff changeset	132 m_free(c->errstring);
2265d7ebfdeb separate client/server fastopen options Matt Johnston <matt@ucc.asn.au> parents: 1078 diff changeset	133 c->errstring = m_strdup(strerror(errno));
2265d7ebfdeb separate client/server fastopen options Matt Johnston <matt@ucc.asn.au> parents: 1078 diff changeset	134 /* Not entirely sure which kind of errors are normal - 2.6.32 seems to
2265d7ebfdeb separate client/server fastopen options Matt Johnston <matt@ucc.asn.au> parents: 1078 diff changeset	135 return EPIPE for any (nonblocking?) sendmsg(). just fall back */
2265d7ebfdeb separate client/server fastopen options Matt Johnston <matt@ucc.asn.au> parents: 1078 diff changeset	136 TRACE(("sendmsg tcp_fastopen failed, falling back. %s", strerror(errno)));
2265d7ebfdeb separate client/server fastopen options Matt Johnston <matt@ucc.asn.au> parents: 1078 diff changeset	137 /* No kernel MSG_FASTOPEN support. Fall back below */
2265d7ebfdeb separate client/server fastopen options Matt Johnston <matt@ucc.asn.au> parents: 1078 diff changeset	138 fastopen = 0;
2265d7ebfdeb separate client/server fastopen options Matt Johnston <matt@ucc.asn.au> parents: 1078 diff changeset	139 /* Set to NULL to avoid trying again */
2265d7ebfdeb separate client/server fastopen options Matt Johnston <matt@ucc.asn.au> parents: 1078 diff changeset	140 c->writequeue = NULL;
2265d7ebfdeb separate client/server fastopen options Matt Johnston <matt@ucc.asn.au> parents: 1078 diff changeset	141 }
2265d7ebfdeb separate client/server fastopen options Matt Johnston <matt@ucc.asn.au> parents: 1078 diff changeset	142 } else {
2265d7ebfdeb separate client/server fastopen options Matt Johnston <matt@ucc.asn.au> parents: 1078 diff changeset	143 packet_queue_consume(c->writequeue, res);
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	144 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	145 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	146 #endif
1033 ca71904cf3ee Fixes for backwards compatibility Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	147
ca71904cf3ee Fixes for backwards compatibility Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	148 /* Normal connect(), used as fallback for TCP fastopen too */
ca71904cf3ee Fixes for backwards compatibility Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	149 if (!fastopen) {
ca71904cf3ee Fixes for backwards compatibility Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	150 res = connect(c->sock, r->ai_addr, r->ai_addrlen);
ca71904cf3ee Fixes for backwards compatibility Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	151 }
ca71904cf3ee Fixes for backwards compatibility Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	152
ca71904cf3ee Fixes for backwards compatibility Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	153 if (res < 0 && errno != EINPROGRESS) {
1035 8ed1d37e75a6 get rid of some unnecessary code Matt Johnston <matt@ucc.asn.au> parents: 1034 diff changeset	154 /* failure */
1065 23103e1e9548 Fix error handling for dbclient async connect Matt Johnston <matt@ucc.asn.au> parents: 1053 diff changeset	155 m_free(c->errstring);
23103e1e9548 Fix error handling for dbclient async connect Matt Johnston <matt@ucc.asn.au> parents: 1053 diff changeset	156 c->errstring = m_strdup(strerror(errno));
1033 ca71904cf3ee Fixes for backwards compatibility Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	157 close(c->sock);
ca71904cf3ee Fixes for backwards compatibility Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	158 c->sock = -1;
ca71904cf3ee Fixes for backwards compatibility Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	159 continue;
ca71904cf3ee Fixes for backwards compatibility Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	160 } else {
1035 8ed1d37e75a6 get rid of some unnecessary code Matt Johnston <matt@ucc.asn.au> parents: 1034 diff changeset	161 /* new connection was successful, wait for it to complete */
1033 ca71904cf3ee Fixes for backwards compatibility Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	162 break;
ca71904cf3ee Fixes for backwards compatibility Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	163 }
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	164 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	165
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	166 if (r) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	167 c->res_iter = r->ai_next;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	168 } else {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	169 c->res_iter = NULL;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	170 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	171 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	172
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	173 /* Connect via TCP to a host. */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	174 struct dropbear_progress_connection connect_remote(const char remotehost, const char* remoteport,
1466 f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	175 connect_callback cb, void* cb_data,
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	176 const char* bind_address, const char* bind_port)
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	177 {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	178 struct dropbear_progress_connection *c = NULL;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	179 int err;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	180 struct addrinfo hints;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	181
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	182 c = m_malloc(sizeof(*c));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	183 c->remotehost = m_strdup(remotehost);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	184 c->remoteport = m_strdup(remoteport);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	185 c->sock = -1;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	186 c->cb = cb;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	187 c->cb_data = cb_data;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	188
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	189 list_append(&ses.conn_pending, c);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	190
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	191 memset(&hints, 0, sizeof(hints));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	192 hints.ai_socktype = SOCK_STREAM;
1078 b3b772646974 Should be AF_UNSPEC not PF_UNSPEC Matt Johnston <matt@ucc.asn.au> parents: 1076 diff changeset	193 hints.ai_family = AF_UNSPEC;
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	194
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	195 err = getaddrinfo(remotehost, remoteport, &hints, &c->res);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	196 if (err) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	197 int len;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	198 len = 100 + strlen(gai_strerror(err));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	199 c->errstring = (char*)m_malloc(len);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	200 snprintf(c->errstring, len, "Error resolving '%s' port '%s'. %s",
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	201 remotehost, remoteport, gai_strerror(err));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	202 TRACE(("Error resolving: %s", gai_strerror(err)))
1053 fd3712d1ff7f Better failure handling Matt Johnston <matt@ucc.asn.au> parents: 1050 diff changeset	203 } else {
fd3712d1ff7f Better failure handling Matt Johnston <matt@ucc.asn.au> parents: 1050 diff changeset	204 c->res_iter = c->res;
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	205 }
1465 f7a53832501d cli_bind_address_connect houseofkodai <karthik@houseofkodai.in> parents: 1464 diff changeset	206
1466 f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	207 if (bind_address) {
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	208 c->bind_address = m_strdup(bind_address);
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	209 }
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	210 if (bind_port) {
f787f60f8e45 bind to port as well with -b Matt Johnston <matt@ucc.asn.au> parents: 1465 diff changeset	211 c->bind_port = m_strdup(bind_port);
1465 f7a53832501d cli_bind_address_connect houseofkodai <karthik@houseofkodai.in> parents: 1464 diff changeset	212 }
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	213
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	214 return c;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	215 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	216
1050 c2a50c9f509e Add cleanup Matt Johnston <matt@ucc.asn.au> parents: 1048 diff changeset	217 void remove_connect_pending() {
c2a50c9f509e Add cleanup Matt Johnston <matt@ucc.asn.au> parents: 1048 diff changeset	218 while (ses.conn_pending.first) {
c2a50c9f509e Add cleanup Matt Johnston <matt@ucc.asn.au> parents: 1048 diff changeset	219 struct dropbear_progress_connection *c = ses.conn_pending.first->item;
c2a50c9f509e Add cleanup Matt Johnston <matt@ucc.asn.au> parents: 1048 diff changeset	220 remove_connect(c, ses.conn_pending.first);
c2a50c9f509e Add cleanup Matt Johnston <matt@ucc.asn.au> parents: 1048 diff changeset	221 }
c2a50c9f509e Add cleanup Matt Johnston <matt@ucc.asn.au> parents: 1048 diff changeset	222 }
c2a50c9f509e Add cleanup Matt Johnston <matt@ucc.asn.au> parents: 1048 diff changeset	223
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	224
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	225 void set_connect_fds(fd_set *writefd) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	226 m_list_elem *iter;
1152 57d09741d46d avoid invalidated iterator when connection fails Matt Johnston <matt@ucc.asn.au> parents: 1136 diff changeset	227 TRACE(("enter set_connect_fds"))
57d09741d46d avoid invalidated iterator when connection fails Matt Johnston <matt@ucc.asn.au> parents: 1136 diff changeset	228 iter = ses.conn_pending.first;
57d09741d46d avoid invalidated iterator when connection fails Matt Johnston <matt@ucc.asn.au> parents: 1136 diff changeset	229 while (iter) {
57d09741d46d avoid invalidated iterator when connection fails Matt Johnston <matt@ucc.asn.au> parents: 1136 diff changeset	230 m_list_elem *next_iter = iter->next;
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	231 struct dropbear_progress_connection *c = iter->item;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	232 /* Set one going */
1152 57d09741d46d avoid invalidated iterator when connection fails Matt Johnston <matt@ucc.asn.au> parents: 1136 diff changeset	233 while (c->res_iter && c->sock < 0) {
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	234 connect_try_next(c);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	235 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	236 if (c->sock >= 0) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	237 FD_SET(c->sock, writefd);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	238 } else {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	239 /* Final failure */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	240 if (!c->errstring) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	241 c->errstring = m_strdup("unexpected failure");
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	242 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	243 c->cb(DROPBEAR_FAILURE, -1, c->cb_data, c->errstring);
1152 57d09741d46d avoid invalidated iterator when connection fails Matt Johnston <matt@ucc.asn.au> parents: 1136 diff changeset	244 remove_connect(c, iter);
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	245 }
1152 57d09741d46d avoid invalidated iterator when connection fails Matt Johnston <matt@ucc.asn.au> parents: 1136 diff changeset	246 iter = next_iter;
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	247 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	248 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	249
1459 06d52bcb8094 Pointer parameter could be declared as pointing to const Francois Perrad <francois.perrad@gadz.org> parents: 1426 diff changeset	250 void handle_connect_fds(const fd_set *writefd) {
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	251 m_list_elem *iter;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	252 TRACE(("enter handle_connect_fds"))
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	253 for (iter = ses.conn_pending.first; iter; iter = iter->next) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	254 int val;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	255 socklen_t vallen = sizeof(val);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	256 struct dropbear_progress_connection *c = iter->item;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	257
1053 fd3712d1ff7f Better failure handling Matt Johnston <matt@ucc.asn.au> parents: 1050 diff changeset	258 if (c->sock < 0 \|\| !FD_ISSET(c->sock, writefd)) {
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	259 continue;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	260 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	261
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	262 TRACE(("handling %s port %s socket %d", c->remotehost, c->remoteport, c->sock));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	263
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	264 if (getsockopt(c->sock, SOL_SOCKET, SO_ERROR, &val, &vallen) != 0) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	265 TRACE(("handle_connect_fds getsockopt(%d) SO_ERROR failed: %s", c->sock, strerror(errno)))
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	266 /* This isn't expected to happen - Unix has surprises though, continue gracefully. */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	267 m_close(c->sock);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	268 c->sock = -1;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	269 } else if (val != 0) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	270 /* Connect failed */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	271 TRACE(("connect to %s port %s failed.", c->remotehost, c->remoteport))
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	272 m_close(c->sock);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	273 c->sock = -1;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	274
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	275 m_free(c->errstring);
1066 cce03ea8e6eb strdup strerror Matt Johnston <matt@ucc.asn.au> parents: 1065 diff changeset	276 c->errstring = m_strdup(strerror(val));
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	277 } else {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	278 /* New connection has been established */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	279 c->cb(DROPBEAR_SUCCESS, c->sock, c->cb_data, NULL);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	280 remove_connect(c, iter);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	281 TRACE(("leave handle_connect_fds - success"))
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	282 /* Must return here - remove_connect() invalidates iter */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	283 return;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	284 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	285 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	286 TRACE(("leave handle_connect_fds - end iter"))
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	287 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	288
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	289 void connect_set_writequeue(struct dropbear_progress_connection c, struct Queue writequeue) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	290 c->writequeue = writequeue;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	291 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	292
1459 06d52bcb8094 Pointer parameter could be declared as pointing to const Francois Perrad <francois.perrad@gadz.org> parents: 1426 diff changeset	293 void packet_queue_to_iovec(const struct Queue queue, struct iovec iov, unsigned int *iov_count) {
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	294 struct Link *l;
1034 107b013e9d9d avoid some warnings Matt Johnston <matt@ucc.asn.au> parents: 1033 diff changeset	295 unsigned int i;
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	296 int len;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	297 buffer *writebuf;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	298
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	299 #ifndef IOV_MAX
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	300 #define IOV_MAX UIO_MAXIOV
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	301 #endif
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	302
1072 686cd3e8e13e avoid malloc for iovec Matt Johnston <matt@ucc.asn.au> parents: 1067 diff changeset	303 iov_count = MIN(MIN(queue->count, IOV_MAX), iov_count);
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	304
1073 88043f9d40bd Fix when iov queue is large Matt Johnston <matt@ucc.asn.au> parents: 1072 diff changeset	305 for (l = queue->head, i = 0; i < *iov_count; l = l->link, i++)
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	306 {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	307 writebuf = (buffer*)l->item;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	308 len = writebuf->len - 1 - writebuf->pos;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	309 dropbear_assert(len > 0);
1034 107b013e9d9d avoid some warnings Matt Johnston <matt@ucc.asn.au> parents: 1033 diff changeset	310 TRACE2(("write_packet writev #%d type %d len %d/%d", i, writebuf->data[writebuf->len-1],
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	311 len, writebuf->len-1))
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	312 iov[i].iov_base = buf_getptr(writebuf, len);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	313 iov[i].iov_len = len;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	314 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	315 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	316
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	317 void packet_queue_consume(struct Queue *queue, ssize_t written) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	318 buffer *writebuf;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	319 int len;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	320 while (written > 0) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	321 writebuf = (buffer*)examine(queue);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	322 len = writebuf->len - 1 - writebuf->pos;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	323 if (len > written) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	324 /* partial buffer write */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	325 buf_incrpos(writebuf, written);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	326 written = 0;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	327 } else {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	328 written -= len;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	329 dequeue(queue);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	330 buf_free(writebuf);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	331 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	332 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	333 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	334
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	335 void set_sock_nodelay(int sock) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	336 int val;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	337
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	338 /* disable nagle */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	339 val = 1;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	340 setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (void*)&val, sizeof(val));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	341 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	342
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1152 diff changeset	343 #if DROPBEAR_SERVER_TCP_FAST_OPEN
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	344 void set_listen_fast_open(int sock) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	345 int qlen = MAX(MAX_UNAUTH_PER_IP, 5);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	346 if (setsockopt(sock, SOL_TCP, TCP_FASTOPEN, &qlen, sizeof(qlen)) != 0) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	347 TRACE(("set_listen_fast_open failed for socket %d: %s", sock, strerror(errno)))
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	348 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	349 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	350
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	351 #endif
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	352
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	353 void set_sock_priority(int sock, enum dropbear_prio prio) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	354
1034 107b013e9d9d avoid some warnings Matt Johnston <matt@ucc.asn.au> parents: 1033 diff changeset	355 int rc;
107b013e9d9d avoid some warnings Matt Johnston <matt@ucc.asn.au> parents: 1033 diff changeset	356 #ifdef IPTOS_LOWDELAY
107b013e9d9d avoid some warnings Matt Johnston <matt@ucc.asn.au> parents: 1033 diff changeset	357 int iptos_val = 0;
107b013e9d9d avoid some warnings Matt Johnston <matt@ucc.asn.au> parents: 1033 diff changeset	358 #endif
1426 89f8c5960527 test for linux/pkt-sched.h rather than SO_PRIORITY Matt Johnston <matt@ucc.asn.au> parents: 1316 diff changeset	359 #ifdef HAVE_LINUX_PKT_SCHED_H
1034 107b013e9d9d avoid some warnings Matt Johnston <matt@ucc.asn.au> parents: 1033 diff changeset	360 int so_prio_val = 0;
107b013e9d9d avoid some warnings Matt Johnston <matt@ucc.asn.au> parents: 1033 diff changeset	361 #endif
107b013e9d9d avoid some warnings Matt Johnston <matt@ucc.asn.au> parents: 1033 diff changeset	362
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	363
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	364 /* Don't log ENOTSOCK errors so that this can harmlessly be called
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	365 * on a client '-J' proxy pipe */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	366
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	367 /* set the TOS bit for either ipv4 or ipv6 */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	368 #ifdef IPTOS_LOWDELAY
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	369 if (prio == DROPBEAR_PRIO_LOWDELAY) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	370 iptos_val = IPTOS_LOWDELAY;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	371 } else if (prio == DROPBEAR_PRIO_BULK) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	372 iptos_val = IPTOS_THROUGHPUT;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	373 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	374 #if defined(IPPROTO_IPV6) && defined(IPV6_TCLASS)
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	375 rc = setsockopt(sock, IPPROTO_IPV6, IPV6_TCLASS, (void*)&iptos_val, sizeof(iptos_val));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	376 if (rc < 0 && errno != ENOTSOCK) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	377 TRACE(("Couldn't set IPV6_TCLASS (%s)", strerror(errno)));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	378 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	379 #endif
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	380 rc = setsockopt(sock, IPPROTO_IP, IP_TOS, (void*)&iptos_val, sizeof(iptos_val));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	381 if (rc < 0 && errno != ENOTSOCK) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	382 TRACE(("Couldn't set IP_TOS (%s)", strerror(errno)));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	383 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	384 #endif
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	385
1426 89f8c5960527 test for linux/pkt-sched.h rather than SO_PRIORITY Matt Johnston <matt@ucc.asn.au> parents: 1316 diff changeset	386 #ifdef HAVE_LINUX_PKT_SCHED_H
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	387 if (prio == DROPBEAR_PRIO_LOWDELAY) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	388 so_prio_val = TC_PRIO_INTERACTIVE;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	389 } else if (prio == DROPBEAR_PRIO_BULK) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	390 so_prio_val = TC_PRIO_BULK;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	391 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	392 /* linux specific, sets QoS class. see tc-prio(8) */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	393 rc = setsockopt(sock, SOL_SOCKET, SO_PRIORITY, (void*) &so_prio_val, sizeof(so_prio_val));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	394 if (rc < 0 && errno != ENOTSOCK)
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	395 dropbear_log(LOG_WARNING, "Couldn't set SO_PRIORITY (%s)",
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	396 strerror(errno));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	397 #endif
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	398
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	399 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	400
1464 ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	401 /* from openssh/canohost.c avoid premature-optimization */
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	402 int get_sock_port(int sock) {
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	403 struct sockaddr_storage from;
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	404 socklen_t fromlen;
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	405 char strport[NI_MAXSERV];
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	406 int r;
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	407
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	408 /* Get IP address of client. */
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	409 fromlen = sizeof(from);
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	410 memset(&from, 0, sizeof(from));
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	411 if (getsockname(sock, (struct sockaddr *)&from, &fromlen) < 0) {
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	412 TRACE(("getsockname failed: %d", errno))
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	413 return 0;
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	414 }
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	415
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	416 /* Work around Linux IPv6 weirdness */
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	417 if (from.ss_family == AF_INET6)
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	418 fromlen = sizeof(struct sockaddr_in6);
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	419
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	420 /* Non-inet sockets don't have a port number. */
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	421 if (from.ss_family != AF_INET && from.ss_family != AF_INET6)
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	422 return 0;
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	423
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	424 /* Return port number. */
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	425 if ((r = getnameinfo((struct sockaddr *)&from, fromlen, NULL, 0,
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	426 strport, sizeof(strport), NI_NUMERICSERV)) != 0) {
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	427 TRACE(("netio.c/get_sock_port/getnameinfo NI_NUMERICSERV failed: %d", r))
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	428 }
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	429 return atoi(strport);
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	430 }
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	431
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	432 /* Listen on address:port.
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	433 * Special cases are address of "" listening on everything,
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	434 * and address of NULL listening on localhost only.
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	435 * Returns the number of sockets bound on success, or -1 on failure. On
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	436 * failure, if errstring wasn't NULL, it'll be a newly malloced error
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	437 * string.*/
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	438 int dropbear_listen(const char* address, const char* port,
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	439 int socks, unsigned int sockcount, char errstring, int maxfd) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	440
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	441 struct addrinfo hints, res = NULL, res0 = NULL;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	442 int err;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	443 unsigned int nsock;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	444 struct linger linger;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	445 int val;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	446 int sock;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	447
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	448 TRACE(("enter dropbear_listen"))
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	449
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	450 memset(&hints, 0, sizeof(hints));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	451 hints.ai_family = AF_UNSPEC; /* TODO: let them flag v4 only etc */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	452 hints.ai_socktype = SOCK_STREAM;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	453
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	454 /* for calling getaddrinfo:
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	455 address == NULL and !AI_PASSIVE: local loopback
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	456 address == NULL and AI_PASSIVE: all interfaces
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	457 address != NULL: whatever the address says */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	458 if (!address) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	459 TRACE(("dropbear_listen: local loopback"))
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	460 } else {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	461 if (address[0] == '\0') {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	462 TRACE(("dropbear_listen: all interfaces"))
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	463 address = NULL;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	464 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	465 hints.ai_flags = AI_PASSIVE;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	466 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	467 err = getaddrinfo(address, port, &hints, &res0);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	468
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	469 if (err) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	470 if (errstring != NULL && *errstring == NULL) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	471 int len;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	472 len = 20 + strlen(gai_strerror(err));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	473 errstring = (char)m_malloc(len);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	474 snprintf(*errstring, len, "Error resolving: %s", gai_strerror(err));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	475 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	476 if (res0) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	477 freeaddrinfo(res0);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	478 res0 = NULL;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	479 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	480 TRACE(("leave dropbear_listen: failed resolving"))
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	481 return -1;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	482 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	483
1464 ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	484 /*
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	485 * when listening on server-assigned-port 0
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	486 * the assigned ports may differ for address families (v4/v6)
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	487 * causing problems for tcpip-forward
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	488 * caller can do a get_socket_address to discover assigned-port
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	489 * hence, use same port for all address families
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	490 */
1503 78d8c3ffdfe1 use NULL instead of 0 Francois Perrad <francois.perrad@gadz.org> parents: 1499 diff changeset	491 u_int16_t *allocated_lport_p = NULL;
1464 ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	492 int allocated_lport = 0;
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	493
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	494 nsock = 0;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	495 for (res = res0; res != NULL && nsock < sockcount;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	496 res = res->ai_next) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	497
1464 ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	498 if (allocated_lport > 0) {
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	499 if (AF_INET == res->ai_family) {
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	500 allocated_lport_p = &((struct sockaddr_in *)res->ai_addr)->sin_port;
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	501 } else if (AF_INET6 == res->ai_family) {
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	502 allocated_lport_p = &((struct sockaddr_in6 *)res->ai_addr)->sin6_port;
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	503 }
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	504 *allocated_lport_p = htons(allocated_lport);
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	505 }
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	506
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	507 /* Get a socket */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	508 socks[nsock] = socket(res->ai_family, res->ai_socktype,
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	509 res->ai_protocol);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	510
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	511 sock = socks[nsock]; /* For clarity */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	512
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	513 if (sock < 0) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	514 err = errno;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	515 TRACE(("socket() failed"))
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	516 continue;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	517 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	518
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	519 /* Various useful socket options */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	520 val = 1;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	521 /* set to reuse, quick timeout */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	522 setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void*) &val, sizeof(val));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	523 linger.l_onoff = 1;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	524 linger.l_linger = 5;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	525 setsockopt(sock, SOL_SOCKET, SO_LINGER, (void*)&linger, sizeof(linger));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	526
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	527 #if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY)
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	528 if (res->ai_family == AF_INET6) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	529 int on = 1;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	530 if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	531 &on, sizeof(on)) == -1) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	532 dropbear_log(LOG_WARNING, "Couldn't set IPV6_V6ONLY");
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	533 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	534 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	535 #endif
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	536
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	537 set_sock_nodelay(sock);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	538
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	539 if (bind(sock, res->ai_addr, res->ai_addrlen) < 0) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	540 err = errno;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	541 close(sock);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	542 TRACE(("bind(%s) failed", port))
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	543 continue;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	544 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	545
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	546 if (listen(sock, DROPBEAR_LISTEN_BACKLOG) < 0) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	547 err = errno;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	548 close(sock);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	549 TRACE(("listen() failed"))
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	550 continue;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	551 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	552
1464 ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	553 if (0 == allocated_lport) {
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	554 allocated_lport = get_sock_port(sock);
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	555 }
ad637c9e0f6f Server chosen tcpfwd ports (#43) houseofkodai <karthik@houseofkodai.in> parents: 1459 diff changeset	556
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	557 maxfd = MAX(maxfd, sock);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	558
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	559 nsock++;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	560 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	561
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	562 if (res0) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	563 freeaddrinfo(res0);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	564 res0 = NULL;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	565 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	566
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	567 if (nsock == 0) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	568 if (errstring != NULL && *errstring == NULL) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	569 int len;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	570 len = 20 + strlen(strerror(err));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	571 errstring = (char)m_malloc(len);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	572 snprintf(*errstring, len, "Error listening: %s", strerror(err));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	573 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	574 TRACE(("leave dropbear_listen: failure, %s", strerror(err)))
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	575 return -1;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	576 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	577
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	578 TRACE(("leave dropbear_listen: success, %d socks bound", nsock))
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	579 return nsock;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	580 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	581
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	582 void get_socket_address(int fd, char local_host, char local_port,
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	583 char remote_host, char remote_port, int host_lookup)
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	584 {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	585 struct sockaddr_storage addr;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	586 socklen_t addrlen;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	587
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	588 if (local_host \|\| local_port) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	589 addrlen = sizeof(addr);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	590 if (getsockname(fd, (struct sockaddr*)&addr, &addrlen) < 0) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	591 dropbear_exit("Failed socket address: %s", strerror(errno));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	592 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	593 getaddrstring(&addr, local_host, local_port, host_lookup);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	594 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	595 if (remote_host \|\| remote_port) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	596 addrlen = sizeof(addr);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	597 if (getpeername(fd, (struct sockaddr*)&addr, &addrlen) < 0) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	598 dropbear_exit("Failed socket address: %s", strerror(errno));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	599 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	600 getaddrstring(&addr, remote_host, remote_port, host_lookup);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	601 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	602 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	603
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	604 /* Return a string representation of the socket address passed. The return
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	605 * value is allocated with malloc() */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	606 void getaddrstring(struct sockaddr_storage* addr,
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	607 char ret_host, char ret_port,
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	608 int host_lookup) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	609
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	610 char host[NI_MAXHOST+1], serv[NI_MAXSERV+1];
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	611 unsigned int len;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	612 int ret;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	613
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	614 int flags = NI_NUMERICSERV \| NI_NUMERICHOST;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	615
1499 2d450c1056e3 options: Complete the transition to numeric toggles (`#if') Michael Witten <mfwitten@gmail.com> parents: 1466 diff changeset	616 #if !DO_HOST_LOOKUP
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	617 host_lookup = 0;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	618 #endif
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	619
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	620 if (host_lookup) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	621 flags = NI_NUMERICSERV;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	622 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	623
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	624 len = sizeof(struct sockaddr_storage);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	625 /* Some platforms such as Solaris 8 require that len is the length
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	626 * of the specific structure. Some older linux systems (glibc 2.1.3
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	627 * such as debian potato) have sockaddr_storage.__ss_family instead
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	628 * but we'll ignore them */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	629 #ifdef HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	630 if (addr->ss_family == AF_INET) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	631 len = sizeof(struct sockaddr_in);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	632 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	633 #ifdef AF_INET6
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	634 if (addr->ss_family == AF_INET6) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	635 len = sizeof(struct sockaddr_in6);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	636 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	637 #endif
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	638 #endif
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	639
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	640 ret = getnameinfo((struct sockaddr*)addr, len, host, sizeof(host)-1,
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	641 serv, sizeof(serv)-1, flags);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	642
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	643 if (ret != 0) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	644 if (host_lookup) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	645 /* On some systems (Darwin does it) we get EINTR from getnameinfo
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	646 * somehow. Eew. So we'll just return the IP, since that doesn't seem
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	647 * to exhibit that behaviour. */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	648 getaddrstring(addr, ret_host, ret_port, 0);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	649 return;
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	650 } else {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	651 /* if we can't do a numeric lookup, something's gone terribly wrong */
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	652 dropbear_exit("Failed lookup: %s", gai_strerror(ret));
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	653 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	654 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	655
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	656 if (ret_host) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	657 *ret_host = m_strdup(host);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	658 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	659 if (ret_port) {
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	660 *ret_port = m_strdup(serv);
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	661 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	662 }
0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	663

Mercurial > dropbear

annotate netio.c @ 1620:572a7aefa188 bugfix