nnchat: network.c annotate

annotate network.c @ 613:2cd71b7c1e8e

Repurpose nn_conn_close() to only close the socket, but not free the connection structure. Add new function nn_conn_free() to do the freeing (also calls nn_conn_close()).

author	Matti Hamalainen <ccr@tnsp.org>
date	Tue, 20 May 2014 06:50:12 +0300
parents	019a54b07f60
children	1fc22e8efd26

rev	line source
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 * NNChat - Custom chat client for NewbieNudes.com chatrooms
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3 * Written by Matti 'ccr' Hämäläinen
605 ad00f2bbb615 Bump copyright year. Matti Hamalainen <ccr@tnsp.org> parents: 604 diff changeset	4 * (C) Copyright 2008-2014 Tecnic Software productions (TNSP)
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5 */
413 14b685cdbd2c Rename files. Matti Hamalainen <ccr@tnsp.org> parents: 412 diff changeset	6 #include "network.h"
415 8263cb88556a Some #include cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 414 diff changeset	7 #include <errno.h>
8263cb88556a Some #include cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 414 diff changeset	8
604 37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	9 struct nn_socks4_t
37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	10 {
37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	11 uint8_t version;
37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	12 uint8_t command;
37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	13 in_port_t port;
37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	14 in_addr_t addr;
37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	15 } __attribute__((__packed__));
37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	16
37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	17 struct nn_socks4_res_t
37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	18 {
37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	19 uint8_t nb;
37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	20 uint8_t result;
37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	21 in_port_t port;
37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	22 in_addr_t addr;
37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	23 } __attribute__((__packed__));
37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	24
37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	25
489 ba48840b8525 Move network initialization/shutdown flag checking to network module. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	26 static BOOL nn_network_inited = FALSE;
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	27
604 37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	28
414 ac4862a94cd1 Move some structures around. Matti Hamalainen <ccr@tnsp.org> parents: 413 diff changeset	29 static const char *nn_proxy_types[] =
ac4862a94cd1 Move some structures around. Matti Hamalainen <ccr@tnsp.org> parents: 413 diff changeset	30 {
ac4862a94cd1 Move some structures around. Matti Hamalainen <ccr@tnsp.org> parents: 413 diff changeset	31 "none",
ac4862a94cd1 Move some structures around. Matti Hamalainen <ccr@tnsp.org> parents: 413 diff changeset	32 "SOCKS 4",
ac4862a94cd1 Move some structures around. Matti Hamalainen <ccr@tnsp.org> parents: 413 diff changeset	33 "SOCKS 4a",
ac4862a94cd1 Move some structures around. Matti Hamalainen <ccr@tnsp.org> parents: 413 diff changeset	34 NULL
ac4862a94cd1 Move some structures around. Matti Hamalainen <ccr@tnsp.org> parents: 413 diff changeset	35 };
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	36
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	37
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	38 #ifdef __WIN32
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	39 const char *hstrerror(int err)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	40 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	41 static char buf[64];
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	42 snprintf(buf, sizeof(buf), "Error #%d", err);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	43 return buf;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	44 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	45
413 14b685cdbd2c Rename files. Matti Hamalainen <ccr@tnsp.org> parents: 412 diff changeset	46
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	47 int nn_get_socket_errno(void)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	48 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	49 return WSAGetLastError();
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	50 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	51
413 14b685cdbd2c Rename files. Matti Hamalainen <ccr@tnsp.org> parents: 412 diff changeset	52
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	53 const char *nn_get_socket_errstr(int err)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	54 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	55 static char buf[64];
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	56 switch (err)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	57 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	58 case WSAEADDRINUSE: return "Address already in use";
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	59 case WSAECONNABORTED: return "Software caused connection abort";
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	60 case WSAECONNREFUSED: return "Connection refused";
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	61 case WSAECONNRESET: return "Connection reset by peer";
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	62 case WSAEHOSTUNREACH: return "No route to host";
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	63 case WSAENETDOWN: return "Network is down";
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	64 case WSAETIMEDOUT: return "Connection timed out";
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	65 case WSAHOST_NOT_FOUND: return "Host not found";
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	66 case WSAVERNOTSUPPORTED: return "Wrong WinSock DLL version";
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	67 default:
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	68 snprintf(buf, sizeof(buf), "Error #%d", err);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	69 return buf;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	70 break;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	71 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	72 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	73 #else
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	74 int nn_get_socket_errno(void)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	75 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	76 return errno;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	77 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	78
413 14b685cdbd2c Rename files. Matti Hamalainen <ccr@tnsp.org> parents: 412 diff changeset	79
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	80 const char *nn_get_socket_errstr(int err)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	81 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	82 return strerror(err);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	83 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	84 #endif
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	85
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	86
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	87 void nn_conn_err(nn_conn_t conn, const char fmt, ...)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	88 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	89 if (conn->errfunc != NULL)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	90 {
564 6e5789cbb4d4 Change network layer error/info message passing API to pass direct strings Matti Hamalainen <ccr@tnsp.org> parents: 490 diff changeset	91 char *msg;
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	92 va_list ap;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	93 va_start(ap, fmt);
564 6e5789cbb4d4 Change network layer error/info message passing API to pass direct strings Matti Hamalainen <ccr@tnsp.org> parents: 490 diff changeset	94 msg = th_strdup_vprintf(fmt, ap);
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	95 va_end(ap);
564 6e5789cbb4d4 Change network layer error/info message passing API to pass direct strings Matti Hamalainen <ccr@tnsp.org> parents: 490 diff changeset	96
6e5789cbb4d4 Change network layer error/info message passing API to pass direct strings Matti Hamalainen <ccr@tnsp.org> parents: 490 diff changeset	97 conn->errfunc(conn, msg);
6e5789cbb4d4 Change network layer error/info message passing API to pass direct strings Matti Hamalainen <ccr@tnsp.org> parents: 490 diff changeset	98 th_free(msg);
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	99 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	100 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	101
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	102
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	103 static void nn_conn_msg(nn_conn_t conn, const char fmt, ...)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	104 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	105 if (conn->msgfunc != NULL)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	106 {
564 6e5789cbb4d4 Change network layer error/info message passing API to pass direct strings Matti Hamalainen <ccr@tnsp.org> parents: 490 diff changeset	107 char *msg;
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	108 va_list ap;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	109 va_start(ap, fmt);
564 6e5789cbb4d4 Change network layer error/info message passing API to pass direct strings Matti Hamalainen <ccr@tnsp.org> parents: 490 diff changeset	110 msg = th_strdup_vprintf(fmt, ap);
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	111 va_end(ap);
564 6e5789cbb4d4 Change network layer error/info message passing API to pass direct strings Matti Hamalainen <ccr@tnsp.org> parents: 490 diff changeset	112
6e5789cbb4d4 Change network layer error/info message passing API to pass direct strings Matti Hamalainen <ccr@tnsp.org> parents: 490 diff changeset	113 conn->msgfunc(conn, msg);
6e5789cbb4d4 Change network layer error/info message passing API to pass direct strings Matti Hamalainen <ccr@tnsp.org> parents: 490 diff changeset	114 th_free(msg);
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	115 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	116 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	117
414 ac4862a94cd1 Move some structures around. Matti Hamalainen <ccr@tnsp.org> parents: 413 diff changeset	118
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	119 struct hostent nn_resolve_host(nn_conn_t conn, const char *name)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	120 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	121 struct hostent *res = gethostbyname(name);
458 6eef0dc83f0a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 456 diff changeset	122
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	123 if (res == NULL)
456 bb65460c7aa2 Clean up some initialization messages. Matti Hamalainen <ccr@tnsp.org> parents: 438 diff changeset	124 nn_conn_err(conn, "Could not resolve hostname '%s': %s\n", name, strerror(h_errno));
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	125 else
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	126 nn_conn_msg(conn, "True hostname for %s is %s\n", name, res->h_name);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	127
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	128 return res;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	129 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	130
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	131
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	132 nn_conn_t * nn_conn_new(
564 6e5789cbb4d4 Change network layer error/info message passing API to pass direct strings Matti Hamalainen <ccr@tnsp.org> parents: 490 diff changeset	133 void (errfunc)(nn_conn_t conn, const char *msg),
6e5789cbb4d4 Change network layer error/info message passing API to pass direct strings Matti Hamalainen <ccr@tnsp.org> parents: 490 diff changeset	134 void (msgfunc)(nn_conn_t conn, const char *msg))
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	135 {
606 2cc5434a8ce0 Change proxy authentication handling. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	136 nn_conn_t *conn = th_malloc0(sizeof(nn_conn_t));
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	137
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	138 if (conn == NULL)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	139 return NULL;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	140
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	141 conn->errfunc = errfunc;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	142 conn->msgfunc = msgfunc;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	143
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	144 return conn;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	145 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	146
458 6eef0dc83f0a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 456 diff changeset	147
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	148 static BOOL nn_get_addr(struct in_addr addr, struct hostent hst)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	149 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	150 if (hst != NULL)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	151 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	152 addr = (struct in_addr *) (hst->h_addr);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	153 return TRUE;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	154 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	155 else
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	156 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	157 addr->s_addr = 0;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	158 return FALSE;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	159 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	160 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	161
458 6eef0dc83f0a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 456 diff changeset	162
606 2cc5434a8ce0 Change proxy authentication handling. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	163 int nn_conn_set_proxy(nn_conn_t conn, int type, int port, const char host, int auth_type)
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	164 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	165 if (conn == NULL)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	166 return -1;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	167
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	168 conn->proxy.type = type;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	169 conn->proxy.port = port;
606 2cc5434a8ce0 Change proxy authentication handling. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	170 conn->proxy.auth_type = auth_type;
2cc5434a8ce0 Change proxy authentication handling. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	171
2cc5434a8ce0 Change proxy authentication handling. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	172 th_free(conn->proxy.host);
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	173 conn->proxy.host = th_strdup(host);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	174
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	175 if (host != NULL)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	176 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	177 conn->proxy.hst = nn_resolve_host(conn, host);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	178 nn_get_addr(&(conn->proxy.addr), conn->proxy.hst);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	179 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	180 else
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	181 return -2;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	182
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	183 return 0;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	184 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	185
458 6eef0dc83f0a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 456 diff changeset	186
606 2cc5434a8ce0 Change proxy authentication handling. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	187 int nn_conn_set_proxy_auth_user(nn_conn_t conn, const char userid, const char *passwd)
2cc5434a8ce0 Change proxy authentication handling. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	188 {
2cc5434a8ce0 Change proxy authentication handling. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	189 if (conn == NULL)
2cc5434a8ce0 Change proxy authentication handling. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	190 return -1;
2cc5434a8ce0 Change proxy authentication handling. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	191
2cc5434a8ce0 Change proxy authentication handling. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	192 th_free(conn->proxy.userid);
2cc5434a8ce0 Change proxy authentication handling. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	193 conn->proxy.userid = th_strdup(userid);
611 019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	194
606 2cc5434a8ce0 Change proxy authentication handling. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	195 th_free(conn->proxy.passwd);
2cc5434a8ce0 Change proxy authentication handling. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	196 conn->proxy.passwd = th_strdup(passwd);
2cc5434a8ce0 Change proxy authentication handling. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	197
2cc5434a8ce0 Change proxy authentication handling. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	198 return 0;
2cc5434a8ce0 Change proxy authentication handling. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	199 }
2cc5434a8ce0 Change proxy authentication handling. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	200
2cc5434a8ce0 Change proxy authentication handling. Matti Hamalainen <ccr@tnsp.org> parents: 605 diff changeset	201
611 019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	202 static int nn_conn_proxy_wait(nn_conn_t *conn)
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	203 {
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	204 int status, tries;
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	205
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	206 for (status = tries = 1; tries <= 20 && status > 0; tries++)
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	207 {
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	208 #ifdef __WIN32
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	209 Sleep(50);
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	210 #else
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	211 usleep(50000);
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	212 #endif
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	213 nn_conn_reset(conn);
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	214 status = nn_conn_pull(conn);
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	215 }
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	216
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	217 if (status < 0)
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	218 nn_conn_err(conn, "Proxy negotiation failed at try %d with network error: %d\n", tries, status);
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	219 else
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	220 nn_conn_err(conn, "Proxy negotiation timed out.\n");
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	221
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	222 return status;
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	223 }
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	224
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	225
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	226 static BOOL nn_conn_proxy_send(nn_conn_t conn, void buf, size_t bufsiz)
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	227 {
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	228 BOOL ret;
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	229 nn_conn_reset(conn);
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	230 if ((ret = nn_conn_send_buf(conn, buf, bufsiz)) == FALSE)
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	231 nn_conn_err(conn, "Error sending SOCKS proxy request.\n");
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	232 th_free(buf);
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	233 return ret;
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	234 }
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	235
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	236
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	237 int nn_conn_open(nn_conn_t conn, const int port, const char host)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	238 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	239 struct sockaddr_in dest;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	240
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	241 if (conn == NULL)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	242 return -1;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	243
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	244 conn->port = port;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	245 if (host != NULL)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	246 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	247 conn->host = th_strdup(host);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	248 conn->hst = nn_resolve_host(conn, host);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	249 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	250
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	251 nn_get_addr(&(conn->addr), conn->hst);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	252
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 415 diff changeset	253 // Prepare for connection
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	254 dest.sin_family = AF_INET;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	255
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	256 if (conn->proxy.type > NN_PROXY_NONE && conn->proxy.type < NN_PROXY_LAST)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	257 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	258 dest.sin_port = htons(conn->proxy.port);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	259 dest.sin_addr = conn->proxy.addr;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	260
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	261 nn_conn_msg(conn, "Connecting to %s proxy %s:%d ...\n",
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	262 nn_proxy_types[conn->proxy.type],
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	263 inet_ntoa(conn->proxy.addr), conn->proxy.port);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	264 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	265 else
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	266 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	267 dest.sin_port = htons(conn->port);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	268 dest.sin_addr = conn->addr;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	269
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	270 nn_conn_msg(conn, "Connecting to %s:%d ...\n",
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	271 inet_ntoa(conn->addr), conn->port);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	272 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	273
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	274 if ((conn->socket = socket(PF_INET, SOCK_STREAM, 0)) == -1)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	275 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	276 conn->err = nn_get_socket_errno();
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	277 nn_conn_err(conn, "Could not open socket: %s\n", nn_get_socket_errstr(conn->err));
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	278 goto error;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	279 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	280
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	281 if (connect(conn->socket, (struct sockaddr *) &dest, sizeof(dest)) == -1)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	282 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	283 conn->err = nn_get_socket_errno();
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	284 nn_conn_err(conn, "Could not connect: %s\n", nn_get_socket_errstr(conn->err));
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	285 goto error;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	286 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	287
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	288 FD_ZERO(&(conn->sockfds));
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	289 FD_SET(conn->socket, &(conn->sockfds));
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	290
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 415 diff changeset	291 // Proxy-specific setup
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	292 if (conn->proxy.type == NN_PROXY_SOCKS4 \|\| conn->proxy.type == NN_PROXY_SOCKS4A)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	293 {
611 019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	294 struct nn_socks4_res_t *sockres;
604 37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	295 struct nn_socks4_t *socksh;
602 4bae14092b78 Add parameters (unused for now) for proxy password etc. in case SOCKS 5 Matti Hamalainen <ccr@tnsp.org> parents: 599 diff changeset	296 size_t bufsiz;
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	297 char ptr, buf;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	298
604 37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	299 nn_conn_msg(conn, "Initializing SOCKS 4/a proxy negotiation.\n");
488 bbe05594f29d Clean up some initialization messages. Matti Hamalainen <ccr@tnsp.org> parents: 482 diff changeset	300
604 37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	301 bufsiz = sizeof(struct nn_socks4_t) + strlen(conn->proxy.userid) + 1;
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	302 if (conn->proxy.type == NN_PROXY_SOCKS4A)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	303 bufsiz += strlen(conn->host) + 1;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	304
604 37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	305 if ((ptr = buf = th_malloc(bufsiz)) == NULL)
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	306 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	307 conn->err = -1;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	308 nn_conn_err(conn, "Could not allocate memory for SOCKS negotiation buffer, %d bytes.\n", bufsiz);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	309 goto error;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	310 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	311
604 37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	312 // Create SOCKS 5 handshake
37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	313 socksh = (struct nn_socks4_t *) buf;
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	314 socksh->version = 4;
604 37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	315 socksh->command = NN_PROXY_CMD_CONNECT;
602 4bae14092b78 Add parameters (unused for now) for proxy password etc. in case SOCKS 5 Matti Hamalainen <ccr@tnsp.org> parents: 599 diff changeset	316 socksh->port = htons(port);
4bae14092b78 Add parameters (unused for now) for proxy password etc. in case SOCKS 5 Matti Hamalainen <ccr@tnsp.org> parents: 599 diff changeset	317 socksh->addr = (conn->proxy.type == NN_PROXY_SOCKS4A) ? htonl(0x00000032) : conn->addr.s_addr;
604 37ab4725e4f9 In preparation for SOCKS 5 support, move some structs etc. into network.c Matti Hamalainen <ccr@tnsp.org> parents: 602 diff changeset	318 ptr += sizeof(struct nn_socks4_t);
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	319
599 eeea75b8b6f3 Implement proxy user id setting. Matti Hamalainen <ccr@tnsp.org> parents: 581 diff changeset	320 strcpy(ptr, conn->proxy.userid);
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	321
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	322 if (conn->proxy.type == NN_PROXY_SOCKS4A)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	323 {
599 eeea75b8b6f3 Implement proxy user id setting. Matti Hamalainen <ccr@tnsp.org> parents: 581 diff changeset	324 ptr += strlen(conn->proxy.userid) + 1;
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	325 strcpy(ptr, conn->host);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	326 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	327
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 415 diff changeset	328 // Send request
611 019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	329 if (!nn_conn_proxy_send(conn, buf, bufsiz))
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	330 goto error;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	331
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 415 diff changeset	332 // Wait for SOCKS server to reply
611 019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	333 if (nn_conn_proxy_wait(conn) != 0)
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	334 goto error;
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	335
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	336 sockres = (struct nn_socks4_res_t *) &(conn->buf);
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	337 if (sockres->nb != 0)
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	338 {
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	339 nn_conn_err(conn, "Invalid SOCKS 4 server reply, does not begin with NUL byte (%d).\n", sockres->nb);
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	340 goto error;
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	341 }
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	342 if (sockres->result != 0x5a)
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	343 {
611 019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	344 char *s = NULL;
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	345 switch (sockres->result)
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	346 {
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	347 case 0x5b: s = "Request rejected or failed"; break;
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	348 case 0x5c: s = "Request failed because client is not running identd (or not reachable from the server)"; break;
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	349 case 0x5d: s = "Request failed because client's identd could not confirm the user ID string in the request"; break;
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	350 default: s = "Unknown SOCKS 4 error response"; break;
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	351 }
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	352 nn_conn_err(conn, "SOCKS 4 setup failed, 0x%02x: %s.\n", sockres->result, s);
019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	353 goto error;
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	354 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	355
611 019a54b07f60 Clean up and modularize proxy connection code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 606 diff changeset	356 nn_conn_msg(conn, "SOCKS 4 connection established!\n");
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	357 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	358
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	359 nn_conn_reset(conn);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	360 conn->status = NN_CONN_OPEN;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	361 return 0;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	362
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	363 error:
613 2cd71b7c1e8e Repurpose nn_conn_close() to only close the socket, but not free the Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	364 nn_conn_close(conn);
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	365 return -2;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	366 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	367
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	368
613 2cd71b7c1e8e Repurpose nn_conn_close() to only close the socket, but not free the Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	369 int nn_conn_close(nn_conn_t *conn)
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	370 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	371 if (conn == NULL)
613 2cd71b7c1e8e Repurpose nn_conn_close() to only close the socket, but not free the Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	372 return -1;
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	373
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	374 if (conn->socket >= 0)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	375 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	376 #ifdef __WIN32
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	377 closesocket(conn->socket);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	378 #else
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	379 close(conn->socket);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	380 #endif
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	381 conn->socket = -1;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	382 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	383
613 2cd71b7c1e8e Repurpose nn_conn_close() to only close the socket, but not free the Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	384 conn->status = NN_CONN_CLOSED;
2cd71b7c1e8e Repurpose nn_conn_close() to only close the socket, but not free the Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	385 return 0;
2cd71b7c1e8e Repurpose nn_conn_close() to only close the socket, but not free the Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	386 }
2cd71b7c1e8e Repurpose nn_conn_close() to only close the socket, but not free the Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	387
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	388
613 2cd71b7c1e8e Repurpose nn_conn_close() to only close the socket, but not free the Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	389 void nn_conn_free(nn_conn_t *conn)
2cd71b7c1e8e Repurpose nn_conn_close() to only close the socket, but not free the Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	390 {
2cd71b7c1e8e Repurpose nn_conn_close() to only close the socket, but not free the Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	391 if (conn != NULL)
2cd71b7c1e8e Repurpose nn_conn_close() to only close the socket, but not free the Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	392 {
2cd71b7c1e8e Repurpose nn_conn_close() to only close the socket, but not free the Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	393 nn_conn_close(conn);
2cd71b7c1e8e Repurpose nn_conn_close() to only close the socket, but not free the Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	394 th_free(conn->host);
2cd71b7c1e8e Repurpose nn_conn_close() to only close the socket, but not free the Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	395 th_free(conn->proxy.host);
2cd71b7c1e8e Repurpose nn_conn_close() to only close the socket, but not free the Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	396 th_free(conn);
2cd71b7c1e8e Repurpose nn_conn_close() to only close the socket, but not free the Matti Hamalainen <ccr@tnsp.org> parents: 611 diff changeset	397 }
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	398 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	399
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	400
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	401 BOOL nn_conn_send_buf(nn_conn_t conn, const char buf, const size_t len)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	402 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	403 size_t bufLeft = len;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	404 const char *bufPtr = buf;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	405
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	406 while (bufLeft > 0)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	407 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	408 ssize_t bufSent;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	409 bufSent = send(conn->socket, bufPtr, bufLeft, 0);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	410 if (bufSent < 0)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	411 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	412 conn->err = nn_get_socket_errno();
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	413 nn_conn_err(conn, "nn_conn_send_buf() failed: %s", nn_get_socket_errstr(conn->err));
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	414 return FALSE;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	415 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	416 bufLeft -= bufSent;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	417 bufPtr += bufSent;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	418 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	419
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	420 return TRUE;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	421 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	422
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	423 void nn_conn_reset(nn_conn_t *conn)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	424 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	425 if (conn != NULL)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	426 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	427 conn->ptr = conn->in_ptr = conn->buf;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	428 conn->got_bytes = conn->total_bytes = 0;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	429 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	430 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	431
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	432
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	433 int nn_conn_pull(nn_conn_t *conn)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	434 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	435 int result;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	436 struct timeval socktv;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	437 fd_set tmpfds;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	438
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	439 if (conn == NULL)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	440 return -10;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	441
438 3be600124da8 Fix packet shifting. Matti Hamalainen <ccr@tnsp.org> parents: 434 diff changeset	442 // Shift the input buffer
3be600124da8 Fix packet shifting. Matti Hamalainen <ccr@tnsp.org> parents: 434 diff changeset	443 if (conn->ptr > conn->buf)
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	444 {
438 3be600124da8 Fix packet shifting. Matti Hamalainen <ccr@tnsp.org> parents: 434 diff changeset	445 size_t left = conn->in_ptr - conn->ptr;
3be600124da8 Fix packet shifting. Matti Hamalainen <ccr@tnsp.org> parents: 434 diff changeset	446 if (left > 0)
3be600124da8 Fix packet shifting. Matti Hamalainen <ccr@tnsp.org> parents: 434 diff changeset	447 {
3be600124da8 Fix packet shifting. Matti Hamalainen <ccr@tnsp.org> parents: 434 diff changeset	448 size_t moved = conn->ptr - conn->buf;
3be600124da8 Fix packet shifting. Matti Hamalainen <ccr@tnsp.org> parents: 434 diff changeset	449 memmove(conn->buf, conn->ptr, left);
3be600124da8 Fix packet shifting. Matti Hamalainen <ccr@tnsp.org> parents: 434 diff changeset	450 conn->ptr = conn->buf;
3be600124da8 Fix packet shifting. Matti Hamalainen <ccr@tnsp.org> parents: 434 diff changeset	451 conn->in_ptr -= moved;
3be600124da8 Fix packet shifting. Matti Hamalainen <ccr@tnsp.org> parents: 434 diff changeset	452 conn->total_bytes -= moved;
3be600124da8 Fix packet shifting. Matti Hamalainen <ccr@tnsp.org> parents: 434 diff changeset	453 }
3be600124da8 Fix packet shifting. Matti Hamalainen <ccr@tnsp.org> parents: 434 diff changeset	454 else
3be600124da8 Fix packet shifting. Matti Hamalainen <ccr@tnsp.org> parents: 434 diff changeset	455 nn_conn_reset(conn);
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	456 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	457
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 415 diff changeset	458 // Check for incoming data
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	459 socktv.tv_sec = 0;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	460 socktv.tv_usec = NN_DELAY_USEC;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	461 tmpfds = conn->sockfds;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	462
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	463 if ((result = select(conn->socket + 1, &tmpfds, NULL, NULL, &socktv)) == -1)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	464 {
490 9141f13be70c Don't set conn->err if we are handling EINTR and it isn't supposed to get to Matti Hamalainen <ccr@tnsp.org> parents: 489 diff changeset	465 int err = nn_get_socket_errno();
9141f13be70c Don't set conn->err if we are handling EINTR and it isn't supposed to get to Matti Hamalainen <ccr@tnsp.org> parents: 489 diff changeset	466 if (err != EINTR)
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	467 {
490 9141f13be70c Don't set conn->err if we are handling EINTR and it isn't supposed to get to Matti Hamalainen <ccr@tnsp.org> parents: 489 diff changeset	468 conn->err = err;
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	469 nn_conn_err(conn, "Error occured in select(%d, sockfds): %d, %s\n",
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	470 socket, conn->err, nn_get_socket_errstr(conn->err));
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	471 return -1;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	472 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	473 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	474 else if (FD_ISSET(conn->socket, &tmpfds))
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	475 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	476 conn->got_bytes = recv(conn->socket, conn->in_ptr, NN_CONNBUF_SIZE - conn->total_bytes, 0);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	477 if (conn->got_bytes < 0)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	478 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	479 conn->err = nn_get_socket_errno();
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	480 nn_conn_err(conn, "Error in recv: %d, %s\n", conn->err, nn_get_socket_errstr(conn->err));
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	481 return -2;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	482 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	483 else if (conn->got_bytes == 0)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	484 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	485 nn_conn_err(conn, "Server closed connection.\n");
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	486 conn->status = NN_CONN_CLOSED;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	487 return -3;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	488 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	489 else
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	490 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	491 conn->total_bytes += conn->got_bytes;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	492 conn->in_ptr += conn->got_bytes;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	493 return 0;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	494 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	495 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	496
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	497 return 1;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	498 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	499
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	500
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	501 BOOL nn_conn_check(nn_conn_t *conn)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	502 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	503 if (conn == NULL)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	504 return FALSE;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	505
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	506 return conn->err == 0 && conn->status == NN_CONN_OPEN;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	507 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	508
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	509
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	510 BOOL nn_network_init(void)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	511 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	512 #ifdef __WIN32
419 d015ecbd231d Use C99 style comments, too. Matti Hamalainen <ccr@tnsp.org> parents: 415 diff changeset	513 // Initialize WinSock, if needed
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	514 WSADATA wsaData;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	515 int err = WSAStartup(0x0101, &wsaData);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	516 if (err != 0)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	517 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	518 THERR("Could not initialize WinSock library (err=%d).\n", err);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	519 return FALSE;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	520 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	521 #endif
489 ba48840b8525 Move network initialization/shutdown flag checking to network module. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	522
ba48840b8525 Move network initialization/shutdown flag checking to network module. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	523 nn_network_inited = TRUE;
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	524 return TRUE;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	525 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	526
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	527
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	528 void nn_network_close(void)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	529 {
489 ba48840b8525 Move network initialization/shutdown flag checking to network module. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	530 if (nn_network_inited)
ba48840b8525 Move network initialization/shutdown flag checking to network module. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	531 {
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	532 #ifdef __WIN32
489 ba48840b8525 Move network initialization/shutdown flag checking to network module. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	533 WSACleanup();
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	534 #endif
489 ba48840b8525 Move network initialization/shutdown flag checking to network module. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	535 }
ba48840b8525 Move network initialization/shutdown flag checking to network module. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	536
ba48840b8525 Move network initialization/shutdown flag checking to network module. Matti Hamalainen <ccr@tnsp.org> parents: 488 diff changeset	537 nn_network_inited = FALSE;
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	538 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	539
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	540
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	541 BOOL nn_conn_buf_check(nn_conn_t *conn, size_t n)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	542 {
428 162011bbec48 Remove somewhat useless pointer checks. Matti Hamalainen <ccr@tnsp.org> parents: 423 diff changeset	543 return conn && (conn->ptr + n <= conn->in_ptr);
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	544 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	545
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	546
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	547 BOOL nn_conn_buf_skip(nn_conn_t *conn, size_t n)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	548 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	549 if (nn_conn_buf_check(conn, n))
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	550 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	551 conn->ptr += n;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	552 return TRUE;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	553 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	554 else
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	555 return FALSE;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	556 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	557
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	558
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	559 int nn_conn_buf_strncmp(nn_conn_t conn, const char str, const size_t n)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	560 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	561 int ret;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	562 if (!nn_conn_buf_check(conn, n))
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	563 return -1;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	564
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	565 if ((ret = strncmp(conn->ptr, str, n)) == 0)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	566 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	567 conn->ptr += n;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	568 return 0;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	569 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	570 else
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	571 return ret;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	572 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	573
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	574
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	575 int nn_conn_buf_strcmp(nn_conn_t conn, const char str)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	576 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	577 return nn_conn_buf_strncmp(conn, str, strlen(str));
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	578 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	579
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	580
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	581 char nn_conn_buf_strstr(nn_conn_t conn, const char *str)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	582 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	583 char *pos;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	584 size_t n = strlen(str);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	585
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	586 if (nn_conn_buf_check(conn, n) && ((pos = strstr(conn->ptr, str)) != NULL))
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	587 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	588 conn->ptr = pos + n;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	589 return pos;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	590 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	591 else
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	592 return NULL;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	593 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	594
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	595
423 6727fec3c326 Rename nn_conn_send_msg() to nn_conn_send_msg_v() and add new nn_conn_send_msg(). Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	596 BOOL nn_conn_send_msg(nn_conn_t conn, const char user, const char *str)
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	597 {
423 6727fec3c326 Rename nn_conn_send_msg() to nn_conn_send_msg_v() and add new nn_conn_send_msg(). Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	598 char *msg;
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	599
423 6727fec3c326 Rename nn_conn_send_msg() to nn_conn_send_msg_v() and add new nn_conn_send_msg(). Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	600 if (str == NULL)
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	601 return FALSE;
423 6727fec3c326 Rename nn_conn_send_msg() to nn_conn_send_msg_v() and add new nn_conn_send_msg(). Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	602
6727fec3c326 Rename nn_conn_send_msg() to nn_conn_send_msg_v() and add new nn_conn_send_msg(). Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	603 msg = th_strdup_printf("<USER>%s</USER><MESSAGE>%s</MESSAGE>", user, str);
412 3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	604
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	605 if (msg != NULL)
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	606 {
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	607 BOOL ret = nn_conn_send_buf(conn, msg, strlen(msg) + 1);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	608 th_free(msg);
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	609 return ret;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	610 }
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	611 else
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	612 return FALSE;
3e64acb433e8 Split libnnchat into libnnet and libnnutil Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	613 }
423 6727fec3c326 Rename nn_conn_send_msg() to nn_conn_send_msg_v() and add new nn_conn_send_msg(). Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	614
6727fec3c326 Rename nn_conn_send_msg() to nn_conn_send_msg_v() and add new nn_conn_send_msg(). Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	615
6727fec3c326 Rename nn_conn_send_msg() to nn_conn_send_msg_v() and add new nn_conn_send_msg(). Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	616 BOOL nn_conn_send_msg_v(nn_conn_t conn, const char user, const char *fmt, ...)
6727fec3c326 Rename nn_conn_send_msg() to nn_conn_send_msg_v() and add new nn_conn_send_msg(). Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	617 {
482 8bd6bad09fb8 Fix a memory leak in nn_conn_send_msg_v(). Matti Hamalainen <ccr@tnsp.org> parents: 458 diff changeset	618 BOOL res;
423 6727fec3c326 Rename nn_conn_send_msg() to nn_conn_send_msg_v() and add new nn_conn_send_msg(). Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	619 char *tmp;
6727fec3c326 Rename nn_conn_send_msg() to nn_conn_send_msg_v() and add new nn_conn_send_msg(). Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	620 va_list ap;
6727fec3c326 Rename nn_conn_send_msg() to nn_conn_send_msg_v() and add new nn_conn_send_msg(). Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	621
6727fec3c326 Rename nn_conn_send_msg() to nn_conn_send_msg_v() and add new nn_conn_send_msg(). Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	622 va_start(ap, fmt);
6727fec3c326 Rename nn_conn_send_msg() to nn_conn_send_msg_v() and add new nn_conn_send_msg(). Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	623 tmp = th_strdup_vprintf(fmt, ap);
6727fec3c326 Rename nn_conn_send_msg() to nn_conn_send_msg_v() and add new nn_conn_send_msg(). Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	624 va_end(ap);
6727fec3c326 Rename nn_conn_send_msg() to nn_conn_send_msg_v() and add new nn_conn_send_msg(). Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	625
482 8bd6bad09fb8 Fix a memory leak in nn_conn_send_msg_v(). Matti Hamalainen <ccr@tnsp.org> parents: 458 diff changeset	626 res = nn_conn_send_msg(conn, user, tmp);
8bd6bad09fb8 Fix a memory leak in nn_conn_send_msg_v(). Matti Hamalainen <ccr@tnsp.org> parents: 458 diff changeset	627 th_free(tmp);
8bd6bad09fb8 Fix a memory leak in nn_conn_send_msg_v(). Matti Hamalainen <ccr@tnsp.org> parents: 458 diff changeset	628 return res;
423 6727fec3c326 Rename nn_conn_send_msg() to nn_conn_send_msg_v() and add new nn_conn_send_msg(). Matti Hamalainen <ccr@tnsp.org> parents: 419 diff changeset	629 }
434 691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	630
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	631
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	632 void nn_conn_dump_buffer(FILE f, nn_conn_t conn)
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	633 {
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	634 char *p;
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	635 size_t offs, left;
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	636
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	637 fprintf(f,
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	638 "\n--------------------------------------------------------------\n"
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	639 "err=%d, status=%d, got_bytes=%d, total_bytes=%d\n"
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	640 "buf=0x%p, in_ptr=0x%04x, ptr=0x%04x\n",
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	641 conn->err, conn->status, conn->got_bytes, conn->total_bytes,
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	642 conn->buf, conn->in_ptr - conn->buf, conn->ptr - conn->buf);
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	643
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	644 // Dump buffer contents as a hexdump
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	645 for (offs = 0, left = conn->total_bytes, p = conn->buf; p < conn->in_ptr;)
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	646 {
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	647 char buf[NN_DUMP_BYTES + 1];
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	648 size_t bufoffs, amount = left < NN_DUMP_BYTES ? left : NN_DUMP_BYTES;
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	649 left -= amount;
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	650
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	651 // Dump offs \| xx xx xx xx \| and fill string
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	652 fprintf(f, "%04x \| ", offs);
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	653 for (bufoffs = 0; bufoffs < amount; offs++, bufoffs++, p++)
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	654 {
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	655 fprintf(f, "%02x ", *p);
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	656 buf[bufoffs] = th_isprint(p) ? p : '.';
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	657 }
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	658 buf[bufoffs] = 0;
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	659
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	660 // Add padding
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	661 for (; bufoffs < NN_DUMP_BYTES; bufoffs++)
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	662 fprintf(f, " ");
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	663
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	664 // Print string
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	665 fprintf(f, "\| %s\n", buf);
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	666 }
691400f1c9bb Add function for dumping current network buffer. Matti Hamalainen <ccr@tnsp.org> parents: 433 diff changeset	667 }

Mercurial > hg > nnchat

annotate network.c @ 613:2cd71b7c1e8e