th-libs: th_network.c annotate

annotate th_network.c @ 131:6624893ad528

Improve error handling.

author	Matti Hamalainen <ccr@tnsp.org>
date	Mon, 23 Jun 2014 16:59:36 +0300
parents	32dcabfc2644
children	11fa2bf90251

rev	line source
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 * Simple TCP network connection handling
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3 * Programmed and designed by Matti 'ccr' Hamalainen
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	4 * (C) Copyright 2013-2014 Tecnic Software productions (TNSP)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5 *
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 * Please read file 'COPYING' for information on license and distribution.
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7 */
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8 #include "th_network.h"
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9 #include "th_string.h"
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10 #include <errno.h>
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	11
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	12
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	13 static BOOL th_network_inited = FALSE;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14 static qlist_t *th_conn_list = NULL;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	15
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	16
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	17 enum
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	18 {
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	19 SOCKS5_AUTH_NONE = 0,
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	20 SOCKS5_AUTH_USER = 2,
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	21 };
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	22
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	23
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	24 enum
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	25 {
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	26 SOCKS5_ADDR_IPV4 = 0x01,
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	27 SOCKS5_ADDR_DOMAIN = 0x03,
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	28 SOCKS5_ADDR_IPV6 = 0x04,
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	29 };
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	30
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	31 static const char *th_proxy_types[] =
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	32 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	33 "none",
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	34 "SOCKS 4",
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	35 "SOCKS 4a",
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	36 "SOCKS 5",
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	37 NULL
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	38 };
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	39
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	40
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	41 static const char *th_socks5_results_msgs[] =
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	42 {
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	43 "Succeeded",
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	44 "General SOCKS server failure",
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	45 "Connection not allowed by ruleset",
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	46 "Network unreachable",
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	47 "Host unreachable",
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	48 "Connection refused",
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	49 "TTL expired",
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	50 "Command not supported",
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	51 "Address type not supported",
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	52 };
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	53
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	54 static const int th_socks5_results_msgs_num = sizeof(th_socks5_results_msgs) / sizeof(th_socks5_results_msgs[0]);
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	55
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	56
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	57
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	58 static int th_get_socket_errno(void)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	59 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	60 return errno;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	61 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	62
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	63
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	64 void th_conn_err(th_conn_t conn, int err, const char fmt, ...)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	65 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	66 if (conn->errfunc != NULL)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	67 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	68 char *msg;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	69 va_list ap;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	70 va_start(ap, fmt);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	71 msg = th_strdup_vprintf(fmt, ap);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	72 va_end(ap);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	73
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	74 conn->errfunc(conn, err, msg);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	75 th_free(msg);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	76 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	77 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	78
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	79
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	80 void th_conn_msg(th_conn_t conn, int loglevel, const char fmt, ...)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	81 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	82 if (conn->msgfunc != NULL)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	83 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	84 char *msg;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	85 va_list ap;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	86 va_start(ap, fmt);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	87 msg = th_strdup_vprintf(fmt, ap);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	88 va_end(ap);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	89
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	90 conn->msgfunc(conn, loglevel, msg);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	91 th_free(msg);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	92 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	93 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	94
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	95
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	96 struct hostent th_resolve_host(th_conn_t conn, const char *name)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	97 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	98 struct hostent *res = gethostbyname(name);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	99
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	100 if (res == NULL)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	101 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	102 th_conn_err(conn, h_errno,
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	103 "Could not resolve hostname '%s': %s\n",
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	104 name, th_error_str(h_errno));
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	105 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	106 else
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	107 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	108 th_conn_msg(conn, THLOG_INFO, "True hostname for %s is %s\n",
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	109 name, res->h_name);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	110 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	111
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	112 return res;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	113 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	114
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	115
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	116 th_conn_t * th_conn_new(
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	117 void (errfunc)(th_conn_t conn, int err, const char *msg),
103 f7bec3f7181d Change connection creation API to specify incoming buffer size. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	118 void (msgfunc)(th_conn_t conn, int loglevel, const char *msg),
f7bec3f7181d Change connection creation API to specify incoming buffer size. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	119 ssize_t bufsize)
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	120 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	121 th_conn_t *conn = th_malloc0(sizeof(th_conn_t));
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	122
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	123 if (conn == NULL)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	124 return NULL;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	125
122 452adc41ccf5 Remember to free the connection data buffer. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	126 // Set function pointers
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	127 conn->errfunc = errfunc;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	128 conn->msgfunc = msgfunc;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	129
122 452adc41ccf5 Remember to free the connection data buffer. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	130 // Allocate connection data buffer
103 f7bec3f7181d Change connection creation API to specify incoming buffer size. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	131 conn->bufsize = (bufsize <= 0) ? TH_CONNBUF_SIZE : bufsize;
f7bec3f7181d Change connection creation API to specify incoming buffer size. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	132 if ((conn->buf = th_malloc(conn->bufsize)) == NULL)
f7bec3f7181d Change connection creation API to specify incoming buffer size. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	133 {
f7bec3f7181d Change connection creation API to specify incoming buffer size. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	134 th_free(conn);
f7bec3f7181d Change connection creation API to specify incoming buffer size. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	135 return NULL;
f7bec3f7181d Change connection creation API to specify incoming buffer size. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	136 }
f7bec3f7181d Change connection creation API to specify incoming buffer size. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	137
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	138 return conn;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	139 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	140
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	141
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	142 static BOOL th_get_addr(struct in_addr addr, struct hostent hst)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	143 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	144 if (hst != NULL)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	145 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	146 addr = (struct in_addr *) (hst->h_addr);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	147 return TRUE;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	148 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	149 else
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	150 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	151 addr->s_addr = 0;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	152 return FALSE;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	153 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	154 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	155
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	156
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	157 int th_conn_set_proxy(th_conn_t conn, int type, int port, const char host, int auth_type)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	158 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	159 if (conn == NULL)
104 ec5a5e573885 Return real error values. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	160 return THERR_NULLPTR;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	161
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	162 conn->proxy.type = type;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	163 conn->proxy.port = port;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	164 conn->proxy.auth_type = auth_type;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	165
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	166 th_free(conn->proxy.host);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	167 conn->proxy.host = th_strdup(host);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	168
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	169 if (host != NULL)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	170 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	171 conn->proxy.hst = th_resolve_host(conn, host);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	172 th_get_addr(&(conn->proxy.addr), conn->proxy.hst);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	173 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	174 else
104 ec5a5e573885 Return real error values. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	175 return THERR_INVALID_DATA;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	176
104 ec5a5e573885 Return real error values. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	177 return THERR_OK;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	178 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	179
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	180
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	181 int th_conn_set_proxy_mode(th_conn_t *conn, const int mode)
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	182 {
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	183 if (conn == NULL)
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	184 return THERR_NULLPTR;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	185
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	186 conn->proxy.mode = mode;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	187
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	188 return THERR_OK;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	189 }
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	190
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	191
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	192 int th_conn_set_proxy_addr_type(th_conn_t *conn, const int atype)
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	193 {
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	194 if (conn == NULL)
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	195 return THERR_NULLPTR;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	196
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	197 conn->proxy.addr_type = atype;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	198
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	199 return THERR_OK;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	200 }
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	201
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	202
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	203 int th_conn_set_proxy_auth_user(th_conn_t conn, const char userid, const char *passwd)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	204 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	205 if (conn == NULL)
104 ec5a5e573885 Return real error values. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	206 return THERR_NULLPTR;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	207
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	208 th_free(conn->proxy.userid);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	209 conn->proxy.userid = th_strdup(userid);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	210
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	211 th_free(conn->proxy.passwd);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	212 conn->proxy.passwd = th_strdup(passwd);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	213
104 ec5a5e573885 Return real error values. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	214 return THERR_OK;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	215 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	216
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	217
131 6624893ad528 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	218 static int th_conn_proxy_wait(th_conn_t *conn, const ssize_t want)
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	219 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	220 int status, tries;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	221
119 38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	222 for (status = TH_CONN_NO_DATA, tries = 1; tries <= 20 && status != TH_CONN_DATA_AVAIL; tries++)
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	223 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	224 #ifdef __WIN32
131 6624893ad528 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	225 Sleep(100);
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	226 #else
131 6624893ad528 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	227 usleep(100000);
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	228 #endif
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	229 th_conn_reset(conn);
119 38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	230 switch (status = th_conn_pull(conn))
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	231 {
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	232 case TH_CONN_ERROR:
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	233 th_conn_err(conn, status, "Proxy negotiation failed at try %d with network error: %s.\n",
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	234 tries, th_error_str(conn->err));
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	235 break;
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	236
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	237 case TH_CONN_DATA_AVAIL:
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	238 case TH_CONN_NO_DATA:
131 6624893ad528 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	239 if (conn->total_bytes < want)
6624893ad528 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	240 status = TH_CONN_NO_DATA;
119 38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	241 break;
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	242
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	243 default:
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	244 return status;
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	245 }
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	246 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	247
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	248 if (status != TH_CONN_DATA_AVAIL)
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	249 th_conn_err(conn, THERR_TIMED_OUT, "Proxy negotiation timed out.\n");
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	250
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	251 return status;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	252 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	253
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	254
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	255 static int th_conn_proxy_send(th_conn_t conn, th_growbuf_t buf)
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	256 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	257 th_conn_reset(conn);
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	258 return th_conn_send_growbuf(conn, buf);
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	259 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	260
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	261
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	262 static int th_conn_socks4_negotiate(th_conn_t conn, const int port, const char host)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	263 {
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	264 th_growbuf_t buf;
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	265 uint8_t *ptr;
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	266 int cmd, err = THERR_INIT_FAIL;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	267
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	268 (void) host;
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	269 th_growbuf_init(&buf, 128);
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	270 th_conn_msg(conn, THLOG_INFO, "Initializing SOCKS 4/a proxy negotiation.\n");
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	271
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	272 switch (conn->proxy.mode)
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	273 {
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	274 case TH_PROXY_CMD_CONNECT: cmd = 1; break;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	275 case TH_PROXY_CMD_BIND: cmd = 2; break;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	276 default:
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	277 err = THERR_NOT_SUPPORTED;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	278 th_conn_err(conn, err, "Invalid SOCKS 4 command/mode, unsupported.\n");
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	279 goto out;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	280 }
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	281
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	282 // Create SOCKS 4 handshake
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	283 th_growbuf_put_u8(&buf, 4); // Protocol version
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	284 th_growbuf_put_u8(&buf, cmd); // Command
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	285 th_growbuf_put_u16_be(&buf, port);
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	286
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	287 switch (conn->proxy.addr_type)
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	288 {
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	289 case TH_PROXY_ADDR_IPV4:
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	290 th_growbuf_put_str(&buf, (uint8_t *) &(conn->addr.s_addr), sizeof(conn->addr.s_addr));
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	291 break;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	292
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	293 case TH_PROXY_ADDR_DOMAIN:
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	294 if (conn->proxy.type == TH_PROXY_SOCKS4A)
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	295 th_growbuf_put_u32_be(&buf, 0x00000032);
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	296 else
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	297 {
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	298 err = THERR_INIT_FAIL;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	299 th_conn_err(conn, err,
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	300 "Invalid proxy settings, SOCKS 4 in use, but domain address type requested. SOCKS 4a or 5 required for host atype.\n");
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	301 goto out;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	302 }
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	303 break;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	304
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	305 default:
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	306 err = THERR_INIT_FAIL;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	307 th_conn_err(conn, err,
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	308 "Invalid proxy settings for SOCKS 4, unsupported address type requrested.\n");
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	309 goto out;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	310 }
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	311
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	312 th_growbuf_puts(&buf, conn->proxy.userid, TRUE);
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	313 if (conn->proxy.addr_type == TH_PROXY_ADDR_DOMAIN)
123 c8584cf52c98 Various bugfixes in proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 122 diff changeset	314 th_growbuf_puts(&buf, host, TRUE);
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	315
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	316 // Send request
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	317 if ((err = th_conn_proxy_send(conn, &buf)) != THERR_OK)
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	318 goto out;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	319
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	320 // Wait for SOCKS server to reply
131 6624893ad528 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	321 if (th_conn_proxy_wait(conn, 2) != TH_CONN_DATA_AVAIL)
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	322 goto out;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	323
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	324 ptr = (uint8_t*) conn->buf;
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	325 if (*ptr != 0)
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	326 {
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	327 err = THERR_INIT_FAIL;
ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	328 th_conn_err(conn, err,
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	329 "Invalid SOCKS 4 server reply, does not begin with NUL byte (%d).\n",
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	330 *ptr);
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	331 goto out;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	332 }
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	333
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	334 ptr++;
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	335 if (*ptr != 0x5a)
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	336 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	337 const char *s = NULL;
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	338 switch (*ptr)
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	339 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	340 case 0x5b: s = "Request rejected or failed"; break;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	341 case 0x5c: s = "Request failed because client is not running identd (or not reachable from the server)"; break;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	342 case 0x5d: s = "Request failed because client's identd could not confirm the user ID string in the request"; break;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	343 default: s = "Unknown SOCKS 4 error response"; break;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	344 }
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	345
ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	346 err = THERR_INIT_FAIL;
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	347 th_conn_err(conn, err, "SOCKS 4 setup failed, 0x%02x: %s.\n", *ptr, s);
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	348 goto out;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	349 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	350
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	351 err = THERR_OK;
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	352
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	353 out:
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	354 th_growbuf_free(&buf);
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	355 return err;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	356 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	357
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	358
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	359 static int th_conn_socks5_negotiate(th_conn_t conn, const int port, const char host)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	360 {
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	361 th_growbuf_t buf;
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	362 uint8_t *ptr;
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	363 int cmd, avail, auth, err = THERR_INIT_FAIL;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	364
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	365 th_growbuf_init(&buf, 256);
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	366 th_conn_msg(conn, THLOG_INFO, "Initializing SOCKS 5 proxy negotiation.\n");
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	367
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	368 switch (conn->proxy.mode)
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	369 {
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	370 case TH_PROXY_CMD_CONNECT: cmd = 1; break;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	371 case TH_PROXY_CMD_BIND: cmd = 2; break;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	372 case TH_PROXY_CMD_ASSOC_UDP: cmd = 3; break;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	373 default:
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	374 err = THERR_NOT_SUPPORTED;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	375 th_conn_err(conn, err, "Invalid SOCKS 5 command/mode, unsupported.\n");
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	376 goto out;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	377 }
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	378
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	379 switch (conn->proxy.auth_type)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	380 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	381 case TH_PROXY_AUTH_NONE:
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	382 avail = 1;
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	383 auth = SOCKS5_AUTH_NONE;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	384 break;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	385
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	386 case TH_PROXY_AUTH_USER:
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	387 avail = 2;
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	388 auth = SOCKS5_AUTH_USER;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	389 if (conn->proxy.userid == NULL \|\| conn->proxy.passwd == NULL)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	390 {
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	391 err = THERR_INVALID_DATA;
ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	392 th_conn_err(conn, err,
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	393 "SOCKS 5 user authentication chosen, but no user/pass set.\n");
112 5403f0d2d692 Use common exit codepath. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	394 goto out;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	395 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	396
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	397 if (strlen(conn->proxy.userid) > 255 \|\|
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	398 strlen(conn->proxy.passwd) > 255)
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	399 {
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	400 err = THERR_INVALID_DATA;
ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	401 th_conn_err(conn, err,
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	402 "SOCKS 5 proxy userid or password is too long.\n");
112 5403f0d2d692 Use common exit codepath. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	403 goto out;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	404 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	405 break;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	406
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	407 default:
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	408 err = THERR_NOT_SUPPORTED;
ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	409 th_conn_err(conn, err,
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	410 "Unsupported proxy authentication method %d.\n",
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	411 conn->proxy.auth_type);
112 5403f0d2d692 Use common exit codepath. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	412 goto out;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	413 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	414
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	415 // Form handshake packet
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	416 th_growbuf_clear(&buf);
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	417 th_growbuf_put_u8(&buf, 0x05); // Protocol version
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	418 th_growbuf_put_u8(&buf, avail); // # of available auth methods
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	419 th_growbuf_put_u8(&buf, auth);
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	420
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	421 // Send request
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	422 if ((err = th_conn_proxy_send(conn, &buf)) != THERR_OK)
112 5403f0d2d692 Use common exit codepath. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	423 goto out;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	424
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	425 // Wait for SOCKS server to reply
131 6624893ad528 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	426 if (th_conn_proxy_wait(conn, 2) != TH_CONN_DATA_AVAIL)
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	427 goto out;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	428
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	429 ptr = (uint8_t *) conn->buf;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	430 if (*ptr != 0x05)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	431 {
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	432 err = THERR_INVALID_DATA;
ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	433 th_conn_err(conn, err,
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	434 "Invalid SOCKS 5 server reply, does not begin with protocol version byte (%d).\n", *ptr);
112 5403f0d2d692 Use common exit codepath. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	435 goto out;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	436 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	437 ptr++;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	438 auth = *ptr;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	439
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	440 if (auth == 0xff)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	441 {
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	442 err = THERR_NOT_SUPPORTED;
ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	443 th_conn_err(conn, err,
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	444 "No authentication method could be negotiated with the server.\n");
112 5403f0d2d692 Use common exit codepath. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	445 goto out;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	446 }
114 b44a0308b53f Add missing else statement. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	447 else
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	448 if (auth == SOCKS5_AUTH_USER)
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	449 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	450 // Attempt user/pass authentication (RFC 1929)
130 32dcabfc2644 Add some informative messages to SOCKS 5 authentication steps. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	451 th_conn_msg(conn, THLOG_INFO, "Attempting SOCKS 5 user/pass authentication.\n");
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	452 th_growbuf_clear(&buf);
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	453
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	454 th_growbuf_put_u8(&buf, 0x01);
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	455 th_growbuf_put_u8(&buf, strlen(conn->proxy.userid));
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	456 th_growbuf_puts(&buf, conn->proxy.userid, FALSE);
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	457 th_growbuf_put_u8(&buf, strlen(conn->proxy.passwd));
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	458 th_growbuf_puts(&buf, conn->proxy.passwd, FALSE);
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	459
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	460 // Send request
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	461 if ((err = th_conn_proxy_send(conn, &buf)) != THERR_OK)
112 5403f0d2d692 Use common exit codepath. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	462 goto out;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	463
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	464 // Wait for SOCKS server to reply
131 6624893ad528 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	465 if (th_conn_proxy_wait(conn, 2) != TH_CONN_DATA_AVAIL)
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	466 goto out;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	467
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	468 ptr = (uint8_t *) conn->buf;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	469 if (*ptr != 0x01)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	470 {
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	471 err = THERR_INVALID_DATA;
ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	472 th_conn_err(conn, err,
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	473 "Invalid SOCKS 5 server reply, does not begin with protocol version byte (%d).\n", *ptr);
112 5403f0d2d692 Use common exit codepath. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	474 goto out;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	475 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	476 ptr++;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	477 if (*ptr != 0)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	478 {
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	479 err = THERR_AUTH_FAILED;
ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	480 th_conn_err(conn, err,
130 32dcabfc2644 Add some informative messages to SOCKS 5 authentication steps. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	481 "SOCKS 5 proxy user/pass authentication failed! Code 0x%02x.\n", *ptr);
112 5403f0d2d692 Use common exit codepath. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	482 goto out;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	483 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	484 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	485 else
130 32dcabfc2644 Add some informative messages to SOCKS 5 authentication steps. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	486 if (auth == SOCKS5_AUTH_NONE)
32dcabfc2644 Add some informative messages to SOCKS 5 authentication steps. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	487 {
32dcabfc2644 Add some informative messages to SOCKS 5 authentication steps. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	488 th_conn_msg(conn, THLOG_INFO, "Using no authentication for SOCKS 5.\n");
32dcabfc2644 Add some informative messages to SOCKS 5 authentication steps. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	489 }
32dcabfc2644 Add some informative messages to SOCKS 5 authentication steps. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	490 else
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	491 {
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	492 err = THERR_NOT_SUPPORTED;
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	493 th_conn_err(conn, err,
130 32dcabfc2644 Add some informative messages to SOCKS 5 authentication steps. Matti Hamalainen <ccr@tnsp.org> parents: 126 diff changeset	494 "Proxy server chose an unsupported SOCKS 5 authentication method 0x%02x.\n",
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	495 auth);
112 5403f0d2d692 Use common exit codepath. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	496 goto out;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	497 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	498
123 c8584cf52c98 Various bugfixes in proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 122 diff changeset	499
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	500 // Form client connection request packet
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	501 th_growbuf_clear(&buf);
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	502 th_growbuf_put_u8(&buf, 0x05); // Protocol version
123 c8584cf52c98 Various bugfixes in proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 122 diff changeset	503 th_growbuf_put_u8(&buf, cmd); // Command
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	504 th_growbuf_put_u8(&buf, 0x00); // Reserved
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	505
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	506 switch (conn->proxy.addr_type)
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	507 {
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	508 case TH_PROXY_ADDR_IPV4:
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	509 th_growbuf_put_u8(&buf, SOCKS5_ADDR_IPV4);
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	510 th_growbuf_put_str(&buf, (uint8_t *) &(conn->addr.s_addr), sizeof(conn->addr.s_addr));
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	511 break;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	512
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	513 case TH_PROXY_ADDR_IPV6:
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	514 th_growbuf_put_u8(&buf, SOCKS5_ADDR_IPV6);
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	515 //th_growbuf_put_str(&buf, (uint8_t *) &(conn->addr.s_addr), sizeof(conn->addr.s_addr));
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	516 break;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	517
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	518 case TH_PROXY_ADDR_DOMAIN:
123 c8584cf52c98 Various bugfixes in proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 122 diff changeset	519 cmd = strlen(host);
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	520 if (cmd < 1 \|\| cmd > 255)
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	521 {
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	522 err = THERR_NOT_SUPPORTED;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	523 th_conn_err(conn, err,
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	524 "Domain address type requested, but domain name longer than 255 characters (%d).\n", cmd);
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	525 goto out;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	526 }
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	527
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	528 th_growbuf_put_u8(&buf, SOCKS5_ADDR_DOMAIN);
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	529 th_growbuf_put_u8(&buf, cmd);
123 c8584cf52c98 Various bugfixes in proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 122 diff changeset	530 th_growbuf_put_str(&buf, host, cmd);
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	531 break;
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	532 }
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	533
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	534 th_growbuf_put_u16_be(&buf, port);
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	535
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	536 // Send request
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	537 if ((err = th_conn_proxy_send(conn, &buf)) != THERR_OK)
112 5403f0d2d692 Use common exit codepath. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	538 goto out;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	539
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	540 // Wait for SOCKS server to reply
131 6624893ad528 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	541 if (th_conn_proxy_wait(conn, 3) != TH_CONN_DATA_AVAIL)
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	542 goto out;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	543
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	544 ptr = (uint8_t *) conn->buf;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	545 if (*ptr != 0x05)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	546 {
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	547 err = THERR_INVALID_DATA;
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	548 th_conn_err(conn, err,
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	549 "Invalid SOCKS 5 server reply, does not begin with protocol version byte (%d).\n", *ptr);
112 5403f0d2d692 Use common exit codepath. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	550 goto out;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	551 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	552 ptr++;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	553 if (*ptr != 0)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	554 {
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	555 err = THERR_INIT_FAIL;
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	556 if (*ptr < th_socks5_results_msgs_num)
8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	557 th_conn_err(conn, err, "SOCKS 5 error: %s.\n", th_socks5_results_msgs[*ptr]);
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	558 else
121 8c39e8e90dbd More work on proxy handling. Matti Hamalainen <ccr@tnsp.org> parents: 119 diff changeset	559 th_conn_err(conn, err, "Unknown SOCKS 5 result code 0x02x.\n", *ptr);
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	560 goto out;
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	561 }
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	562 ptr++;
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	563 if (*ptr != 0)
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	564 {
131 6624893ad528 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	565 err = THERR_INVALID_DATA;
6624893ad528 Improve error handling. Matti Hamalainen <ccr@tnsp.org> parents: 130 diff changeset	566 th_conn_err(conn, err, "Invalid reply from SOCKS 5 server: expected 0x00, got 0x%02x.\n", *ptr);
112 5403f0d2d692 Use common exit codepath. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	567 goto out;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	568 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	569
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	570 err = THERR_OK;
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	571
112 5403f0d2d692 Use common exit codepath. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	572 out:
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	573 th_growbuf_free(&buf);
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	574 return err;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	575 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	576
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	577
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	578 int th_conn_open(th_conn_t conn, const int port, const char host)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	579 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	580 struct sockaddr_in dest;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	581 int err = THERR_INIT_FAIL;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	582
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	583 if (conn == NULL)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	584 return THERR_NULLPTR;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	585
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	586 conn->port = port;
126 8efebf863404 Fix host handling. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	587 conn->host = th_strdup(host);
8efebf863404 Fix host handling. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	588 conn->hst = th_resolve_host(conn, host);
8efebf863404 Fix host handling. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	589
8efebf863404 Fix host handling. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	590 // If name resolving locally fails, force to domain addr type
8efebf863404 Fix host handling. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	591 if (conn->hst == NULL)
8efebf863404 Fix host handling. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	592 conn->proxy.addr_type = TH_PROXY_ADDR_DOMAIN;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	593
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	594 th_get_addr(&(conn->addr), conn->hst);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	595
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	596 // Prepare for connection
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	597 dest.sin_family = AF_INET;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	598
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	599 if (conn->proxy.type > TH_PROXY_NONE && conn->proxy.type < TH_PROXY_LAST)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	600 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	601 // If using a proxy, we connect to the proxy server
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	602 dest.sin_port = htons(conn->proxy.port);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	603 dest.sin_addr = conn->proxy.addr;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	604
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	605 th_conn_msg(conn, THLOG_INFO, "Connecting to %s proxy %s:%d ...\n",
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	606 th_proxy_types[conn->proxy.type],
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	607 inet_ntoa(conn->proxy.addr), conn->proxy.port);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	608 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	609 else
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	610 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	611 dest.sin_port = htons(conn->port);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	612 dest.sin_addr = conn->addr;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	613
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	614 th_conn_msg(conn, THLOG_INFO, "Connecting to %s:%d ...\n",
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	615 inet_ntoa(conn->addr), conn->port);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	616 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	617
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	618 if ((conn->socket = socket(PF_INET, SOCK_STREAM, 0)) == -1)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	619 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	620 err = th_errno_to_error(th_get_socket_errno());
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	621 th_conn_err(conn, err, "Could not open socket: %s\n", th_error_str(err));
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	622 goto error;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	623 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	624
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	625 if (connect(conn->socket, (struct sockaddr *) &dest, sizeof(dest)) == -1)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	626 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	627 err = th_errno_to_error(th_get_socket_errno());
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	628 th_conn_err(conn, err, "Could not connect: %s\n", th_error_str(err));
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	629 goto error;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	630 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	631
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	632 FD_ZERO(&(conn->sockfds));
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	633 FD_SET(conn->socket, &(conn->sockfds));
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	634
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	635 // Proxy-specific setup
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	636 switch (conn->proxy.type)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	637 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	638 case TH_PROXY_SOCKS4:
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	639 case TH_PROXY_SOCKS4A:
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	640 if ((err = th_conn_socks4_negotiate(conn, port, host)) != THERR_OK)
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	641 goto error;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	642 th_conn_msg(conn, THLOG_INFO, "SOCKS 4 connection established!\n");
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	643 break;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	644
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	645 case TH_PROXY_SOCKS5:
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	646 if ((err = th_conn_socks5_negotiate(conn, port, host)) != THERR_OK)
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	647 goto error;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	648 th_conn_msg(conn, THLOG_INFO, "SOCKS 5 connection established!\n");
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	649 break;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	650 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	651
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	652 th_conn_reset(conn);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	653 conn->status = TH_CONN_OPEN;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	654
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	655 // Insert to connection list
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	656 conn->node = th_llist_append(&th_conn_list, conn);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	657
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	658 return THERR_OK;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	659
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	660 error:
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	661 th_conn_close(conn);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	662 return err;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	663 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	664
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	665
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	666 int th_conn_close(th_conn_t *conn)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	667 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	668 if (conn == NULL)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	669 return -1;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	670
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	671 if (conn->socket >= 0)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	672 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	673 #ifdef __WIN32
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	674 closesocket(conn->socket);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	675 #else
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	676 close(conn->socket);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	677 #endif
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	678 conn->socket = -1;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	679 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	680
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	681 conn->status = TH_CONN_CLOSED;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	682 return 0;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	683 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	684
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	685
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	686 static void th_conn_free_nodelete(th_conn_t *conn)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	687 {
122 452adc41ccf5 Remember to free the connection data buffer. Matti Hamalainen <ccr@tnsp.org> parents: 121 diff changeset	688 th_free(conn->buf);
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	689 th_conn_close(conn);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	690 th_free(conn->host);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	691 th_free(conn->proxy.host);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	692 th_free(conn);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	693 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	694
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	695
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	696 void th_conn_free(th_conn_t *conn)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	697 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	698 if (conn != NULL)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	699 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	700 // Remove from linked list
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	701 if (conn->node != NULL)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	702 th_llist_delete_node_fast(&th_conn_list, conn->node);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	703
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	704 // Free connection data
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	705 th_conn_free_nodelete(conn);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	706 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	707 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	708
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	709
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	710 int th_conn_send_buf(th_conn_t conn, const void buf, const size_t len)
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	711 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	712 size_t bufLeft = len;
118 ca33c6c80176 Change type. Matti Hamalainen <ccr@tnsp.org> parents: 117 diff changeset	713 const char bufPtr = (char ) buf;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	714
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	715 while (bufLeft > 0)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	716 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	717 ssize_t bufSent;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	718 bufSent = send(conn->socket, bufPtr, bufLeft, 0);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	719 if (bufSent < 0)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	720 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	721 int err = th_errno_to_error(th_get_socket_errno());
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	722 th_conn_err(conn, err, "th_conn_send_buf() failed: %s", th_error_str(err));
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	723 return err;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	724 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	725 bufLeft -= bufSent;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	726 bufPtr += bufSent;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	727 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	728
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	729 return THERR_OK;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	730 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	731
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	732
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	733 int th_conn_send_growbuf(th_conn_t conn, th_growbuf_t buf)
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	734 {
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	735 int ret = th_conn_send_buf(conn, buf->data, buf->len);
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	736 th_growbuf_clear(buf);
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	737 return ret;
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	738 }
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	739
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	740
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	741 void th_conn_reset(th_conn_t *conn)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	742 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	743 if (conn != NULL)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	744 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	745 conn->ptr = conn->in_ptr = conn->buf;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	746 conn->got_bytes = conn->total_bytes = 0;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	747 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	748 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	749
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	750
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	751 int th_conn_pull(th_conn_t *conn)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	752 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	753 int result;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	754 struct timeval socktv;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	755 fd_set tmpfds;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	756
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	757 if (conn == NULL)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	758 return TH_CONN_ERROR;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	759
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	760 // Shift the input buffer
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	761 if (conn->ptr > conn->buf)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	762 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	763 size_t left = conn->in_ptr - conn->ptr;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	764 if (left > 0)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	765 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	766 size_t moved = conn->ptr - conn->buf;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	767 memmove(conn->buf, conn->ptr, left);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	768 conn->ptr = conn->buf;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	769 conn->in_ptr -= moved;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	770 conn->total_bytes -= moved;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	771 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	772 else
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	773 th_conn_reset(conn);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	774 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	775
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	776 // Check for incoming data
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	777 socktv.tv_sec = 0;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	778 socktv.tv_usec = TH_DELAY_USEC;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	779 tmpfds = conn->sockfds;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	780
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	781 if ((result = select(conn->socket + 1, &tmpfds, NULL, NULL, &socktv)) == -1)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	782 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	783 int err = th_get_socket_errno();
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	784 if (err != EINTR)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	785 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	786 err = th_errno_to_error(err);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	787 th_conn_err(conn, err, "Error occured in select(%d, sockfds): %s\n",
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	788 socket, th_error_str(err));
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	789 return TH_CONN_ERROR;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	790 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	791 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	792 else if (FD_ISSET(conn->socket, &tmpfds))
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	793 {
103 f7bec3f7181d Change connection creation API to specify incoming buffer size. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	794 conn->got_bytes = recv(conn->socket, conn->in_ptr, conn->bufsize - conn->total_bytes, 0);
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	795 if (conn->got_bytes < 0)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	796 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	797 int err = th_errno_to_error(th_get_socket_errno());
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	798 th_conn_err(conn, err, "Error in recv: %s\n", th_error_str(err));
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	799 return TH_CONN_ERROR;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	800 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	801 else if (conn->got_bytes == 0)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	802 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	803 th_conn_err(conn, ECONNABORTED, "Server closed connection.\n");
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	804 conn->status = TH_CONN_CLOSED;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	805 return TH_CONN_CLOSED;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	806 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	807 else
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	808 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	809 conn->total_bytes += conn->got_bytes;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	810 conn->in_ptr += conn->got_bytes;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	811 return TH_CONN_DATA_AVAIL;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	812 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	813 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	814
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	815 return TH_CONN_NO_DATA;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	816 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	817
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	818
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	819 BOOL th_conn_check(th_conn_t *conn)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	820 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	821 if (conn == NULL)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	822 return FALSE;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	823
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	824 return conn->err == 0 && conn->status == TH_CONN_OPEN;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	825 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	826
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	827
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	828 int th_network_init(void)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	829 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	830 #ifdef __WIN32
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	831 // Initialize WinSock, if needed
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	832 WSADATA wsaData;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	833 int err = WSAStartup(0x0101, &wsaData);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	834 if (err != 0)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	835 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	836 THERR("Could not initialize WinSock library (err=%d).\n", err);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	837 return THERR_INIT_FAIL;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	838 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	839 #endif
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	840
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	841 th_network_inited = TRUE;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	842
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	843 th_conn_list = NULL;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	844
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	845 return THERR_OK;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	846 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	847
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	848
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	849 void th_network_close(void)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	850 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	851 if (th_network_inited)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	852 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	853 // Close connections
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	854 qlist_t *curr = th_conn_list;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	855 while (curr != NULL)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	856 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	857 qlist_t *next = curr->next;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	858 th_conn_free_nodelete(curr->data);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	859 curr = next;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	860 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	861
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	862 #ifdef __WIN32
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	863 WSACleanup();
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	864 #endif
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	865 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	866
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	867 th_network_inited = FALSE;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	868 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	869
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	870
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	871 BOOL th_conn_buf_check(th_conn_t *conn, size_t n)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	872 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	873 return conn && (conn->ptr + n <= conn->in_ptr);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	874 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	875
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	876
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	877 BOOL th_conn_buf_skip(th_conn_t *conn, size_t n)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	878 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	879 if (th_conn_buf_check(conn, n))
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	880 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	881 conn->ptr += n;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	882 return TRUE;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	883 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	884 else
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	885 return FALSE;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	886 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	887
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	888
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	889 int th_conn_buf_strncmp(th_conn_t conn, const char str, const size_t n)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	890 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	891 int ret;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	892 if (!th_conn_buf_check(conn, n))
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	893 return -1;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	894
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	895 if ((ret = strncmp(conn->ptr, str, n)) == 0)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	896 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	897 conn->ptr += n;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	898 return 0;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	899 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	900 else
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	901 return ret;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	902 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	903
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	904
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	905 int th_conn_buf_strcmp(th_conn_t conn, const char str)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	906 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	907 return th_conn_buf_strncmp(conn, str, strlen(str));
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	908 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	909
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	910
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	911 char th_conn_buf_strstr(th_conn_t conn, const char *str)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	912 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	913 char *pos;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	914 size_t n = strlen(str);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	915
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	916 if (th_conn_buf_check(conn, n) && ((pos = strstr(conn->ptr, str)) != NULL))
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	917 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	918 conn->ptr = pos + n;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	919 return pos;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	920 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	921 else
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	922 return NULL;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	923 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	924
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	925
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	926 void th_conn_dump_buffer(FILE f, th_conn_t conn)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	927 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	928 char *p;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	929 size_t offs, left;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	930
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	931 fprintf(f,
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	932 "\n--------------------------------------------------------------\n"
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	933 "err=%d, status=%d, got_bytes=%d, total_bytes=%d\n"
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	934 "buf=0x%p, in_ptr=0x%04x, ptr=0x%04x\n",
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	935 conn->err, conn->status, conn->got_bytes, conn->total_bytes,
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	936 conn->buf, conn->in_ptr - conn->buf, conn->ptr - conn->buf);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	937
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	938 // Dump buffer contents as a hexdump
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	939 for (offs = 0, left = conn->total_bytes, p = conn->buf; p < conn->in_ptr;)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	940 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	941 char buf[TH_DUMP_BYTES + 1];
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	942 size_t bufoffs, amount = left < TH_DUMP_BYTES ? left : TH_DUMP_BYTES;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	943 left -= amount;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	944
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	945 // Dump offs \| xx xx xx xx \| and fill string
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	946 fprintf(f, "%04x \| ", offs);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	947 for (bufoffs = 0; bufoffs < amount; offs++, bufoffs++, p++)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	948 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	949 fprintf(f, "%02x ", *p);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	950 buf[bufoffs] = th_isprint(p) ? p : '.';
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	951 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	952 buf[bufoffs] = 0;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	953
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	954 // Add padding
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	955 for (; bufoffs < TH_DUMP_BYTES; bufoffs++)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	956 fprintf(f, " ");
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	957
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	958 // Print string
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	959 fprintf(f, "\| %s\n", buf);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	960 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	961 }

Mercurial > hg > th-libs

annotate th_network.c @ 131:6624893ad528