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

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.64 by root, Tue May 6 16:55:26 2008 UTC vs.
Revision 1.68 by root, Sat Dec 27 01:25:00 2008 UTC

180 {"reply", SC(ReplyCmd) 0 }, 180 {"reply", SC(ReplyCmd) 0 },
181 {"exti", SC(ExtiCmd) 0 }, // CF+ 181 {"exti", SC(ExtiCmd) 0 }, // CF+
182 {"addme", SC(AddMeCmd) 0 }, 182 {"addme", SC(AddMeCmd) 0 },
183 {"askface", SC(AskFaceCmd) 0 }, 183 {"askface", SC(AskFaceCmd) 0 },
184 {"requestinfo", SC(RequestInfo) 0 }, 184 {"requestinfo", SC(RequestInfo) 0 },
185 {"setfacemode", SC(SetFaceMode) 0 },
186 {"setsound", SC(SetSound) 0 }, 185 {"setsound", SC(SetSound) 0 },
187 {"setup", SC(SetUp) 0 }, 186 {"setup", SC(SetUp) 0 },
188 {"version", SC(VersionCmd) 0 }, 187 {"version", SC(VersionCmd) 0 },
189 {"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /*Added: tchize */
190 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */ 188 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */
191 {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
192}; 189};
193 190
194bool 191bool
195client::may_execute (const packet_type *pkt) const 192client::may_execute (const packet_type *pkt) const
196{ 193{
474 va_end (ap); 471 va_end (ap);
475 472
476 send_packet (sl); 473 send_packet (sl);
477} 474}
478 475
479// returns true when the message needs special (read: perl) treatment
480static bool
481msg_is_special (const char *msg)
482{
483 return msg [strcspn (msg, "<[&\n")];
484}
485
486void 476void
487client::send_msg (int color, const char *type, const char *msg) 477client::send_msg (int color, const char *type, const char *msg)
488{ 478{
489 if (!msg || !type) // it can happen (for example, missing attack messages cause this) 479 if (!msg || !type) // it can happen (for example, missing attack messages cause this)
490 { 480 {
492 return; 482 return;
493 } 483 }
494 484
495 int len = strlen (msg); 485 int len = strlen (msg);
496 486
487 if (!(color & NDI_VERBATIM)
488 && (msg_is_special (msg)
497 if (msg_is_special (msg) || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)) 489 || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)))
498 cfperl_send_msg (this, color, type, msg); 490 cfperl_send_msg (this, color, type, msg);
499 else if (can_msg) 491 else if (can_msg)
500 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg); 492 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
501 else if (color < 0) 493 else if (color < 0)
502 return; // client cannot handle this 494 return; // client cannot handle this

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines