… | |
… | |
190 | static struct packet_type packets[] = { |
190 | static struct packet_type packets[] = { |
191 | {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 }, |
191 | {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 }, |
192 | {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 }, |
192 | {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 }, |
193 | |
193 | |
194 | {"examine", PC(ExamineCmd) PF_PLAYING }, |
194 | {"examine", PC(ExamineCmd) PF_PLAYING }, |
|
|
195 | {"ex", PC(ExCmd) PF_PLAYING }, |
195 | {"apply", PC(ApplyCmd) PF_PLAYING }, |
196 | {"apply", PC(ApplyCmd) PF_PLAYING }, |
196 | {"lookat", PC(LookAt) PF_PLAYING }, |
197 | {"lookat", PC(LookAt) PF_PLAYING }, |
197 | {"lock", PC(LockItem) PF_PLAYING }, |
198 | {"lock", PC(LockItem) PF_PLAYING }, |
198 | {"mark", PC(MarkItem) PF_PLAYING }, |
199 | {"mark", PC(MarkItem) PF_PLAYING }, |
199 | {"move", PC(MoveCmd) PF_PLAYING }, |
200 | {"move", PC(MoveCmd) PF_PLAYING }, |
200 | {"ext", PC(ExtCmd) 0 }, /* CF+ */ |
201 | {"ext", PC(ExtCmd) 0 }, // CF+ |
201 | {"mapredraw", PC(MapRedrawCmd) 0 }, /* Added: phil */ |
202 | {"mapredraw", PC(MapRedrawCmd) 0 }, |
202 | {"mapinfo", PC(MapInfoCmd) 0 }, /* CF+ */ |
203 | {"mapinfo", PC(MapInfoCmd) 0 }, // CF+ |
203 | |
204 | |
204 | {"reply", SC(ReplyCmd) 0 }, |
205 | {"reply", SC(ReplyCmd) 0 }, |
205 | {"exti", SC(ExtiCmd) 0 }, /* CF+ */ |
206 | {"exti", SC(ExtiCmd) 0 }, // CF+ |
206 | {"addme", SC(AddMeCmd) 0 }, |
207 | {"addme", SC(AddMeCmd) 0 }, |
207 | {"askface", SC(SendFaceCmd) 0 }, /* Added: phil */ |
208 | {"askface", SC(AskFaceCmd) 0 }, |
208 | {"requestinfo", SC(RequestInfo) 0 }, |
209 | {"requestinfo", SC(RequestInfo) 0 }, |
209 | {"setfacemode", SC(SetFaceMode) 0 }, |
210 | {"setfacemode", SC(SetFaceMode) 0 }, |
210 | {"setsound", SC(SetSound) 0 }, |
211 | {"setsound", SC(SetSound) 0 }, |
211 | {"setup", SC(SetUp) 0 }, |
212 | {"setup", SC(SetUp) 0 }, |
212 | {"version", SC(VersionCmd) 0 }, |
213 | {"version", SC(VersionCmd) 0 }, |
… | |
… | |
416 | return; |
417 | return; |
417 | |
418 | |
418 | if (len + outputbuffer.len > SOCKETBUFSIZE) |
419 | if (len + outputbuffer.len > SOCKETBUFSIZE) |
419 | { |
420 | { |
420 | LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd); |
421 | LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd); |
421 | destroy (); |
422 | // shutdown the socket, this is safer than destroying it immediately |
|
|
423 | // as lots of code in the callchain might still access the map etc. |
|
|
424 | shutdown (fd, SHUT_RDWR); |
422 | return; |
425 | return; |
423 | } |
426 | } |
424 | |
427 | |
425 | int avail, end; |
428 | int avail, end; |
426 | |
429 | |
… | |
… | |
502 | va_end (ap); |
505 | va_end (ap); |
503 | |
506 | |
504 | send_packet (sl); |
507 | send_packet (sl); |
505 | } |
508 | } |
506 | |
509 | |
|
|
510 | void |
|
|
511 | client::send_drawinfo (const char *msg, int flags) |
|
|
512 | { |
|
|
513 | send_packet_printf ("drawinfo %d %s", flags, msg); |
|
|
514 | } |
|
|
515 | |
507 | /*********************************************************************** |
516 | /*********************************************************************** |
508 | * |
517 | * |
509 | * packet functions/utilities |
518 | * packet functions/utilities |
510 | * |
519 | * |
511 | **********************************************************************/ |
520 | **********************************************************************/ |
… | |
… | |
515 | reset (); |
524 | reset (); |
516 | |
525 | |
517 | int len = strlen (name); |
526 | int len = strlen (name); |
518 | memcpy (cur, name, len); cur += len; |
527 | memcpy (cur, name, len); cur += len; |
519 | *cur++ = ' '; |
528 | *cur++ = ' '; |
|
|
529 | } |
|
|
530 | |
|
|
531 | packet &packet::operator <<(const ber32 v) |
|
|
532 | { |
|
|
533 | enum { maxlen = 32 / 7 + 1}; |
|
|
534 | uint8 buf[maxlen]; |
|
|
535 | uint8 *p = buf + maxlen; |
|
|
536 | uint32 val = v.val; |
|
|
537 | |
|
|
538 | *--p = val & 0x7F; |
|
|
539 | |
|
|
540 | while (val > 0x7F) |
|
|
541 | { |
|
|
542 | val >>= 7; |
|
|
543 | *--p = (val & 0x7F) | 0x80; |
|
|
544 | } |
|
|
545 | |
|
|
546 | return *this << data (p, buf + maxlen - p); |
520 | } |
547 | } |
521 | |
548 | |
522 | packet &packet::operator <<(const data &v) |
549 | packet &packet::operator <<(const data &v) |
523 | { |
550 | { |
524 | if (room () < v.len) |
551 | if (room () < v.len) |