… | |
… | |
51 | // easily die in 20 seconds... |
51 | // easily die in 20 seconds... |
52 | #define SOCKET_TIMEOUT1 10 |
52 | #define SOCKET_TIMEOUT1 10 |
53 | #define SOCKET_TIMEOUT2 20 |
53 | #define SOCKET_TIMEOUT2 20 |
54 | |
54 | |
55 | void |
55 | void |
56 | Socket_Flush (NewSocket * ns) |
56 | client_socket::flush () |
57 | { |
57 | { |
58 | #ifdef __linux__ |
58 | #ifdef __linux__ |
59 | // check time of last ack, and, if too old, kill connection |
59 | // check time of last ack, and, if too old, kill connection |
60 | struct tcp_info tcpi; |
60 | struct tcp_info tcpi; |
61 | socklen_t len = sizeof (tcpi); |
61 | socklen_t len = sizeof (tcpi); |
62 | |
62 | |
63 | if (!getsockopt (ns->fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi)) |
63 | if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi)) |
64 | { |
64 | { |
65 | unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent; |
65 | unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent; |
|
|
66 | |
|
|
67 | rtt = tcpi.tcpi_rtt; |
|
|
68 | rttvar = tcpi.tcpi_rttvar; |
66 | |
69 | |
67 | if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 * TCP_HZ < diff && diff < 0x80000000UL // ack delayed for 20s |
70 | 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 |
71 | && SOCKET_TIMEOUT2 * TCP_HZ < tcpi.tcpi_last_data_sent) // no data sent for 10s |
69 | { |
72 | { |
70 | LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", ns->fd, |
73 | 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); |
74 | (unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked); |
72 | ns->status = Ns_Dead; |
75 | status = Ns_Dead; |
73 | } |
76 | } |
74 | } |
77 | } |
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 |
78 | #endif |
|
|
79 | |
|
|
80 | /** |
|
|
81 | * Writes data to socket. |
|
|
82 | * |
|
|
83 | * When the socket is clear to write, and we have backlogged data, this |
|
|
84 | * is called to write it out. |
|
|
85 | */ |
|
|
86 | |
|
|
87 | if (!outputbuffer.len || socket_ev.poll () & PE_W) |
|
|
88 | return; |
|
|
89 | |
|
|
90 | write_outputbuffer (); |
|
|
91 | } |
|
|
92 | |
|
|
93 | void |
|
|
94 | client_socket::write_outputbuffer () |
|
|
95 | { |
|
|
96 | while (outputbuffer.len) |
|
|
97 | { |
|
|
98 | int res = write (fd, outputbuffer.data + outputbuffer.start, |
|
|
99 | min (outputbuffer.len, SOCKETBUFSIZE - outputbuffer.start)); |
|
|
100 | |
|
|
101 | if (res > 0) |
|
|
102 | { |
|
|
103 | outputbuffer.start += res; |
|
|
104 | /* wrap back to start of buffer */ |
|
|
105 | if (outputbuffer.start == SOCKETBUFSIZE) |
|
|
106 | outputbuffer.start = 0; |
|
|
107 | |
|
|
108 | outputbuffer.len -= res; |
|
|
109 | #ifdef CS_LOGSTATS |
|
|
110 | cst_tot.obytes += res; |
|
|
111 | cst_lst.obytes += res; |
|
|
112 | #endif |
|
|
113 | } |
|
|
114 | else if (res == 0) |
|
|
115 | { |
|
|
116 | LOG (llevError, "socket write failed, connection closed.\n"); |
|
|
117 | status = Ns_Dead; |
|
|
118 | return; |
|
|
119 | } |
|
|
120 | else if (errno == EINTR) |
|
|
121 | { |
|
|
122 | // just retry |
|
|
123 | } |
|
|
124 | else if (errno == EAGAIN) |
|
|
125 | { |
|
|
126 | // delay till ready |
|
|
127 | socket_ev.poll (socket_ev.poll () | PE_W); |
|
|
128 | socket_ev.start (); |
|
|
129 | return; |
|
|
130 | } |
|
|
131 | else |
|
|
132 | { |
|
|
133 | LOG (llevError, "socket write failed: %s\n", strerror (errno)); |
|
|
134 | status = Ns_Dead; |
|
|
135 | return; |
|
|
136 | } |
|
|
137 | } |
|
|
138 | |
|
|
139 | socket_ev.poll (socket_ev.poll () & ~PE_W); |
81 | } |
140 | } |
82 | |
141 | |
83 | /*********************************************************************** |
142 | /*********************************************************************** |
84 | * |
143 | * |
85 | * SockList functions/utilities |
144 | * packet functions/utilities |
86 | * |
145 | * |
87 | **********************************************************************/ |
146 | **********************************************************************/ |
88 | |
147 | |
89 | SockList &SockList::operator <<(const data &v) |
148 | packet &packet::operator <<(const data &v) |
90 | { |
149 | { |
|
|
150 | if (room () < v.len) |
|
|
151 | reset (); |
|
|
152 | else |
|
|
153 | { |
91 | if (v.len) |
154 | if (v.len) |
92 | { |
155 | { |
93 | memcpy (buf + len, v.ptr, v.len); |
156 | memcpy (cur, v.ptr, v.len); |
94 | len += v.len; |
157 | cur += v.len; |
|
|
158 | } |
95 | } |
159 | } |
96 | |
160 | |
97 | return *this; |
161 | return *this; |
98 | } |
162 | } |
99 | |
163 | |
100 | SockList &SockList::operator <<(const data8 &v) |
164 | packet &packet::operator <<(const data8 &v) |
101 | { |
165 | { |
102 | unsigned int len = min (v.len, 0x00FF); |
166 | unsigned int len = min (v.len, 0x00FF); |
103 | return *this << uint8 (len) << data (v.ptr, len); |
167 | return *this << uint8 (len) << data (v.ptr, len); |
104 | } |
168 | } |
105 | |
169 | |
106 | SockList &SockList::operator <<(const data16 &v) |
170 | packet &packet::operator <<(const data16 &v) |
107 | { |
171 | { |
108 | unsigned int len = min (v.len, 0xFFFF); |
172 | unsigned int len = min (v.len, 0xFFFF); |
109 | return *this << uint16 (len) << data (v.ptr, len); |
173 | return *this << uint16 (len) << data (v.ptr, len); |
110 | } |
174 | } |
111 | |
175 | |
112 | SockList &SockList::operator <<(const char *v) |
176 | packet &packet::operator <<(const char *v) |
113 | { |
177 | { |
114 | return *this << data (v, strlen (v ? v : 0)); |
178 | return *this << data (v, strlen (v ? v : 0)); |
115 | } |
179 | } |
116 | |
180 | |
117 | void |
181 | void |
118 | SockList::printf (const char *format, ...) |
182 | packet::printf (const char *format, ...) |
119 | { |
183 | { |
|
|
184 | int size = room (); |
|
|
185 | |
120 | va_list ap; |
186 | va_list ap; |
121 | va_start (ap, format); |
187 | va_start (ap, format); |
122 | |
188 | int len = vsnprintf ((char *)cur, size, format, ap); |
123 | len += vsnprintf ((char *)buf + len, MAXSOCKBUF, format, ap); |
|
|
124 | |
|
|
125 | va_end (ap); |
189 | va_end (ap); |
|
|
190 | |
|
|
191 | if (len >= size) |
|
|
192 | return reset (); |
|
|
193 | |
|
|
194 | cur += len; |
126 | } |
195 | } |
127 | |
196 | |
128 | /****************************************************************************** |
197 | /****************************************************************************** |
129 | * |
198 | * |
130 | * Start of read routines. |
199 | * Start of read routines. |
131 | * |
200 | * |
132 | ******************************************************************************/ |
201 | ******************************************************************************/ |
133 | |
202 | |
134 | int |
203 | int |
135 | NewSocket::read_packet () |
204 | client_socket::read_packet () |
136 | { |
205 | { |
137 | for (;;) |
206 | for (;;) |
138 | { |
207 | { |
139 | if (inbuf_len >= 2) |
208 | if (inbuf_len >= 2) |
140 | { |
209 | { |
… | |
… | |
161 | } |
230 | } |
162 | else if (amount < 0) |
231 | else if (amount < 0) |
163 | { |
232 | { |
164 | if (errno != EAGAIN && errno != EINTR) |
233 | if (errno != EAGAIN && errno != EINTR) |
165 | { |
234 | { |
166 | LOG (llevError, "read error: %s", strerror (errno)); |
235 | LOG (llevError, "read error: %s\n", strerror (errno)); |
167 | return -1; |
236 | return -1; |
168 | } |
237 | } |
169 | |
238 | |
170 | return 0; |
239 | return 0; |
171 | } |
240 | } |
… | |
… | |
176 | cst_lst.ibytes += amount; |
245 | cst_lst.ibytes += amount; |
177 | } |
246 | } |
178 | } |
247 | } |
179 | |
248 | |
180 | void |
249 | void |
181 | NewSocket::skip_packet (int len) |
250 | client_socket::skip_packet (int len) |
182 | { |
251 | { |
183 | inbuf_len -= len; |
252 | inbuf_len -= len; |
184 | memmove (inbuf, inbuf + len, inbuf_len); |
253 | memmove (inbuf, inbuf + len, inbuf_len); |
185 | } |
254 | } |
186 | |
255 | |
… | |
… | |
194 | * Adds data to a socket buffer for whatever reason. |
263 | * Adds data to a socket buffer for whatever reason. |
195 | * |
264 | * |
196 | * ns is the socket we are adding the data to, buf is the start of the |
265 | * 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. |
266 | * data, and len is the number of bytes to add. |
198 | */ |
267 | */ |
199 | |
268 | void |
200 | static void |
269 | client_socket::send (void *buf_, int len) |
201 | add_to_buffer (NewSocket *ns, char *buf, int len) |
|
|
202 | { |
270 | { |
|
|
271 | char *buf = (char *)buf_; |
|
|
272 | char *pos = buf; |
|
|
273 | int amt = 0; |
|
|
274 | |
|
|
275 | if (status == Ns_Dead || !buf) |
|
|
276 | { |
|
|
277 | LOG (llevDebug, "Write_To_Socket called with dead socket\n"); |
|
|
278 | return; |
|
|
279 | } |
|
|
280 | |
|
|
281 | if ((len + outputbuffer.len) > SOCKETBUFSIZE) |
|
|
282 | { |
|
|
283 | LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", fd); |
|
|
284 | status = Ns_Dead; |
|
|
285 | return; |
|
|
286 | } |
|
|
287 | |
203 | int avail, end; |
288 | 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 | |
289 | |
212 | /* data + end is where we start putting the new data. The last byte |
290 | /* data + end is where we start putting the new data. The last byte |
213 | * currently in use is actually data + end -1 |
291 | * currently in use is actually data + end -1 |
214 | */ |
292 | */ |
215 | |
|
|
216 | end = ns->outputbuffer.start + ns->outputbuffer.len; |
293 | end = outputbuffer.start + outputbuffer.len; |
217 | /* The buffer is already in a wrapped state, so adjust end */ |
294 | /* The buffer is already in a wrapped state, so adjust end */ |
218 | if (end >= SOCKETBUFSIZE) |
295 | if (end >= SOCKETBUFSIZE) |
219 | end -= SOCKETBUFSIZE; |
296 | end -= SOCKETBUFSIZE; |
220 | |
297 | |
221 | avail = SOCKETBUFSIZE - end; |
298 | avail = SOCKETBUFSIZE - end; |
222 | |
299 | |
223 | /* We can all fit it behind the current data without wrapping */ |
300 | /* We can all fit it behind the current data without wrapping */ |
224 | if (avail >= len) |
301 | if (avail >= len) |
225 | memcpy (ns->outputbuffer.data + end, buf, len); |
302 | memcpy (outputbuffer.data + end, buf, len); |
226 | else |
303 | else |
227 | { |
304 | { |
228 | memcpy (ns->outputbuffer.data + end, buf, avail); |
305 | memcpy (outputbuffer.data + end, buf, avail); |
229 | memcpy (ns->outputbuffer.data, buf + avail, len - avail); |
306 | memcpy (outputbuffer.data, buf + avail, len - avail); |
230 | } |
307 | } |
231 | |
308 | |
232 | ns->outputbuffer.len += len; |
309 | 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 | } |
310 | } |
237 | |
311 | |
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 |
312 | void |
245 | write_socket_buffer (NewSocket * ns) |
313 | client_socket::socket_cb (iow &w, int got) |
246 | { |
314 | { |
247 | int amt, max; |
315 | write_outputbuffer (); |
248 | |
316 | |
249 | if (ns->outputbuffer.len == 0) |
317 | if (!outputbuffer.len) |
250 | { |
318 | socket_ev.poll (socket_ev.poll () & ~PE_W); |
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 | } |
319 | } |
364 | |
320 | |
365 | /** |
321 | /** |
366 | * Takes a string of data, and writes it out to the socket. A very handy |
322 | * Takes a string of data, and writes it out to the socket. A very handy |
367 | * shortcut function. |
323 | * shortcut function. |
368 | */ |
324 | */ |
369 | |
|
|
370 | void |
325 | void |
371 | NewSocket::send_packet (SockList &sl) |
326 | client_socket::send_packet (packet &sl) |
372 | { |
327 | { |
373 | Send_With_Handling (this, &sl); |
|
|
374 | } |
|
|
375 | |
|
|
376 | void |
|
|
377 | NewSocket::send_packet (const char *buf, int len) |
|
|
378 | { |
|
|
379 | SockList sl (MAXSOCKBUF); |
|
|
380 | |
|
|
381 | sl << data (buf, len); |
|
|
382 | send_packet (sl); |
|
|
383 | sl.free (); |
|
|
384 | } |
|
|
385 | |
|
|
386 | void |
|
|
387 | NewSocket::send_packet (const char *buf) |
|
|
388 | { |
|
|
389 | send_packet (buf, strlen (buf)); |
|
|
390 | } |
|
|
391 | |
|
|
392 | /** |
|
|
393 | * Calls Write_To_Socket to send data to the client. |
|
|
394 | * |
|
|
395 | * The only difference in this function is that we take a SockList |
|
|
396 | *, and we prepend the length information. |
|
|
397 | */ |
|
|
398 | void |
|
|
399 | Send_With_Handling (NewSocket *ns, SockList *msg) |
|
|
400 | { |
|
|
401 | unsigned char sbuf[4]; |
|
|
402 | |
|
|
403 | if (ns->status == Ns_Dead || !msg) |
328 | if (status == Ns_Dead) |
404 | return; |
329 | return; |
405 | |
330 | |
406 | if (msg->len >= MAXSOCKBUF) |
331 | if (sl.length () >= MAXSOCKBUF) |
407 | { |
332 | { |
408 | LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", msg->len); |
333 | LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ()); |
409 | /* Almost certainly we've overflowed a buffer, so quite now to make |
334 | /* Almost certainly we've overflowed a buffer, so quit now to make |
410 | * it easier to debug. |
335 | * it easier to debug. |
411 | */ |
336 | */ |
412 | abort (); |
337 | abort (); |
413 | } |
338 | } |
414 | sbuf[0] = ((uint32) (msg->len) >> 8) & 0xFF; |
339 | |
415 | sbuf[1] = ((uint32) (msg->len)) & 0xFF; |
340 | if (!sl.length ()) |
416 | if (ns->status != Ns_Old) |
341 | return; |
417 | Write_To_Socket (ns, (char *) sbuf, 2); |
342 | |
418 | Write_To_Socket (ns, (char *) msg->buf, msg->len); |
343 | assert (sl.hdrlen == 2); |
|
|
344 | |
|
|
345 | sl.buf_ [0] = sl.length () >> 8; |
|
|
346 | sl.buf_ [1] = sl.length () ; |
|
|
347 | |
|
|
348 | send (sl.buf_, sl.length () + sl.hdrlen); |
|
|
349 | } |
|
|
350 | |
|
|
351 | void |
|
|
352 | client_socket::send_packet (const char *buf, int len) |
|
|
353 | { |
|
|
354 | packet sl; |
|
|
355 | |
|
|
356 | sl << data (buf, len); |
|
|
357 | send_packet (sl); |
|
|
358 | } |
|
|
359 | |
|
|
360 | void |
|
|
361 | client_socket::send_packet (const char *buf) |
|
|
362 | { |
|
|
363 | send_packet (buf, strlen (buf)); |
419 | } |
364 | } |
420 | |
365 | |
421 | /****************************************************************************** |
366 | /****************************************************************************** |
422 | * |
367 | * |
423 | * statistics logging functions. |
368 | * statistics logging functions. |
… | |
… | |
447 | LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n", |
392 | LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n", |
448 | ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn, |
393 | ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn, |
449 | now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start); |
394 | now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start); |
450 | cst_lst.ibytes = 0; |
395 | cst_lst.ibytes = 0; |
451 | cst_lst.obytes = 0; |
396 | cst_lst.obytes = 0; |
452 | cst_lst.max_conn = socket_info.nconns; |
|
|
453 | cst_lst.time_start = now; |
397 | cst_lst.time_start = now; |
454 | } |
398 | } |
455 | #endif |
399 | #endif |
456 | |
400 | |