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.21 by root, Sat Dec 16 03:21:08 2006 UTC

… …
45 45
46#include <unistd.h> 46#include <unistd.h>
47#include <arpa/inet.h> 47#include <arpa/inet.h>
48 48
49#include <loader.h> 49#include <loader.h>
50#include <newserver.h>
51 50
52/***************************************************************************** 51#define MAX_QUEUE_DEPTH 500 //TODO
53 * Start of command dispatch area. 52#define MAX_QUEUE_BACKLOG 2 //TODO
54 * The commands here are protocol commands.
55 ****************************************************************************/
56 53
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 54void
133RequestInfo (char *buf, int len, client_socket * ns) 55client::reset_state ()
134{ 56{
135 char *params = NULL, *cp; 57 if (!pl)
58 return;
136 59
137 /* No match */ 60 pl->run_on = 0;
138 char bigbuf[MAX_BUF]; 61 pl->fire_on = 0;
139 int slen; 62}
140 63
141 /* Set up replyinfo before we modify any of the buffers - this is used 64void
142 * if we don't find a match. 65client::queue_command (packet_type *handler, char *data, int datalen)
143 */ 66{
144 strcpy (bigbuf, "replyinfo "); 67 tstamp stamp = now ();
145 slen = strlen (bigbuf);
146 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
147 68
148 /* find the first space, make it null, and update the 69 if (cmd_queue.size () >= MAX_QUEUE_DEPTH)
149 * params pointer.
150 */
151 for (cp = buf; *cp != '\0'; cp++)
152 if (*cp == ' ')
153 { 70 {
154 *cp = '\0'; 71 //TODO: just disconnect here?
155 params = cp + 1; 72 reset_state ();
156 break; 73 send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED);
157 } 74 }
158 75 else if (!cmd_queue.empty () && cmd_queue.front ().stamp + MAX_QUEUE_BACKLOG < stamp)
159 if (!strcmp (buf, "image_info")) 76 {
160 send_image_info (ns, params); 77 reset_state ();
161 else if (!strcmp (buf, "image_sums")) 78 send_packet_printf ("drawinfo %d too many commands in queue, ignoring.", NDI_RED);
162 send_image_sums (ns, params); 79 }
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 80 else
168 ns->send_packet (bigbuf, len); 81 cmd_queue.push_back (command (
82 stamp, handler, (char *)salloc (datalen, data), datalen
83 ));
169} 84}
170 85
171/** 86bool
172 * Handle client input. 87client::handle_command ()
173 *
174 * HandleClient is actually not named really well - we only get here once
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{ 88{
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 {
188 /* If it is a player, and they don't have any speed left, we
189 * return, and will read in the data when they do have time.
190 */
191 if (pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0) 89 if (pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0)
192 return; 90 return false;
193 91
194 int pkt_len = ns->read_packet (); 92 if (cmd_queue.empty ())
93 return false;
195 94
196 if (pkt_len < 0) 95 command &cmd = cmd_queue.front ();
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 }
203 else if (pkt_len == 0)
204 /* Still dont have a full packet */
205 return;
206 96
207 /* First, break out beginning word. There are at least 97 if (cmd.stamp + MAX_QUEUE_BACKLOG < now ())
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 {
217 *data++ = 0;
218 datalen = pkt_len - (data - (char *)ns->inbuf);
219 }
220 else
221 {
222 data = (char *)ns->inbuf + 2; // better read garbage than segfault
223 datalen = 0;
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;
239 }
240 }
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 } 98 {
99 reset_state ();
100 send_packet_printf ("drawinfo %d ignoring delayed command.", NDI_RED);
101 }
102 else
103 execute (cmd.handler, cmd.data, cmd.datalen);
104
105 sfree (cmd.data, cmd.datalen);
106 cmd_queue.pop_front ();
107
108 return true;
251} 109}
252 110
253void 111void
254flush_sockets (void) 112flush_sockets (void)
255{ 113{
256 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i) 114 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
257 if ((*i)->status != Ns_Dead) 115 if ((*i)->status != Ns_Dead)
258 (*i)->flush (); 116 (*i)->flush ();
259} 117}
260 118
261/** 119/**
… …
266 * 124 *
267 */ 125 */
268void 126void
269doeric_server (void) 127doeric_server (void)
270{ 128{
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 129#ifdef CS_LOGSTATS
279 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) 130 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
280 write_cs_stats (); 131 write_cs_stats ();
281#endif 132#endif
282 133
283 /* Go through the players. Let the loop set the next pl value, 134 /* Go through the players. Let the loop set the next pl value,
284 * since we may remove some 135 * since we may remove some
285 */ 136 */
286 //TODO: must be handled cleanly elsewhere 137 //TODO: must be handled cleanly elsewhere
287 for (pl = first_player; pl; ) 138 for (player *pl = first_player; pl; )
288 { 139 {
289 player *npl = pl->next; 140 player *npl = pl->next;
290 141
291 //TODO: must be handled cleanly elsewhere 142 //TODO: must be handled cleanly elsewhere
292 if (pl->socket->status == Ns_Dead) 143 if (!pl->socket || pl->socket->status == Ns_Dead)
293 { 144 {
294 save_player (pl->ob, 0); 145 save_player (pl->ob, 0);
295 146
296 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 147 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
297 { 148 {
… …
304 } 155 }
305 156
306 pl = npl; 157 pl = npl;
307 } 158 }
308 159
309 FD_ZERO (&tmp_read);
310
311 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ) 160 for (sockvec::iterator i = clients.begin (); i != clients.end (); )
312 { 161 {
313 client_socket *s = *i; 162 client *s = *i;
314 163
315 if (s->status == Ns_Dead) 164 if (s->status == Ns_Dead)
316 { 165 {
317 client_sockets.erase (i); 166 clients.erase (i);
318 delete s; 167 delete s;
319 } 168 }
320 else 169 else
321 {
322 if (s->fd > maxfd) maxfd = s->fd;
323
324 FD_SET (s->fd, &tmp_read);
325
326 ++i; 170 ++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 } 171 }
344 172
345 /* We need to do some of the processing below regardless */ 173 /* We need to do some of the processing below regardless */
346 174
347 /* Check for any input on the sockets */ 175 /* Check for any input on the sockets */
348 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i) 176 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
349 { 177 {
350 client_socket *s = *i; 178 client *s = *i;
351 player *pl = s->pl; 179 player *pl = s->pl;
352 180
353 //TODO: disassociate handleclient from socket readin 181 s->handle_packet ();
354 if (s->inbuf_len || FD_ISSET (s->fd, &tmp_read)) 182 s->handle_command ();
355 HandleClient (s, pl);
356 183
357 //TODO: should not be done here, either 184 //TODO: should not be done here, either
358 if (s->status != Ns_Dead && pl) 185 if (s->status != Ns_Dead && pl)
359 { 186 {
360 /* Update the players stats once per tick. More efficient than 187 /* Update the players stats once per tick. More efficient than
361 * sending them whenever they change, and probably just as useful 188 * sending them whenever they change, and probably just as useful
362 */ 189 */
363 esrv_update_stats (pl); 190 esrv_update_stats (pl);
191
364 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob)) 192 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
365 { 193 {
366 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); 194 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
367 if (pl->last_weight != WEIGHT (pl->ob)) 195 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", 196 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)); 197 (unsigned long) pl->last_weight, WEIGHT (pl->ob));
370 } 198 }
371 199
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); 200 draw_client_map (pl->ob);
201
376 if (s->update_look) 202 if (s->update_look)
377 esrv_draw_look (pl->ob); 203 esrv_draw_look (pl->ob);
378 } 204 }
379 } 205 }
380} 206}

Diff Legend

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