… | |
… | |
33 | */ |
33 | */ |
34 | |
34 | |
35 | using namespace std; |
35 | using namespace std; |
36 | |
36 | |
37 | #include <global.h> |
37 | #include <global.h> |
38 | #include <newclient.h> |
|
|
39 | #include <sproto.h> |
38 | #include <sproto.h> |
40 | #include <cstdarg> |
39 | #include <cstdarg> |
41 | |
40 | |
42 | #ifdef __linux__ |
41 | #ifdef __linux__ |
43 | # include <sys/types.h> |
42 | # include <sys/types.h> |
… | |
… | |
51 | // easily die in 20 seconds... |
50 | // easily die in 20 seconds... |
52 | #define SOCKET_TIMEOUT1 10 |
51 | #define SOCKET_TIMEOUT1 10 |
53 | #define SOCKET_TIMEOUT2 20 |
52 | #define SOCKET_TIMEOUT2 20 |
54 | |
53 | |
55 | void |
54 | void |
56 | Socket_Flush (NewSocket * ns) |
55 | client::flush () |
57 | { |
56 | { |
58 | #ifdef __linux__ |
57 | #ifdef __linux__ |
59 | // check time of last ack, and, if too old, kill connection |
58 | // check time of last ack, and, if too old, kill connection |
60 | struct tcp_info tcpi; |
59 | struct tcp_info tcpi; |
61 | socklen_t len = sizeof (tcpi); |
60 | socklen_t len = sizeof (tcpi); |
62 | |
61 | |
63 | if (!getsockopt (ns->fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi)) |
62 | if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi)) |
64 | { |
63 | { |
65 | unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent; |
64 | unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent; |
|
|
65 | |
|
|
66 | rtt = tcpi.tcpi_rtt; |
|
|
67 | rttvar = tcpi.tcpi_rttvar; |
66 | |
68 | |
67 | if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 * TCP_HZ < diff && diff < 0x80000000UL // ack delayed for 20s |
69 | if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 * TCP_HZ < diff && diff < 0x80000000UL // ack delayed for 20s |
68 | && SOCKET_TIMEOUT2 * TCP_HZ < tcpi.tcpi_last_data_sent) // no data sent for 10s |
70 | && SOCKET_TIMEOUT2 * TCP_HZ < tcpi.tcpi_last_data_sent) // no data sent for 10s |
69 | { |
71 | { |
70 | LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", ns->fd, |
72 | LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd, |
71 | (unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked); |
73 | (unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked); |
72 | ns->status = Ns_Dead; |
74 | destroy (); |
73 | } |
75 | } |
74 | } |
76 | } |
75 | |
|
|
76 | int val; |
|
|
77 | |
|
|
78 | val = 0; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val)); |
|
|
79 | val = 1; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val)); |
|
|
80 | #endif |
77 | #endif |
81 | } |
|
|
82 | |
78 | |
83 | /*********************************************************************** |
79 | /** |
84 | * |
80 | * Writes data to socket. |
85 | * packet functions/utilities |
81 | * |
86 | * |
82 | * When the socket is clear to write, and we have backlogged data, this |
87 | **********************************************************************/ |
83 | * is called to write it out. |
|
|
84 | */ |
88 | |
85 | |
89 | packet &packet::operator <<(const data &v) |
86 | if (!outputbuffer.len || socket_ev.poll () & PE_W) |
|
|
87 | return; |
|
|
88 | |
|
|
89 | write_outputbuffer (); |
|
|
90 | } |
|
|
91 | |
|
|
92 | void |
|
|
93 | client::write_outputbuffer () |
90 | { |
94 | { |
91 | if (v.len) |
95 | while (outputbuffer.len) |
92 | { |
|
|
93 | memcpy (buf + len, v.ptr, v.len); |
|
|
94 | len += v.len; |
|
|
95 | } |
96 | { |
|
|
97 | int res = write (fd, outputbuffer.data + outputbuffer.start, |
|
|
98 | min (outputbuffer.len, SOCKETBUFSIZE - outputbuffer.start)); |
96 | |
99 | |
97 | return *this; |
100 | if (res > 0) |
98 | } |
101 | { |
|
|
102 | outputbuffer.start += res; |
|
|
103 | /* wrap back to start of buffer */ |
|
|
104 | if (outputbuffer.start == SOCKETBUFSIZE) |
|
|
105 | outputbuffer.start = 0; |
99 | |
106 | |
100 | packet &packet::operator <<(const data8 &v) |
107 | outputbuffer.len -= res; |
101 | { |
108 | #ifdef CS_LOGSTATS |
102 | unsigned int len = min (v.len, 0x00FF); |
109 | cst_tot.obytes += res; |
103 | return *this << uint8 (len) << data (v.ptr, len); |
110 | cst_lst.obytes += res; |
104 | } |
111 | #endif |
|
|
112 | } |
|
|
113 | else if (res == 0) |
|
|
114 | { |
|
|
115 | LOG (llevError, "socket write failed, connection closed.\n"); |
|
|
116 | destroy (); |
|
|
117 | return; |
|
|
118 | } |
|
|
119 | else if (errno == EINTR) |
|
|
120 | { |
|
|
121 | // just retry |
|
|
122 | } |
|
|
123 | else if (errno == EAGAIN) |
|
|
124 | { |
|
|
125 | // delay till ready |
|
|
126 | socket_ev.poll (socket_ev.poll () | PE_W); |
|
|
127 | socket_ev.start (); |
|
|
128 | return; |
|
|
129 | } |
|
|
130 | else |
|
|
131 | { |
|
|
132 | LOG (llevError, "socket write failed: %s\n", strerror (errno)); |
|
|
133 | destroy (); |
|
|
134 | return; |
|
|
135 | } |
|
|
136 | } |
105 | |
137 | |
106 | packet &packet::operator <<(const data16 &v) |
138 | socket_ev.poll (socket_ev.poll () & ~PE_W); |
107 | { |
|
|
108 | unsigned int len = min (v.len, 0xFFFF); |
|
|
109 | return *this << uint16 (len) << data (v.ptr, len); |
|
|
110 | } |
|
|
111 | |
|
|
112 | packet &packet::operator <<(const char *v) |
|
|
113 | { |
|
|
114 | return *this << data (v, strlen (v ? v : 0)); |
|
|
115 | } |
|
|
116 | |
|
|
117 | void |
|
|
118 | packet::printf (const char *format, ...) |
|
|
119 | { |
|
|
120 | va_list ap; |
|
|
121 | va_start (ap, format); |
|
|
122 | |
|
|
123 | len += vsnprintf ((char *)buf + len, MAXSOCKBUF, format, ap); |
|
|
124 | |
|
|
125 | va_end (ap); |
|
|
126 | } |
139 | } |
127 | |
140 | |
128 | /****************************************************************************** |
141 | /****************************************************************************** |
129 | * |
142 | * |
130 | * Start of read routines. |
143 | * Start of read routines. |
131 | * |
144 | * |
132 | ******************************************************************************/ |
145 | ******************************************************************************/ |
133 | |
146 | |
134 | int |
147 | int |
135 | NewSocket::read_packet () |
148 | client::next_packet () |
136 | { |
149 | { |
137 | for (;;) |
|
|
138 | { |
|
|
139 | if (inbuf_len >= 2) |
150 | if (inbuf_len >= 2) |
140 | { |
151 | { |
141 | unsigned int pkt_len = (inbuf [0] << 8) | inbuf [1]; |
152 | int pkt_len = (inbuf [0] << 8) | inbuf [1]; |
142 | |
153 | |
143 | if (inbuf_len >= 2 + pkt_len) |
154 | if (inbuf_len >= 2 + pkt_len) |
144 | return pkt_len + 2; |
155 | return 2 + pkt_len; |
|
|
156 | |
|
|
157 | if (inbuf_len == sizeof (inbuf)) |
145 | } |
158 | { |
|
|
159 | send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED); |
|
|
160 | destroy (); |
|
|
161 | return -1; |
|
|
162 | } |
|
|
163 | } |
|
|
164 | |
|
|
165 | return 0; |
|
|
166 | } |
|
|
167 | |
|
|
168 | void |
|
|
169 | client::skip_packet (int len) |
|
|
170 | { |
|
|
171 | inbuf_len -= len; |
|
|
172 | memmove (inbuf, inbuf + len, inbuf_len); |
|
|
173 | } |
|
|
174 | |
|
|
175 | /***************************************************************************** |
|
|
176 | * Start of command dispatch area. |
|
|
177 | * The commands here are protocol commands. |
|
|
178 | ****************************************************************************/ |
|
|
179 | |
|
|
180 | // SocketCommand, PlayingCommand, should not exist with those ugly casts |
|
|
181 | #define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb), |
|
|
182 | #define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER | |
|
|
183 | |
|
|
184 | /** |
|
|
185 | * Dispatch table for the server. |
|
|
186 | */ |
|
|
187 | static struct packet_type packets[] = { |
|
|
188 | {"ncom", PC(NewPlayerCmd) PF_PLAYING }, |
|
|
189 | {"command", PC(PlayerCmd) PF_PLAYING }, |
|
|
190 | |
|
|
191 | {"examine", PC(ExamineCmd) PF_PLAYING }, |
|
|
192 | {"apply", PC(ApplyCmd) PF_PLAYING }, |
|
|
193 | {"reply", PC(ReplyCmd) PF_IMMEDIATE }, |
|
|
194 | {"lookat", PC(LookAt) PF_PLAYING }, |
|
|
195 | {"lock", PC(LockItem) PF_PLAYING }, |
|
|
196 | {"mark", PC(MarkItem) PF_PLAYING }, |
|
|
197 | {"move", PC(MoveCmd) PF_PLAYING }, |
|
|
198 | {"exti", PC(ExtCmd) PF_IMMEDIATE }, /* CF+ */ |
|
|
199 | {"ext", PC(ExtCmd) 0 }, /* CF+ */ |
|
|
200 | {"mapredraw", PC(MapRedrawCmd) PF_IMMEDIATE }, /* Added: phil */ |
|
|
201 | {"mapinfo", PC(MapInfoCmd) 0 }, /* CF+ */ |
|
|
202 | |
|
|
203 | {"addme", SC(AddMeCmd) PF_IMMEDIATE }, |
|
|
204 | {"askface", SC(SendFaceCmd) PF_IMMEDIATE }, /* Added: phil */ |
|
|
205 | {"requestinfo", SC(RequestInfo) PF_IMMEDIATE }, |
|
|
206 | {"setfacemode", SC(SetFaceMode) PF_IMMEDIATE }, |
|
|
207 | {"setsound", SC(SetSound) PF_IMMEDIATE }, |
|
|
208 | {"setup", SC(SetUp) PF_IMMEDIATE }, |
|
|
209 | {"version", SC(VersionCmd) PF_IMMEDIATE }, |
|
|
210 | {"toggleextendedinfos", SC(ToggleExtendedInfos) PF_IMMEDIATE }, /*Added: tchize */ |
|
|
211 | {"toggleextendedtext", SC(ToggleExtendedText) PF_IMMEDIATE }, /*Added: tchize */ |
|
|
212 | {"asksmooth", SC(AskSmooth) PF_IMMEDIATE }, /*Added: tchize (smoothing technologies) */ |
|
|
213 | }; |
|
|
214 | |
|
|
215 | bool |
|
|
216 | client::may_execute (const packet_type *pkt) const |
|
|
217 | { |
|
|
218 | return (!(pkt->flags & PF_PLAYER) || pl) |
|
|
219 | && (!(pkt->flags & PF_PLAYING) || (pl && pl->state == ST_PLAYING)); |
|
|
220 | } |
|
|
221 | |
|
|
222 | void |
|
|
223 | client::execute (const packet_type *pkt, char *data, int datalen) |
|
|
224 | { |
|
|
225 | if (may_execute (pkt)) |
|
|
226 | { |
|
|
227 | //TODO: only one format |
|
|
228 | if (pkt->flags & PF_PLAYER) |
|
|
229 | ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); |
|
|
230 | else |
|
|
231 | ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); |
|
|
232 | } |
|
|
233 | else |
|
|
234 | send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name); |
|
|
235 | } |
|
|
236 | |
|
|
237 | bool |
|
|
238 | client::handle_packet () |
|
|
239 | { |
|
|
240 | int pkt_len = next_packet (); |
|
|
241 | |
|
|
242 | if (!pkt_len) |
|
|
243 | return false; |
|
|
244 | else if (pkt_len < 0) |
|
|
245 | { |
|
|
246 | LOG (llevError, "read error on player %s\n", |
|
|
247 | pl && pl->ob ? &pl->ob->name : "[anonymous]"); |
|
|
248 | destroy (); |
|
|
249 | return false; |
|
|
250 | } |
|
|
251 | |
|
|
252 | inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ |
|
|
253 | |
|
|
254 | /* First, break out beginning word. There are at least |
|
|
255 | * a few commands that do not have any paremeters. If |
|
|
256 | * we get such a command, don't worry about trying |
|
|
257 | * to break it up. |
|
|
258 | */ |
|
|
259 | int datalen; |
|
|
260 | char *data = strchr ((char *)inbuf + 2, ' '); |
|
|
261 | |
|
|
262 | if (data) |
|
|
263 | { |
|
|
264 | *data++ = 0; |
|
|
265 | datalen = pkt_len - (data - (char *)inbuf); |
|
|
266 | } |
|
|
267 | else |
|
|
268 | { |
|
|
269 | data = (char *)inbuf + 2; // better read garbage than segfault |
|
|
270 | datalen = 0; |
|
|
271 | } |
|
|
272 | |
|
|
273 | for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt) |
|
|
274 | if (!strcmp ((char *)inbuf + 2, pkt->name)) |
|
|
275 | { |
|
|
276 | if (pkt->flags & PF_IMMEDIATE) |
|
|
277 | execute (pkt, data, datalen); |
|
|
278 | else |
|
|
279 | queue_command (pkt, data, datalen); |
|
|
280 | |
|
|
281 | goto next_packet; |
|
|
282 | } |
|
|
283 | |
|
|
284 | /* If we get here, we didn't find a valid command. Logging |
|
|
285 | * this might be questionable, because a broken client/malicious |
|
|
286 | * user could certainly send a whole bunch of invalid commands. |
|
|
287 | */ |
|
|
288 | send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED, (char *)inbuf + 2); |
|
|
289 | next_packet: |
|
|
290 | skip_packet (pkt_len); |
|
|
291 | |
|
|
292 | // input buffer has space again |
|
|
293 | socket_ev.poll (socket_ev.poll () | PE_R); |
|
|
294 | |
|
|
295 | return true; |
|
|
296 | } |
|
|
297 | |
|
|
298 | // callback called when socket is either readable or writable |
|
|
299 | void |
|
|
300 | client::socket_cb (iow &w, int got) |
|
|
301 | { |
|
|
302 | //TODO remove when we have better socket cleanup logic |
|
|
303 | if (status == Ns_Dead) |
|
|
304 | { |
|
|
305 | socket_ev.poll (0); |
|
|
306 | return; |
|
|
307 | } |
|
|
308 | |
|
|
309 | if (got & PE_W) |
|
|
310 | { |
|
|
311 | write_outputbuffer (); |
|
|
312 | |
|
|
313 | if (!outputbuffer.len) |
|
|
314 | socket_ev.poll (socket_ev.poll () & ~PE_W); |
|
|
315 | } |
|
|
316 | |
|
|
317 | if (got & PE_R) |
|
|
318 | { |
|
|
319 | //TODO: rate-limit tcp connection in better ways, important |
146 | |
320 | |
147 | int amount = sizeof (inbuf) - inbuf_len; |
321 | int amount = sizeof (inbuf) - inbuf_len; |
148 | |
322 | |
149 | if (amount <= 0) |
323 | if (!amount) |
150 | { |
324 | { |
151 | LOG (llevError, "packet too large");//TODO |
325 | // input buffer full |
|
|
326 | socket_ev.poll (socket_ev.poll () & ~PE_R); |
152 | return -1; |
327 | return; |
153 | } |
328 | } |
154 | |
329 | |
155 | amount = read (fd, inbuf + inbuf_len, amount); |
330 | amount = read (fd, inbuf + inbuf_len, amount); |
156 | |
331 | |
157 | if (!amount) |
332 | if (!amount) |
158 | { |
333 | { |
159 | status = Ns_Dead; |
334 | destroy (); |
160 | return -1; |
335 | return; |
161 | } |
336 | } |
162 | else if (amount < 0) |
337 | else if (amount < 0) |
163 | { |
338 | { |
164 | if (errno != EAGAIN && errno != EINTR) |
339 | if (errno != EAGAIN && errno != EINTR) |
165 | { |
340 | { |
166 | LOG (llevError, "read error: %s", strerror (errno)); |
341 | LOG (llevError, "read error: %s\n", strerror (errno)); |
|
|
342 | destroy (); |
167 | return -1; |
343 | return; |
168 | } |
344 | } |
169 | |
345 | |
170 | return 0; |
346 | // should not be here, normally |
|
|
347 | } |
|
|
348 | else |
171 | } |
349 | { |
172 | |
|
|
173 | inbuf_len += amount; |
350 | inbuf_len += amount; |
174 | |
351 | |
175 | cst_tot.ibytes += amount; |
352 | cst_tot.ibytes += amount; |
176 | cst_lst.ibytes += amount; |
353 | cst_lst.ibytes += amount; |
177 | } |
|
|
178 | } |
|
|
179 | |
354 | |
|
|
355 | cmd_ev.start (); |
|
|
356 | } |
|
|
357 | } |
|
|
358 | } |
|
|
359 | |
|
|
360 | // called whenever we have additional commands to process |
180 | void |
361 | void |
181 | NewSocket::skip_packet (int len) |
362 | client::cmd_cb (iw &w) |
182 | { |
363 | { |
183 | inbuf_len -= len; |
364 | if (handle_packet () /*|| handle_command ()*/)//TODO: re-enable async command execution(?) |
184 | memmove (inbuf, inbuf + len, inbuf_len); |
365 | w.start (); |
|
|
366 | else |
|
|
367 | flush (); |
185 | } |
368 | } |
186 | |
369 | |
187 | /******************************************************************************* |
370 | /******************************************************************************* |
188 | * |
371 | * |
189 | * Start of write related routines. |
372 | * Start of write related routines. |
… | |
… | |
194 | * Adds data to a socket buffer for whatever reason. |
377 | * Adds data to a socket buffer for whatever reason. |
195 | * |
378 | * |
196 | * ns is the socket we are adding the data to, buf is the start of the |
379 | * ns is the socket we are adding the data to, buf is the start of the |
197 | * data, and len is the number of bytes to add. |
380 | * data, and len is the number of bytes to add. |
198 | */ |
381 | */ |
199 | |
382 | void |
200 | static void |
383 | client::send (void *buf_, int len) |
201 | add_to_buffer (NewSocket *ns, char *buf, int len) |
|
|
202 | { |
384 | { |
|
|
385 | char *buf = (char *)buf_; |
|
|
386 | char *pos = buf; |
|
|
387 | int amt = 0; |
|
|
388 | |
|
|
389 | if (status == Ns_Dead || !buf) |
|
|
390 | return; |
|
|
391 | |
|
|
392 | if ((len + outputbuffer.len) > SOCKETBUFSIZE) |
|
|
393 | { |
|
|
394 | LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd); |
|
|
395 | destroy (); |
|
|
396 | return; |
|
|
397 | } |
|
|
398 | |
203 | int avail, end; |
399 | int avail, end; |
204 | |
|
|
205 | if ((len + ns->outputbuffer.len) > SOCKETBUFSIZE) |
|
|
206 | { |
|
|
207 | LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", ns->fd); |
|
|
208 | ns->status = Ns_Dead; |
|
|
209 | return; |
|
|
210 | } |
|
|
211 | |
400 | |
212 | /* data + end is where we start putting the new data. The last byte |
401 | /* data + end is where we start putting the new data. The last byte |
213 | * currently in use is actually data + end -1 |
402 | * currently in use is actually data + end -1 |
214 | */ |
403 | */ |
215 | |
|
|
216 | end = ns->outputbuffer.start + ns->outputbuffer.len; |
404 | end = outputbuffer.start + outputbuffer.len; |
217 | /* The buffer is already in a wrapped state, so adjust end */ |
405 | /* The buffer is already in a wrapped state, so adjust end */ |
218 | if (end >= SOCKETBUFSIZE) |
406 | if (end >= SOCKETBUFSIZE) |
219 | end -= SOCKETBUFSIZE; |
407 | end -= SOCKETBUFSIZE; |
220 | |
408 | |
221 | avail = SOCKETBUFSIZE - end; |
409 | avail = SOCKETBUFSIZE - end; |
222 | |
410 | |
223 | /* We can all fit it behind the current data without wrapping */ |
411 | /* We can all fit it behind the current data without wrapping */ |
224 | if (avail >= len) |
412 | if (avail >= len) |
225 | memcpy (ns->outputbuffer.data + end, buf, len); |
413 | memcpy (outputbuffer.data + end, buf, len); |
226 | else |
414 | else |
227 | { |
415 | { |
228 | memcpy (ns->outputbuffer.data + end, buf, avail); |
416 | memcpy (outputbuffer.data + end, buf, avail); |
229 | memcpy (ns->outputbuffer.data, buf + avail, len - avail); |
417 | memcpy (outputbuffer.data, buf + avail, len - avail); |
230 | } |
418 | } |
231 | |
419 | |
232 | ns->outputbuffer.len += len; |
420 | outputbuffer.len += len; |
233 | #if 0 |
|
|
234 | LOG (llevDebug, "Added %d to output buffer, total length now %d, start=%d\n", len, ns->outputbuffer.len, ns->outputbuffer.start); |
|
|
235 | #endif |
|
|
236 | } |
|
|
237 | |
|
|
238 | /** |
|
|
239 | * Writes data to socket. |
|
|
240 | * |
|
|
241 | * When the socket is clear to write, and we have backlogged data, this |
|
|
242 | * is called to write it out. |
|
|
243 | */ |
|
|
244 | void |
|
|
245 | write_socket_buffer (NewSocket * ns) |
|
|
246 | { |
|
|
247 | int amt, max; |
|
|
248 | |
|
|
249 | if (ns->outputbuffer.len == 0) |
|
|
250 | { |
|
|
251 | LOG (llevDebug, "write_socket_buffer called when there is no data, fd=%d\n", ns->fd); |
|
|
252 | return; |
|
|
253 | } |
|
|
254 | |
|
|
255 | do |
|
|
256 | { |
|
|
257 | max = SOCKETBUFSIZE - ns->outputbuffer.start; |
|
|
258 | if (ns->outputbuffer.len < max) |
|
|
259 | max = ns->outputbuffer.len; |
|
|
260 | |
|
|
261 | do |
|
|
262 | { |
|
|
263 | amt = write (ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max); |
|
|
264 | } |
|
|
265 | while ((amt < 0) && (errno == EINTR)); |
|
|
266 | |
|
|
267 | if (amt < 0) |
|
|
268 | { /* We got an error */ |
|
|
269 | |
|
|
270 | if (errno != EWOULDBLOCK) |
|
|
271 | { |
|
|
272 | LOG (llevError, "New socket write failed (wsb) (%d: %s).\n", errno, strerror (errno)); |
|
|
273 | ns->status = Ns_Dead; |
|
|
274 | return; |
|
|
275 | } |
|
|
276 | else |
|
|
277 | { /* EWOULDBLOCK */ |
|
|
278 | /* can't write it, so store it away. */ |
|
|
279 | ns->can_write = 0; |
|
|
280 | return; |
|
|
281 | } |
|
|
282 | } |
|
|
283 | ns->outputbuffer.start += amt; |
|
|
284 | /* wrap back to start of buffer */ |
|
|
285 | if (ns->outputbuffer.start == SOCKETBUFSIZE) |
|
|
286 | ns->outputbuffer.start = 0; |
|
|
287 | ns->outputbuffer.len -= amt; |
|
|
288 | #ifdef CS_LOGSTATS |
|
|
289 | cst_tot.obytes += amt; |
|
|
290 | cst_lst.obytes += amt; |
|
|
291 | #endif |
|
|
292 | } |
|
|
293 | while (ns->outputbuffer.len > 0); |
|
|
294 | } |
|
|
295 | |
|
|
296 | /** |
|
|
297 | * This writes data to the socket. - It is very low level - |
|
|
298 | * all we try and do is write out the data to the socket |
|
|
299 | * provided (ns). buf is the data to write, len is the number |
|
|
300 | * of bytes to write. IT doesn't return anything - rather, it |
|
|
301 | * updates the ns structure if we get an error. |
|
|
302 | */ |
|
|
303 | void |
|
|
304 | Write_To_Socket (NewSocket * ns, char *buf, int len) |
|
|
305 | { |
|
|
306 | int amt = 0; |
|
|
307 | char *pos = buf; |
|
|
308 | |
|
|
309 | if (ns->status == Ns_Dead || !buf) |
|
|
310 | { |
|
|
311 | LOG (llevDebug, "Write_To_Socket called with dead socket\n"); |
|
|
312 | return; |
|
|
313 | } |
|
|
314 | |
|
|
315 | #ifndef __GNU__ /* This caused problems on Hurd */ |
|
|
316 | if (!ns->can_write) |
|
|
317 | { |
|
|
318 | add_to_buffer (ns, buf, len); |
|
|
319 | return; |
|
|
320 | } |
|
|
321 | #endif |
|
|
322 | /* If we manage to write more than we wanted, take it as a bonus */ |
|
|
323 | while (len > 0) |
|
|
324 | { |
|
|
325 | |
|
|
326 | do |
|
|
327 | { |
|
|
328 | amt = write (ns->fd, pos, len); |
|
|
329 | } |
|
|
330 | while ((amt < 0) && (errno == EINTR)); |
|
|
331 | |
|
|
332 | if (amt < 0) |
|
|
333 | { /* We got an error */ |
|
|
334 | if (errno != EWOULDBLOCK) |
|
|
335 | { |
|
|
336 | LOG (llevError, "New socket write failed WTS (%d: %s).\n", /* ---WIN32 */ |
|
|
337 | errno, strerror (errno)); |
|
|
338 | ns->status = Ns_Dead; |
|
|
339 | return; |
|
|
340 | } |
|
|
341 | else |
|
|
342 | { /* EWOULDBLOCK */ |
|
|
343 | /* can't write it, so store it away. */ |
|
|
344 | add_to_buffer (ns, pos, len); |
|
|
345 | ns->can_write = 0; |
|
|
346 | return; |
|
|
347 | } |
|
|
348 | } |
|
|
349 | /* amt gets set to 0 above in blocking code, so we do this as |
|
|
350 | * an else if to make sure we don't reprocess it. |
|
|
351 | */ |
|
|
352 | else if (amt == 0) |
|
|
353 | { |
|
|
354 | LOG (llevError, "Write_To_Socket: No data written out.\n"); |
|
|
355 | } |
|
|
356 | len -= amt; |
|
|
357 | pos += amt; |
|
|
358 | #ifdef CS_LOGSTATS |
|
|
359 | cst_tot.obytes += amt; |
|
|
360 | cst_lst.obytes += amt; |
|
|
361 | #endif |
|
|
362 | } |
|
|
363 | } |
421 | } |
364 | |
422 | |
365 | /** |
423 | /** |
366 | * Takes a string of data, and writes it out to the socket. A very handy |
424 | * Takes a string of data, and writes it out to the socket. A very handy |
367 | * shortcut function. |
425 | * shortcut function. |
368 | */ |
426 | */ |
369 | |
|
|
370 | void |
427 | void |
371 | NewSocket::send_packet (packet &sl) |
428 | client::send_packet (packet &sl) |
372 | { |
429 | { |
373 | Send_With_Handling (this, &sl); |
|
|
374 | } |
|
|
375 | |
|
|
376 | void |
|
|
377 | NewSocket::send_packet (const char *buf, int len) |
|
|
378 | { |
|
|
379 | packet sl; |
|
|
380 | |
|
|
381 | sl << data (buf, len); |
|
|
382 | send_packet (sl); |
|
|
383 | } |
|
|
384 | |
|
|
385 | void |
|
|
386 | NewSocket::send_packet (const char *buf) |
|
|
387 | { |
|
|
388 | send_packet (buf, strlen (buf)); |
|
|
389 | } |
|
|
390 | |
|
|
391 | /** |
|
|
392 | * Calls Write_To_Socket to send data to the client. |
|
|
393 | * |
|
|
394 | * The only difference in this function is that we take a packet |
|
|
395 | *, and we prepend the length information. |
|
|
396 | */ |
|
|
397 | void |
|
|
398 | Send_With_Handling (NewSocket *ns, packet *msg) |
|
|
399 | { |
|
|
400 | unsigned char sbuf[4]; |
|
|
401 | |
|
|
402 | if (ns->status == Ns_Dead || !msg) |
430 | if (status == Ns_Dead) |
403 | return; |
431 | return; |
404 | |
432 | |
405 | if (msg->len >= MAXSOCKBUF) |
433 | if (sl.length () >= MAXSOCKBUF) |
406 | { |
434 | { |
407 | LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", msg->len); |
435 | LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ()); |
408 | /* Almost certainly we've overflowed a buffer, so quite now to make |
436 | /* Almost certainly we've overflowed a buffer, so quit now to make |
409 | * it easier to debug. |
437 | * it easier to debug. |
410 | */ |
438 | */ |
411 | abort (); |
439 | abort (); |
412 | } |
440 | } |
413 | sbuf[0] = ((uint32) (msg->len) >> 8) & 0xFF; |
441 | |
414 | sbuf[1] = ((uint32) (msg->len)) & 0xFF; |
442 | if (!sl.length ()) |
415 | if (ns->status != Ns_Old) |
443 | return; |
416 | Write_To_Socket (ns, (char *) sbuf, 2); |
444 | |
417 | Write_To_Socket (ns, (char *) msg->buf, msg->len); |
445 | assert (sl.hdrlen == 2); |
|
|
446 | |
|
|
447 | sl.buf_ [0] = sl.length () >> 8; |
|
|
448 | sl.buf_ [1] = sl.length () ; |
|
|
449 | |
|
|
450 | send (sl.buf_, sl.length () + sl.hdrlen); |
|
|
451 | } |
|
|
452 | |
|
|
453 | void |
|
|
454 | client::send_packet (const char *buf, int len) |
|
|
455 | { |
|
|
456 | packet sl; |
|
|
457 | |
|
|
458 | sl << data (buf, len); |
|
|
459 | send_packet (sl); |
|
|
460 | } |
|
|
461 | |
|
|
462 | void |
|
|
463 | client::send_packet (const char *buf) |
|
|
464 | { |
|
|
465 | send_packet (buf, strlen (buf)); |
|
|
466 | } |
|
|
467 | |
|
|
468 | void |
|
|
469 | client::send_packet_printf (const char *format, ...) |
|
|
470 | { |
|
|
471 | packet sl; |
|
|
472 | |
|
|
473 | va_list ap; |
|
|
474 | va_start (ap, format); |
|
|
475 | sl.vprintf (format, ap); |
|
|
476 | va_end (ap); |
|
|
477 | |
|
|
478 | send_packet (sl); |
|
|
479 | } |
|
|
480 | |
|
|
481 | /*********************************************************************** |
|
|
482 | * |
|
|
483 | * packet functions/utilities |
|
|
484 | * |
|
|
485 | **********************************************************************/ |
|
|
486 | |
|
|
487 | packet &packet::operator <<(const data &v) |
|
|
488 | { |
|
|
489 | if (room () < v.len) |
|
|
490 | reset (); |
|
|
491 | else |
|
|
492 | { |
|
|
493 | if (v.len) |
|
|
494 | { |
|
|
495 | memcpy (cur, v.ptr, v.len); |
|
|
496 | cur += v.len; |
|
|
497 | } |
|
|
498 | } |
|
|
499 | |
|
|
500 | return *this; |
|
|
501 | } |
|
|
502 | |
|
|
503 | packet &packet::operator <<(const data8 &v) |
|
|
504 | { |
|
|
505 | unsigned int len = min (v.len, 0x00FF); |
|
|
506 | return *this << uint8 (len) << data (v.ptr, len); |
|
|
507 | } |
|
|
508 | |
|
|
509 | packet &packet::operator <<(const data16 &v) |
|
|
510 | { |
|
|
511 | unsigned int len = min (v.len, 0xFFFF); |
|
|
512 | return *this << uint16 (len) << data (v.ptr, len); |
|
|
513 | } |
|
|
514 | |
|
|
515 | packet &packet::operator <<(const char *v) |
|
|
516 | { |
|
|
517 | return *this << data (v, strlen (v ? v : 0)); |
|
|
518 | } |
|
|
519 | |
|
|
520 | void |
|
|
521 | packet::vprintf (const char *format, va_list ap) |
|
|
522 | { |
|
|
523 | int size = room (); |
|
|
524 | |
|
|
525 | int len = vsnprintf ((char *)cur, size, format, ap); |
|
|
526 | |
|
|
527 | if (len >= size) |
|
|
528 | return reset (); |
|
|
529 | |
|
|
530 | cur += len; |
418 | } |
531 | } |
419 | |
532 | |
420 | /****************************************************************************** |
533 | /****************************************************************************** |
421 | * |
534 | * |
422 | * statistics logging functions. |
535 | * statistics logging functions. |
… | |
… | |
446 | LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n", |
559 | LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n", |
447 | ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn, |
560 | ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn, |
448 | now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start); |
561 | now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start); |
449 | cst_lst.ibytes = 0; |
562 | cst_lst.ibytes = 0; |
450 | cst_lst.obytes = 0; |
563 | cst_lst.obytes = 0; |
451 | cst_lst.max_conn = socket_info.nconns; |
|
|
452 | cst_lst.time_start = now; |
564 | cst_lst.time_start = now; |
453 | } |
565 | } |
454 | #endif |
566 | #endif |
455 | |
567 | |