ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/loop.C
(Generate patch)

Comparing deliantra/server/socket/loop.C (file contents):
Revision 1.15 by root, Thu Dec 14 21:46:34 2006 UTC vs.
Revision 1.29 by root, Tue Dec 19 04:58:05 2006 UTC

… …
26 * Main client/server loops. 26 * Main client/server loops.
27 * 27 *
28 * \date 2003-12-02 28 * \date 2003-12-02
29 * 29 *
30 * loop.c mainly deals with initialization and higher level socket 30 * loop.c mainly deals with initialization and higher level socket
31 * maintenance (checking for lost connections and if data has arrived.) 31 * maintanance (checking for lost connections and if data has arrived.)
32 * The reading of data is handled in ericserver.c
33 */ 32 */
34 33
35 34
36#include <global.h> 35#include <global.h>
37#include <sproto.h> 36#include <sproto.h>
… …
41#include <sys/time.h> 40#include <sys/time.h>
42#include <sys/socket.h> 41#include <sys/socket.h>
43#include <netinet/in.h> 42#include <netinet/in.h>
44#include <netdb.h> 43#include <netdb.h>
45 44
46#ifdef HAVE_UNISTD_H
47# include <unistd.h> 45#include <unistd.h>
48#endif
49
50#ifdef HAVE_ARPA_INET_H
51# include <arpa/inet.h> 46#include <arpa/inet.h>
52#endif
53 47
54#include <loader.h> 48#include <loader.h>
55#include <newserver.h>
56 49
57/***************************************************************************** 50#define MAX_QUEUE_DEPTH 500 //TODO
58 * Start of command dispatch area. 51#define MAX_QUEUE_BACKLOG 5. //TODO
59 * The commands here are protocol commands.
60 ****************************************************************************/
61 52
62/* Either keep this near the start or end of the file so it is
63 * at least reasonablye easy to find.
64 * There are really 2 commands - those which are sent/received
65 * before player joins, and those happen after the player has joined.
66 * As such, we have function types that might be called, so
67 * we end up having 2 tables.
68 */
69
70typedef void (*func_uint8_int_ns) (char *, int, client_socket *);
71
72struct NsCmdMapping
73{
74 const char *cmdname;
75 func_uint8_int_ns cmdproc;
76 uint8 flag;
77};
78
79typedef void (*func_uint8_int_pl) (char *, int, player *);
80struct PlCmdMapping
81{
82 const char *cmdname;
83 func_uint8_int_pl cmdproc;
84 uint8 flag;
85};
86
87/**
88 * Dispatch table for the server.
89 *
90 * CmdMapping is the dispatch table for the server, used in HandleClient,
91 * which gets called when the client has input. All commands called here
92 * use the same parameter form (char* data, int len, int clientnum.
93 * We do implicit casts, because the data that is being passed is
94 * unsigned (pretty much needs to be for binary data), however, most
95 * of these treat it only as strings, so it makes things easier
96 * to cast it here instead of a bunch of times in the function itself.
97 * flag is 1 if the player must be in the playing state to issue the
98 * command, 0 if they can issue it at any time.
99 */
100static struct PlCmdMapping plcommands[] = {
101 {"examine", ExamineCmd, 1},
102 {"apply", ApplyCmd, 1},
103 {"move", MoveCmd, 1},
104 {"reply", ReplyCmd, 0},
105 {"command", PlayerCmd, 1},
106 {"ncom", (func_uint8_int_pl) NewPlayerCmd, 1},
107 {"lookat", LookAt, 1},
108 {"lock", (func_uint8_int_pl) LockItem, 1},
109 {"mark", (func_uint8_int_pl) MarkItem, 1},
110 {"mapredraw", MapRedrawCmd, 0}, /* Added: phil */
111 {"mapinfo", MapInfoCmd, 2}, /* CF+ */
112 {"ext", ExtCmd, 2}, /* CF+ */
113 { 0 } /* terminator */
114};
115
116/** Face-related commands */
117static struct NsCmdMapping nscommands[] = {
118 {"addme", AddMeCmd, 2},
119 {"askface", SendFaceCmd}, /* Added: phil */
120 {"requestinfo", RequestInfo},
121 {"setfacemode", SetFaceMode, 2},
122 {"setsound", SetSound, 2},
123 {"setup", SetUp, 2},
124 {"version", VersionCmd, 2},
125 {"toggleextendedinfos", ToggleExtendedInfos, 2}, /*Added: tchize */
126 {"toggleextendedtext", ToggleExtendedText, 2}, /*Added: tchize */
127 {"asksmooth", AskSmooth}, /*Added: tchize (smoothing technologies) */
128 { 0 } /* terminator (I, II & III) */
129};
130
131/**
132 * RequestInfo is sort of a meta command. There is some specific
133 * request of information, but we call other functions to provide
134 * that information.
135 */
136void 53void
137RequestInfo (char *buf, int len, client_socket * ns) 54client::reset_state ()
138{ 55{
139 char *params = NULL, *cp; 56 if (!pl)
57 return;
140 58
141 /* No match */ 59 pl->run_on = 0;
142 char bigbuf[MAX_BUF]; 60 pl->fire_on = 0;
143 int slen; 61}
144 62
145 /* Set up replyinfo before we modify any of the buffers - this is used 63void
146 * if we don't find a match. 64client::queue_command (packet_type *handler, char *data, int datalen)
147 */ 65{
148 strcpy (bigbuf, "replyinfo "); 66 tstamp stamp = now ();
149 slen = strlen (bigbuf);
150 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
151 67
152 /* find the first space, make it null, and update the 68 if (cmd_queue.size () >= MAX_QUEUE_DEPTH)
153 * params pointer.
154 */
155 for (cp = buf; *cp != '\0'; cp++)
156 if (*cp == ' ')
157 { 69 {
158 *cp = '\0'; 70 //TODO: just disconnect here?
159 params = cp + 1; 71 reset_state ();
160 break; 72 send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED);
161 } 73 }
162
163 if (!strcmp (buf, "image_info"))
164 send_image_info (ns, params);
165 else if (!strcmp (buf, "image_sums"))
166 send_image_sums (ns, params);
167 else if (!strcmp (buf, "skill_info"))
168 send_skill_info (ns, params);
169 else if (!strcmp (buf, "spell_paths"))
170 send_spell_paths (ns, params);
171 else 74 else
172 ns->send_packet (bigbuf, len); 75 {
173} 76 cmd_queue.push_back (command ());
174 77 command &cmd = cmd_queue.back ();
175/** 78 cmd.stamp = stamp;
176 * Handle client input. 79 cmd.handler = handler;
177 * 80 cmd.data = salloc<char> (datalen + 1, data);
178 * HandleClient is actually not named really well - we only get here once 81 cmd.datalen = datalen;
179 * there is input, so we don't do exception or other stuff here.
180 * sock is the output socket information. pl is the player associated
181 * with this socket, null if no player (one of the init_sockets for just
182 * starting a connection)
183 */
184
185void
186HandleClient (client_socket *ns, player *pl)
187{
188 /* Loop through this - maybe we have several complete packets here. */
189 // limit to a few commands only, though, as to not monopolise the server
190 for (int repeat = 16; repeat--;)
191 { 82 }
192 /* If it is a player, and they don't have any speed left, we 83}
193 * return, and will read in the data when they do have time. 84
194 */ 85bool
86client::handle_command ()
87{
88 bool skipping = false;
89
90 while (!cmd_queue.empty ()
195 if (pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0) 91 && !(pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0))
196 return; 92 {
93 command &cmd = cmd_queue.front ();
197 94
198 int pkt_len = ns->read_packet (); 95 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ())
199
200 if (pkt_len < 0)
201 {
202 LOG (llevError, "read error on player %s\n", &pl->ob->name);
203 /* Caller will take care of cleaning this up */
204 ns->status = Ns_Dead;
205 return;
206 } 96 {
207 else if (pkt_len == 0) 97 if (!skipping)
208 /* Still dont have a full packet */
209 return;
210
211 /* First, break out beginning word. There are at least
212 * a few commands that do not have any paremeters. If
213 * we get such a command, don't worry about trying
214 * to break it up.
215 */
216 int datalen;
217 char *data = strchr ((char *)ns->inbuf + 2, ' ');
218
219 if (data)
220 { 98 {
221 *data++ = 0; 99 skipping = true;
222 datalen = pkt_len - (data - (char *)ns->inbuf); 100 reset_state ();
101 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
102 }
103
104 cmd_queue.pop_front ();
223 } 105 }
224 else 106 else
225 { 107 {
226 data = (char *)ns->inbuf + 2; // better read garbage than segfault 108 execute (cmd.handler, cmd.data, cmd.datalen);
227 datalen = 0; 109 cmd_queue.pop_front ();
228 }
229
230 ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
231
232 for (int i = 0; nscommands[i].cmdname; i++)
233 {
234 if (!strcmp ((char *)ns->inbuf + 2, nscommands[i].cmdname))
235 {
236 nscommands[i].cmdproc (data, datalen, ns);
237 ns->skip_packet (pkt_len);
238 //D// not doing this causes random memory corruption
239 if (nscommands[i].flag & 2)
240 goto next_packet;
241 return; 110 return true;
242 }
243 }
244
245 /* Player must be in the playing state or the flag on the
246 * the command must be zero for the user to use the command -
247 * otherwise, a player cam save, be in the play_again state, and
248 * the map they were on gets swapped out, yet things that try to look
249 * at the map causes a crash. If the command is valid, but
250 * one they can't use, we still swallow it up.
251 */
252 if (pl)
253 for (int i = 0; plcommands[i].cmdname; i++)
254 {
255 if (!strcmp ((char *)ns->inbuf + 2, plcommands[i].cmdname))
256 {
257 if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1))
258 plcommands[i].cmdproc ((char *) data, datalen, pl);
259
260 ns->skip_packet (pkt_len);
261 //D// not doing this causes random memory corruption
262 if (plcommands[i].flag & 2)
263 goto next_packet;
264
265 return;
266 }
267 } 111 }
268
269 /* If we get here, we didn't find a valid command. Logging
270 * this might be questionable, because a broken client/malicious
271 * user could certainly send a whole bunch of invalid commands.
272 */
273 LOG (llevDebug, "Bad command from client (%s)\n", ns->inbuf + 2);
274 ns->skip_packet (pkt_len);
275 next_packet:
276 ;
277 } 112 }
113
114 return false;
278} 115}
279 116
280void 117void
281flush_sockets (void) 118flush_sockets (void)
282{ 119{
283 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i) 120 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
284 if ((*i)->status != Ns_Dead) 121 if ((*i)->status != Ns_Dead)
285 (*i)->flush (); 122 (*i)->flush ();
286} 123}
287 124
288/** 125/**
… …
293 * 130 *
294 */ 131 */
295void 132void
296doeric_server (void) 133doeric_server (void)
297{ 134{
298 int i, pollret;
299 fd_set tmp_read;
300 struct sockaddr_in addr;
301 socklen_t addrlen = sizeof (struct sockaddr);
302 player *pl, *next;
303 int maxfd = 0;
304
305#ifdef CS_LOGSTATS 135#ifdef CS_LOGSTATS
306 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) 136 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
307 write_cs_stats (); 137 write_cs_stats ();
308#endif 138#endif
309 139
310 /* Go through the players. Let the loop set the next pl value, 140 /* Go through the players. Let the loop set the next pl value,
311 * since we may remove some 141 * since we may remove some
312 */ 142 */
313 //TODO: must be handled cleanly elsewhere 143 //TODO: must be handled cleanly elsewhere
314 for (pl = first_player; pl; ) 144 for (player *pl = first_player; pl; )
315 { 145 {
316 player *npl = pl->next; 146 player *npl = pl->next;
317 147
318 //TODO: must be handled cleanly elsewhere 148 //TODO: must be handled cleanly elsewhere
319 if (pl->socket->status == Ns_Dead) 149 if (!pl->socket || pl->socket->status == Ns_Dead)
320 { 150 {
321 save_player (pl->ob, 0); 151 save_player (pl->ob, 0);
322 152
323 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 153 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
324 { 154 {
… …
331 } 161 }
332 162
333 pl = npl; 163 pl = npl;
334 } 164 }
335 165
336 FD_ZERO (&tmp_read);
337
338 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ) 166 for (sockvec::iterator i = clients.begin (); i != clients.end (); )
339 { 167 {
340 client_socket *s = *i; 168 client *s = *i;
341 169
342 if (s->status == Ns_Dead) 170 if (s->status == Ns_Dead)
343 { 171 {
344 client_sockets.erase (i); 172 clients.erase (i);
345 delete s; 173 delete s;
346 } 174 }
347 else 175 else
348 {
349 if (s->fd > maxfd) maxfd = s->fd;
350
351 FD_SET (s->fd, &tmp_read);
352
353 ++i; 176 ++i;
354 }
355 }
356
357 struct timeval timeout;
358
359 timeout.tv_sec = 0;
360 timeout.tv_usec = 0;
361
362 pollret = select (maxfd + 1,
363 &tmp_read, 0, 0,
364 &timeout);
365
366 if (pollret == -1)
367 {
368 LOG (llevError, "select failed: %s\n", strerror (errno));
369 return;
370 } 177 }
371 178
372 /* We need to do some of the processing below regardless */ 179 /* We need to do some of the processing below regardless */
373 180
374 /* Check for any input on the sockets */ 181 /* Check for any input on the sockets */
375 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i) 182 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
376 { 183 {
377 client_socket *s = *i; 184 client *s = *i;
378 player *pl = s->pl; 185 player *pl = s->pl;
379
380 //TODO: disassociate handleclient from socket readin
381 if (s->inbuf_len || FD_ISSET (s->fd, &tmp_read))
382 HandleClient (s, pl);
383 186
384 //TODO: should not be done here, either 187 //TODO: should not be done here, either
385 if (s->status != Ns_Dead && pl) 188 if (s->status != Ns_Dead && pl)
386 { 189 {
387 /* Update the players stats once per tick. More efficient than 190 /* Update the players stats once per tick. More efficient than
388 * sending them whenever they change, and probably just as useful 191 * sending them whenever they change, and probably just as useful
389 */ 192 */
390 esrv_update_stats (pl); 193 esrv_update_stats (pl);
194
391 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob)) 195 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
392 { 196 {
393 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); 197 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
394 if (pl->last_weight != WEIGHT (pl->ob)) 198 if (pl->last_weight != WEIGHT (pl->ob))
395 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n", 199 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
396 (unsigned long) pl->last_weight, WEIGHT (pl->ob)); 200 (unsigned long) pl->last_weight, WEIGHT (pl->ob));
397 } 201 }
398 202
399 /* draw_client_map does sanity checking that map is
400 * valid, so don't do it here.
401 */
402 draw_client_map (pl->ob); 203 draw_client_map (pl->ob);
204
403 if (s->update_look) 205 if (s->update_look)
404 esrv_draw_look (pl->ob); 206 esrv_draw_look (pl->ob);
405 } 207 }
406 } 208 }
407} 209}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines