annotate network.c @ 458:6eef0dc83f0a

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