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

Diff Legend

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