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.67 by root, Fri Dec 26 10:44:17 2008 UTC vs.
Revision 1.73 by root, Tue Nov 3 23:44:21 2009 UTC

1/* 1/*
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,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 1992,2007 Frank Tore Johansen
6 * 5 *
7 * Deliantra is free software: you can redistribute it and/or modify 6 * 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 7 * 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 8 * Free Software Foundation, either version 3 of the License, or (at your
10 * (at your option) any later version. 9 * option) any later version.
11 * 10 *
12 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details. 14 * GNU General Public License for more details.
16 * 15 *
17 * You should have received a copy of the GNU General Public License 16 * 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/>. 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>.
19 * 19 *
20 * The authors can be reached via e-mail to <support@deliantra.net> 20 * The authors can be reached via e-mail to <support@deliantra.net>
21 */ 21 */
22 22
23using namespace std; 23using namespace std;
… …
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 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */ 188 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */
190 {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
191}; 189};
192 190
193bool 191bool
194client::may_execute (const packet_type *pkt) const 192client::may_execute (const packet_type *pkt) const
195{ 193{
… …
215 { 213 {
216 data += 6; 214 data += 6;
217 len -= 6; 215 len -= 6;
218 } 216 }
219 217
220 if (len > 4 && data [3] == ' ' && !strncmp (data, "say " , 4)) return true; 218 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true;
221 if (len > 5 && data [4] == ' ' && !strncmp (data, "chat " , 5)) return true; 219 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true;
222 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;
223 223
224 if (len == 7 && !strcmp (data, "suicide")) return true; 224 if (len == 7 && !strcmp (data, "suicide")) return true;
225 225
226 return false; 226 return false;
227} 227}
… …
254 pl && pl->ob ? &pl->ob->name : "[anonymous]"); 254 pl && pl->ob ? &pl->ob->name : "[anonymous]");
255 destroy (); 255 destroy ();
256 return false; 256 return false;
257 } 257 }
258 258
259 uint8_t save_byte = inbuf [pkt_len]; // rather ugly
259 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ 260 inbuf [pkt_len] = 0; /* temporarily terminate buffer - useful for string data */
260 261
261 /* First, break out beginning word. There are at least 262 /* First, break out beginning word. There are at least
262 * a few commands that do not have any paremeters. If 263 * a few commands that do not have any paremeters. If
263 * we get such a command, don't worry about trying 264 * we get such a command, don't worry about trying
264 * to break it up. 265 * to break it up.
… …
288 goto next_packet; 289 goto next_packet;
289 } 290 }
290 291
291 // If we get here, we didn't find a valid command. 292 // If we get here, we didn't find a valid command.
292 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2); 293 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
294
293next_packet: 295next_packet:
296 inbuf [pkt_len] = save_byte; // rather ugly
294 skip_packet (pkt_len); 297 skip_packet (pkt_len);
295 298
296 // input buffer has space again 299 // input buffer has space again
297 socket_ev.poll (socket_ev.poll () | EV_READ); 300 socket_ev.poll (socket_ev.poll () | EV_READ);
298 301
… …
488 491
489 if (!(color & NDI_VERBATIM) 492 if (!(color & NDI_VERBATIM)
490 && (msg_is_special (msg) 493 && (msg_is_special (msg)
491 || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128))) 494 || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)))
492 cfperl_send_msg (this, color, type, msg); 495 cfperl_send_msg (this, color, type, msg);
493 else if (can_msg) 496 else
494 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg); 497 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
495 else if (color < 0)
496 return; // client cannot handle this
497 else
498 send_packet_printf ("drawinfo %d %s", color & NDI_COLOR_MASK, msg);
499} 498}
500 499
501void 500void
502client::send_drawinfo (const char *msg, int flags) 501client::send_drawinfo (const char *msg, int flags)
503{ 502{

Diff Legend

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