nnchat: libnnchat.c annotate

annotate libnnchat.c @ 359:8f3c102db611

Fix SOCKS handling.

author	Matti Hamalainen <ccr@tnsp.org>
date	Thu, 23 Jun 2011 10:11:45 +0300
parents	ba2aa110755b
children	b465a17ffa47

rev	line source
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 * NNChat - Custom chat client for NewbieNudes.com chatrooms
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3 * Written by Matti 'ccr' Hämäläinen
274 1211b740fbda Update copyright years. Matti Hamalainen <ccr@tnsp.org> parents: 215 diff changeset	4 * (C) Copyright 2008-2011 Tecnic Software productions (TNSP)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	5 */
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 #include "libnnchat.h"
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8
90 1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	9 #ifdef __WIN32
1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	10 const char *hstrerror(int err)
1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	11 {
1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	12 static char buf[64];
1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	13 snprintf(buf, sizeof(buf), "Error #%d", err);
1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	14 return buf;
1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	15 }
1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	16
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	17 int nn_get_socket_errno(void)
90 1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	18 {
1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	19 return WSAGetLastError();
1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	20 }
1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	21
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	22 const char *nn_get_socket_errstr(int err)
90 1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	23 {
1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	24 static char buf[64];
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	25 switch (err) {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	26 case WSAEADDRINUSE: return "Address already in use";
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	27 case WSAECONNABORTED: return "Software caused connection abort";
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	28 case WSAECONNREFUSED: return "Connection refused";
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	29 case WSAECONNRESET: return "Connection reset by peer";
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	30 case WSAEHOSTUNREACH: return "No route to host";
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	31 case WSAENETDOWN: return "Network is down";
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	32 case WSAETIMEDOUT: return "Connection timed out";
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	33 case WSAHOST_NOT_FOUND: return "Host not found";
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	34 case WSAVERNOTSUPPORTED: return "Wrong WinSock DLL version";
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	35 default:
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	36 snprintf(buf, sizeof(buf), "Error #%d", err);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	37 return buf;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	38 break;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	39 }
90 1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	40 }
1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	41 #else
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	42 int nn_get_socket_errno(void)
90 1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	43 {
1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	44 return errno;
1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	45 }
1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	46
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	47 const char *nn_get_socket_errstr(int err)
90 1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	48 {
1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	49 return strerror(err);
1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	50 }
1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	51 #endif
1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	52
1e0bf7b4fd41 Move socket error handling functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 89 diff changeset	53
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	54 void nn_conn_err(nn_conn_t conn, const char fmt, ...)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	55 {
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	56 if (conn->errfunc) {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	57 va_list ap;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	58 va_start(ap, fmt);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	59 conn->errfunc(conn, fmt, ap);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	60 va_end(ap);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	61 }
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	62 }
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	63
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	64
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	65 static void nn_conn_msg(nn_conn_t conn, const char fmt, ...)
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	66 {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	67 if (conn->msgfunc) {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	68 va_list ap;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	69 va_start(ap, fmt);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	70 conn->msgfunc(conn, fmt, ap);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	71 va_end(ap);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	72 }
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	73 }
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	74
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	75 struct hostent nn_resolve_host(nn_conn_t conn, const char *name)
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	76 {
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	77 struct hostent *res = gethostbyname(name);
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	78 if (res == NULL)
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	79 nn_conn_err(conn, "Could not resolve hostname: %s\n", strerror(h_errno));
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	80 else
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	81 nn_conn_msg(conn, "True hostname for %s is %s\n", name, res->h_name);
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	82
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	83 return res;
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	84 }
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	85
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	86 static const char *nn_proxy_types[] = {
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	87 "none",
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	88 "SOCKS 4",
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	89 "SOCKS 4a",
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	90 NULL
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	91 };
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	92
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	93
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	94 nn_conn_t * nn_conn_new(
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	95 void (errfunc)(nn_conn_t conn, const char *fmt, va_list ap),
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	96 void (msgfunc)(nn_conn_t conn, const char *fmt, va_list ap))
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	97 {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	98 nn_conn_t *conn = th_calloc(1, sizeof(nn_conn_t));
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	99
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	100 if (conn == NULL)
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	101 return NULL;
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	102
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	103 conn->errfunc = errfunc;
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	104 conn->msgfunc = msgfunc;
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	105
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	106 return conn;
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	107 }
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	108
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	109 int nn_conn_set_proxy(nn_conn_t conn, int type, int port, const char host)
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	110 {
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	111 if (conn == NULL)
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	112 return -1;
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	113
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	114 conn->proxy.type = type;
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	115 conn->proxy.port = port;
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	116 conn->proxy.host = th_strdup(host);
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	117
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	118 if (host != NULL) {
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	119 conn->proxy.hst = nn_resolve_host(conn, host);
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	120 if (conn->proxy.hst != NULL)
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	121 conn->proxy.addr = (struct in_addr ) (conn->proxy.hst->h_addr);
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	122 else {
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	123 conn->proxy.addr.s_addr = 0;
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	124 }
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	125 } else
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	126 return -2;
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	127
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	128 return 0;
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	129 }
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	130
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	131 int nn_conn_open(nn_conn_t conn, const int port, const char host)
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	132 {
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	133 struct sockaddr_in dest;
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	134 static const char *userid = "James Bond";
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	135
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	136 if (conn == NULL)
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	137 return -1;
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	138
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	139 conn->port = port;
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	140 if (host != NULL) {
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	141 conn->host = th_strdup(host);
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	142 conn->hst = nn_resolve_host(conn, host);
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	143 }
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	144
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	145 if (conn->hst != NULL)
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	146 conn->addr = (struct in_addr ) (conn->hst->h_addr);
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	147 else {
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	148 conn->addr.s_addr = 0;
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	149 }
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	150
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	151
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	152 /* Prepare for connection */
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	153 if (conn->proxy.type > NN_PROXY_NONE && conn->proxy.type < NN_PROXY_LAST) {
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	154 dest.sin_family = AF_INET;
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	155 dest.sin_port = htons(conn->proxy.port);
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	156 dest.sin_addr = conn->proxy.addr;
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	157
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	158 nn_conn_msg(conn, "Connecting to %s proxy %s:%d ...\n",
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	159 nn_proxy_types[conn->proxy.type],
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	160 inet_ntoa(dest.sin_addr), port);
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	161 } else {
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	162 dest.sin_family = AF_INET;
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	163 dest.sin_port = htons(port);
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	164 dest.sin_addr = conn->addr;
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	165
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	166 nn_conn_msg(conn, "Connecting to %s:%d ...\n",
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	167 inet_ntoa(dest.sin_addr), port);
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	168 }
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	169
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	170 if ((conn->socket = socket(PF_INET, SOCK_STREAM, 0)) == -1) {
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	171 conn->err = nn_get_socket_errno();
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	172 nn_conn_err(conn, "Could not open socket: %s\n", nn_get_socket_errstr(conn->err));
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	173 goto error;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	174 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	175
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	176 nn_conn_msg(conn, "Using socket %d.\n", conn->socket);
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	177
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	178 if (connect(conn->socket, (struct sockaddr *) &dest, sizeof(dest)) == -1) {
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	179 conn->err = nn_get_socket_errno();
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	180 nn_conn_err(conn, "Could not connect: %s\n", nn_get_socket_errstr(conn->err));
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	181 goto error;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	182 }
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	183
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	184 FD_ZERO(&(conn->sockfds));
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	185 FD_SET(conn->socket, &(conn->sockfds));
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	186
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	187 /* Proxy-specific setup */
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	188 if (conn->proxy.type == NN_PROXY_SOCKS4 \|\| conn->proxy.type == NN_PROXY_SOCKS4A) {
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	189 struct nn_socks_t *socksh;
359 8f3c102db611 Fix SOCKS handling. Matti Hamalainen <ccr@tnsp.org> parents: 355 diff changeset	190 size_t bufsiz = sizeof(struct nn_socks_t) + strlen(userid) + 1;
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	191 char ptr, buf;
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	192 int tries, status = -1;
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	193
359 8f3c102db611 Fix SOCKS handling. Matti Hamalainen <ccr@tnsp.org> parents: 355 diff changeset	194 if (conn->proxy.type == NN_PROXY_SOCKS4A)
8f3c102db611 Fix SOCKS handling. Matti Hamalainen <ccr@tnsp.org> parents: 355 diff changeset	195 bufsiz += strlen(conn->host) + 1;
8f3c102db611 Fix SOCKS handling. Matti Hamalainen <ccr@tnsp.org> parents: 355 diff changeset	196
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	197 ptr = buf = th_malloc(bufsiz);
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	198 if (buf == NULL) {
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	199 conn->err = -1;
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	200 nn_conn_err(conn, "Could not allocate memory for SOCKS negotiation buffer, %d bytes.\n", bufsiz);
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	201 goto error;
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	202 }
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	203
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	204 /* Create SOCKS 4/4A request */
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	205 nn_conn_msg(conn, "Initializing proxy negotiation.\n");
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	206 socksh = (struct nn_socks_t *) buf;
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	207 socksh->version = 4;
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	208 socksh->command = SOCKS_CMD_CONNECT;
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	209 socksh->port = htons(port);
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	210 if (conn->proxy.type == NN_PROXY_SOCKS4A)
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	211 socksh->addr = htonl(0x00000032);
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	212 else
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	213 socksh->addr = conn->addr.s_addr;
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	214 ptr += sizeof(struct nn_socks_t);
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	215
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	216 strcpy(ptr, userid);
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	217
359 8f3c102db611 Fix SOCKS handling. Matti Hamalainen <ccr@tnsp.org> parents: 355 diff changeset	218 if (conn->proxy.type == NN_PROXY_SOCKS4A) {
8f3c102db611 Fix SOCKS handling. Matti Hamalainen <ccr@tnsp.org> parents: 355 diff changeset	219 ptr += strlen(userid) + 1;
8f3c102db611 Fix SOCKS handling. Matti Hamalainen <ccr@tnsp.org> parents: 355 diff changeset	220 strcpy(ptr, conn->host);
8f3c102db611 Fix SOCKS handling. Matti Hamalainen <ccr@tnsp.org> parents: 355 diff changeset	221 }
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	222
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	223 /* Send request */
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	224 if (!nn_conn_send_buf(conn, buf, bufsiz)) {
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	225 th_free(buf);
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	226 nn_conn_err(conn, "Error sending SOCKS proxy request.\n");
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	227 goto error;
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	228 }
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	229 th_free(buf);
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	230
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	231 /* Wait for SOCKS server to reply */
359 8f3c102db611 Fix SOCKS handling. Matti Hamalainen <ccr@tnsp.org> parents: 355 diff changeset	232 for (status = tries = 1; tries <= 20 && status > 0; tries++) {
355 ba2aa110755b Add some informational messages to proxy connection setup. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	233 usleep(500);
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	234 status = nn_conn_pull(conn);
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	235 }
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	236
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	237 /* Check results */
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	238 if (status == 0) {
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	239 struct nn_socks_res_t res = (struct nn_socks_res_t ) &(conn->buf);
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	240 if (res->nb != 0) {
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	241 nn_conn_err(conn, "Invalid SOCKS server reply, does not begin with NUL byte (%d).\n", res->nb);
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	242 goto error;
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	243 }
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	244 if (res->result != 0x5a) {
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	245 char *s = NULL;
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	246 switch (res->result) {
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	247 case 0x5b: s = "Request rejected or failed"; break;
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	248 case 0x5c: s = "Request failed because client is not running identd (or not reachable from the server)"; break;
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	249 case 0x5d: s = "Request failed because client's identd could not confirm the user ID string in the request"; break;
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	250 default: s = "Unknown SOCKS error response"; break;
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	251 }
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	252 nn_conn_err(conn, "SOCKS setup failed, 0x%02x: %s.\n", res->result, s);
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	253 goto error;
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	254 }
355 ba2aa110755b Add some informational messages to proxy connection setup. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	255 nn_conn_msg(conn, "SOCKS connection established!\n");
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	256 }
355 ba2aa110755b Add some informational messages to proxy connection setup. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	257 else if (status < 0) {
359 8f3c102db611 Fix SOCKS handling. Matti Hamalainen <ccr@tnsp.org> parents: 355 diff changeset	258 nn_conn_err(conn, "Proxy negotiation failed at try %d with network error: %d\n", tries, status);
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	259 goto error;
355 ba2aa110755b Add some informational messages to proxy connection setup. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	260 }
ba2aa110755b Add some informational messages to proxy connection setup. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	261 else {
ba2aa110755b Add some informational messages to proxy connection setup. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	262 nn_conn_err(conn, "Proxy negotiation timed out.\n");
ba2aa110755b Add some informational messages to proxy connection setup. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	263 goto error;
ba2aa110755b Add some informational messages to proxy connection setup. Matti Hamalainen <ccr@tnsp.org> parents: 354 diff changeset	264 }
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	265 }
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	266
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	267 conn->status = NN_CONN_OPEN;
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	268 return 0;
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	269
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	270 error:
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	271 conn->status = NN_CONN_CLOSED;
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	272 return -2;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	273 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	274
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	275
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	276 void nn_conn_close(nn_conn_t *conn)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	277 {
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	278 if (conn == NULL)
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	279 return;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	280
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	281 if (conn->socket >= 0) {
64 6a3a917303e4 Some random cleanups, bring back WinSock support. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	282 #ifdef __WIN32
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	283 closesocket(conn->socket);
64 6a3a917303e4 Some random cleanups, bring back WinSock support. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	284 #else
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	285 close(conn->socket);
64 6a3a917303e4 Some random cleanups, bring back WinSock support. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	286 #endif
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	287 conn->socket = -1;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	288 }
354 c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	289
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	290 th_free(conn->host);
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	291 th_free(conn->proxy.host);
c01e42fc9adb More work on SOCKS proxy support, should work now. Matti Hamalainen <ccr@tnsp.org> parents: 352 diff changeset	292
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	293 conn->status = NN_CONN_CLOSED;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	294
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	295 th_free(conn);
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	296 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	297
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	298
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	299 BOOL nn_conn_send_buf(nn_conn_t conn, const char buf, const size_t len)
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	300 {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	301 size_t bufLeft = len;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	302 const char *bufPtr = buf;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	303
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	304 while (bufLeft > 0) {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	305 ssize_t bufSent;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	306 bufSent = send(conn->socket, bufPtr, bufLeft, 0);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	307 if (bufSent < 0) {
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	308 conn->err = nn_get_socket_errno();
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	309 nn_conn_err(conn, "nn_conn_send_buf() failed: %s", nn_get_socket_errstr(conn->err));
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	310 return FALSE;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	311 }
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	312 bufLeft -= bufSent;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	313 bufPtr += bufSent;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	314 }
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	315
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	316 return TRUE;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	317 }
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	318
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	319
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	320 int nn_conn_pull(nn_conn_t *conn)
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	321 {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	322 int result;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	323 struct timeval socktv;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	324 fd_set tmpfds;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	325
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	326 if (conn == NULL)
359 8f3c102db611 Fix SOCKS handling. Matti Hamalainen <ccr@tnsp.org> parents: 355 diff changeset	327 return -10;
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	328
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	329 conn->ptr = conn->buf;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	330
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	331 /* Check for incoming data */
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	332 socktv.tv_sec = 0;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	333 socktv.tv_usec = NN_DELAY_USEC;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	334 tmpfds = conn->sockfds;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	335
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	336 if ((result = select(conn->socket + 1, &tmpfds, NULL, NULL, &socktv)) == -1) {
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	337 conn->err = nn_get_socket_errno();
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	338 if (conn->err != EINTR) {
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	339 nn_conn_err(conn, "Error occured in select(%d, sockfds): %d, %s\n",
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	340 socket, conn->err, nn_get_socket_errstr(conn->err));
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	341 return -1;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	342 }
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	343 } else
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	344 if (FD_ISSET(conn->socket, &tmpfds)) {
359 8f3c102db611 Fix SOCKS handling. Matti Hamalainen <ccr@tnsp.org> parents: 355 diff changeset	345 conn->got = recv(conn->socket, conn->buf, NN_CONNBUF_SIZE, 0);
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	346 if (conn->got < 0) {
352 b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	347 conn->err = nn_get_socket_errno();
b54c8545dcb0 Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested. Matti Hamalainen <ccr@tnsp.org> parents: 330 diff changeset	348 nn_conn_err(conn, "Error in recv: %d, %s\n", conn->err, nn_get_socket_errstr(conn->err));
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	349 return -2;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	350 } else if (conn->got == 0) {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	351 nn_conn_err(conn, "Server closed connection.\n");
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	352 conn->status = NN_CONN_CLOSED;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	353 return -3;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	354 } else {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	355 /* Handle protocol data */
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	356 conn->buf[conn->got] = 0;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	357 return 0;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	358 }
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	359 }
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	360
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	361 return 1;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	362 }
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	363
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	364 BOOL nn_conn_check(nn_conn_t *conn)
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	365 {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	366 if (conn == NULL)
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	367 return FALSE;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	368
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	369 return conn->err == 0 && conn->status == NN_CONN_OPEN;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	370 }
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	371
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	372
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	373
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	374 BOOL nn_network_init(void)
91 acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	375 {
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	376 #ifdef __WIN32
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	377 /* Initialize WinSock, if needed */
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	378 WSADATA wsaData;
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	379 int err = WSAStartup(0x0101, &wsaData);
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	380 if (err != 0) {
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	381 THERR("Could not initialize WinSock library (err=%d).\n", err);
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	382 return FALSE;
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	383 }
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	384 #endif
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	385 return TRUE;
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	386 }
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	387
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	388
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	389 void nn_network_close(void)
91 acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	390 {
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	391 #ifdef __WIN32
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	392 WSACleanup();
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	393 #endif
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	394 }
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	395
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	396
304 61884ce9db41 Use th_vputch() and th_vputs() instead of similar routines in libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 285 diff changeset	397 #define PUSHCHAR(x) th_vputch(&result, &resSize, &resPos, x)
61884ce9db41 Use th_vputch() and th_vputs() instead of similar routines in libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 285 diff changeset	398 #define PUSHSTR(x) th_vputs(&result, &resSize, &resPos, x)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	399
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	400 char nn_encode_str1(const char str)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	401 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	402 const char *s = str;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	403 char *result;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	404 size_t resSize, resPos = 0;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	405
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	406 if (str == NULL) return NULL;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	407
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	408 resSize = strlen(str) + NN_ALLOC_SIZE;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	409 if ((result = th_malloc(resSize)) == NULL)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	410 return NULL;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	411
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	412 while (*s) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	413 switch (*s) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	414 case 32:
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	415 PUSHCHAR('+');
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	416 break;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	417
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	418 default:
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	419 if (th_isalnum(*s))
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	420 PUSHCHAR(*s);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	421 else {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	422 char tmpStr[4];
215 659b8229d015 Silence some warnings on OpenBSD. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	423 snprintf(tmpStr, sizeof(tmpStr), "%2X", (unsigned char) *s);
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	424 PUSHCHAR('%');
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	425 PUSHSTR(tmpStr);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	426 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	427 break;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	428 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	429 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	430 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	431 PUSHCHAR(0);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	432
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	433 return result;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	434 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	435
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	436
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	437 static int getHexDigit(const int c, const int shift)
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	438 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	439 int i;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	440
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	441 if (c >= 'A' && c <= 'F')
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	442 i = c - 'A' + 10;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	443 else if (c >= 'a' && c <= 'f')
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	444 i = c - 'a' + 10;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	445 else if (c >= '0' && c <= '9')
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	446 i = c - '0';
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	447 else
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	448 return -1;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	449
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	450 return i << shift;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	451 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	452
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	453
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	454 char nn_decode_str1(const char str)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	455 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	456 const char *s = str;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	457 char *result;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	458 size_t resSize, resPos = 0;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	459 int c;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	460
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	461 if (str == NULL) return NULL;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	462
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	463 resSize = strlen(str) + NN_ALLOC_SIZE;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	464 if ((result = th_malloc(resSize)) == NULL)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	465 return NULL;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	466
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	467 while (*s) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	468 switch (*s) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	469 case '+':
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	470 PUSHCHAR(' ');
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	471 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	472 break;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	473
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	474 case '½':
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	475 /* Escape these .. */
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	476 PUSHCHAR('½');
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	477 PUSHCHAR('½');
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	478 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	479 break;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	480
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	481 case '\r':
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	482 PUSHCHAR(' ');
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	483 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	484 break;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	485
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	486 case '%':
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	487 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	488 if (*s == '%')
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	489 PUSHCHAR('%');
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	490 else if ((c = getHexDigit(*s, 4)) >= 0) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	491 int i = getHexDigit(*(++s), 0);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	492 if (i >= 0) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	493 PUSHCHAR(c \| i);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	494 } else {
72 fe5fc76c0806 Fix the fuckups of previous commit. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	495 PUSHCHAR('§');
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	496 PUSHCHAR(*s);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	497 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	498 } else {
72 fe5fc76c0806 Fix the fuckups of previous commit. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	499 PUSHCHAR('§');
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	500 PUSHCHAR(*s);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	501 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	502 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	503 break;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	504
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	505 default:
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	506 PUSHCHAR(*s);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	507 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	508 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	509 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	510 PUSHCHAR(0);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	511
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	512 return result;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	513 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	514
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	515
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	516 char nn_strip_tags(const char str)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	517 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	518 const char *s = str;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	519 char *result;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	520 size_t resSize, resPos = 0;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	521
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	522 if (str == NULL) return NULL;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	523
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	524 resSize = strlen(str) + NN_ALLOC_SIZE;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	525 if ((result = th_malloc(resSize)) == NULL)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	526 return NULL;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	527
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	528 while (*s) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	529 if (*s == '<') {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	530 while (s && s != '>') s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	531 if (*s == '>') s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	532 } else
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	533 PUSHCHAR(*s++);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	534 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	535 PUSHCHAR(0);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	536
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	537 return result;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	538 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	539
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	540
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	541 typedef struct {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	542 char c;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	543 char *ent;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	544 } html_entity_t;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	545
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	546
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	547 static const html_entity_t HTMLEntities[] = {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	548 { '<', "<" },
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	549 { '>', ">" },
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	550 };
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	551
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	552 static const int numHTMLEntities = sizeof(HTMLEntities) / sizeof(HTMLEntities[0]);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	553
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	554
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	555 char nn_encode_str2(const char str)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	556 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	557 const char *s = str;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	558 char *result;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	559 size_t resSize, resPos = 0;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	560
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	561 if (str == NULL) return NULL;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	562
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	563 resSize = strlen(str) + NN_ALLOC_SIZE;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	564 if ((result = th_malloc(resSize)) == NULL)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	565 return NULL;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	566
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	567 while (*s) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	568 int i;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	569 BOOL found = FALSE;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	570 for (i = 0; i < numHTMLEntities; i++)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	571 if (HTMLEntities[i].c == *s) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	572 PUSHSTR(HTMLEntities[i].ent);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	573 found = TRUE;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	574 break;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	575 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	576 if (!found) PUSHCHAR(*s);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	577
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	578 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	579 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	580 PUSHCHAR(0);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	581
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	582 return result;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	583 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	584
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	585
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	586 char nn_decode_str2(const char str)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	587 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	588 const char *s = str;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	589 char *result;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	590 size_t resSize, resPos = 0;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	591
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	592 if (str == NULL) return NULL;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	593
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	594 resSize = strlen(str);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	595 if ((result = th_malloc(resSize)) == NULL)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	596 return NULL;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	597
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	598 while (*s) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	599 if (*s == '&') {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	600 int i;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	601 BOOL found = FALSE;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	602 for (i = 0; i < numHTMLEntities; i++) {
95 69f9c46e4a94 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	603 const html_entity_t *ent = &HTMLEntities[i];
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	604 int len = strlen(ent->ent);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	605 if (!strncmp(s, ent->ent, len)) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	606 PUSHCHAR(ent->c);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	607 s += len;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	608 found = TRUE;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	609 break;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	610 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	611 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	612 if (!found) PUSHCHAR(*s++);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	613 } else
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	614 PUSHCHAR(*s++);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	615 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	616 PUSHCHAR(0);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	617
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	618 return result;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	619 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	620
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	621
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	622 char nn_dbldecode_str(const char str)
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	623 {
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	624 char res, tmp;
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	625
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	626 if ((tmp = nn_decode_str1(str)) == NULL)
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	627 return NULL;
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	628
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	629 res = nn_decode_str2(tmp);
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	630 th_free(tmp);
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	631
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	632 return res;
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	633 }
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	634
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	635
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	636 char nn_dblencode_str(const char str)
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	637 {
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	638 char res, tmp;
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	639
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	640 if ((tmp = nn_encode_str2(str)) == NULL)
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	641 return NULL;
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	642
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	643 res = nn_encode_str1(tmp);
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	644 th_free(tmp);
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	645
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	646 return res;
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	647 }
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	648
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	649
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	650 BOOL nn_conn_send_msg(nn_conn_t conn, const char user, const char *fmt, ...)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	651 {
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	652 char tmp, msg;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	653 va_list ap;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	654
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	655 va_start(ap, fmt);
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	656 tmp = th_strdup_vprintf(fmt, ap);
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	657 va_end(ap);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	658
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	659 if (tmp == NULL)
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	660 return FALSE;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	661
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	662 msg = th_strdup_printf("<USER>%s</USER><MESSAGE>%s</MESSAGE>", user, tmp);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	663 th_free(tmp);
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	664
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	665 if (msg != NULL) {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	666 BOOL ret = nn_conn_send_buf(conn, msg, strlen(msg) + 1);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	667 th_free(msg);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	668 return ret;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	669 } else
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	670 return FALSE;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	671 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	672
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	673
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	674 int nn_editbuf_write(nn_editbuf_t *buf, ssize_t pos, int ch)
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	675 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	676 if (buf->len+1 >= buf->size) return -3;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	677
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	678 if (pos < 0)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	679 return -1;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	680 else if (pos >= buf->len) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	681 buf->data[buf->len++] = ch;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	682 } else {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	683 buf->data[pos] = ch;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	684 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	685 return 0;
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	686 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	687
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	688
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	689 int nn_editbuf_insert(nn_editbuf_t *buf, ssize_t pos, int ch)
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	690 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	691 if (buf->len+1 >= buf->size) return -3;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	692
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	693 if (pos < 0)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	694 return -1;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	695 else if (pos >= buf->len) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	696 buf->data[buf->len] = ch;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	697 } else {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	698 memmove(&(buf->data[pos+1]), &(buf->data[pos]), buf->len - pos + 1);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	699 buf->data[pos] = ch;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	700 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	701 buf->len++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	702 return 0;
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	703 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	704
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	705
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	706 int nn_editbuf_delete(nn_editbuf_t *buf, ssize_t pos)
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	707 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	708 if (pos < 0)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	709 return -1;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	710 else if (pos < buf->len) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	711 memmove(&(buf->data[pos]), &(buf->data[pos+1]), buf->len - pos);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	712 buf->len--;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	713 return 0;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	714 } else
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	715 return -2;
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	716 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	717
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	718
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	719 void nn_editbuf_clear(nn_editbuf_t *buf)
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	720 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	721 buf->len = 0;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	722 buf->pos = 0;
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	723 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	724
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	725
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	726 nn_editbuf_t * nn_editbuf_new(ssize_t n)
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	727 {
89 c2d916b340bf Change some typedef names; Add struct for user list handling. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	728 nn_editbuf_t *res = th_calloc(1, sizeof(nn_editbuf_t));
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	729
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	730 res->data = (char *) th_malloc(n);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	731 res->size = n;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	732
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	733 return res;
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	734 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	735
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	736
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	737 void nn_editbuf_free(nn_editbuf_t *buf)
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	738 {
312 a0c001672b44 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 304 diff changeset	739 if (buf != NULL) {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	740 th_free(buf->data);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	741 th_free(buf);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	742 }
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	743 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	744
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	745
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	746 nn_editbuf_t * nn_editbuf_copy(nn_editbuf_t *src)
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	747 {
89 c2d916b340bf Change some typedef names; Add struct for user list handling. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	748 nn_editbuf_t *res;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	749
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	750 assert(src != NULL);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	751
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	752 if (src == NULL) return NULL;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	753
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	754 if ((res = nn_editbuf_new(src->size)) == NULL)
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	755 return NULL;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	756
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	757 memcpy(res->data, src->data, src->size);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	758 res->pos = res->len = src->len;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	759
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	760 return res;
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	761 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	762
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	763
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	764 char * nn_editbuf_get_string(nn_editbuf_t *buf, ssize_t start, ssize_t end)
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	765 {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	766 char *str;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	767 ssize_t siz;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	768
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	769 if (buf == NULL)
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	770 return NULL;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	771
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	772 if (start < 0 \|\| end > buf->len \|\| start >= buf->len)
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	773 return NULL;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	774
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	775 if (end < 0) {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	776 siz = buf->len - start + 1;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	777 } else if (start <= end) {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	778 siz = end - start + 1;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	779 } else
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	780 return NULL;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	781
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	782 if ((str = th_malloc(siz + 1)) == NULL)
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	783 return NULL;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	784
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	785 memcpy(str, buf->data + start, siz);
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	786 str[siz] = 0;
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	787
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	788 return str;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	789 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	790
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	791
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	792 void nn_editbuf_setpos(nn_editbuf_t *buf, ssize_t pos)
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	793 {
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	794 assert(buf != NULL);
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	795
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	796 if (pos < 0)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	797 buf->pos = 0;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	798 else if (pos >= buf->len)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	799 buf->pos = buf->len;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	800 else
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	801 buf->pos = pos;
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	802 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	803
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	804
102 b096ae97fc7d Renamed functions. Matti Hamalainen <ccr@tnsp.org> parents: 97 diff changeset	805 static uint8_t nn_hash_user(const char *name)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	806 {
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	807 /*
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	808 int n = 0;
102 b096ae97fc7d Renamed functions. Matti Hamalainen <ccr@tnsp.org> parents: 97 diff changeset	809 const uint8_t c = (uint8_t )name;
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	810 uint8_t hash = 0xff;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	811
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	812 while (*c && n < 4) {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	813 hash = (hash << 1) ^ tolower(*c);
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	814 c++; n++;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	815 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	816
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	817 return (hash & 0xff);
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	818 */
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	819 return tolower(name[0]);
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	820 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	821
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	822
102 b096ae97fc7d Renamed functions. Matti Hamalainen <ccr@tnsp.org> parents: 97 diff changeset	823 static void nn_user_insert(nn_user_t *list, nn_user_t node)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	824 {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	825 node->next = *list;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	826 *list = node;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	827 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	828
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	829
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	830 nn_user_t nn_userhash_foreach(const nn_userhash_t list, int (func)(const nn_user_t ))
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	831 {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	832 int i;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	833
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	834 if (list == NULL) return NULL;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	835
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	836 for (i = 0; i < NN_NUM_BUCKETS; i++)
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	837 if (list->buckets[i] != NULL) {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	838 nn_user_t *curr = list->buckets[i];
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	839 while (curr != NULL) {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	840 if (func(curr) != 0)
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	841 return curr;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	842 curr = curr->next;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	843 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	844 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	845
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	846 return NULL;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	847 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	848
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	849
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	850 nn_user_t nn_user_find(const nn_userhash_t list, const char *name)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	851 {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	852 uint8_t hash;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	853
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	854 if (list == NULL) return NULL;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	855
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	856 hash = nn_hash_user(name);
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	857 if (list->buckets[hash] != NULL) {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	858 nn_user_t *curr = list->buckets[hash];
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	859 while (curr != NULL) {
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	860 if (strcasecmp(curr->name, name) == 0)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	861 return curr;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	862 curr = curr->next;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	863 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	864 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	865
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	866 return NULL;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	867 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	868
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	869
164 701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	870 static nn_user_t nn_user_match_do(nn_user_t list, const char *pattern, size_t len)
701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	871 {
701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	872 nn_user_t *curr = list;
701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	873 while (curr != NULL) {
701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	874 if (len <= strlen(curr->name) && strncasecmp(curr->name, pattern, len) == 0)
701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	875 return curr;
701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	876 curr = curr->next;
701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	877 }
701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	878 return NULL;
701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	879 }
701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	880
701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	881
116 741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	882 nn_user_t nn_user_match(const nn_userhash_t list, const char pattern, const char current, BOOL again)
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	883 {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	884 uint8_t hash;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	885
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	886 if (list == NULL \|\| pattern == NULL) return NULL;
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	887
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	888 hash = nn_hash_user(pattern);
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	889 if (list->buckets[hash] != NULL) {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	890 nn_user_t *curr = list->buckets[hash];
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	891 size_t len = strlen(pattern);
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	892
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	893 if (current != NULL) {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	894 nn_user_t *found = NULL;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	895 while (curr != NULL) {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	896 if (strcasecmp(curr->name, current) == 0) {
116 741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	897 if (again)
741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	898 return curr;
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	899 found = curr->next;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	900 break;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	901 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	902 curr = curr->next;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	903 }
164 701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	904
701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	905 if (found != NULL && (found = nn_user_match_do(found, pattern, len)) != NULL)
701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	906 return found;
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	907 }
116 741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	908
164 701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	909 if ((curr = nn_user_match_do(list->buckets[hash], pattern, len)) != NULL)
701c54a45466 Fix matching of usernames against hash. In some cases after the last match the function would not go back to the first match. Matti Hamalainen <ccr@tnsp.org> parents: 116 diff changeset	910 return curr;
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	911 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	912
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	913 return NULL;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	914 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	915
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	916
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	917 nn_userhash_t *nn_userhash_new(void)
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	918 {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	919 return th_calloc(1, sizeof(nn_userhash_t));
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	920 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	921
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	922
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	923 int nn_userhash_insert(nn_userhash_t list, const char name)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	924 {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	925 uint8_t hash;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	926 nn_user_t *user;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	927
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	928 /* Check arguments */
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	929 if (list == NULL \|\| name == NULL)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	930 return -1;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	931
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	932 /* Check if username is already there */
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	933 if (nn_user_find(list, name) != NULL)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	934 return 1;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	935
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	936 /* No, we'll add it */
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	937 if ((user = th_calloc(1, sizeof(nn_user_t))) == NULL)
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	938 return -3;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	939
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	940 user->name = th_strdup(name);
c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	941 if (user->name == NULL)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	942 return -4;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	943
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	944 hash = nn_hash_user(name);
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	945 nn_user_insert(&(list->buckets[hash]), user);
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	946
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	947 return 0;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	948 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	949
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	950
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	951 int nn_userhash_delete(nn_userhash_t list, const char name)
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	952 {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	953 uint8_t hash;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	954
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	955 /* Check arguments */
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	956 if (list == NULL \|\| name == NULL)
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	957 return -1;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	958
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	959 /* Check if username is already there */
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	960 hash = nn_hash_user(name);
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	961 if (list->buckets[hash] != NULL) {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	962 nn_user_t curr, prev;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	963 curr = list->buckets[hash];
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	964 prev = NULL;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	965 while (curr != NULL) {
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	966 if (strcasecmp(curr->name, name) == 0) {
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	967 if (prev)
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	968 prev->next = curr->next;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	969 else
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	970 list->buckets[hash] = curr->next;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	971
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	972 nn_user_free(curr);
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	973
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	974 return 0;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	975 } else {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	976 prev = curr;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	977 curr = curr->next;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	978 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	979 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	980 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	981
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	982 return 1;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	983 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	984
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	985
102 b096ae97fc7d Renamed functions. Matti Hamalainen <ccr@tnsp.org> parents: 97 diff changeset	986 nn_user_t nn_user_copy(const nn_user_t src)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	987 {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	988 nn_user_t *user;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	989
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	990 if (src == NULL) return NULL;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	991
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	992 if ((user = th_calloc(1, sizeof(nn_user_t))) == NULL)
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	993 return NULL;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	994
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	995 /* Copy relevant data */
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	996 user->name = th_strdup(src->name);
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	997 user->lastspoke = src->lastspoke;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	998 user->joined = src->joined;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	999
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1000 return user;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1001 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1002
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1003
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	1004 void nn_user_free(nn_user_t *user)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1005 {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1006 th_free(user->name);
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1007 th_free(user);
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1008 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1009
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1010
102 b096ae97fc7d Renamed functions. Matti Hamalainen <ccr@tnsp.org> parents: 97 diff changeset	1011 void nn_user_free_list(nn_user_t *list)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1012 {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1013 nn_user_t next, curr = list;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1014 while (curr != NULL) {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1015 next = curr->next;
102 b096ae97fc7d Renamed functions. Matti Hamalainen <ccr@tnsp.org> parents: 97 diff changeset	1016 nn_user_free(curr);
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1017 curr = next;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1018 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1019 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1020
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	1021 void nn_userhash_free(nn_userhash_t *hash)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1022 {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1023 int i;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1024 if (hash == NULL)
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1025 return;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1026
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1027 for (i = 0; i < NN_NUM_BUCKETS; i++) {
102 b096ae97fc7d Renamed functions. Matti Hamalainen <ccr@tnsp.org> parents: 97 diff changeset	1028 nn_user_free_list(hash->buckets[i]);
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1029 hash->buckets[i] = NULL;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1030 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1031
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1032 th_free(hash);
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	1033 }
285 b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1034
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1035
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1036 char nn_username_encode(char str)
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1037 {
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1038 unsigned char c = (unsigned char ) str;
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1039 if (str == NULL) return NULL;
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1040 for (; *c ; c++)
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1041 if (c == ' ') c = 255;
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1042 return str;
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1043 }
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1044
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1045
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1046 char nn_username_decode(char str)
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1047 {
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1048 unsigned char c = (unsigned char ) str;
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1049 if (str == NULL) return NULL;
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1050 for (; *c ; c++)
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1051 if (c == 255) c = ' ';
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1052 return str;
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1053 }
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1054
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1055
325 c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1056 nn_window_t nn_window_new(const char id)
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1057 {
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1058 nn_window_t *res = th_calloc(1, sizeof(nn_window_t));
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1059
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1060 if (res == NULL) return NULL;
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1061
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1062 res->data = th_ringbuf_new(NN_BACKBUF_LEN, th_free);
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1063 if (res->data == NULL) {
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1064 th_free(res);
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1065 return NULL;
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1066 }
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1067
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1068 res->id = th_strdup(id);
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1069
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1070 return res;
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1071 }
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1072
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1073
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1074 void nn_window_free(nn_window_t *win)
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1075 {
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1076 if (win != NULL) {
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1077 th_ringbuf_free(win->data);
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1078 th_free(win->id);
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1079 th_free(win);
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1080 }
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1081 }
330 8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1082
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1083
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1084 nn_strtuple_t nn_strtuple_new(size_t len, char str)
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1085 {
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1086 nn_strtuple_t *tuple = th_calloc(1, sizeof(nn_strtuple_t));
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1087 tuple->len = len;
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1088 tuple->str = str;
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1089 return tuple;
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1090 }
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1091
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1092
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1093 void nn_strtuple_free(nn_strtuple_t *tuple)
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1094 {
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1095 th_free(tuple->str);
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1096 th_free(tuple);
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1097 }

Mercurial > hg > nnchat

annotate libnnchat.c @ 359:8f3c102db611