th-libs: th_network.c annotate

annotate th_network.c @ 119:38a39a9e3a1d

Fix proxy negotiation.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sun, 22 Jun 2014 00:07:25 +0300
parents	ca33c6c80176
children	8c39e8e90dbd

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 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	19 TH_SOCKS5_AUTH_NONE = 0,
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	20 TH_SOCKS5_AUTH_USER = 2,
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
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	24 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	25 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	26 "none",
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	27 "SOCKS 4",
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	28 "SOCKS 4a",
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	29 "SOCKS 5",
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	30 NULL
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	31 };
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
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	34 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	35 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	36 return errno;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	37 }
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 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	41 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	42 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	43 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	44 char *msg;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	45 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	46 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	47 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	48 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	49
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	50 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	51 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	52 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	53 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	54
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	55
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	56 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	57 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	58 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	59 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	60 char *msg;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	61 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	62 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	63 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	64 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	65
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	66 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	67 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	68 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	69 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	70
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	71
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	72 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	73 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	74 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	75
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	76 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	77 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	78 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	79 "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	80 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	81 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	82 else
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 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	85 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	86 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	87
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	88 return res;
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
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	91
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	92 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	93 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	94 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	95 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	96 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	97 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	98
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	99 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	100 return 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 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	103 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	104
103 f7bec3f7181d Change connection creation API to specify incoming buffer size. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	105 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	106 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	107 {
f7bec3f7181d Change connection creation API to specify incoming buffer size. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	108 th_free(conn);
f7bec3f7181d Change connection creation API to specify incoming buffer size. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	109 return NULL;
f7bec3f7181d Change connection creation API to specify incoming buffer size. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	110 }
f7bec3f7181d Change connection creation API to specify incoming buffer size. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	111
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	112 return conn;
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 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	117 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	118 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	119 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	120 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	121 return TRUE;
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 else
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	124 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	125 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	126 return FALSE;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	127 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	128 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	129
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	130
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	131 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	132 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	133 if (conn == NULL)
104 ec5a5e573885 Return real error values. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	134 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	135
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	136 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	137 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	138 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	139
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	140 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	141 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	142
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	143 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	144 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	145 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	146 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	147 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	148 else
104 ec5a5e573885 Return real error values. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	149 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	150
104 ec5a5e573885 Return real error values. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	151 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	152 }
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 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	156 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	157 if (conn == NULL)
104 ec5a5e573885 Return real error values. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	158 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	159
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	160 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	161 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	162
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	163 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	164 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	165
104 ec5a5e573885 Return real error values. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	166 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	167 }
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
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	170 static int th_conn_proxy_wait(th_conn_t *conn)
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	171 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	172 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	173
119 38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	174 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	175 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	176 #ifdef __WIN32
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	177 Sleep(50);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	178 #else
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	179 usleep(50000);
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	180 #endif
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	181 th_conn_reset(conn);
119 38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	182 switch (status = th_conn_pull(conn))
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	183 {
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	184 case TH_CONN_ERROR:
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	185 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	186 tries, th_error_str(conn->err));
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	187 break;
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	188
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	189 case TH_CONN_DATA_AVAIL:
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	190 case TH_CONN_NO_DATA:
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	191 break;
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	192
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	193 default:
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	194 return status;
38a39a9e3a1d Fix proxy negotiation. Matti Hamalainen <ccr@tnsp.org> parents: 118 diff changeset	195 }
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	196 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	197
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	198 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	199 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	200
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	201 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	202 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	203
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	204
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	205 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	206 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	207 th_conn_reset(conn);
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	208 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	209 }
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
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	212 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	213 {
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	214 th_growbuf_t buf;
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	215 uint8_t *ptr;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	216 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	217
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	218 (void) host;
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	219 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	220 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	221
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	222 // Create SOCKS 4 handshake
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	223 th_growbuf_put_u8(&buf, 4); // Protocol version
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	224 th_growbuf_put_u8(&buf, TH_PROXY_CMD_CONNECT); // Command
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	225 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	226 if (conn->proxy.type == TH_PROXY_SOCKS4A)
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	227 th_growbuf_put_u32_be(&buf, 0x00000032);
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	228 else
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	229 th_growbuf_put_str(&buf, (uint8_t *) &(conn->addr.s_addr), sizeof(conn->addr.s_addr));
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	230
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	231 th_growbuf_puts(&buf, conn->proxy.userid, TRUE);
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	232 if (conn->proxy.type == TH_PROXY_SOCKS4A)
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	233 th_growbuf_puts(&buf, conn->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	234
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	235 // Send request
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	236 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	237 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	238
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	239 // Wait for SOCKS server to reply
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	240 if (th_conn_proxy_wait(conn) != TH_CONN_DATA_AVAIL)
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	241 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	242
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	243 ptr = (uint8_t*) conn->buf;
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	244 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	245 {
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	246 err = THERR_INIT_FAIL;
ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	247 th_conn_err(conn, err,
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	248 "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	249 *ptr);
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	250 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	251 }
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	252
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	253 ptr++;
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	254 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	255 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	256 const char *s = NULL;
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	257 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	258 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	259 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	260 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	261 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	262 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	263 }
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	264
ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	265 err = THERR_INIT_FAIL;
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	266 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	267 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	268 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	269
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	270 err = THERR_OK;
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	271
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	272 out:
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	273 th_growbuf_free(&buf);
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	274 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	275 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	276
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	277
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	278 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	279 {
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	280 size_t userid_len = 0, passwd_len = 0;
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	281 th_growbuf_t buf;
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	282 uint8_t *ptr;
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	283 int 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	284
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	285 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	286 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	287
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	288 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	289 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	290 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	291 avail = 1;
113 059f48a04024 Set auth method. Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	292 auth = TH_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	293 break;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	294
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	295 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	296 avail = 2;
113 059f48a04024 Set auth method. Matti Hamalainen <ccr@tnsp.org> parents: 112 diff changeset	297 auth = TH_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	298 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	299 {
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	300 err = THERR_INVALID_DATA;
ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	301 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	302 "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	303 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	304 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	305
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	306 userid_len = strlen(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	307 passwd_len = strlen(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	308 if (userid_len > 255 \|\| passwd_len > 255)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	309 {
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	310 err = THERR_INVALID_DATA;
ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	311 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	312 "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	313 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	314 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	315 break;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	316
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	317 default:
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	318 err = THERR_NOT_SUPPORTED;
ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	319 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	320 "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	321 conn->proxy.auth_type);
112 5403f0d2d692 Use common exit codepath. Matti Hamalainen <ccr@tnsp.org> parents: 105 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 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	324
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	325
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	326 // Form handshake packet
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	327 th_growbuf_clear(&buf);
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	328 th_growbuf_put_u8(&buf, 0x05); // Protocol version
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	329 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	330 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	331
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	332 // Send request
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	333 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	334 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	335
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	336 // Wait for SOCKS server to reply
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	337 if (th_conn_proxy_wait(conn) != TH_CONN_DATA_AVAIL)
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	338 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	339
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	340 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	341 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	342 {
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	343 err = THERR_INVALID_DATA;
ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	344 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	345 "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	346 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	347 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	348 ptr++;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	349 auth = *ptr;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	350
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	351 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	352 {
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	353 err = THERR_NOT_SUPPORTED;
ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	354 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	355 "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	356 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	357 }
114 b44a0308b53f Add missing else statement. Matti Hamalainen <ccr@tnsp.org> parents: 113 diff changeset	358 else
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	359 if (auth == TH_SOCKS5_AUTH_USER)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	360 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	361 // Attempt user/pass authentication (RFC 1929)
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	362 th_growbuf_clear(&buf);
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	363
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	364 th_growbuf_put_u8(&buf, 0x01);
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	365 th_growbuf_put_u8(&buf, userid_len);
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	366 th_growbuf_puts(&buf, conn->proxy.userid, FALSE);
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	367 th_growbuf_put_u8(&buf, passwd_len);
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	368 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	369
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	370 // Send request
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	371 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	372 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	373
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	374 // Wait for SOCKS server to reply
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	375 if (th_conn_proxy_wait(conn) != TH_CONN_DATA_AVAIL)
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	376 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	377
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	378 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	379 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	380 {
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	381 err = THERR_INVALID_DATA;
ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	382 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	383 "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	384 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	385 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	386 ptr++;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	387 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	388 {
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	389 err = THERR_AUTH_FAILED;
ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	390 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	391 "SOCKS 5 proxy user/pass authentication failed! Code %d.\n", *ptr);
112 5403f0d2d692 Use common exit codepath. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	392 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	393 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	394 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	395 else
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	396 if (auth != TH_SOCKS5_AUTH_NONE)
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	397 {
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	398 err = THERR_NOT_SUPPORTED;
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	399 th_conn_err(conn, THERR_NOT_SUPPORTED,
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	400 "Proxy server chose an unsupported SOCKS 5 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	401 auth);
112 5403f0d2d692 Use common exit codepath. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	402 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	403 }
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
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	406 #if 0
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	407 // Form client connection request packet
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	408 th_growbuf_clear(&buf);
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	409
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	410 th_growbuf_put_u8(&buf, 0x05); // Protocol version
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	411 th_growbuf_put_u8(&buf, cmd);
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	412 th_growbuf_put_u8(&buf, 0x00);
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	413 th_growbuf_put_u8(&buf, SOCKS5_ADDR_IPV4);
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	414 th_growbuf_put_str(&buf, conn->addr.s_addr, sizeof(conn->addr.s_addr));
bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	415 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	416
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	417 // Send request
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	418 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	419 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	420
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	421 // Wait for SOCKS server to reply
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	422 if (th_conn_proxy_wait(conn) != TH_CONN_DATA_AVAIL)
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 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 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	426 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	427 {
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	428 err = THERR_INVALID_DATA;
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	429 th_conn_err(conn, err,
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	430 "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	431 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	432 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	433 ptr++;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	434 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	435 {
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	436 err = THERR_INIT_FAIL;
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	437 if (ptr >= 0 && ptr < sizeof())
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	438 th_conn_err(conn, err, "%s.\n", th_socks5_results_msgs[*ptr]);
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	439 else
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	440 th_conn_err(conn, err ".Unknown\n");
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	441 goto out;
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	442 }
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	443 ptr++;
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	444 if (*ptr != 0)
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	445 {
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	446 err = THERR_INIT_FAIL;
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	447 th_conn_err(conn, err, "wot.\n");
112 5403f0d2d692 Use common exit codepath. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	448 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	449 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	450
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	451 #endif
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	452
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	453 err = THERR_OK;
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	454
112 5403f0d2d692 Use common exit codepath. Matti Hamalainen <ccr@tnsp.org> parents: 105 diff changeset	455 out:
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	456 th_growbuf_free(&buf);
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	457 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	458 }
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
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	461 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	462 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	463 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	464 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	465
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	466 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	467 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	468
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	469 conn->port = port;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	470 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	471 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	472 conn->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	473 conn->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	474 }
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 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	477
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	478 // 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	479 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	480
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	481 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	482 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	483 // 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	484 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	485 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	486
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	487 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	488 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	489 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	490 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	491 else
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	492 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	493 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	494 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	495
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	496 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	497 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	498 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	499
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	500 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	501 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	502 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	503 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	504 goto error;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	505 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	506
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	507 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	508 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	509 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	510 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	511 goto error;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	512 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	513
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	514 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	515 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	516
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	517 // 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	518 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	519 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	520 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	521 case TH_PROXY_SOCKS4A:
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	522 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	523 goto error;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	524 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	525 break;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	526
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	527 case TH_PROXY_SOCKS5:
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	528 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	529 goto error;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	530 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	531 break;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	532 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	533
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	534 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	535 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	536
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	537 // 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	538 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	539
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	540 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	541
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	542 error:
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	543 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	544 return err;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	545 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	546
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	547
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	548 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	549 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	550 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	551 return -1;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	552
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	553 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	554 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	555 #ifdef __WIN32
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	556 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	557 #else
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	558 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	559 #endif
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	560 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	561 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	562
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	563 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	564 return 0;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	565 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	566
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	567
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	568 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	569 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	570 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	571 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	572 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	573 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	574 }
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 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	578 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	579 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	580 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	581 // 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	582 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	583 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	584
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	585 // 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	586 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	587 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	588 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	589
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	590
116 bc540c5bfaf9 More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	591 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	592 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	593 size_t bufLeft = len;
118 ca33c6c80176 Change type. Matti Hamalainen <ccr@tnsp.org> parents: 117 diff changeset	594 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	595
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	596 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	597 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	598 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	599 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	600 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	601 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	602 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	603 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	604 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	605 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	606 bufLeft -= bufSent;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	607 bufPtr += bufSent;
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
105 ea5b1c4b3af5 Cleanups and a breaking API change. Matti Hamalainen <ccr@tnsp.org> parents: 104 diff changeset	610 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	611 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	612
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	613
117 bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	614 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	615 {
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	616 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	617 th_growbuf_clear(buf);
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	618 return ret;
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	619 }
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	620
bfae4758fa6f More work on network module. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	621
102 6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	622 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	623 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	624 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	625 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	626 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	627 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	628 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	629 }
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 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	633 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	634 int result;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	635 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	636 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	637
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	638 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	639 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	640
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	641 // 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	642 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	643 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	644 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	645 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	646 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	647 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	648 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	649 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	650 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	651 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	652 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	653 else
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	654 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	655 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	656
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	657 // 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	658 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	659 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	660 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	661
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	662 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	663 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	664 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	665 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	666 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	667 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	668 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	669 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	670 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	671 }
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 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	674 {
103 f7bec3f7181d Change connection creation API to specify incoming buffer size. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	675 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	676 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	677 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	678 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	679 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	680 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	681 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	682 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	683 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	684 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	685 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	686 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	687 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	688 else
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	689 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	690 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	691 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	692 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	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 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	697 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	698
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 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	701 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	702 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	703 return FALSE;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	704
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	705 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	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 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	710 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	711 #ifdef __WIN32
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	712 // 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	713 WSADATA wsaData;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	714 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	715 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	716 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	717 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	718 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	719 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	720 #endif
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	721
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	722 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	723
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	724 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	725
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	726 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	727 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	728
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	729
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	730 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	731 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	732 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	733 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	734 // Close connections
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	735 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	736 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	737 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	738 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	739 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	740 curr = next;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	741 }
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 #ifdef __WIN32
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	744 WSACleanup();
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	745 #endif
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	746 }
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 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	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
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	752 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	753 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	754 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	755 }
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
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	758 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	759 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	760 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	761 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	762 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	763 return TRUE;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	764 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	765 else
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	766 return FALSE;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	767 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	768
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	769
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	770 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	771 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	772 int ret;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	773 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	774 return -1;
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 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	777 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	778 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	779 return 0;
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 else
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	782 return ret;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	783 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	784
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 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	787 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	788 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	789 }
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 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	793 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	794 char *pos;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	795 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	796
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	797 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	798 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	799 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	800 return pos;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	801 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	802 else
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	803 return NULL;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	804 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	805
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 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	808 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	809 char *p;
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	810 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	811
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	812 fprintf(f,
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	813 "\n--------------------------------------------------------------\n"
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	814 "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	815 "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	816 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	817 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	818
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	819 // 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	820 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	821 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	822 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	823 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	824 left -= amount;
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 // 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	827 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	828 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	829 {
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	830 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	831 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	832 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	833 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	834
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	835 // Add padding
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	836 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	837 fprintf(f, " ");
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 // Print string
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	840 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	841 }
6ca407bfbeaf New TCP network module, rather simple and only useful for client applications now. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	842 }

Mercurial > hg > th-libs

annotate th_network.c @ 119:38a39a9e3a1d