… | |
… | |
35 | using namespace std; |
35 | using namespace std; |
36 | |
36 | |
37 | #include <global.h> |
37 | #include <global.h> |
38 | #include <newclient.h> |
38 | #include <newclient.h> |
39 | #include <sproto.h> |
39 | #include <sproto.h> |
|
|
40 | #include <cstdarg> |
40 | |
41 | |
41 | #ifdef __linux__ |
42 | #ifdef __linux__ |
42 | # include <sys/types.h> |
43 | # include <sys/types.h> |
43 | # include <sys/socket.h> |
44 | # include <sys/socket.h> |
44 | # include <netinet/in.h> |
45 | # include <netinet/in.h> |
… | |
… | |
50 | // easily die in 20 seconds... |
51 | // easily die in 20 seconds... |
51 | #define SOCKET_TIMEOUT1 10 |
52 | #define SOCKET_TIMEOUT1 10 |
52 | #define SOCKET_TIMEOUT2 20 |
53 | #define SOCKET_TIMEOUT2 20 |
53 | |
54 | |
54 | void |
55 | void |
55 | Socket_Flush (NewSocket * ns) |
56 | client_socket::flush () |
56 | { |
57 | { |
57 | #ifdef __linux__ |
58 | #ifdef __linux__ |
58 | // check time of last ack, and, if too old, kill connection |
59 | // check time of last ack, and, if too old, kill connection |
59 | struct tcp_info tcpi; |
60 | struct tcp_info tcpi; |
60 | socklen_t len = sizeof (tcpi); |
61 | socklen_t len = sizeof (tcpi); |
61 | |
62 | |
62 | 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)) |
63 | { |
64 | { |
64 | 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; |
65 | |
66 | |
66 | if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 * TCP_HZ < diff && diff < 0x80000000UL // ack delayed for 20s |
67 | if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 * TCP_HZ < diff && diff < 0x80000000UL // ack delayed for 20s |
67 | && SOCKET_TIMEOUT2 * TCP_HZ < tcpi.tcpi_last_data_sent) // no data sent for 10s |
68 | && SOCKET_TIMEOUT2 * TCP_HZ < tcpi.tcpi_last_data_sent) // no data sent for 10s |
68 | { |
69 | { |
69 | LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", ns->fd, |
70 | LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd, |
70 | (unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked); |
71 | (unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked); |
71 | ns->status = Ns_Dead; |
72 | status = Ns_Dead; |
72 | } |
73 | } |
73 | } |
74 | } |
74 | |
|
|
75 | int val; |
|
|
76 | |
|
|
77 | val = 0; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val)); |
|
|
78 | val = 1; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val)); |
|
|
79 | #endif |
75 | #endif |
|
|
76 | |
|
|
77 | /** |
|
|
78 | * Writes data to socket. |
|
|
79 | * |
|
|
80 | * When the socket is clear to write, and we have backlogged data, this |
|
|
81 | * is called to write it out. |
|
|
82 | */ |
|
|
83 | |
|
|
84 | if (!outputbuffer.len || socket_ev.poll () & PE_W) |
|
|
85 | return; |
|
|
86 | |
|
|
87 | write_outputbuffer (); |
|
|
88 | } |
|
|
89 | |
|
|
90 | void |
|
|
91 | client_socket::write_outputbuffer () |
|
|
92 | { |
|
|
93 | while (outputbuffer.len) |
|
|
94 | { |
|
|
95 | int res = write (fd, outputbuffer.data + outputbuffer.start, |
|
|
96 | min (outputbuffer.len, SOCKETBUFSIZE - outputbuffer.start)); |
|
|
97 | |
|
|
98 | if (res > 0) |
|
|
99 | { |
|
|
100 | outputbuffer.start += res; |
|
|
101 | /* wrap back to start of buffer */ |
|
|
102 | if (outputbuffer.start == SOCKETBUFSIZE) |
|
|
103 | outputbuffer.start = 0; |
|
|
104 | |
|
|
105 | outputbuffer.len -= res; |
|
|
106 | #ifdef CS_LOGSTATS |
|
|
107 | cst_tot.obytes += res; |
|
|
108 | cst_lst.obytes += res; |
|
|
109 | #endif |
|
|
110 | } |
|
|
111 | else if (res == 0) |
|
|
112 | { |
|
|
113 | LOG (llevError, "socket write failed, connection closed.\n"); |
|
|
114 | status = Ns_Dead; |
|
|
115 | return; |
|
|
116 | } |
|
|
117 | else if (errno == EINTR) |
|
|
118 | { |
|
|
119 | // just retry |
|
|
120 | } |
|
|
121 | else if (errno == EAGAIN) |
|
|
122 | { |
|
|
123 | // delay till ready |
|
|
124 | socket_ev.poll (socket_ev.poll () | PE_W); |
|
|
125 | socket_ev.start (); |
|
|
126 | return; |
|
|
127 | } |
|
|
128 | else |
|
|
129 | { |
|
|
130 | LOG (llevError, "socket write failed: %s\n", strerror (errno)); |
|
|
131 | status = Ns_Dead; |
|
|
132 | return; |
|
|
133 | } |
|
|
134 | } |
|
|
135 | |
|
|
136 | socket_ev.poll (socket_ev.poll () & ~PE_W); |
80 | } |
137 | } |
81 | |
138 | |
82 | /*********************************************************************** |
139 | /*********************************************************************** |
83 | * |
140 | * |
84 | * SockList functions/utilities |
141 | * packet functions/utilities |
85 | * |
142 | * |
86 | **********************************************************************/ |
143 | **********************************************************************/ |
87 | |
144 | |
88 | SockList &SockList::operator <<(const data8 &v) |
145 | packet &packet::operator <<(const data &v) |
89 | { |
146 | { |
90 | *this << uint8 (v.len); |
147 | if (room () < v.len) |
91 | |
148 | reset (); |
92 | memcpy (buf + len, v.data, v.len); |
149 | else |
93 | len += v.len; |
150 | { |
|
|
151 | if (v.len) |
|
|
152 | { |
|
|
153 | memcpy (cur, v.ptr, v.len); |
|
|
154 | cur += v.len; |
|
|
155 | } |
|
|
156 | } |
94 | |
157 | |
95 | return *this; |
158 | return *this; |
96 | } |
159 | } |
97 | |
160 | |
|
|
161 | packet &packet::operator <<(const data8 &v) |
|
|
162 | { |
|
|
163 | unsigned int len = min (v.len, 0x00FF); |
|
|
164 | return *this << uint8 (len) << data (v.ptr, len); |
|
|
165 | } |
|
|
166 | |
98 | SockList &SockList::operator <<(const data16 &v) |
167 | packet &packet::operator <<(const data16 &v) |
99 | { |
168 | { |
100 | *this << uint16 (v.len); |
169 | unsigned int len = min (v.len, 0xFFFF); |
101 | |
170 | return *this << uint16 (len) << data (v.ptr, len); |
102 | memcpy (buf + len, v.data, v.len); |
|
|
103 | len += v.len; |
|
|
104 | |
|
|
105 | return *this; |
|
|
106 | } |
171 | } |
107 | |
172 | |
108 | /* Basically does the reverse of SockList_AddInt, but on |
173 | packet &packet::operator <<(const char *v) |
109 | * strings instead. Same for the GetShort, but for 16 bits. |
174 | { |
|
|
175 | return *this << data (v, strlen (v ? v : 0)); |
|
|
176 | } |
|
|
177 | |
|
|
178 | void |
|
|
179 | packet::printf (const char *format, ...) |
|
|
180 | { |
|
|
181 | int size = room (); |
|
|
182 | |
|
|
183 | va_list ap; |
|
|
184 | va_start (ap, format); |
|
|
185 | int len = vsnprintf ((char *)cur, size, format, ap); |
|
|
186 | va_end (ap); |
|
|
187 | |
|
|
188 | if (len >= size) |
|
|
189 | return reset (); |
|
|
190 | |
|
|
191 | cur += len; |
|
|
192 | } |
|
|
193 | |
|
|
194 | /****************************************************************************** |
110 | */ |
195 | * |
|
|
196 | * Start of read routines. |
|
|
197 | * |
|
|
198 | ******************************************************************************/ |
|
|
199 | |
111 | int |
200 | int |
112 | GetInt_String (unsigned char *data) |
201 | client_socket::read_packet () |
113 | { |
202 | { |
114 | return ((data[0] << 24) + (data[1] << 16) + (data[2] << 8) + data[3]); |
203 | for (;;) |
115 | } |
|
|
116 | |
|
|
117 | short |
|
|
118 | GetShort_String (unsigned char *data) |
|
|
119 | { |
|
|
120 | return ((data[0] << 8) + data[1]); |
|
|
121 | } |
|
|
122 | |
|
|
123 | /****************************************************************************** |
|
|
124 | * |
|
|
125 | * Start of read routines. |
|
|
126 | * |
|
|
127 | ******************************************************************************/ |
|
|
128 | |
|
|
129 | /** |
|
|
130 | * This reads from fd and puts the data in sl. We return true if we think |
|
|
131 | * we have a full packet, 0 if we have a partial packet. The only processing |
|
|
132 | * we do is remove the intial size value. len (As passed) is the size of the |
|
|
133 | * buffer allocated in the socklist. We make the assumption the buffer is |
|
|
134 | * at least 2 bytes long. |
|
|
135 | */ |
|
|
136 | |
|
|
137 | int |
|
|
138 | SockList_ReadPacket (int fd, SockList * sl, int len) |
|
|
139 | { |
|
|
140 | int stat, toread; |
|
|
141 | |
|
|
142 | /* Sanity check - shouldn't happen */ |
|
|
143 | if (sl->len < 0) |
|
|
144 | { |
|
|
145 | abort (); |
|
|
146 | } |
204 | { |
147 | /* We already have a partial packet */ |
205 | if (inbuf_len >= 2) |
148 | if (sl->len < 2) |
|
|
149 | { |
|
|
150 | do |
|
|
151 | { |
|
|
152 | stat = read (fd, sl->buf + sl->len, 2 - sl->len); |
|
|
153 | } |
206 | { |
154 | while ((stat == -1) && (errno == EINTR)); |
207 | unsigned int pkt_len = (inbuf [0] << 8) | inbuf [1]; |
155 | |
208 | |
156 | if (stat < 0) |
209 | if (inbuf_len >= 2 + pkt_len) |
|
|
210 | return pkt_len + 2; |
157 | { |
211 | } |
158 | /* In non blocking mode, EAGAIN is set when there is no |
212 | |
159 | * data available. |
213 | int amount = sizeof (inbuf) - inbuf_len; |
160 | */ |
214 | |
|
|
215 | if (amount <= 0) |
|
|
216 | { |
|
|
217 | LOG (llevError, "packet too large");//TODO |
|
|
218 | return -1; |
|
|
219 | } |
|
|
220 | |
|
|
221 | amount = read (fd, inbuf + inbuf_len, amount); |
|
|
222 | |
|
|
223 | if (!amount) |
|
|
224 | { |
|
|
225 | status = Ns_Dead; |
|
|
226 | return -1; |
|
|
227 | } |
|
|
228 | else if (amount < 0) |
|
|
229 | { |
161 | if (errno != EAGAIN && errno != EWOULDBLOCK) |
230 | if (errno != EAGAIN && errno != EINTR) |
162 | { |
231 | { |
163 | LOG (llevDebug, "ReadPacket got error %s, returning 0\n", strerror (errno)); |
232 | LOG (llevError, "read error: %s\n", strerror (errno)); |
|
|
233 | return -1; |
164 | } |
234 | } |
165 | return 0; /*Error */ |
|
|
166 | } |
|
|
167 | if (stat == 0) |
|
|
168 | return -1; |
|
|
169 | sl->len += stat; |
|
|
170 | #ifdef CS_LOGSTATS |
|
|
171 | cst_tot.ibytes += stat; |
|
|
172 | cst_lst.ibytes += stat; |
|
|
173 | #endif |
|
|
174 | if (stat < 2) |
|
|
175 | return 0; /* Still don't have a full packet */ |
|
|
176 | } |
|
|
177 | /* Figure out how much more data we need to read. Add 2 from the |
|
|
178 | * end of this - size header information is not included. |
|
|
179 | */ |
|
|
180 | toread = 2 + (sl->buf[0] << 8) + sl->buf[1] - sl->len; |
|
|
181 | if ((toread + sl->len) >= len) |
|
|
182 | { |
|
|
183 | LOG (llevError, "SockList_ReadPacket: Want to read more bytes than will fit in buffer (%d>=%d).\n", toread + sl->len, len); |
|
|
184 | /* Quick hack in case for 'oldsocketmode' input. If we are |
|
|
185 | * closing the socket anyways, then reading this extra 100 bytes |
|
|
186 | * shouldn't hurt. |
|
|
187 | */ |
|
|
188 | read (fd, sl->buf + 2, 100); |
|
|
189 | |
235 | |
190 | /* return error so the socket is closed */ |
|
|
191 | return -1; |
|
|
192 | } |
|
|
193 | do |
|
|
194 | { |
|
|
195 | do |
|
|
196 | { |
|
|
197 | stat = read (fd, sl->buf + sl->len, toread); |
|
|
198 | } |
|
|
199 | while ((stat < 0) && (errno == EINTR)); |
|
|
200 | if (stat < 0) |
|
|
201 | { |
|
|
202 | |
|
|
203 | if (errno != EAGAIN && errno != EWOULDBLOCK) |
|
|
204 | { |
|
|
205 | LOG (llevDebug, "ReadPacket got error %s, returning 0\n", strerror (errno)); |
|
|
206 | } |
|
|
207 | return 0; /*Error */ |
|
|
208 | } |
|
|
209 | if (stat == 0) |
|
|
210 | return -1; |
|
|
211 | sl->len += stat; |
|
|
212 | #ifdef CS_LOGSTATS |
|
|
213 | cst_tot.ibytes += stat; |
|
|
214 | cst_lst.ibytes += stat; |
|
|
215 | #endif |
|
|
216 | toread -= stat; |
|
|
217 | if (toread == 0) |
|
|
218 | return 1; |
|
|
219 | if (toread < 0) |
|
|
220 | { |
|
|
221 | LOG (llevError, "SockList_ReadPacket: Read more bytes than desired.\n"); |
|
|
222 | return 1; |
236 | return 0; |
223 | } |
237 | } |
|
|
238 | |
|
|
239 | inbuf_len += amount; |
|
|
240 | |
|
|
241 | cst_tot.ibytes += amount; |
|
|
242 | cst_lst.ibytes += amount; |
224 | } |
243 | } |
225 | while (toread > 0); |
244 | } |
226 | return 0; |
245 | |
|
|
246 | void |
|
|
247 | client_socket::skip_packet (int len) |
|
|
248 | { |
|
|
249 | inbuf_len -= len; |
|
|
250 | memmove (inbuf, inbuf + len, inbuf_len); |
227 | } |
251 | } |
228 | |
252 | |
229 | /******************************************************************************* |
253 | /******************************************************************************* |
230 | * |
254 | * |
231 | * Start of write related routines. |
255 | * Start of write related routines. |
… | |
… | |
236 | * Adds data to a socket buffer for whatever reason. |
260 | * Adds data to a socket buffer for whatever reason. |
237 | * |
261 | * |
238 | * ns is the socket we are adding the data to, buf is the start of the |
262 | * ns is the socket we are adding the data to, buf is the start of the |
239 | * data, and len is the number of bytes to add. |
263 | * data, and len is the number of bytes to add. |
240 | */ |
264 | */ |
241 | |
265 | void |
242 | static void |
266 | client_socket::send (void *buf_, int len) |
243 | add_to_buffer (NewSocket * ns, char *buf, int len) |
|
|
244 | { |
267 | { |
|
|
268 | char *buf = (char *)buf_; |
|
|
269 | char *pos = buf; |
|
|
270 | int amt = 0; |
|
|
271 | |
|
|
272 | if (status == Ns_Dead || !buf) |
|
|
273 | { |
|
|
274 | LOG (llevDebug, "Write_To_Socket called with dead socket\n"); |
|
|
275 | return; |
|
|
276 | } |
|
|
277 | |
|
|
278 | if ((len + outputbuffer.len) > SOCKETBUFSIZE) |
|
|
279 | { |
|
|
280 | LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", fd); |
|
|
281 | status = Ns_Dead; |
|
|
282 | return; |
|
|
283 | } |
|
|
284 | |
245 | int avail, end; |
285 | int avail, end; |
246 | |
|
|
247 | if ((len + ns->outputbuffer.len) > SOCKETBUFSIZE) |
|
|
248 | { |
|
|
249 | LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", ns->fd); |
|
|
250 | ns->status = Ns_Dead; |
|
|
251 | return; |
|
|
252 | } |
|
|
253 | |
286 | |
254 | /* data + end is where we start putting the new data. The last byte |
287 | /* data + end is where we start putting the new data. The last byte |
255 | * currently in use is actually data + end -1 |
288 | * currently in use is actually data + end -1 |
256 | */ |
289 | */ |
257 | |
|
|
258 | end = ns->outputbuffer.start + ns->outputbuffer.len; |
290 | end = outputbuffer.start + outputbuffer.len; |
259 | /* The buffer is already in a wrapped state, so adjust end */ |
291 | /* The buffer is already in a wrapped state, so adjust end */ |
260 | if (end >= SOCKETBUFSIZE) |
292 | if (end >= SOCKETBUFSIZE) |
261 | end -= SOCKETBUFSIZE; |
293 | end -= SOCKETBUFSIZE; |
262 | |
294 | |
263 | avail = SOCKETBUFSIZE - end; |
295 | avail = SOCKETBUFSIZE - end; |
264 | |
296 | |
265 | /* We can all fit it behind the current data without wrapping */ |
297 | /* We can all fit it behind the current data without wrapping */ |
266 | if (avail >= len) |
298 | if (avail >= len) |
267 | memcpy (ns->outputbuffer.data + end, buf, len); |
299 | memcpy (outputbuffer.data + end, buf, len); |
268 | else |
300 | else |
269 | { |
301 | { |
270 | memcpy (ns->outputbuffer.data + end, buf, avail); |
302 | memcpy (outputbuffer.data + end, buf, avail); |
271 | memcpy (ns->outputbuffer.data, buf + avail, len - avail); |
303 | memcpy (outputbuffer.data, buf + avail, len - avail); |
272 | } |
304 | } |
273 | |
305 | |
274 | ns->outputbuffer.len += len; |
306 | outputbuffer.len += len; |
275 | #if 0 |
|
|
276 | LOG (llevDebug, "Added %d to output buffer, total length now %d, start=%d\n", len, ns->outputbuffer.len, ns->outputbuffer.start); |
|
|
277 | #endif |
|
|
278 | } |
307 | } |
279 | |
308 | |
280 | /** |
|
|
281 | * Writes data to socket. |
|
|
282 | * |
|
|
283 | * When the socket is clear to write, and we have backlogged data, this |
|
|
284 | * is called to write it out. |
|
|
285 | */ |
|
|
286 | void |
309 | void |
287 | write_socket_buffer (NewSocket * ns) |
310 | client_socket::socket_cb (iow &w, int got) |
288 | { |
311 | { |
289 | int amt, max; |
312 | write_outputbuffer (); |
290 | |
313 | |
291 | if (ns->outputbuffer.len == 0) |
314 | if (!outputbuffer.len) |
292 | { |
315 | socket_ev.poll (socket_ev.poll () & ~PE_W); |
293 | LOG (llevDebug, "write_socket_buffer called when there is no data, fd=%d\n", ns->fd); |
|
|
294 | return; |
|
|
295 | } |
|
|
296 | |
|
|
297 | do |
|
|
298 | { |
|
|
299 | max = SOCKETBUFSIZE - ns->outputbuffer.start; |
|
|
300 | if (ns->outputbuffer.len < max) |
|
|
301 | max = ns->outputbuffer.len; |
|
|
302 | |
|
|
303 | do |
|
|
304 | { |
|
|
305 | amt = write (ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max); |
|
|
306 | } |
|
|
307 | while ((amt < 0) && (errno == EINTR)); |
|
|
308 | |
|
|
309 | if (amt < 0) |
|
|
310 | { /* We got an error */ |
|
|
311 | |
|
|
312 | if (errno != EWOULDBLOCK) |
|
|
313 | { |
|
|
314 | LOG (llevError, "New socket write failed (wsb) (%d: %s).\n", errno, strerror (errno)); |
|
|
315 | ns->status = Ns_Dead; |
|
|
316 | return; |
|
|
317 | } |
|
|
318 | else |
|
|
319 | { /* EWOULDBLOCK */ |
|
|
320 | /* can't write it, so store it away. */ |
|
|
321 | ns->can_write = 0; |
|
|
322 | return; |
|
|
323 | } |
|
|
324 | } |
|
|
325 | ns->outputbuffer.start += amt; |
|
|
326 | /* wrap back to start of buffer */ |
|
|
327 | if (ns->outputbuffer.start == SOCKETBUFSIZE) |
|
|
328 | ns->outputbuffer.start = 0; |
|
|
329 | ns->outputbuffer.len -= amt; |
|
|
330 | #ifdef CS_LOGSTATS |
|
|
331 | cst_tot.obytes += amt; |
|
|
332 | cst_lst.obytes += amt; |
|
|
333 | #endif |
|
|
334 | } |
|
|
335 | while (ns->outputbuffer.len > 0); |
|
|
336 | } |
316 | } |
337 | |
|
|
338 | /** |
|
|
339 | * This writes data to the socket. - It is very low level - |
|
|
340 | * all we try and do is write out the data to the socket |
|
|
341 | * provided (ns). buf is the data to write, len is the number |
|
|
342 | * of bytes to write. IT doesn't return anything - rather, it |
|
|
343 | * updates the ns structure if we get an error. |
|
|
344 | */ |
|
|
345 | void |
|
|
346 | Write_To_Socket (NewSocket * ns, char *buf, int len) |
|
|
347 | { |
|
|
348 | int amt = 0; |
|
|
349 | char *pos = buf; |
|
|
350 | |
|
|
351 | if (ns->status == Ns_Dead || !buf) |
|
|
352 | { |
|
|
353 | LOG (llevDebug, "Write_To_Socket called with dead socket\n"); |
|
|
354 | return; |
|
|
355 | } |
|
|
356 | |
|
|
357 | #ifndef __GNU__ /* This caused problems on Hurd */ |
|
|
358 | if (!ns->can_write) |
|
|
359 | { |
|
|
360 | add_to_buffer (ns, buf, len); |
|
|
361 | return; |
|
|
362 | } |
|
|
363 | #endif |
|
|
364 | /* If we manage to write more than we wanted, take it as a bonus */ |
|
|
365 | while (len > 0) |
|
|
366 | { |
|
|
367 | |
|
|
368 | do |
|
|
369 | { |
|
|
370 | amt = write (ns->fd, pos, len); |
|
|
371 | } |
|
|
372 | while ((amt < 0) && (errno == EINTR)); |
|
|
373 | |
|
|
374 | if (amt < 0) |
|
|
375 | { /* We got an error */ |
|
|
376 | if (errno != EWOULDBLOCK) |
|
|
377 | { |
|
|
378 | LOG (llevError, "New socket write failed WTS (%d: %s).\n", /* ---WIN32 */ |
|
|
379 | errno, strerror (errno)); |
|
|
380 | ns->status = Ns_Dead; |
|
|
381 | return; |
|
|
382 | } |
|
|
383 | else |
|
|
384 | { /* EWOULDBLOCK */ |
|
|
385 | /* can't write it, so store it away. */ |
|
|
386 | add_to_buffer (ns, pos, len); |
|
|
387 | ns->can_write = 0; |
|
|
388 | return; |
|
|
389 | } |
|
|
390 | } |
|
|
391 | /* amt gets set to 0 above in blocking code, so we do this as |
|
|
392 | * an else if to make sure we don't reprocess it. |
|
|
393 | */ |
|
|
394 | else if (amt == 0) |
|
|
395 | { |
|
|
396 | LOG (llevError, "Write_To_Socket: No data written out.\n"); |
|
|
397 | } |
|
|
398 | len -= amt; |
|
|
399 | pos += amt; |
|
|
400 | #ifdef CS_LOGSTATS |
|
|
401 | cst_tot.obytes += amt; |
|
|
402 | cst_lst.obytes += amt; |
|
|
403 | #endif |
|
|
404 | } |
|
|
405 | } |
|
|
406 | |
|
|
407 | |
317 | |
408 | /** |
318 | /** |
409 | * Takes a string of data, and writes it out to the socket. A very handy |
319 | * Takes a string of data, and writes it out to the socket. A very handy |
410 | * shortcut function. |
320 | * shortcut function. |
411 | */ |
321 | */ |
412 | void |
322 | void |
413 | cs_write_string (NewSocket * ns, const char *buf, int len) |
323 | client_socket::send_packet (packet &sl) |
414 | { |
324 | { |
415 | SockList sl; |
|
|
416 | |
|
|
417 | sl.len = len; |
|
|
418 | sl.buf = (unsigned char *) buf; |
|
|
419 | Send_With_Handling (ns, &sl); |
|
|
420 | } |
|
|
421 | |
|
|
422 | |
|
|
423 | /** |
|
|
424 | * Calls Write_To_Socket to send data to the client. |
|
|
425 | * |
|
|
426 | * The only difference in this function is that we take a SockList |
|
|
427 | *, and we prepend the length information. |
|
|
428 | */ |
|
|
429 | void |
|
|
430 | Send_With_Handling (NewSocket * ns, SockList * msg) |
|
|
431 | { |
|
|
432 | unsigned char sbuf[4]; |
|
|
433 | |
|
|
434 | if (ns->status == Ns_Dead || !msg) |
325 | if (status == Ns_Dead) |
435 | return; |
326 | return; |
436 | |
327 | |
437 | if (msg->len >= MAXSOCKBUF) |
328 | if (sl.length () >= MAXSOCKBUF) |
438 | { |
329 | { |
439 | LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", msg->len); |
330 | LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ()); |
440 | /* Almost certainly we've overflowed a buffer, so quite now to make |
331 | /* Almost certainly we've overflowed a buffer, so quit now to make |
441 | * it easier to debug. |
332 | * it easier to debug. |
442 | */ |
333 | */ |
443 | abort (); |
334 | abort (); |
444 | } |
335 | } |
445 | sbuf[0] = ((uint32) (msg->len) >> 8) & 0xFF; |
|
|
446 | sbuf[1] = ((uint32) (msg->len)) & 0xFF; |
|
|
447 | if (ns->status != Ns_Old) |
|
|
448 | Write_To_Socket (ns, (char *) sbuf, 2); |
|
|
449 | Write_To_Socket (ns, (char *) msg->buf, msg->len); |
|
|
450 | } |
|
|
451 | |
336 | |
452 | /** |
337 | if (!sl.length ()) |
453 | * Takes a string of data, and writes it out to the socket. A very handy |
338 | return; |
454 | * shortcut function. |
|
|
455 | */ |
|
|
456 | void |
|
|
457 | Write_String_To_Socket (NewSocket * ns, char *buf, int len) |
|
|
458 | { |
|
|
459 | SockList sl; |
|
|
460 | |
339 | |
461 | sl.len = len; |
340 | assert (sl.hdrlen == 2); |
462 | sl.buf = (unsigned char *) buf; |
|
|
463 | Send_With_Handling (ns, &sl); |
|
|
464 | } |
|
|
465 | |
341 | |
|
|
342 | sl.buf_ [0] = sl.length () >> 8; |
|
|
343 | sl.buf_ [1] = sl.length () ; |
|
|
344 | |
|
|
345 | send (sl.buf_, sl.length () + sl.hdrlen); |
|
|
346 | } |
|
|
347 | |
|
|
348 | void |
|
|
349 | client_socket::send_packet (const char *buf, int len) |
|
|
350 | { |
|
|
351 | packet sl; |
|
|
352 | |
|
|
353 | sl << data (buf, len); |
|
|
354 | send_packet (sl); |
|
|
355 | } |
|
|
356 | |
|
|
357 | void |
|
|
358 | client_socket::send_packet (const char *buf) |
|
|
359 | { |
|
|
360 | send_packet (buf, strlen (buf)); |
|
|
361 | } |
466 | |
362 | |
467 | /****************************************************************************** |
363 | /****************************************************************************** |
468 | * |
364 | * |
469 | * statistics logging functions. |
365 | * statistics logging functions. |
470 | * |
366 | * |
… | |
… | |
493 | LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n", |
389 | LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n", |
494 | ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn, |
390 | ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn, |
495 | now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start); |
391 | now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start); |
496 | cst_lst.ibytes = 0; |
392 | cst_lst.ibytes = 0; |
497 | cst_lst.obytes = 0; |
393 | cst_lst.obytes = 0; |
498 | cst_lst.max_conn = socket_info.nconns; |
|
|
499 | cst_lst.time_start = now; |
394 | cst_lst.time_start = now; |
500 | } |
395 | } |
501 | #endif |
396 | #endif |
502 | |
397 | |