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.75 by root, Fri Mar 26 01:04:45 2010 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,2010 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}
… …
231{ 231{
232 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen)) 232 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen))
233 { 233 {
234 //TODO: only one format 234 //TODO: only one format
235 if (pkt->flags & PF_PLAYER) 235 if (pkt->flags & PF_PLAYER)
236 {
236 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); 237 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
238 pl->need_updated_stats ();
239 }
237 else 240 else
238 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 241 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
239 } 242 }
240 else 243 else
241 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name); 244 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name);
… …
254 pl && pl->ob ? &pl->ob->name : "[anonymous]"); 257 pl && pl->ob ? &pl->ob->name : "[anonymous]");
255 destroy (); 258 destroy ();
256 return false; 259 return false;
257 } 260 }
258 261
262 uint8_t save_byte = inbuf [pkt_len]; // rather ugly
259 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ 263 inbuf [pkt_len] = 0; /* temporarily terminate buffer - useful for string data */
260 264
261 /* First, break out beginning word. There are at least 265 /* First, break out beginning word. There are at least
262 * a few commands that do not have any paremeters. If 266 * a few commands that do not have any paremeters. If
263 * we get such a command, don't worry about trying 267 * we get such a command, don't worry about trying
264 * to break it up. 268 * to break it up.
… …
288 goto next_packet; 292 goto next_packet;
289 } 293 }
290 294
291 // If we get here, we didn't find a valid command. 295 // 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); 296 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
297
293next_packet: 298next_packet:
299 inbuf [pkt_len] = save_byte; // rather ugly
294 skip_packet (pkt_len); 300 skip_packet (pkt_len);
295 301
296 // input buffer has space again 302 // input buffer has space again
297 socket_ev.poll (socket_ev.poll () | EV_READ); 303 socket_ev.poll (socket_ev.poll () | EV_READ);
298 304
… …
488 494
489 if (!(color & NDI_VERBATIM) 495 if (!(color & NDI_VERBATIM)
490 && (msg_is_special (msg) 496 && (msg_is_special (msg)
491 || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128))) 497 || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)))
492 cfperl_send_msg (this, color, type, msg); 498 cfperl_send_msg (this, color, type, msg);
493 else if (can_msg) 499 else
494 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg); 500 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} 501}
500 502
501void 503void
502client::send_drawinfo (const char *msg, int flags) 504client::send_drawinfo (const char *msg, int flags)
503{ 505{

Diff Legend

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