nnchat: libnnchat.c annotate

annotate libnnchat.c @ 352:b54c8545dcb0

Overhaul network code a bit, add initial implementation of SOCKS4/4A proxy support -- which may not work yet, it is untested.

author	Matti Hamalainen <ccr@tnsp.org>
date	Thu, 23 Jun 2011 06:28:40 +0300
parents	8e509d6546d3
children	c01e42fc9adb

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
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	75 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	76 "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	77 "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	78 "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	79 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	80 };
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	81
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	82 nn_conn_t * nn_conn_open(
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	83 void (errfunc)(struct _nn_conn_t conn, const char *fmt, va_list ap),
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	84 void (msgfunc)(struct _nn_conn_t conn, const char *fmt, va_list ap),
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	85 int ptype, int pport, struct in_addr *paddr,
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 struct in_addr addr, const int port, const char host)
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	87 {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	88 nn_conn_t *conn = th_calloc(1, sizeof(nn_conn_t));
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	89 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	90 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	91
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	92 if (conn == NULL)
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	93 return NULL;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	94
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	95 /* Initialize data */
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	96 conn->errfunc = errfunc;
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	97 conn->msgfunc = msgfunc;
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	98
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	99 conn->proxy.type = ptype;
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	100 conn->proxy.port = pport;
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	101 if (paddr != 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	102 conn->proxy.addr = *paddr;
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	103
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	104 conn->port = 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	105 conn->addr = *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	106
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	107 if (ptype == NN_PROXY_SOCKS4A && host == 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	108 nn_conn_err(conn, "Host string NULL and proxy type SOCKS 4a specified. Using IP address instead.\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	109 conn->host = th_strdup(inet_ntoa(dest.sin_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	110 } 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	111 conn->host = th_strdup(host);
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	112
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	113
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	114 /* Prepare for connection */
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	115 if (ptype > NN_PROXY_NONE && ptype < NN_PROXY_LAST) {
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	116 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	117 dest.sin_port = htons(pport);
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	118 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	119
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	120 nn_conn_msg(conn, "Connecting to %s proxy %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	121 nn_proxy_types[ptype],
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	122 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	123 } 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	124 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	125 dest.sin_port = htons(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	126 dest.sin_addr = *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	127
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	128 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	129 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	130 }
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	131
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	132 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	133 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	134 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	135 goto error;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	136 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	137
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	138 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	139
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	140 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	141 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	142 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	143 goto error;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	144 }
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	145
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	146 FD_ZERO(&(conn->sockfds));
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	147 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	148
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	149 /* Proxy-specific setup */
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	150 if (ptype == NN_PROXY_SOCKS4 \|\| ptype == NN_PROXY_SOCKS4A) {
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 struct nn_socks_t *socksh;
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 size_t bufsiz = sizeof(struct nn_socks_t) + strlen(userid) + 1 + strlen(conn->host) + 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	153 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	154 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	155
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 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	157 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	158 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	159 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	160 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	161 }
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
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 /* 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	164 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	165 socksh = (struct nn_socks_t *) 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	166 socksh->version = (ptype == NN_PROXY_SOCKS4) ? 4 : 5;
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 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	168 socksh->port = htons(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	169 if (ptype == NN_PROXY_SOCKS4A)
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	170 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	171 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	172 socksh->addr = dest.sin_addr.s_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	173 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	174
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	175 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	176 ptr += strlen(userid) + 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	177
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	178 strcpy(ptr, conn->host);
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
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 /* 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	181 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	182 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	183 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	184 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	185 }
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 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	187
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	188 /* Wait for SOCKS server to reply */
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 for (tries = 0; tries < 20; tries++) {
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	190 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	191 if (status <= 0) 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	192 }
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
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	194 /* 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	195 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	196 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	197 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	198 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	199 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	200 }
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 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	202 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	203 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	204 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	205 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	206 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	207 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	208 }
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 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	210 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	211 }
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 }
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	213 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	214 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	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
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	217 conn->status = NN_CONN_OPEN;
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	218 return 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	219
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	220 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	221 conn->status = NN_CONN_CLOSED;
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	222 return conn;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	223 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	224
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	225
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	226 void nn_conn_close(nn_conn_t *conn)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	227 {
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	228 if (conn == NULL)
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	229 return;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	230
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	231 if (conn->socket >= 0) {
64 6a3a917303e4 Some random cleanups, bring back WinSock support. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	232 #ifdef __WIN32
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	233 closesocket(conn->socket);
64 6a3a917303e4 Some random cleanups, bring back WinSock support. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	234 #else
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	235 close(conn->socket);
64 6a3a917303e4 Some random cleanups, bring back WinSock support. Matti Hamalainen <ccr@tnsp.org> parents: 62 diff changeset	236 #endif
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	237 conn->socket = -1;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	238 }
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	239
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	240 conn->status = NN_CONN_CLOSED;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	241
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	242 th_free(conn);
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	243 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	244
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	245
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	246 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	247 {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	248 size_t bufLeft = len;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	249 const char *bufPtr = buf;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	250
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	251 while (bufLeft > 0) {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	252 ssize_t bufSent;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	253 bufSent = send(conn->socket, bufPtr, bufLeft, 0);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	254 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	255 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	256 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	257 return FALSE;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	258 }
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	259 bufLeft -= bufSent;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	260 bufPtr += bufSent;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	261 }
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	262
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	263 return TRUE;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	264 }
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	265
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	266
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	267 int nn_conn_pull(nn_conn_t *conn)
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	268 {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	269 int result;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	270 struct timeval socktv;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	271 fd_set tmpfds;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	272
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	273 if (conn == NULL)
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	274 return -1;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	275
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	276 conn->ptr = conn->buf;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	277
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	278 /* Check for incoming data */
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	279 socktv.tv_sec = 0;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	280 socktv.tv_usec = NN_DELAY_USEC;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	281 tmpfds = conn->sockfds;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	282
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	283 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	284 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	285 if (conn->err != EINTR) {
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	286 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	287 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	288 return -1;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	289 }
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	290 } else
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	291 if (FD_ISSET(conn->socket, &tmpfds)) {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	292 conn->got = recv(conn->socket, conn->ptr, NN_CONNBUF_SIZE, 0);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	293 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	294 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	295 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	296 return -2;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	297 } else if (conn->got == 0) {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	298 nn_conn_err(conn, "Server closed connection.\n");
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	299 conn->status = NN_CONN_CLOSED;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	300 return -3;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	301 } else {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	302 /* Handle protocol data */
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	303 conn->buf[conn->got] = 0;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	304 return 0;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	305 }
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	306 }
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	307
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	308 return 1;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	309 }
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	310
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	311 BOOL nn_conn_check(nn_conn_t *conn)
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	312 {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	313 if (conn == NULL)
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	314 return FALSE;
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 conn->err == 0 && conn->status == NN_CONN_OPEN;
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
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	320
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	321 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	322 {
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	323 #ifdef __WIN32
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	324 /* 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	325 WSADATA wsaData;
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	326 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	327 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	328 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	329 return FALSE;
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	330 }
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	331 #endif
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	332 return TRUE;
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	333 }
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	334
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	335
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	336 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	337 {
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	338 #ifdef __WIN32
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	339 WSACleanup();
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	340 #endif
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	341 }
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	342
acfc4b4bc180 Create network initialization functions in libnnchat and move Win32/WinSock code there. Matti Hamalainen <ccr@tnsp.org> parents: 90 diff changeset	343
304 61884ce9db41 Use th_vputch() and th_vputs() instead of similar routines in libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 285 diff changeset	344 #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	345 #define PUSHSTR(x) th_vputs(&result, &resSize, &resPos, x)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	346
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	347 char nn_encode_str1(const char str)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	348 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	349 const char *s = str;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	350 char *result;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	351 size_t resSize, resPos = 0;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	352
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	353 if (str == NULL) return NULL;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	354
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	355 resSize = strlen(str) + NN_ALLOC_SIZE;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	356 if ((result = th_malloc(resSize)) == NULL)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	357 return NULL;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	358
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	359 while (*s) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	360 switch (*s) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	361 case 32:
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	362 PUSHCHAR('+');
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	363 break;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	364
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	365 default:
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	366 if (th_isalnum(*s))
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	367 PUSHCHAR(*s);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	368 else {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	369 char tmpStr[4];
215 659b8229d015 Silence some warnings on OpenBSD. Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	370 snprintf(tmpStr, sizeof(tmpStr), "%2X", (unsigned char) *s);
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	371 PUSHCHAR('%');
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	372 PUSHSTR(tmpStr);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	373 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	374 break;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	375 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	376 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	377 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	378 PUSHCHAR(0);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	379
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	380 return result;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	381 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	382
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	383
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	384 static int getHexDigit(const int c, const int shift)
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	385 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	386 int i;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	387
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	388 if (c >= 'A' && c <= 'F')
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	389 i = c - 'A' + 10;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	390 else if (c >= 'a' && c <= 'f')
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	391 i = c - 'a' + 10;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	392 else if (c >= '0' && c <= '9')
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	393 i = c - '0';
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	394 else
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	395 return -1;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	396
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	397 return i << shift;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	398 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	399
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	400
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	401 char nn_decode_str1(const char str)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	402 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	403 const char *s = str;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	404 char *result;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	405 size_t resSize, resPos = 0;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	406 int c;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	407
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	408 if (str == NULL) return NULL;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	409
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	410 resSize = strlen(str) + NN_ALLOC_SIZE;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	411 if ((result = th_malloc(resSize)) == NULL)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	412 return NULL;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	413
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	414 while (*s) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	415 switch (*s) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	416 case '+':
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	417 PUSHCHAR(' ');
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	418 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	419 break;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	420
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	421 case '½':
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	422 /* Escape these .. */
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	423 PUSHCHAR('½');
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 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	426 break;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	427
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	428 case '\r':
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	429 PUSHCHAR(' ');
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	430 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	431 break;
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 case '%':
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	434 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	435 if (*s == '%')
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	436 PUSHCHAR('%');
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	437 else if ((c = getHexDigit(*s, 4)) >= 0) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	438 int i = getHexDigit(*(++s), 0);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	439 if (i >= 0) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	440 PUSHCHAR(c \| i);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	441 } else {
72 fe5fc76c0806 Fix the fuckups of previous commit. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	442 PUSHCHAR('§');
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	443 PUSHCHAR(*s);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	444 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	445 } else {
72 fe5fc76c0806 Fix the fuckups of previous commit. Matti Hamalainen <ccr@tnsp.org> parents: 71 diff changeset	446 PUSHCHAR('§');
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	447 PUSHCHAR(*s);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	448 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	449 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	450 break;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	451
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	452 default:
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	453 PUSHCHAR(*s);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	454 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	455 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	456 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	457 PUSHCHAR(0);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	458
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	459 return result;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	460 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	461
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	462
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	463 char nn_strip_tags(const char str)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	464 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	465 const char *s = str;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	466 char *result;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	467 size_t resSize, resPos = 0;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	468
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	469 if (str == NULL) return NULL;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	470
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	471 resSize = strlen(str) + NN_ALLOC_SIZE;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	472 if ((result = th_malloc(resSize)) == NULL)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	473 return NULL;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	474
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	475 while (*s) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	476 if (*s == '<') {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	477 while (s && s != '>') s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	478 if (*s == '>') s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	479 } else
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	480 PUSHCHAR(*s++);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	481 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	482 PUSHCHAR(0);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	483
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	484 return result;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	485 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	486
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	487
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	488 typedef struct {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	489 char c;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	490 char *ent;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	491 } html_entity_t;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	492
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	493
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	494 static const html_entity_t HTMLEntities[] = {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	495 { '<', "<" },
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	496 { '>', ">" },
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	497 };
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	498
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	499 static const int numHTMLEntities = sizeof(HTMLEntities) / sizeof(HTMLEntities[0]);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	500
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	501
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	502 char nn_encode_str2(const char str)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	503 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	504 const char *s = str;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	505 char *result;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	506 size_t resSize, resPos = 0;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	507
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	508 if (str == NULL) return NULL;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	509
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	510 resSize = strlen(str) + NN_ALLOC_SIZE;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	511 if ((result = th_malloc(resSize)) == NULL)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	512 return NULL;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	513
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	514 while (*s) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	515 int i;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	516 BOOL found = FALSE;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	517 for (i = 0; i < numHTMLEntities; i++)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	518 if (HTMLEntities[i].c == *s) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	519 PUSHSTR(HTMLEntities[i].ent);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	520 found = TRUE;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	521 break;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	522 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	523 if (!found) PUSHCHAR(*s);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	524
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	525 s++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	526 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	527 PUSHCHAR(0);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	528
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	529 return result;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	530 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	531
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	532
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	533 char nn_decode_str2(const char str)
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	534 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	535 const char *s = str;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	536 char *result;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	537 size_t resSize, resPos = 0;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	538
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	539 if (str == NULL) return NULL;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	540
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	541 resSize = strlen(str);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	542 if ((result = th_malloc(resSize)) == NULL)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	543 return NULL;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	544
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	545 while (*s) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	546 if (*s == '&') {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	547 int i;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	548 BOOL found = FALSE;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	549 for (i = 0; i < numHTMLEntities; i++) {
95 69f9c46e4a94 Constify. Matti Hamalainen <ccr@tnsp.org> parents: 94 diff changeset	550 const html_entity_t *ent = &HTMLEntities[i];
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	551 int len = strlen(ent->ent);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	552 if (!strncmp(s, ent->ent, len)) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	553 PUSHCHAR(ent->c);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	554 s += len;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	555 found = TRUE;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	556 break;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	557 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	558 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	559 if (!found) PUSHCHAR(*s++);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	560 } else
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	561 PUSHCHAR(*s++);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	562 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	563 PUSHCHAR(0);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	564
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	565 return result;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	566 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	567
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	568
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	569 char nn_dbldecode_str(const char str)
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	570 {
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	571 char res, tmp;
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	572
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	573 if ((tmp = nn_decode_str1(str)) == NULL)
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	574 return NULL;
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	575
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	576 res = nn_decode_str2(tmp);
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	577 th_free(tmp);
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	578
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	579 return res;
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	580 }
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	581
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	582
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	583 char nn_dblencode_str(const char str)
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	584 {
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	585 char res, tmp;
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	586
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	587 if ((tmp = nn_encode_str2(str)) == NULL)
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	588 return NULL;
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	589
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	590 res = nn_encode_str1(tmp);
78 745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	591 th_free(tmp);
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	592
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	593 return res;
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	594 }
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	595
745f670068dc Add functions to simplify code. Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	596
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	597 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	598 {
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	599 char tmp, msg;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	600 va_list ap;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	601
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	602 va_start(ap, fmt);
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	603 tmp = th_strdup_vprintf(fmt, ap);
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	604 va_end(ap);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	605
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	606 if (tmp == NULL)
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	607 return FALSE;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	608
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	609 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	610 th_free(tmp);
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	611
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	612 if (msg != NULL) {
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	613 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	614 th_free(msg);
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	615 return ret;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	616 } else
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	617 return FALSE;
62 ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	618 }
ff5d74f0d428 Moved some functions to "libnnchat". Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	619
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	620
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	621 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	622 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	623 if (buf->len+1 >= buf->size) return -3;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	624
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	625 if (pos < 0)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	626 return -1;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	627 else if (pos >= buf->len) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	628 buf->data[buf->len++] = ch;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	629 } else {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	630 buf->data[pos] = ch;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	631 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	632 return 0;
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	633 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	634
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	635
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	636 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	637 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	638 if (buf->len+1 >= buf->size) return -3;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	639
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	640 if (pos < 0)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	641 return -1;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	642 else if (pos >= buf->len) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	643 buf->data[buf->len] = ch;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	644 } else {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	645 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	646 buf->data[pos] = ch;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	647 }
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	648 buf->len++;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	649 return 0;
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	650 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	651
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	652
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	653 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	654 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	655 if (pos < 0)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	656 return -1;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	657 else if (pos < buf->len) {
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	658 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	659 buf->len--;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	660 return 0;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	661 } else
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	662 return -2;
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	663 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	664
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	665
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	666 void nn_editbuf_clear(nn_editbuf_t *buf)
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	667 {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	668 buf->len = 0;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	669 buf->pos = 0;
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	670 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	671
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	672
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	673 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	674 {
89 c2d916b340bf Change some typedef names; Add struct for user list handling. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	675 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	676
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	677 res->data = (char *) th_malloc(n);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	678 res->size = n;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	679
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	680 return res;
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	681 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	682
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	683
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	684 void nn_editbuf_free(nn_editbuf_t *buf)
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	685 {
312 a0c001672b44 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 304 diff changeset	686 if (buf != NULL) {
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	687 th_free(buf->data);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	688 th_free(buf);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	689 }
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	690 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	691
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	692
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	693 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	694 {
89 c2d916b340bf Change some typedef names; Add struct for user list handling. Matti Hamalainen <ccr@tnsp.org> parents: 79 diff changeset	695 nn_editbuf_t *res;
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	696
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	697 assert(src != NULL);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	698
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	699 if (src == NULL) return NULL;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	700
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	701 if ((res = nn_editbuf_new(src->size)) == NULL)
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	702 return NULL;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	703
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	704 memcpy(res->data, src->data, src->size);
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	705 res->pos = res->len = src->len;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	706
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	707 return res;
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	708 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	709
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	710
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	711 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	712 {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	713 char *str;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	714 ssize_t siz;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	715
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	716 if (buf == NULL)
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	717 return NULL;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	718
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	719 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	720 return NULL;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	721
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	722 if (end < 0) {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	723 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	724 } 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	725 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	726 } else
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	727 return NULL;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	728
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	729 if ((str = th_malloc(siz + 1)) == NULL)
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	730 return NULL;
2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	731
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	732 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	733 str[siz] = 0;
168 2e4850ece456 Partially re-factor connection handling. Matti Hamalainen <ccr@tnsp.org> parents: 167 diff changeset	734
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	735 return str;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	736 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	737
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	738
97 218efd2f0641 Rename functions for clarity. Matti Hamalainen <ccr@tnsp.org> parents: 95 diff changeset	739 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	740 {
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	741 assert(buf != NULL);
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	742
71 3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	743 if (pos < 0)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	744 buf->pos = 0;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	745 else if (pos >= buf->len)
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	746 buf->pos = buf->len;
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	747 else
3a23c2adfb78 Remove tabs from indentation. Matti Hamalainen <ccr@tnsp.org> parents: 65 diff changeset	748 buf->pos = pos;
65 e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	749 }
e763ef5cfd53 Move more functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 64 diff changeset	750
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	751
102 b096ae97fc7d Renamed functions. Matti Hamalainen <ccr@tnsp.org> parents: 97 diff changeset	752 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	753 {
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	754 /*
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	755 int n = 0;
102 b096ae97fc7d Renamed functions. Matti Hamalainen <ccr@tnsp.org> parents: 97 diff changeset	756 const uint8_t c = (uint8_t )name;
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	757 uint8_t hash = 0xff;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	758
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	759 while (*c && n < 4) {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	760 hash = (hash << 1) ^ tolower(*c);
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	761 c++; n++;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	762 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	763
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	764 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	765 */
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	766 return tolower(name[0]);
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	767 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	768
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	769
102 b096ae97fc7d Renamed functions. Matti Hamalainen <ccr@tnsp.org> parents: 97 diff changeset	770 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	771 {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	772 node->next = *list;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	773 *list = node;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	774 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	775
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	776
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	777 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	778 {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	779 int i;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	780
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	781 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	782
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	783 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	784 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	785 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	786 while (curr != NULL) {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	787 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	788 return curr;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	789 curr = curr->next;
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 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	792
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	793 return NULL;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	794 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	795
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	796
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	797 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	798 {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	799 uint8_t hash;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	800
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	801 if (list == NULL) return NULL;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	802
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	803 hash = nn_hash_user(name);
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	804 if (list->buckets[hash] != NULL) {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	805 nn_user_t *curr = list->buckets[hash];
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	806 while (curr != NULL) {
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	807 if (strcasecmp(curr->name, name) == 0)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	808 return curr;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	809 curr = curr->next;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	810 }
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
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	813 return NULL;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	814 }
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
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	817 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	818 {
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	819 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	820 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	821 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	822 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	823 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	824 }
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	825 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	826 }
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	827
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	828
116 741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	829 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	830 {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	831 uint8_t hash;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	832
108 f323b137ca08 Tab-completion now works with cycling, but bugs with names that have whitespaces. Matti Hamalainen <ccr@tnsp.org> parents: 106 diff changeset	833 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	834
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	835 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	836 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	837 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	838 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	839
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	840 if (current != NULL) {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	841 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	842 while (curr != NULL) {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	843 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	844 if (again)
741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	845 return curr;
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	846 found = curr->next;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	847 break;
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 curr = curr->next;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	850 }
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	851
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	852 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	853 return found;
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	854 }
116 741e45592522 Add simple "prediction" into tab-completion based on previously gotten last Matti Hamalainen <ccr@tnsp.org> parents: 108 diff changeset	855
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	856 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	857 return curr;
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	858 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	859
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	860 return NULL;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	861 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	862
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	863
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	864 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	865 {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	866 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	867 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	868
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	869
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	870 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	871 {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	872 uint8_t hash;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	873 nn_user_t *user;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	874
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	875 /* Check arguments */
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	876 if (list == NULL \|\| name == NULL)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	877 return -1;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	878
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	879 /* 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	880 if (nn_user_find(list, name) != NULL)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	881 return 1;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	882
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	883 /* No, we'll add it */
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	884 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	885 return -3;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	886
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	887 user->name = th_strdup(name);
c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	888 if (user->name == NULL)
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	889 return -4;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	890
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	891 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	892 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	893
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	894 return 0;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	895 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	896
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	897
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	898 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	899 {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	900 uint8_t hash;
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 /* Check arguments */
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	903 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	904 return -1;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	905
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	906 /* 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	907 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	908 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	909 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	910 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	911 prev = NULL;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	912 while (curr != NULL) {
106 c587a99e2096 Drop internal use and storage of encoded usernames. Matti Hamalainen <ccr@tnsp.org> parents: 103 diff changeset	913 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	914 if (prev)
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	915 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	916 else
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	917 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	918
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	919 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	920
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	921 return 0;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	922 } else {
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	923 prev = curr;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	924 curr = curr->next;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	925 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	926 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	927 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	928
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	929 return 1;
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	930 }
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	931
eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	932
102 b096ae97fc7d Renamed functions. Matti Hamalainen <ccr@tnsp.org> parents: 97 diff changeset	933 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	934 {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	935 nn_user_t *user;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	936
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	937 if (src == NULL) return NULL;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	938
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	939 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	940 return NULL;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	941
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	942 /* Copy relevant data */
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	943 user->name = th_strdup(src->name);
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	944 user->lastspoke = src->lastspoke;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	945 user->joined = src->joined;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	946
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	947 return user;
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
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	951 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	952 {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	953 th_free(user->name);
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	954 th_free(user);
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	955 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	956
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	957
102 b096ae97fc7d Renamed functions. Matti Hamalainen <ccr@tnsp.org> parents: 97 diff changeset	958 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	959 {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	960 nn_user_t next, curr = list;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	961 while (curr != NULL) {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	962 next = curr->next;
102 b096ae97fc7d Renamed functions. Matti Hamalainen <ccr@tnsp.org> parents: 97 diff changeset	963 nn_user_free(curr);
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	964 curr = next;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	965 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	966 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	967
103 eaa524e153f9 Initial implementation of functions for implementing tab-completion for user names. Matti Hamalainen <ccr@tnsp.org> parents: 102 diff changeset	968 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	969 {
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	970 int i;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	971 if (hash == NULL)
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	972 return;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	973
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	974 for (i = 0; i < NN_NUM_BUCKETS; i++) {
102 b096ae97fc7d Renamed functions. Matti Hamalainen <ccr@tnsp.org> parents: 97 diff changeset	975 nn_user_free_list(hash->buckets[i]);
94 6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	976 hash->buckets[i] = NULL;
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	977 }
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	978
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	979 th_free(hash);
6e47426efb6a Add preliminary userlist data handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 91 diff changeset	980 }
285 b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	981
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	982
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	983 char nn_username_encode(char str)
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	984 {
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	985 unsigned char c = (unsigned char ) str;
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	986 if (str == NULL) return NULL;
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	987 for (; *c ; c++)
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	988 if (c == ' ') c = 255;
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	989 return str;
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	990 }
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	991
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	992
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	993 char nn_username_decode(char str)
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	994 {
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	995 unsigned char c = (unsigned char ) str;
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	996 if (str == NULL) return NULL;
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	997 for (; *c ; c++)
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	998 if (c == 255) c = ' ';
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	999 return str;
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1000 }
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1001
b765f15f9895 Move nn_username_{de,en}code() to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 277 diff changeset	1002
325 c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1003 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	1004 {
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1005 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	1006
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1007 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	1008
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1009 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	1010 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	1011 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	1012 return NULL;
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1013 }
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1014
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1015 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	1016
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1017 return res;
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1018 }
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1019
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1020
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1021 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	1022 {
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1023 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	1024 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	1025 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	1026 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	1027 }
c086345d176b Move some functions to libnnchat and rename nn_find_window to findWindow() Matti Hamalainen <ccr@tnsp.org> parents: 312 diff changeset	1028 }
330 8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1029
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1030
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1031 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	1032 {
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1033 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	1034 tuple->len = len;
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1035 tuple->str = str;
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1036 return tuple;
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1037 }
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1038
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1039
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1040 void nn_strtuple_free(nn_strtuple_t *tuple)
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1041 {
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1042 th_free(tuple->str);
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1043 th_free(tuple);
8e509d6546d3 Move nn_strtuple_* functions to libnnchat. Matti Hamalainen <ccr@tnsp.org> parents: 325 diff changeset	1044 }

Mercurial > hg > nnchat

annotate libnnchat.c @ 352:b54c8545dcb0