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.70 by root, Sat Feb 21 06:25:46 2009 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{
… …
216 { 213 {
217 data += 6; 214 data += 6;
218 len -= 6; 215 len -= 6;
219 } 216 }
220 217
221 if (len > 4 && data [3] == ' ' && !strncmp (data, "say " , 4)) return true; 218 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true;
222 if (len > 5 && data [4] == ' ' && !strncmp (data, "chat " , 5)) return true; 219 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true;
223 if (len > 6 && data [5] == ' ' && !strncmp (data, "shout ", 6)) return true; 220 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true;
221 if (len > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true;
222 if (len > 18 && data [17] == ' ' && !strncmp (data, "accept-invitation ", 18)) return true;
224 223
225 if (len == 7 && !strcmp (data, "suicide")) return true; 224 if (len == 7 && !strcmp (data, "suicide")) return true;
226 225
227 return false; 226 return false;
228} 227}
… …
474 va_end (ap); 473 va_end (ap);
475 474
476 send_packet (sl); 475 send_packet (sl);
477} 476}
478 477
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 478void
487client::send_msg (int color, const char *type, const char *msg) 479client::send_msg (int color, const char *type, const char *msg)
488{ 480{
489 if (!msg || !type) // it can happen (for example, missing attack messages cause this) 481 if (!msg || !type) // it can happen (for example, missing attack messages cause this)
490 { 482 {
… …
492 return; 484 return;
493 } 485 }
494 486
495 int len = strlen (msg); 487 int len = strlen (msg);
496 488
489 if (!(color & NDI_VERBATIM)
490 && (msg_is_special (msg)
497 if (msg_is_special (msg) || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)) 491 || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)))
498 cfperl_send_msg (this, color, type, msg); 492 cfperl_send_msg (this, color, type, msg);
499 else if (can_msg) 493 else
500 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg); 494 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
501 else if (color < 0)
502 return; // client cannot handle this
503 else
504 send_packet_printf ("drawinfo %d %s", color & NDI_COLOR_MASK, msg);
505} 495}
506 496
507void 497void
508client::send_drawinfo (const char *msg, int flags) 498client::send_drawinfo (const char *msg, int flags)
509{ 499{

Diff Legend

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