1 | |
|
|
2 | /* |
1 | /* |
3 | * static char *rcsid_sockets_c = |
2 | * CrossFire, A Multiplayer game for X-windows |
4 | * "$Id: lowlevel.C,v 1.2 2006/08/18 02:06:58 root Exp $"; |
3 | * |
|
|
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
|
|
5 | * Copyright (C) 1992 Frank Tore Johansen |
|
|
6 | * |
|
|
7 | * This program is free software; you can redistribute it and/or modify |
|
|
8 | * it under the terms of the GNU General Public License as published by |
|
|
9 | * the Free Software Foundation; either version 2 of the License, or |
|
|
10 | * (at your option) any later version. |
|
|
11 | * |
|
|
12 | * This program is distributed in the hope that it will be useful, |
|
|
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
|
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
|
15 | * GNU General Public License for more details. |
|
|
16 | * |
|
|
17 | * You should have received a copy of the GNU General Public License |
|
|
18 | * along with this program; if not, write to the Free Software |
|
|
19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
|
|
20 | * |
|
|
21 | * The author can be reached via e-mail to mark@pyramid.com |
5 | */ |
22 | */ |
6 | |
23 | |
7 | /* |
|
|
8 | CrossFire, A Multiplayer game for X-windows |
|
|
9 | |
|
|
10 | Copyright (C) 1992 Frank Tore Johansen |
|
|
11 | |
|
|
12 | This program is free software; you can redistribute it and/or modify |
|
|
13 | it under the terms of the GNU General Public License as published by |
|
|
14 | the Free Software Foundation; either version 2 of the License, or |
|
|
15 | (at your option) any later version. |
|
|
16 | |
|
|
17 | This program is distributed in the hope that it will be useful, |
|
|
18 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
|
19 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
|
20 | GNU General Public License for more details. |
|
|
21 | |
|
|
22 | You should have received a copy of the GNU General Public License |
|
|
23 | along with this program; if not, write to the Free Software |
|
|
24 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
|
|
25 | |
|
|
26 | The author can be reached via e-mail to mark@pyramid.com |
|
|
27 | */ |
|
|
28 | |
|
|
29 | /** |
24 | /** |
30 | * \file |
25 | * \file |
31 | * Low-level socket-related functions. |
26 | * Low-level socket-related functions. |
32 | * |
27 | * |
33 | * \date 2003-12-02 |
28 | * \date 2003-12-02 |
… | |
… | |
39 | */ |
34 | */ |
40 | |
35 | |
41 | using namespace std; |
36 | using namespace std; |
42 | |
37 | |
43 | #include <global.h> |
38 | #include <global.h> |
44 | #include <newclient.h> |
|
|
45 | #include <sproto.h> |
39 | #include <sproto.h> |
|
|
40 | #include <cstdarg> |
46 | |
41 | |
47 | #ifdef __linux__ |
42 | #ifdef __linux__ |
48 | # include <sys/types.h> |
43 | # include <sys/types.h> |
49 | # include <sys/socket.h> |
44 | # include <sys/socket.h> |
50 | # include <netinet/in.h> |
45 | # include <netinet/in.h> |
51 | # define TCP_HZ 1000 // sorry... |
|
|
52 | # include <netinet/tcp.h> |
46 | # include <netinet/tcp.h> |
53 | #endif |
47 | #endif |
54 | |
48 | |
55 | // use a really low timeout, as it doesn't cost any bandwidth, and you can |
49 | // use a really low timeout, as it doesn't cost any bandwidth, and you can |
56 | // easily die in 20 seconds... |
50 | // easily die in 20 seconds... |
57 | #define SOCKET_TIMEOUT1 10 |
51 | #define SOCKET_TIMEOUT1 10 * 1000 |
58 | #define SOCKET_TIMEOUT2 20 |
52 | #define SOCKET_TIMEOUT2 20 * 1000 |
59 | |
53 | |
60 | void Socket_Flush (NewSocket *ns) |
54 | void |
|
|
55 | client::flush () |
61 | { |
56 | { |
|
|
57 | if (destroyed ()) |
|
|
58 | return; |
|
|
59 | |
62 | #ifdef __linux__ |
60 | #ifdef __linux__ |
63 | // check time of last ack, and, if too old, kill connection |
61 | // check time of last ack, and, if too old, kill connection |
64 | struct tcp_info tcpi; |
62 | struct tcp_info tcpi; |
65 | socklen_t len = sizeof (tcpi); |
63 | socklen_t len = sizeof (tcpi); |
66 | |
64 | |
67 | if (!getsockopt (ns->fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi)) |
65 | if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi)) |
68 | { |
66 | { |
69 | unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent; |
67 | unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent; |
70 | |
68 | |
71 | if (tcpi.tcpi_unacked |
69 | rtt = tcpi.tcpi_rtt; |
|
|
70 | rttvar = tcpi.tcpi_rttvar; |
|
|
71 | |
72 | && SOCKET_TIMEOUT1 * TCP_HZ < diff && diff < 0x80000000UL // ack delayed for 20s |
72 | if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 < diff && diff < 0x80000000UL // ack delayed for 20s |
73 | && SOCKET_TIMEOUT2 * TCP_HZ < tcpi.tcpi_last_data_sent) // no data sent for 10s |
73 | && SOCKET_TIMEOUT2 < tcpi.tcpi_last_data_sent) // no data sent for 10s |
74 | { |
74 | { |
75 | LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", ns->fd, |
75 | LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd, |
76 | (unsigned)tcpi.tcpi_last_ack_recv, (unsigned)tcpi.tcpi_last_data_sent, (unsigned)tcpi.tcpi_unacked); |
76 | (unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked); |
77 | ns->status = Ns_Dead; |
77 | destroy (); |
78 | } |
78 | } |
79 | } |
79 | } |
80 | |
|
|
81 | int val; |
|
|
82 | val = 0; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val)); |
|
|
83 | val = 1; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val)); |
|
|
84 | #endif |
80 | #endif |
85 | } |
|
|
86 | |
81 | |
|
|
82 | /** |
|
|
83 | * Writes data to socket. |
|
|
84 | * |
|
|
85 | * When the socket is clear to write, and we have backlogged data, this |
|
|
86 | * is called to write it out. |
|
|
87 | */ |
|
|
88 | |
|
|
89 | if (!outputbuffer.len || socket_ev.poll () & PE_W) |
|
|
90 | return; |
|
|
91 | |
|
|
92 | write_outputbuffer (); |
|
|
93 | } |
|
|
94 | |
|
|
95 | void |
|
|
96 | client::write_outputbuffer () |
|
|
97 | { |
|
|
98 | while (outputbuffer.len) |
|
|
99 | { |
|
|
100 | int res = write (fd, outputbuffer.data + outputbuffer.start, |
|
|
101 | min (outputbuffer.len, SOCKETBUFSIZE - outputbuffer.start)); |
|
|
102 | |
|
|
103 | if (res > 0) |
|
|
104 | { |
|
|
105 | outputbuffer.start += res; |
|
|
106 | /* wrap back to start of buffer */ |
|
|
107 | if (outputbuffer.start == SOCKETBUFSIZE) |
|
|
108 | outputbuffer.start = 0; |
|
|
109 | |
|
|
110 | outputbuffer.len -= res; |
|
|
111 | #ifdef CS_LOGSTATS |
|
|
112 | cst_tot.obytes += res; |
|
|
113 | cst_lst.obytes += res; |
|
|
114 | #endif |
|
|
115 | } |
|
|
116 | else if (res == 0) |
|
|
117 | { |
|
|
118 | LOG (llevError, "socket write failed, connection closed.\n"); |
|
|
119 | destroy (); |
|
|
120 | return; |
|
|
121 | } |
|
|
122 | else if (errno == EINTR) |
|
|
123 | { |
|
|
124 | // just retry |
|
|
125 | } |
|
|
126 | else if (errno == EAGAIN) |
|
|
127 | { |
|
|
128 | // delay till ready |
|
|
129 | socket_ev.poll (socket_ev.poll () | PE_W); |
|
|
130 | socket_ev.start (); |
|
|
131 | return; |
|
|
132 | } |
|
|
133 | else |
|
|
134 | { |
|
|
135 | LOG (llevError, "socket write failed: %s\n", strerror (errno)); |
|
|
136 | destroy (); |
|
|
137 | return; |
|
|
138 | } |
|
|
139 | } |
|
|
140 | |
|
|
141 | socket_ev.poll (socket_ev.poll () & ~PE_W); |
|
|
142 | } |
|
|
143 | |
|
|
144 | /****************************************************************************** |
|
|
145 | * |
|
|
146 | * Start of read routines. |
|
|
147 | * |
|
|
148 | ******************************************************************************/ |
|
|
149 | |
|
|
150 | int |
|
|
151 | client::next_packet () |
|
|
152 | { |
|
|
153 | if (inbuf_len >= 2) |
|
|
154 | { |
|
|
155 | int pkt_len = (inbuf [0] << 8) | inbuf [1]; |
|
|
156 | |
|
|
157 | if (inbuf_len >= 2 + pkt_len) |
|
|
158 | return 2 + pkt_len; |
|
|
159 | |
|
|
160 | if (inbuf_len == sizeof (inbuf)) |
|
|
161 | { |
|
|
162 | send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED); |
|
|
163 | destroy (); |
|
|
164 | return -1; |
|
|
165 | } |
|
|
166 | } |
|
|
167 | |
|
|
168 | return 0; |
|
|
169 | } |
|
|
170 | |
|
|
171 | void |
|
|
172 | client::skip_packet (int len) |
|
|
173 | { |
|
|
174 | inbuf_len -= len; |
|
|
175 | memmove (inbuf, inbuf + len, inbuf_len); |
|
|
176 | } |
|
|
177 | |
87 | /*********************************************************************** |
178 | /***************************************************************************** |
88 | * |
179 | * Start of command dispatch area. |
89 | * SockList functions/utilities |
180 | * The commands here are protocol commands. |
90 | * |
|
|
91 | **********************************************************************/ |
181 | ****************************************************************************/ |
92 | |
182 | |
93 | void SockList_Init(SockList *sl) |
183 | // SocketCommand, PlayingCommand, should not exist with those ugly casts |
94 | { |
184 | #define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb), |
95 | sl->len=0; |
185 | #define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER | |
96 | sl->buf=NULL; |
|
|
97 | } |
|
|
98 | |
186 | |
99 | void SockList_AddInt(SockList *sl, uint32 data) |
187 | /** |
100 | { |
188 | * Dispatch table for the server. |
101 | sl->buf[sl->len++]= (data>>24)&0xff; |
|
|
102 | sl->buf[sl->len++]= (data>>16)&0xff; |
|
|
103 | sl->buf[sl->len++]= (data>>8)&0xff; |
|
|
104 | sl->buf[sl->len++] = data & 0xff; |
|
|
105 | } |
|
|
106 | |
|
|
107 | void SockList_AddInt64(SockList *sl, uint64 data) |
|
|
108 | { |
|
|
109 | sl->buf[sl->len++]= ( char )( (data>>56)&0xff ); |
|
|
110 | sl->buf[sl->len++]= ( char )( (data>>48)&0xff ); |
|
|
111 | sl->buf[sl->len++]= ( char )( (data>>40)&0xff ); |
|
|
112 | sl->buf[sl->len++]= ( char )( (data>>32)&0xff ); |
|
|
113 | |
|
|
114 | sl->buf[sl->len++]= ( char )( (data>>24)&0xff ); |
|
|
115 | sl->buf[sl->len++]= ( char )( (data>>16)&0xff ); |
|
|
116 | sl->buf[sl->len++]= ( char )( (data>>8)&0xff ); |
|
|
117 | sl->buf[sl->len++] =( char )( data & 0xff ); |
|
|
118 | } |
|
|
119 | |
|
|
120 | /* Basically does the reverse of SockList_AddInt, but on |
|
|
121 | * strings instead. Same for the GetShort, but for 16 bits. |
|
|
122 | */ |
189 | */ |
123 | int GetInt_String(unsigned char *data) |
190 | static struct packet_type packets[] = { |
124 | { |
191 | {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 }, |
125 | return ((data[0]<<24) + (data[1]<<16) + (data[2]<<8) + data[3]); |
192 | {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 }, |
126 | } |
|
|
127 | |
193 | |
128 | short GetShort_String(unsigned char *data) { |
194 | {"examine", PC(ExamineCmd) PF_PLAYING }, |
129 | return ((data[0]<<8)+data[1]); |
195 | {"apply", PC(ApplyCmd) PF_PLAYING }, |
130 | } |
196 | {"lookat", PC(LookAt) PF_PLAYING }, |
|
|
197 | {"lock", PC(LockItem) PF_PLAYING }, |
|
|
198 | {"mark", PC(MarkItem) PF_PLAYING }, |
|
|
199 | {"move", PC(MoveCmd) PF_PLAYING }, |
|
|
200 | {"ext", PC(ExtCmd) 0 }, /* CF+ */ |
|
|
201 | {"mapredraw", PC(MapRedrawCmd) 0 }, /* Added: phil */ |
|
|
202 | {"mapinfo", PC(MapInfoCmd) 0 }, /* CF+ */ |
131 | |
203 | |
132 | /****************************************************************************** |
204 | {"reply", SC(ReplyCmd) 0 }, |
133 | * |
205 | {"exti", SC(ExtiCmd) 0 }, /* CF+ */ |
134 | * Start of read routines. |
206 | {"addme", SC(AddMeCmd) 0 }, |
135 | * |
207 | {"askface", SC(AskFaceCmd) 0 }, |
136 | ******************************************************************************/ |
208 | {"requestinfo", SC(RequestInfo) 0 }, |
|
|
209 | {"setfacemode", SC(SetFaceMode) 0 }, |
|
|
210 | {"setsound", SC(SetSound) 0 }, |
|
|
211 | {"setup", SC(SetUp) 0 }, |
|
|
212 | {"version", SC(VersionCmd) 0 }, |
|
|
213 | {"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /*Added: tchize */ |
|
|
214 | {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */ |
|
|
215 | {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */ |
|
|
216 | }; |
137 | |
217 | |
138 | /** |
218 | bool |
139 | * This reads from fd and puts the data in sl. We return true if we think |
219 | client::may_execute (const packet_type *pkt) const |
140 | * we have a full packet, 0 if we have a partial packet. The only processing |
|
|
141 | * we do is remove the intial size value. len (As passed) is the size of the |
|
|
142 | * buffer allocated in the socklist. We make the assumption the buffer is |
|
|
143 | * at least 2 bytes long. |
|
|
144 | */ |
|
|
145 | |
|
|
146 | int SockList_ReadPacket(int fd, SockList *sl, int len) |
|
|
147 | { |
220 | { |
148 | int stat,toread; |
221 | return (!(pkt->flags & PF_PLAYER) || pl) |
|
|
222 | && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING); |
|
|
223 | } |
149 | |
224 | |
150 | /* Sanity check - shouldn't happen */ |
225 | // HACK: some commands currently should be executed |
151 | if (sl->len < 0) { |
226 | // even when the player is frozen. this hack detects |
152 | abort(); |
227 | // those commands. it should be folded into may_execute, |
|
|
228 | // but kept seperate to emphasise the hack aspect, i.e. |
|
|
229 | // do it better, then remove. |
|
|
230 | static bool |
|
|
231 | always_immediate (const client *ns, const packet_type *pkt, const char *data, int len) |
|
|
232 | { |
|
|
233 | if (!(pkt->flags & (PF_COMMAND0 | PF_COMMAND6))) |
|
|
234 | return false; |
|
|
235 | |
|
|
236 | if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map) |
|
|
237 | return false; |
|
|
238 | |
|
|
239 | if (pkt->flags & PF_COMMAND6) |
153 | } |
240 | { |
154 | /* We already have a partial packet */ |
241 | data += 6; |
155 | if (sl->len<2) { |
242 | len -= 6; |
156 | #ifdef WIN32 /* ***WIN32 SockList_ReadPacket: change read() to recv() */ |
|
|
157 | |
|
|
158 | stat=recv(fd, sl->buf + sl->len, 2-sl->len,0); |
|
|
159 | |
|
|
160 | #else |
|
|
161 | do { |
|
|
162 | stat=read(fd, sl->buf + sl->len, 2-sl->len); |
|
|
163 | } while ((stat==-1) && (errno==EINTR)); |
|
|
164 | #endif |
|
|
165 | if (stat<0) { |
|
|
166 | /* In non blocking mode, EAGAIN is set when there is no |
|
|
167 | * data available. |
|
|
168 | */ |
|
|
169 | #ifdef WIN32 /* ***WIN32 SockList_ReadPacket: error handling for win32 */ |
|
|
170 | if ((stat==-1) && WSAGetLastError() !=WSAEWOULDBLOCK) { |
|
|
171 | if(WSAGetLastError() == WSAECONNRESET) |
|
|
172 | LOG(llevDebug,"Connection closed by client\n"); |
|
|
173 | else |
|
|
174 | { |
|
|
175 | LOG(llevDebug,"ReadPacket got error %d, returning 0\n",WSAGetLastError()); |
|
|
176 | } |
|
|
177 | return -1; /* kick this user! */ |
|
|
178 | } |
243 | } |
179 | #else |
244 | |
180 | if (errno != EAGAIN && errno !=EWOULDBLOCK) { |
245 | if (len > 4 && !strncmp (data, "say " , 4)) |
181 | LOG(llevDebug, "ReadPacket got error %s, returning 0\n", strerror_local(errno)); |
246 | return true; |
|
|
247 | if (len > 5 && !strncmp (data, "chat ", 5)) |
|
|
248 | return true; |
|
|
249 | |
|
|
250 | return false; |
|
|
251 | } |
|
|
252 | |
|
|
253 | void |
|
|
254 | client::execute (const packet_type *pkt, char *data, int datalen) |
|
|
255 | { |
|
|
256 | if (may_execute (pkt) || always_immediate (this, pkt, data, datalen)) |
|
|
257 | { |
|
|
258 | //TODO: only one format |
|
|
259 | if (pkt->flags & PF_PLAYER) |
|
|
260 | ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); |
|
|
261 | else |
|
|
262 | ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); |
182 | } |
263 | } |
183 | #endif |
264 | else |
184 | return 0; /*Error */ |
265 | send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name); |
185 | } |
266 | } |
186 | if (stat==0) return -1; |
267 | |
187 | sl->len += stat; |
268 | bool |
188 | #ifdef CS_LOGSTATS |
269 | client::handle_packet () |
189 | cst_tot.ibytes += stat; |
270 | { |
190 | cst_lst.ibytes += stat; |
271 | int pkt_len = next_packet (); |
191 | #endif |
272 | |
192 | if (stat<2) return 0; /* Still don't have a full packet */ |
273 | if (!pkt_len) |
|
|
274 | return false; |
|
|
275 | else if (pkt_len < 0) |
193 | } |
276 | { |
194 | /* Figure out how much more data we need to read. Add 2 from the |
277 | LOG (llevError, "read error on player %s\n", |
195 | * end of this - size header information is not included. |
278 | pl && pl->ob ? &pl->ob->name : "[anonymous]"); |
196 | */ |
279 | destroy (); |
197 | toread = 2+(sl->buf[0] << 8) + sl->buf[1] - sl->len; |
280 | return false; |
198 | if ((toread + sl->len) >= len) { |
|
|
199 | LOG(llevError,"SockList_ReadPacket: Want to read more bytes than will fit in buffer (%d>=%d).\n", |
|
|
200 | toread + sl->len, len); |
|
|
201 | /* Quick hack in case for 'oldsocketmode' input. If we are |
|
|
202 | * closing the socket anyways, then reading this extra 100 bytes |
|
|
203 | * shouldn't hurt. |
|
|
204 | */ |
|
|
205 | #ifdef WIN32 /* ***win32 SockList_ReadPacket: change read() to recv() */ |
|
|
206 | recv(fd, sl->buf+2, 100, 0); |
|
|
207 | #else |
|
|
208 | read(fd, sl->buf+2, 100); |
|
|
209 | #endif /* end win32 */ |
|
|
210 | |
|
|
211 | /* return error so the socket is closed */ |
|
|
212 | return -1; |
|
|
213 | } |
|
|
214 | do { |
|
|
215 | #ifdef WIN32 /* ***win32 SockList_ReadPacket: change read() to recv() */ |
|
|
216 | stat = recv(fd, sl->buf+ sl->len, toread, 0); |
|
|
217 | #else |
|
|
218 | do { |
|
|
219 | stat = read(fd, sl->buf+ sl->len, toread); |
|
|
220 | } while ((stat<0) && (errno==EINTR)); |
|
|
221 | #endif |
|
|
222 | if (stat<0) { |
|
|
223 | |
|
|
224 | #ifdef WIN32 /* ***win32 SockList_ReadPacket: change error handling for win32 */ |
|
|
225 | if ((stat==-1) && WSAGetLastError() !=WSAEWOULDBLOCK) { |
|
|
226 | if(WSAGetLastError() == WSAECONNRESET) |
|
|
227 | LOG(llevDebug,"Connection closed by client\n"); |
|
|
228 | else |
|
|
229 | { |
|
|
230 | LOG(llevDebug,"ReadPacket got error %d, returning 0\n",WSAGetLastError()); |
|
|
231 | } |
|
|
232 | return -1; /* kick this user! */ |
|
|
233 | } |
281 | } |
234 | #else |
282 | |
235 | if (errno != EAGAIN && errno !=EWOULDBLOCK) { |
283 | inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ |
236 | LOG(llevDebug, "ReadPacket got error %s, returning 0\n", strerror_local(errno)); |
284 | |
|
|
285 | /* First, break out beginning word. There are at least |
|
|
286 | * a few commands that do not have any paremeters. If |
|
|
287 | * we get such a command, don't worry about trying |
|
|
288 | * to break it up. |
|
|
289 | */ |
|
|
290 | int datalen; |
|
|
291 | char *data = strchr ((char *)inbuf + 2, ' '); |
|
|
292 | |
|
|
293 | if (data) |
|
|
294 | { |
|
|
295 | *data++ = 0; |
|
|
296 | datalen = pkt_len - (data - (char *)inbuf); |
237 | } |
297 | } |
238 | #endif |
298 | else |
239 | return 0; /*Error */ |
299 | { |
240 | } |
300 | data = (char *)inbuf + 2; // better read garbage than segfault |
241 | if (stat==0) return -1; |
301 | datalen = 0; |
242 | sl->len += stat; |
302 | } |
243 | #ifdef CS_LOGSTATS |
303 | |
244 | cst_tot.ibytes += stat; |
304 | for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt) |
245 | cst_lst.ibytes += stat; |
305 | if (!strcmp ((char *)inbuf + 2, pkt->name)) |
246 | #endif |
306 | { |
247 | toread -= stat; |
307 | if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen)) |
248 | if (toread==0) return 1; |
308 | queue_command (pkt, data, datalen); |
249 | if (toread < 0) { |
309 | else |
250 | LOG(llevError,"SockList_ReadPacket: Read more bytes than desired.\n"); |
310 | execute (pkt, data, datalen); |
251 | return 1; |
311 | |
252 | } |
312 | goto next_packet; |
253 | } while (toread>0); |
313 | } |
|
|
314 | |
|
|
315 | // If we get here, we didn't find a valid command. |
|
|
316 | send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED, (char *)inbuf + 2); |
|
|
317 | next_packet: |
|
|
318 | skip_packet (pkt_len); |
|
|
319 | |
|
|
320 | // input buffer has space again |
|
|
321 | socket_ev.poll (socket_ev.poll () | PE_R); |
|
|
322 | |
|
|
323 | return true; |
|
|
324 | } |
|
|
325 | |
|
|
326 | // callback called when socket is either readable or writable |
|
|
327 | void |
|
|
328 | client::socket_cb (iow &w, int got) |
|
|
329 | { |
|
|
330 | //TODO remove when we have better socket cleanup logic |
|
|
331 | if (destroyed ()) |
|
|
332 | { |
|
|
333 | socket_ev.poll (0); |
254 | return 0; |
334 | return; |
|
|
335 | } |
|
|
336 | |
|
|
337 | if (got & PE_W) |
|
|
338 | { |
|
|
339 | write_outputbuffer (); |
|
|
340 | |
|
|
341 | if (!outputbuffer.len) |
|
|
342 | socket_ev.poll (socket_ev.poll () & ~PE_W); |
|
|
343 | } |
|
|
344 | |
|
|
345 | if (got & PE_R) |
|
|
346 | { |
|
|
347 | //TODO: rate-limit tcp connection in better ways, important |
|
|
348 | |
|
|
349 | int amount = sizeof (inbuf) - inbuf_len; |
|
|
350 | |
|
|
351 | if (!amount) |
|
|
352 | { |
|
|
353 | // input buffer full |
|
|
354 | socket_ev.poll (socket_ev.poll () & ~PE_R); |
|
|
355 | return; |
|
|
356 | } |
|
|
357 | |
|
|
358 | amount = read (fd, inbuf + inbuf_len, amount); |
|
|
359 | |
|
|
360 | if (!amount) |
|
|
361 | { |
|
|
362 | destroy (); |
|
|
363 | return; |
|
|
364 | } |
|
|
365 | else if (amount < 0) |
|
|
366 | { |
|
|
367 | if (errno != EAGAIN && errno != EINTR) |
|
|
368 | { |
|
|
369 | LOG (llevError, "read error: %s\n", strerror (errno)); |
|
|
370 | destroy (); |
|
|
371 | return; |
|
|
372 | } |
|
|
373 | |
|
|
374 | // should not be here, normally |
|
|
375 | } |
|
|
376 | else |
|
|
377 | { |
|
|
378 | inbuf_len += amount; |
|
|
379 | |
|
|
380 | cst_tot.ibytes += amount; |
|
|
381 | cst_lst.ibytes += amount; |
|
|
382 | |
|
|
383 | cmd_ev.start (); |
|
|
384 | } |
|
|
385 | } |
|
|
386 | } |
|
|
387 | |
|
|
388 | // called whenever we have additional commands to process |
|
|
389 | void |
|
|
390 | client::cmd_cb (iw &w) |
|
|
391 | { |
|
|
392 | if (handle_packet ()) |
|
|
393 | w.start (); |
|
|
394 | else |
|
|
395 | flush (); |
255 | } |
396 | } |
256 | |
397 | |
257 | /******************************************************************************* |
398 | /******************************************************************************* |
258 | * |
399 | * |
259 | * Start of write related routines. |
400 | * Start of write related routines. |
… | |
… | |
264 | * Adds data to a socket buffer for whatever reason. |
405 | * Adds data to a socket buffer for whatever reason. |
265 | * |
406 | * |
266 | * ns is the socket we are adding the data to, buf is the start of the |
407 | * ns is the socket we are adding the data to, buf is the start of the |
267 | * data, and len is the number of bytes to add. |
408 | * data, and len is the number of bytes to add. |
268 | */ |
409 | */ |
269 | |
410 | void |
270 | static void add_to_buffer(NewSocket *ns, char *buf, int len) |
411 | client::send (void *buf_, int len) |
271 | { |
412 | { |
|
|
413 | char *buf = (char *)buf_; |
|
|
414 | |
|
|
415 | if (destroyed () || !buf) |
|
|
416 | return; |
|
|
417 | |
|
|
418 | if (len + outputbuffer.len > SOCKETBUFSIZE) |
|
|
419 | { |
|
|
420 | LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd); |
|
|
421 | // shutdown the socket, this is safer than destroying it immediately |
|
|
422 | // as lots of code in the callchain might still access the map etc. |
|
|
423 | shutdown (fd, SHUT_RDWR); |
|
|
424 | return; |
|
|
425 | } |
|
|
426 | |
272 | int avail, end; |
427 | int avail, end; |
273 | |
428 | |
274 | if ((len+ns->outputbuffer.len)>SOCKETBUFSIZE) { |
|
|
275 | LOG(llevDebug,"Socket on fd %d has overrun internal buffer - marking as dead\n", |
|
|
276 | ns->fd); |
|
|
277 | ns->status = Ns_Dead; |
|
|
278 | return; |
|
|
279 | } |
|
|
280 | |
|
|
281 | /* data + end is where we start putting the new data. The last byte |
429 | /* data + end is where we start putting the new data. The last byte |
282 | * currently in use is actually data + end -1 |
430 | * currently in use is actually data + end -1 |
283 | */ |
431 | */ |
284 | |
|
|
285 | end=ns->outputbuffer.start + ns->outputbuffer.len; |
432 | end = outputbuffer.start + outputbuffer.len; |
286 | /* The buffer is already in a wrapped state, so adjust end */ |
433 | /* The buffer is already in a wrapped state, so adjust end */ |
287 | if (end>=SOCKETBUFSIZE) end-=SOCKETBUFSIZE; |
434 | if (end >= SOCKETBUFSIZE) |
|
|
435 | end -= SOCKETBUFSIZE; |
|
|
436 | |
288 | avail=SOCKETBUFSIZE - end; |
437 | avail = SOCKETBUFSIZE - end; |
289 | |
438 | |
290 | /* We can all fit it behind the current data without wrapping */ |
439 | /* We can all fit it behind the current data without wrapping */ |
291 | if (avail >=len ) { |
440 | if (avail >= len) |
292 | memcpy(ns->outputbuffer.data + end, buf, len); |
441 | memcpy (outputbuffer.data + end, buf, len); |
|
|
442 | else |
293 | } |
443 | { |
294 | else { |
|
|
295 | memcpy(ns->outputbuffer.data + end, buf, avail); |
444 | memcpy (outputbuffer.data + end, buf, avail); |
296 | memcpy(ns->outputbuffer.data, buf+avail, len-avail); |
445 | memcpy (outputbuffer.data, buf + avail, len - avail); |
297 | } |
|
|
298 | ns->outputbuffer.len += len; |
|
|
299 | #if 0 |
|
|
300 | LOG(llevDebug,"Added %d to output buffer, total length now %d, start=%d\n", len, |
|
|
301 | ns->outputbuffer.len, ns->outputbuffer.start); |
|
|
302 | #endif |
|
|
303 | } |
|
|
304 | |
|
|
305 | /** |
|
|
306 | * Writes data to socket. |
|
|
307 | * |
|
|
308 | * When the socket is clear to write, and we have backlogged data, this |
|
|
309 | * is called to write it out. |
|
|
310 | */ |
|
|
311 | void write_socket_buffer(NewSocket *ns) |
|
|
312 | { |
|
|
313 | int amt, max; |
|
|
314 | |
|
|
315 | if (ns->outputbuffer.len==0) { |
|
|
316 | LOG(llevDebug,"write_socket_buffer called when there is no data, fd=%d\n", |
|
|
317 | ns->fd); |
|
|
318 | return; |
|
|
319 | } |
|
|
320 | |
|
|
321 | do { |
|
|
322 | max = SOCKETBUFSIZE - ns->outputbuffer.start; |
|
|
323 | if (ns->outputbuffer.len<max) max = ns->outputbuffer.len; |
|
|
324 | |
|
|
325 | #ifdef WIN32 /* ***win32 write_socket_buffer: change write() to send() */ |
|
|
326 | amt=send(ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max,0); |
|
|
327 | #else |
|
|
328 | do { |
|
|
329 | amt=write(ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max); |
|
|
330 | } while ((amt<0) && (errno==EINTR)); |
|
|
331 | #endif |
|
|
332 | |
|
|
333 | if (amt < 0) { /* We got an error */ |
|
|
334 | |
|
|
335 | #ifdef WIN32 /* ***win32 write_socket_buffer: change error handling */ |
|
|
336 | if (amt == -1 && WSAGetLastError() !=WSAEWOULDBLOCK) { |
|
|
337 | LOG(llevError,"New socket write failed (wsb) (%d).\n", WSAGetLastError()); |
|
|
338 | #else |
|
|
339 | if (errno !=EWOULDBLOCK) { |
|
|
340 | LOG(llevError,"New socket write failed (wsb) (%d: %s).\n", |
|
|
341 | errno, strerror_local(errno)); |
|
|
342 | #endif |
|
|
343 | ns->status=Ns_Dead; |
|
|
344 | return; |
|
|
345 | } |
446 | } |
346 | else { /* EWOULDBLOCK */ |
|
|
347 | /* can't write it, so store it away. */ |
|
|
348 | ns->can_write=0; |
|
|
349 | return; |
|
|
350 | } |
|
|
351 | } |
|
|
352 | ns->outputbuffer.start += amt; |
|
|
353 | /* wrap back to start of buffer */ |
|
|
354 | if (ns->outputbuffer.start==SOCKETBUFSIZE) ns->outputbuffer.start=0; |
|
|
355 | ns->outputbuffer.len -= amt; |
|
|
356 | #ifdef CS_LOGSTATS |
|
|
357 | cst_tot.obytes += amt; |
|
|
358 | cst_lst.obytes += amt; |
|
|
359 | #endif |
|
|
360 | } while (ns->outputbuffer.len>0); |
|
|
361 | } |
|
|
362 | |
447 | |
363 | /** |
448 | outputbuffer.len += len; |
364 | * This writes data to the socket. - It is very low level - |
|
|
365 | * all we try and do is write out the data to the socket |
|
|
366 | * provided (ns). buf is the data to write, len is the number |
|
|
367 | * of bytes to write. IT doesn't return anything - rather, it |
|
|
368 | * updates the ns structure if we get an error. |
|
|
369 | */ |
|
|
370 | void Write_To_Socket(NewSocket *ns, char *buf, int len) |
|
|
371 | { |
|
|
372 | int amt=0; |
|
|
373 | char *pos=buf; |
|
|
374 | |
|
|
375 | if (ns->status == Ns_Dead || !buf) { |
|
|
376 | LOG(llevDebug,"Write_To_Socket called with dead socket\n"); |
|
|
377 | return; |
|
|
378 | } |
|
|
379 | |
|
|
380 | #ifndef __GNU__ /* This caused problems on Hurd */ |
|
|
381 | if (!ns->can_write) { |
|
|
382 | add_to_buffer(ns, buf, len); |
|
|
383 | return; |
|
|
384 | } |
|
|
385 | #endif |
|
|
386 | /* If we manage to write more than we wanted, take it as a bonus */ |
|
|
387 | while (len>0) { |
|
|
388 | |
|
|
389 | #ifdef WIN32 /* ***win32 Write_To_Socket: change write() to send() */ |
|
|
390 | amt=send(ns->fd, pos, len,0); |
|
|
391 | #else |
|
|
392 | do { |
|
|
393 | amt=write(ns->fd, pos, len); |
|
|
394 | } while ((amt<0) && (errno==EINTR)); |
|
|
395 | #endif |
|
|
396 | |
|
|
397 | if (amt < 0) { /* We got an error */ |
|
|
398 | #ifdef WIN32 /* ***win32 Write_To_Socket: change error handling */ |
|
|
399 | if (amt == -1 && WSAGetLastError() !=WSAEWOULDBLOCK) { |
|
|
400 | LOG(llevError,"New socket write failed WTS (%d).\n",WSAGetLastError()); |
|
|
401 | #else |
|
|
402 | if (errno !=EWOULDBLOCK) { |
|
|
403 | LOG(llevError,"New socket write failed WTS (%d: %s).\n", /* ---WIN32 */ |
|
|
404 | errno, strerror_local(errno)); |
|
|
405 | #endif |
|
|
406 | ns->status=Ns_Dead; |
|
|
407 | return; |
|
|
408 | } |
|
|
409 | else { /* EWOULDBLOCK */ |
|
|
410 | /* can't write it, so store it away. */ |
|
|
411 | add_to_buffer(ns, pos, len); |
|
|
412 | ns->can_write=0; |
|
|
413 | return; |
|
|
414 | } |
|
|
415 | } |
|
|
416 | /* amt gets set to 0 above in blocking code, so we do this as |
|
|
417 | * an else if to make sure we don't reprocess it. |
|
|
418 | */ |
|
|
419 | else if (amt==0) { |
|
|
420 | LOG(llevError,"Write_To_Socket: No data written out.\n"); |
|
|
421 | } |
|
|
422 | len -= amt; |
|
|
423 | pos += amt; |
|
|
424 | #ifdef CS_LOGSTATS |
|
|
425 | cst_tot.obytes += amt; |
|
|
426 | cst_lst.obytes += amt; |
|
|
427 | #endif |
|
|
428 | } |
|
|
429 | } |
449 | } |
430 | |
|
|
431 | |
450 | |
432 | /** |
451 | /** |
433 | * Takes a string of data, and writes it out to the socket. A very handy |
452 | * Takes a string of data, and writes it out to the socket. A very handy |
434 | * shortcut function. |
453 | * shortcut function. |
435 | */ |
454 | */ |
436 | void cs_write_string(NewSocket *ns, const char *buf, int len) |
455 | void |
|
|
456 | client::send_packet (packet &sl) |
437 | { |
457 | { |
438 | SockList sl; |
458 | if (destroyed ()) |
|
|
459 | return; |
439 | |
460 | |
440 | sl.len = len; |
|
|
441 | sl.buf = (unsigned char*)buf; |
|
|
442 | Send_With_Handling(ns, &sl); |
|
|
443 | } |
|
|
444 | |
|
|
445 | |
|
|
446 | /** |
|
|
447 | * Calls Write_To_Socket to send data to the client. |
|
|
448 | * |
|
|
449 | * The only difference in this function is that we take a SockList |
|
|
450 | *, and we prepend the length information. |
|
|
451 | */ |
|
|
452 | void Send_With_Handling(NewSocket *ns,SockList *msg) |
|
|
453 | { |
|
|
454 | unsigned char sbuf[4]; |
|
|
455 | |
|
|
456 | if (ns->status == Ns_Dead || !msg) |
|
|
457 | return; |
|
|
458 | |
|
|
459 | if (msg->len >= MAXSOCKBUF) { |
461 | if (sl.length () >= MAXSOCKBUF) |
|
|
462 | { |
460 | LOG(llevError,"Trying to send a buffer beyond properly size, len =%d\n", |
463 | LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ()); |
461 | msg->len); |
|
|
462 | /* Almost certainly we've overflowed a buffer, so quite now to make |
464 | /* Almost certainly we've overflowed a buffer, so quit now to make |
463 | * it easier to debug. |
465 | * it easier to debug. |
464 | */ |
466 | */ |
465 | abort(); |
467 | abort (); |
466 | } |
468 | } |
467 | sbuf[0] = ((uint32)(msg->len) >> 8) & 0xFF; |
|
|
468 | sbuf[1] = ((uint32)(msg->len)) & 0xFF; |
|
|
469 | if (ns->status != Ns_Old) |
|
|
470 | Write_To_Socket(ns, (char *) sbuf, 2); |
|
|
471 | Write_To_Socket(ns, (char*)msg->buf, msg->len); |
|
|
472 | } |
|
|
473 | |
469 | |
474 | /** |
470 | if (!sl.length ()) |
475 | * Takes a string of data, and writes it out to the socket. A very handy |
471 | return; |
476 | * shortcut function. |
472 | |
|
|
473 | assert (sl.hdrlen == 2); |
|
|
474 | |
|
|
475 | sl.buf_ [0] = sl.length () >> 8; |
|
|
476 | sl.buf_ [1] = sl.length () ; |
|
|
477 | |
|
|
478 | send (sl.buf_, sl.length () + sl.hdrlen); |
|
|
479 | } |
|
|
480 | |
|
|
481 | void |
|
|
482 | client::send_packet (const char *buf, int len) |
|
|
483 | { |
|
|
484 | packet sl; |
|
|
485 | |
|
|
486 | sl << data (buf, len); |
|
|
487 | send_packet (sl); |
|
|
488 | } |
|
|
489 | |
|
|
490 | void |
|
|
491 | client::send_packet (const char *buf) |
|
|
492 | { |
|
|
493 | send_packet (buf, strlen (buf)); |
|
|
494 | } |
|
|
495 | |
|
|
496 | void |
|
|
497 | client::send_packet_printf (const char *format, ...) |
|
|
498 | { |
|
|
499 | packet sl; |
|
|
500 | |
|
|
501 | va_list ap; |
|
|
502 | va_start (ap, format); |
|
|
503 | sl.vprintf (format, ap); |
|
|
504 | va_end (ap); |
|
|
505 | |
|
|
506 | send_packet (sl); |
|
|
507 | } |
|
|
508 | |
|
|
509 | void |
|
|
510 | client::send_drawinfo (const char *msg, int flags) |
|
|
511 | { |
|
|
512 | send_packet_printf ("drawinfo %d %s", flags, msg); |
|
|
513 | } |
|
|
514 | |
|
|
515 | /*********************************************************************** |
477 | */ |
516 | * |
478 | void Write_String_To_Socket(NewSocket *ns, char *buf, int len) |
517 | * packet functions/utilities |
479 | { |
518 | * |
480 | SockList sl; |
519 | **********************************************************************/ |
481 | |
520 | |
482 | sl.len = len; |
521 | packet::packet (const char *name) |
483 | sl.buf = (unsigned char*) buf; |
522 | { |
484 | Send_With_Handling(ns, &sl); |
523 | reset (); |
485 | } |
|
|
486 | |
524 | |
|
|
525 | int len = strlen (name); |
|
|
526 | memcpy (cur, name, len); cur += len; |
|
|
527 | *cur++ = ' '; |
|
|
528 | } |
|
|
529 | |
|
|
530 | packet &packet::operator <<(const ber32 v) |
|
|
531 | { |
|
|
532 | enum { maxlen = 32 / 7 + 1}; |
|
|
533 | uint8 buf[maxlen]; |
|
|
534 | uint8 *p = buf + maxlen; |
|
|
535 | uint32 val = v.val; |
|
|
536 | |
|
|
537 | *--p = val & 0x7F; |
|
|
538 | |
|
|
539 | while (val > 0x7F) |
|
|
540 | { |
|
|
541 | val >>= 7; |
|
|
542 | *--p = (val & 0x7F) | 0x80; |
|
|
543 | } |
|
|
544 | |
|
|
545 | return *this << data (p, buf + maxlen - p); |
|
|
546 | } |
|
|
547 | |
|
|
548 | packet &packet::operator <<(const data &v) |
|
|
549 | { |
|
|
550 | if (room () < v.len) |
|
|
551 | reset (); |
|
|
552 | else |
|
|
553 | { |
|
|
554 | if (v.len) |
|
|
555 | { |
|
|
556 | memcpy (cur, v.ptr, v.len); |
|
|
557 | cur += v.len; |
|
|
558 | } |
|
|
559 | } |
|
|
560 | |
|
|
561 | return *this; |
|
|
562 | } |
|
|
563 | |
|
|
564 | packet &packet::operator <<(const data8 &v) |
|
|
565 | { |
|
|
566 | unsigned int len = min (v.len, 0x00FF); |
|
|
567 | return *this << uint8 (len) << data (v.ptr, len); |
|
|
568 | } |
|
|
569 | |
|
|
570 | packet &packet::operator <<(const data16 &v) |
|
|
571 | { |
|
|
572 | unsigned int len = min (v.len, 0xFFFF); |
|
|
573 | return *this << uint16 (len) << data (v.ptr, len); |
|
|
574 | } |
|
|
575 | |
|
|
576 | packet &packet::operator <<(const char *v) |
|
|
577 | { |
|
|
578 | return *this << data (v, strlen (v ? v : 0)); |
|
|
579 | } |
|
|
580 | |
|
|
581 | void |
|
|
582 | packet::vprintf (const char *format, va_list ap) |
|
|
583 | { |
|
|
584 | int size = room (); |
|
|
585 | |
|
|
586 | int len = vsnprintf ((char *)cur, size, format, ap); |
|
|
587 | |
|
|
588 | if (len >= size) |
|
|
589 | return reset (); |
|
|
590 | |
|
|
591 | cur += len; |
|
|
592 | } |
487 | |
593 | |
488 | /****************************************************************************** |
594 | /****************************************************************************** |
489 | * |
595 | * |
490 | * statistics logging functions. |
596 | * statistics logging functions. |
491 | * |
597 | * |
492 | ******************************************************************************/ |
598 | ******************************************************************************/ |
493 | |
599 | |
494 | #ifdef CS_LOGSTATS |
600 | #ifdef CS_LOGSTATS |
|
|
601 | |
495 | /* cst_tot is for the life of the server, cst_last is for the last series of |
602 | /* cst_tot is for the life of the server, cst_last is for the last series of |
496 | * stats |
603 | * stats |
497 | */ |
604 | */ |
498 | CS_Stats cst_tot, cst_lst; |
605 | CS_Stats cst_tot, cst_lst; |
499 | |
606 | |
500 | /** |
607 | /** |
501 | * Writes out the gathered stats. We clear cst_lst. |
608 | * Writes out the gathered stats. We clear cst_lst. |
502 | */ |
609 | */ |
|
|
610 | void |
503 | void write_cs_stats(void) |
611 | write_cs_stats (void) |
504 | { |
612 | { |
505 | time_t now=time(NULL); |
613 | time_t now = time (NULL); |
506 | |
614 | |
507 | /* If no connections recently, don't both to log anything */ |
615 | /* If no connections recently, don't both to log anything */ |
508 | if (cst_lst.ibytes==0 && cst_lst.obytes==0) return; |
616 | if (cst_lst.ibytes == 0 && cst_lst.obytes == 0) |
|
|
617 | return; |
509 | |
618 | |
510 | /* CSSTAT is put in so scripts can easily find the line */ |
619 | /* CSSTAT is put in so scripts can easily find the line */ |
511 | LOG(llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n", |
620 | LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n", |
512 | ctime(&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn, |
621 | ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn, |
513 | now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, |
622 | now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start); |
514 | cst_lst.max_conn, now - cst_lst.time_start); |
|
|
515 | cst_lst.ibytes=0; |
623 | cst_lst.ibytes = 0; |
516 | cst_lst.obytes=0; |
624 | cst_lst.obytes = 0; |
517 | cst_lst.max_conn=socket_info.nconns; |
|
|
518 | cst_lst.time_start=now; |
625 | cst_lst.time_start = now; |
519 | } |
626 | } |
520 | #endif |
627 | #endif |
|
|
628 | |