… | |
… | |
186 | |
186 | |
187 | /** |
187 | /** |
188 | * Dispatch table for the server. |
188 | * Dispatch table for the server. |
189 | */ |
189 | */ |
190 | static struct packet_type packets[] = { |
190 | static struct packet_type packets[] = { |
191 | {"ncom", PC(NewPlayerCmd) PF_PLAYING }, |
191 | {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 }, |
192 | {"command", PC(PlayerCmd) PF_PLAYING }, |
192 | {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 }, |
193 | |
193 | |
194 | {"examine", PC(ExamineCmd) PF_PLAYING }, |
194 | {"examine", PC(ExamineCmd) PF_PLAYING }, |
195 | {"apply", PC(ApplyCmd) PF_PLAYING }, |
195 | {"apply", PC(ApplyCmd) PF_PLAYING }, |
196 | {"lookat", PC(LookAt) PF_PLAYING }, |
196 | {"lookat", PC(LookAt) PF_PLAYING }, |
197 | {"lock", PC(LockItem) PF_PLAYING }, |
197 | {"lock", PC(LockItem) PF_PLAYING }, |
… | |
… | |
202 | {"mapinfo", PC(MapInfoCmd) 0 }, /* CF+ */ |
202 | {"mapinfo", PC(MapInfoCmd) 0 }, /* CF+ */ |
203 | |
203 | |
204 | {"reply", SC(ReplyCmd) 0 }, |
204 | {"reply", SC(ReplyCmd) 0 }, |
205 | {"exti", SC(ExtiCmd) 0 }, /* CF+ */ |
205 | {"exti", SC(ExtiCmd) 0 }, /* CF+ */ |
206 | {"addme", SC(AddMeCmd) 0 }, |
206 | {"addme", SC(AddMeCmd) 0 }, |
207 | {"askface", SC(SendFaceCmd) 0 }, /* Added: phil */ |
207 | {"askface", SC(AskFaceCmd) 0 }, |
208 | {"requestinfo", SC(RequestInfo) 0 }, |
208 | {"requestinfo", SC(RequestInfo) 0 }, |
209 | {"setfacemode", SC(SetFaceMode) 0 }, |
209 | {"setfacemode", SC(SetFaceMode) 0 }, |
210 | {"setsound", SC(SetSound) 0 }, |
210 | {"setsound", SC(SetSound) 0 }, |
211 | {"setup", SC(SetUp) 0 }, |
211 | {"setup", SC(SetUp) 0 }, |
212 | {"version", SC(VersionCmd) 0 }, |
212 | {"version", SC(VersionCmd) 0 }, |
… | |
… | |
220 | { |
220 | { |
221 | return (!(pkt->flags & PF_PLAYER) || pl) |
221 | return (!(pkt->flags & PF_PLAYER) || pl) |
222 | && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING); |
222 | && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING); |
223 | } |
223 | } |
224 | |
224 | |
|
|
225 | // HACK: some commands currently should be executed |
|
|
226 | // even when the player is frozen. this hack detects |
|
|
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) |
|
|
240 | { |
|
|
241 | data += 6; |
|
|
242 | len -= 6; |
|
|
243 | } |
|
|
244 | |
|
|
245 | if (len > 4 && !strncmp (data, "say " , 4)) |
|
|
246 | return true; |
|
|
247 | if (len > 5 && !strncmp (data, "chat ", 5)) |
|
|
248 | return true; |
|
|
249 | |
|
|
250 | return false; |
|
|
251 | } |
|
|
252 | |
225 | void |
253 | void |
226 | client::execute (const packet_type *pkt, char *data, int datalen) |
254 | client::execute (const packet_type *pkt, char *data, int datalen) |
227 | { |
255 | { |
228 | if (may_execute (pkt)) |
256 | if (may_execute (pkt) || always_immediate (this, pkt, data, datalen)) |
229 | { |
257 | { |
230 | //TODO: only one format |
258 | //TODO: only one format |
231 | if (pkt->flags & PF_PLAYER) |
259 | if (pkt->flags & PF_PLAYER) |
232 | ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); |
260 | ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); |
233 | else |
261 | else |
… | |
… | |
274 | } |
302 | } |
275 | |
303 | |
276 | for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt) |
304 | for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt) |
277 | if (!strcmp ((char *)inbuf + 2, pkt->name)) |
305 | if (!strcmp ((char *)inbuf + 2, pkt->name)) |
278 | { |
306 | { |
279 | if (pkt->flags & PF_PLAYER) |
307 | if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen)) |
280 | queue_command (pkt, data, datalen); |
308 | queue_command (pkt, data, datalen); |
281 | else |
309 | else |
282 | execute (pkt, data, datalen); |
310 | execute (pkt, data, datalen); |
283 | |
311 | |
284 | goto next_packet; |
312 | goto next_packet; |
… | |
… | |
381 | */ |
409 | */ |
382 | void |
410 | void |
383 | client::send (void *buf_, int len) |
411 | client::send (void *buf_, int len) |
384 | { |
412 | { |
385 | char *buf = (char *)buf_; |
413 | char *buf = (char *)buf_; |
386 | char *pos = buf; |
|
|
387 | int amt = 0; |
|
|
388 | |
414 | |
389 | if (destroyed () || !buf) |
415 | if (destroyed () || !buf) |
390 | return; |
416 | return; |
391 | |
417 | |
392 | if (len + outputbuffer.len > SOCKETBUFSIZE) |
418 | if (len + outputbuffer.len > SOCKETBUFSIZE) |
393 | { |
419 | { |
394 | LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd); |
420 | LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd); |
395 | destroy (); |
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); |
396 | return; |
424 | return; |
397 | } |
425 | } |
398 | |
426 | |
399 | int avail, end; |
427 | int avail, end; |
400 | |
428 | |
… | |
… | |
476 | va_end (ap); |
504 | va_end (ap); |
477 | |
505 | |
478 | send_packet (sl); |
506 | send_packet (sl); |
479 | } |
507 | } |
480 | |
508 | |
|
|
509 | void |
|
|
510 | client::send_drawinfo (const char *msg, int flags) |
|
|
511 | { |
|
|
512 | send_packet_printf ("drawinfo %d %s", flags, msg); |
|
|
513 | } |
|
|
514 | |
481 | /*********************************************************************** |
515 | /*********************************************************************** |
482 | * |
516 | * |
483 | * packet functions/utilities |
517 | * packet functions/utilities |
484 | * |
518 | * |
485 | **********************************************************************/ |
519 | **********************************************************************/ |
… | |
… | |
489 | reset (); |
523 | reset (); |
490 | |
524 | |
491 | int len = strlen (name); |
525 | int len = strlen (name); |
492 | memcpy (cur, name, len); cur += len; |
526 | memcpy (cur, name, len); cur += len; |
493 | *cur++ = ' '; |
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); |
494 | } |
546 | } |
495 | |
547 | |
496 | packet &packet::operator <<(const data &v) |
548 | packet &packet::operator <<(const data &v) |
497 | { |
549 | { |
498 | if (room () < v.len) |
550 | if (room () < v.len) |