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.71 by root, Mon Oct 12 14:00:59 2009 UTC

… …
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 1992,2007 Frank Tore Johansen 5 * Copyright (©) 1992,2007 Frank Tore Johansen
6 * 6 *
7 * Deliantra is free software: you can redistribute it and/or modify 7 * Deliantra is free software: you can redistribute it and/or modify it under
8 * it under the terms of the GNU General Public License as published by 8 * the terms of the Affero GNU General Public License as published by the
9 * the Free Software Foundation, either version 3 of the License, or 9 * Free Software Foundation, either version 3 of the License, or (at your
10 * (at your option) any later version. 10 * option) any later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details. 15 * GNU General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the Affero GNU General Public License
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. 18 * and the GNU General Public License along with this program. If not, see
19 * <http://www.gnu.org/licenses/>.
19 * 20 *
20 * The authors can be reached via e-mail to <support@deliantra.net> 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 */ 22 */
22 23
23using namespace std; 24using namespace std;
… …
180 {"reply", SC(ReplyCmd) 0 }, 181 {"reply", SC(ReplyCmd) 0 },
181 {"exti", SC(ExtiCmd) 0 }, // CF+ 182 {"exti", SC(ExtiCmd) 0 }, // CF+
182 {"addme", SC(AddMeCmd) 0 }, 183 {"addme", SC(AddMeCmd) 0 },
183 {"askface", SC(AskFaceCmd) 0 }, 184 {"askface", SC(AskFaceCmd) 0 },
184 {"requestinfo", SC(RequestInfo) 0 }, 185 {"requestinfo", SC(RequestInfo) 0 },
185 {"setfacemode", SC(SetFaceMode) 0 },
186 {"setsound", SC(SetSound) 0 }, 186 {"setsound", SC(SetSound) 0 },
187 {"setup", SC(SetUp) 0 }, 187 {"setup", SC(SetUp) 0 },
188 {"version", SC(VersionCmd) 0 }, 188 {"version", SC(VersionCmd) 0 },
189 {"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /*Added: tchize */
190 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */ 189 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */
191 {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
192}; 190};
193 191
194bool 192bool
195client::may_execute (const packet_type *pkt) const 193client::may_execute (const packet_type *pkt) const
196{ 194{
… …
216 { 214 {
217 data += 6; 215 data += 6;
218 len -= 6; 216 len -= 6;
219 } 217 }
220 218
221 if (len > 4 && data [3] == ' ' && !strncmp (data, "say " , 4)) return true; 219 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true;
222 if (len > 5 && data [4] == ' ' && !strncmp (data, "chat " , 5)) return true; 220 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true;
223 if (len > 6 && data [5] == ' ' && !strncmp (data, "shout ", 6)) return true; 221 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true;
222 if (len > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true;
223 if (len > 18 && data [17] == ' ' && !strncmp (data, "accept-invitation ", 18)) return true;
224 224
225 if (len == 7 && !strcmp (data, "suicide")) return true; 225 if (len == 7 && !strcmp (data, "suicide")) return true;
226 226
227 return false; 227 return false;
228} 228}
… …
474 va_end (ap); 474 va_end (ap);
475 475
476 send_packet (sl); 476 send_packet (sl);
477} 477}
478 478
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 479void
487client::send_msg (int color, const char *type, const char *msg) 480client::send_msg (int color, const char *type, const char *msg)
488{ 481{
489 if (!msg || !type) // it can happen (for example, missing attack messages cause this) 482 if (!msg || !type) // it can happen (for example, missing attack messages cause this)
490 { 483 {
… …
492 return; 485 return;
493 } 486 }
494 487
495 int len = strlen (msg); 488 int len = strlen (msg);
496 489
490 if (!(color & NDI_VERBATIM)
491 && (msg_is_special (msg)
497 if (msg_is_special (msg) || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)) 492 || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)))
498 cfperl_send_msg (this, color, type, msg); 493 cfperl_send_msg (this, color, type, msg);
499 else if (can_msg) 494 else
500 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg); 495 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} 496}
506 497
507void 498void
508client::send_drawinfo (const char *msg, int flags) 499client::send_drawinfo (const char *msg, int flags)
509{ 500{

Diff Legend

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