Mercurial > hg > nnchat
annotate network.c @ 498:b6f6c989deab
Add str_trim_right().
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Fri, 01 Jun 2012 04:43:53 +0300 |
parents | 9141f13be70c |
children | 6e5789cbb4d4 |
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 | 6 #include "network.h" |
415 | 7 #include <errno.h> |
8 | |
489
ba48840b8525
Move network initialization/shutdown flag checking to network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
488
diff
changeset
|
9 static BOOL nn_network_inited = FALSE; |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
10 |
414
ac4862a94cd1
Move some structures around.
Matti Hamalainen <ccr@tnsp.org>
parents:
413
diff
changeset
|
11 static const char *nn_proxy_types[] = |
ac4862a94cd1
Move some structures around.
Matti Hamalainen <ccr@tnsp.org>
parents:
413
diff
changeset
|
12 { |
ac4862a94cd1
Move some structures around.
Matti Hamalainen <ccr@tnsp.org>
parents:
413
diff
changeset
|
13 "none", |
ac4862a94cd1
Move some structures around.
Matti Hamalainen <ccr@tnsp.org>
parents:
413
diff
changeset
|
14 "SOCKS 4", |
ac4862a94cd1
Move some structures around.
Matti Hamalainen <ccr@tnsp.org>
parents:
413
diff
changeset
|
15 "SOCKS 4a", |
ac4862a94cd1
Move some structures around.
Matti Hamalainen <ccr@tnsp.org>
parents:
413
diff
changeset
|
16 NULL |
ac4862a94cd1
Move some structures around.
Matti Hamalainen <ccr@tnsp.org>
parents:
413
diff
changeset
|
17 }; |
412
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 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
20 #ifdef __WIN32 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
21 const char *hstrerror(int err) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
22 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
23 static char buf[64]; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
24 snprintf(buf, sizeof(buf), "Error #%d", err); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
25 return buf; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
26 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
27 |
413 | 28 |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
29 int nn_get_socket_errno(void) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
30 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
31 return WSAGetLastError(); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
32 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
33 |
413 | 34 |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
35 const char *nn_get_socket_errstr(int err) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
36 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
37 static char buf[64]; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
38 switch (err) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
39 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
40 case WSAEADDRINUSE: return "Address already in use"; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
41 case WSAECONNABORTED: return "Software caused connection abort"; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
42 case WSAECONNREFUSED: return "Connection refused"; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
43 case WSAECONNRESET: return "Connection reset by peer"; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
44 case WSAEHOSTUNREACH: return "No route to host"; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
45 case WSAENETDOWN: return "Network is down"; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
46 case WSAETIMEDOUT: return "Connection timed out"; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
47 case WSAHOST_NOT_FOUND: return "Host not found"; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
48 case WSAVERNOTSUPPORTED: return "Wrong WinSock DLL version"; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
49 default: |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
50 snprintf(buf, sizeof(buf), "Error #%d", err); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
51 return buf; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
52 break; |
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 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
55 #else |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
56 int nn_get_socket_errno(void) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
57 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
58 return errno; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
59 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
60 |
413 | 61 |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
62 const char *nn_get_socket_errstr(int err) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
63 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
64 return strerror(err); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
65 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
66 #endif |
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 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
69 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
|
70 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
71 if (conn->errfunc != NULL) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
72 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
73 va_list ap; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
74 va_start(ap, fmt); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
75 conn->errfunc(conn, fmt, ap); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
76 va_end(ap); |
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 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
81 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
|
82 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
83 if (conn->msgfunc != NULL) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
84 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
85 va_list ap; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
86 va_start(ap, fmt); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
87 conn->msgfunc(conn, fmt, ap); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
88 va_end(ap); |
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 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
91 |
414
ac4862a94cd1
Move some structures around.
Matti Hamalainen <ccr@tnsp.org>
parents:
413
diff
changeset
|
92 |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
93 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
|
94 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
95 struct hostent *res = gethostbyname(name); |
458 | 96 |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
97 if (res == NULL) |
456
bb65460c7aa2
Clean up some initialization messages.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
98 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
|
99 else |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
100 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
|
101 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
102 return res; |
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 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
106 nn_conn_t * nn_conn_new( |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
107 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
|
108 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
|
109 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
110 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
|
111 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
112 if (conn == NULL) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
113 return NULL; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
114 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
115 conn->errfunc = errfunc; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
116 conn->msgfunc = msgfunc; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
117 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
118 return conn; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
119 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
120 |
458 | 121 |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
122 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
|
123 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
124 if (hst != NULL) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
125 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
126 *addr = *(struct in_addr *) (hst->h_addr); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
127 return TRUE; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
128 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
129 else |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
130 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
131 addr->s_addr = 0; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
132 return FALSE; |
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 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
135 |
458 | 136 |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
137 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
|
138 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
139 if (conn == NULL) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
140 return -1; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
141 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
142 conn->proxy.type = type; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
143 conn->proxy.port = port; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
144 conn->proxy.host = th_strdup(host); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
145 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
146 if (host != NULL) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
147 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
148 conn->proxy.hst = nn_resolve_host(conn, host); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
149 nn_get_addr(&(conn->proxy.addr), conn->proxy.hst); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
150 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
151 else |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
152 return -2; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
153 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
154 return 0; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
155 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
156 |
458 | 157 |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
158 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
|
159 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
160 struct sockaddr_in dest; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
161 static const char *userid = "James Bond"; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
162 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
163 if (conn == NULL) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
164 return -1; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
165 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
166 conn->port = port; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
167 if (host != NULL) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
168 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
169 conn->host = th_strdup(host); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
170 conn->hst = nn_resolve_host(conn, host); |
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 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
173 nn_get_addr(&(conn->addr), conn->hst); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
174 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
415
diff
changeset
|
175 // Prepare for connection |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
176 dest.sin_family = AF_INET; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
177 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
178 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
|
179 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
180 dest.sin_port = htons(conn->proxy.port); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
181 dest.sin_addr = conn->proxy.addr; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
182 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
183 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
|
184 nn_proxy_types[conn->proxy.type], |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
185 inet_ntoa(conn->proxy.addr), conn->proxy.port); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
186 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
187 else |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
188 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
189 dest.sin_port = htons(conn->port); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
190 dest.sin_addr = conn->addr; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
191 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
192 nn_conn_msg(conn, "Connecting to %s:%d ...\n", |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
193 inet_ntoa(conn->addr), conn->port); |
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 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
196 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
|
197 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
198 conn->err = nn_get_socket_errno(); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
199 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
|
200 goto error; |
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 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
203 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
|
204 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
205 conn->err = nn_get_socket_errno(); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
206 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
|
207 goto error; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
208 } |
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 FD_ZERO(&(conn->sockfds)); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
211 FD_SET(conn->socket, &(conn->sockfds)); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
212 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
415
diff
changeset
|
213 // Proxy-specific setup |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
214 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
|
215 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
216 struct nn_socks_t *socksh; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
217 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
|
218 char *ptr, *buf; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
219 int tries, status = -1; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
220 |
488
bbe05594f29d
Clean up some initialization messages.
Matti Hamalainen <ccr@tnsp.org>
parents:
482
diff
changeset
|
221 nn_conn_msg(conn, "Initializing proxy negotiation.\n"); |
bbe05594f29d
Clean up some initialization messages.
Matti Hamalainen <ccr@tnsp.org>
parents:
482
diff
changeset
|
222 |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
223 if (conn->proxy.type == NN_PROXY_SOCKS4A) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
224 bufsiz += strlen(conn->host) + 1; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
225 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
226 ptr = buf = th_malloc(bufsiz); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
227 if (buf == NULL) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
228 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
229 conn->err = -1; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
230 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
|
231 goto error; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
232 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
233 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
415
diff
changeset
|
234 // Create SOCKS 4/4A request |
412
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 | 386 // Shift the input buffer |
387 if (conn->ptr > conn->buf) | |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
388 { |
438 | 389 size_t left = conn->in_ptr - conn->ptr; |
390 if (left > 0) | |
391 { | |
392 size_t moved = conn->ptr - conn->buf; | |
393 memmove(conn->buf, conn->ptr, left); | |
394 conn->ptr = conn->buf; | |
395 conn->in_ptr -= moved; | |
396 conn->total_bytes -= moved; | |
397 } | |
398 else | |
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 { |
490
9141f13be70c
Don't set conn->err if we are handling EINTR and it isn't supposed to get to
Matti Hamalainen <ccr@tnsp.org>
parents:
489
diff
changeset
|
409 int err = nn_get_socket_errno(); |
9141f13be70c
Don't set conn->err if we are handling EINTR and it isn't supposed to get to
Matti Hamalainen <ccr@tnsp.org>
parents:
489
diff
changeset
|
410 if (err != EINTR) |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
411 { |
490
9141f13be70c
Don't set conn->err if we are handling EINTR and it isn't supposed to get to
Matti Hamalainen <ccr@tnsp.org>
parents:
489
diff
changeset
|
412 conn->err = err; |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
413 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
|
414 socket, conn->err, nn_get_socket_errstr(conn->err)); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
415 return -1; |
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 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
418 else if (FD_ISSET(conn->socket, &tmpfds)) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
419 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
420 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
|
421 if (conn->got_bytes < 0) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
422 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
423 conn->err = nn_get_socket_errno(); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
424 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
|
425 return -2; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
426 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
427 else if (conn->got_bytes == 0) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
428 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
429 nn_conn_err(conn, "Server closed connection.\n"); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
430 conn->status = NN_CONN_CLOSED; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
431 return -3; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
432 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
433 else |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
434 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
435 conn->total_bytes += conn->got_bytes; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
436 conn->in_ptr += conn->got_bytes; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
437 return 0; |
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 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
441 return 1; |
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 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
445 BOOL nn_conn_check(nn_conn_t *conn) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
446 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
447 if (conn == NULL) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
448 return FALSE; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
449 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
450 return conn->err == 0 && conn->status == NN_CONN_OPEN; |
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 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
454 BOOL nn_network_init(void) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
455 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
456 #ifdef __WIN32 |
419
d015ecbd231d
Use C99 style comments, too.
Matti Hamalainen <ccr@tnsp.org>
parents:
415
diff
changeset
|
457 // Initialize WinSock, if needed |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
458 WSADATA wsaData; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
459 int err = WSAStartup(0x0101, &wsaData); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
460 if (err != 0) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
461 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
462 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
|
463 return FALSE; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
464 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
465 #endif |
489
ba48840b8525
Move network initialization/shutdown flag checking to network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
488
diff
changeset
|
466 |
ba48840b8525
Move network initialization/shutdown flag checking to network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
488
diff
changeset
|
467 nn_network_inited = TRUE; |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
468 return TRUE; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
469 } |
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 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
472 void nn_network_close(void) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
473 { |
489
ba48840b8525
Move network initialization/shutdown flag checking to network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
488
diff
changeset
|
474 if (nn_network_inited) |
ba48840b8525
Move network initialization/shutdown flag checking to network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
488
diff
changeset
|
475 { |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
476 #ifdef __WIN32 |
489
ba48840b8525
Move network initialization/shutdown flag checking to network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
488
diff
changeset
|
477 WSACleanup(); |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
478 #endif |
489
ba48840b8525
Move network initialization/shutdown flag checking to network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
488
diff
changeset
|
479 } |
ba48840b8525
Move network initialization/shutdown flag checking to network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
488
diff
changeset
|
480 |
ba48840b8525
Move network initialization/shutdown flag checking to network module.
Matti Hamalainen <ccr@tnsp.org>
parents:
488
diff
changeset
|
481 nn_network_inited = FALSE; |
412
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 |
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 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
|
486 { |
428
162011bbec48
Remove somewhat useless pointer checks.
Matti Hamalainen <ccr@tnsp.org>
parents:
423
diff
changeset
|
487 return conn && (conn->ptr + n <= conn->in_ptr); |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
488 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
489 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
490 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
491 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
|
492 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
493 if (nn_conn_buf_check(conn, n)) |
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 conn->ptr += n; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
496 return TRUE; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
497 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
498 else |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
499 return FALSE; |
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 |
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 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
|
504 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
505 int ret; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
506 if (!nn_conn_buf_check(conn, n)) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
507 return -1; |
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 if ((ret = strncmp(conn->ptr, str, n)) == 0) |
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 conn->ptr += n; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
512 return 0; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
513 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
514 else |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
515 return ret; |
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 |
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 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
|
520 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
521 return nn_conn_buf_strncmp(conn, str, strlen(str)); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
522 } |
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 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
525 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
|
526 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
527 char *pos; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
528 size_t n = strlen(str); |
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 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
|
531 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
532 conn->ptr = pos + n; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
533 return pos; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
534 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
535 else |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
536 return NULL; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
537 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
538 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
539 |
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
|
540 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
|
541 { |
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
|
542 char *msg; |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
543 |
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
|
544 if (str == NULL) |
412
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
545 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
|
546 |
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
|
547 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
|
548 |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
549 if (msg != NULL) |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
550 { |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
551 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
|
552 th_free(msg); |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
553 return ret; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
554 } |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
555 else |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
556 return FALSE; |
3e64acb433e8
Split libnnchat into libnnet and libnnutil
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
557 } |
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
|
558 |
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 |
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 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
|
561 { |
482
8bd6bad09fb8
Fix a memory leak in nn_conn_send_msg_v().
Matti Hamalainen <ccr@tnsp.org>
parents:
458
diff
changeset
|
562 BOOL res; |
423
6727fec3c326
Rename nn_conn_send_msg() to nn_conn_send_msg_v() and add new nn_conn_send_msg().
Matti Hamalainen <ccr@tnsp.org>
parents:
419
diff
changeset
|
563 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
|
564 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
|
565 |
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
|
566 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
|
567 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
|
568 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
|
569 |
482
8bd6bad09fb8
Fix a memory leak in nn_conn_send_msg_v().
Matti Hamalainen <ccr@tnsp.org>
parents:
458
diff
changeset
|
570 res = nn_conn_send_msg(conn, user, tmp); |
8bd6bad09fb8
Fix a memory leak in nn_conn_send_msg_v().
Matti Hamalainen <ccr@tnsp.org>
parents:
458
diff
changeset
|
571 th_free(tmp); |
8bd6bad09fb8
Fix a memory leak in nn_conn_send_msg_v().
Matti Hamalainen <ccr@tnsp.org>
parents:
458
diff
changeset
|
572 return res; |
423
6727fec3c326
Rename nn_conn_send_msg() to nn_conn_send_msg_v() and add new nn_conn_send_msg().
Matti Hamalainen <ccr@tnsp.org>
parents:
419
diff
changeset
|
573 } |
434
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
574 |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
575 |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
576 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
|
577 { |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
578 char *p; |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
579 size_t offs, left; |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
580 |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
581 fprintf(f, |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
582 "\n--------------------------------------------------------------\n" |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
583 "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
|
584 "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
|
585 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
|
586 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
|
587 |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
588 // Dump buffer contents as a hexdump |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
589 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
|
590 { |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
591 char buf[NN_DUMP_BYTES + 1]; |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
592 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
|
593 left -= amount; |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
594 |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
595 // 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
|
596 fprintf(f, "%04x | ", offs); |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
597 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
|
598 { |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
599 fprintf(f, "%02x ", *p); |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
600 buf[bufoffs] = th_isprint(*p) ? *p : '.'; |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
601 } |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
602 buf[bufoffs] = 0; |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
603 |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
604 // Add padding |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
605 for (; bufoffs < NN_DUMP_BYTES; bufoffs++) |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
606 fprintf(f, " "); |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
607 |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
608 // Print string |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
609 fprintf(f, "| %s\n", buf); |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
610 } |
691400f1c9bb
Add function for dumping current network buffer.
Matti Hamalainen <ccr@tnsp.org>
parents:
433
diff
changeset
|
611 } |