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.70 by root, Sat Feb 21 06:25:46 2009 UTC vs.
Revision 1.78 by root, Fri Apr 30 20:43:18 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;
… …
156 ****************************************************************************/ 156 ****************************************************************************/
157 157
158// SocketCommand, PlayingCommand, should not exist with those ugly casts 158// SocketCommand, PlayingCommand, should not exist with those ugly casts
159#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb), 159#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb),
160#define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER | 160#define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER |
161
162static void
163NopCmd (char *, int, client *)
164{
165 // do nothing
166}
161 167
162/** 168/**
163 * Dispatch table for the server. 169 * Dispatch table for the server.
164 */ 170 */
165static struct packet_type packets[] = { 171static struct packet_type packets[] = {
… …
171 {"apply", PC(ApplyCmd) PF_PLAYING }, 177 {"apply", PC(ApplyCmd) PF_PLAYING },
172 {"lookat", PC(LookAt) PF_PLAYING }, 178 {"lookat", PC(LookAt) PF_PLAYING },
173 {"lock", PC(LockItem) PF_PLAYING }, 179 {"lock", PC(LockItem) PF_PLAYING },
174 {"mark", PC(MarkItem) PF_PLAYING }, 180 {"mark", PC(MarkItem) PF_PLAYING },
175 {"move", PC(MoveCmd) PF_PLAYING }, 181 {"move", PC(MoveCmd) PF_PLAYING },
176 {"ext", PC(ExtCmd) 0 }, // CF+ 182 {"ext", PC(ExtCmd) 0 }, // CF+/Deliantra
177 {"mapredraw", PC(MapRedrawCmd) 0 }, 183 {"mapredraw", PC(MapRedrawCmd) 0 },
178 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+ 184 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+/Deliantra
179 185
180 {"reply", SC(ReplyCmd) 0 }, 186 {"reply", SC(ReplyCmd) 0 },
181 {"exti", SC(ExtiCmd) 0 }, // CF+ 187 {"exti", SC(ExtiCmd) 0 }, // CF+/Deliantra
182 {"addme", SC(AddMeCmd) 0 }, 188 {"addme", SC(AddMeCmd) 0 },
183 {"askface", SC(AskFaceCmd) 0 }, 189 {"askface", SC(AskFaceCmd) 0 },
184 {"requestinfo", SC(RequestInfo) 0 }, 190 {"requestinfo", SC(RequestInfo) 0 },
185 {"setsound", SC(SetSound) 0 }, 191 {"setsound", SC(SetSound) 0 },
186 {"setup", SC(SetUp) 0 }, 192 {"setup", SC(SetUp) 0 },
187 {"version", SC(VersionCmd) 0 }, 193 {"version", SC(VersionCmd) 0 },
188 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */ 194
195 {"toggleextendedtext", SC(NopCmd) 0 }, // deliantra: disabled
189}; 196};
190 197
191bool 198bool
192client::may_execute (const packet_type *pkt) const 199client::may_execute (const packet_type *pkt) const
193{ 200{
… …
231{ 238{
232 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen)) 239 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen))
233 { 240 {
234 //TODO: only one format 241 //TODO: only one format
235 if (pkt->flags & PF_PLAYER) 242 if (pkt->flags & PF_PLAYER)
243 {
236 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); 244 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
245 pl->need_updated_stats ();
246 }
237 else 247 else
238 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 248 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
239 } 249 }
240 else 250 else
241 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name); 251 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]"); 264 pl && pl->ob ? &pl->ob->name : "[anonymous]");
255 destroy (); 265 destroy ();
256 return false; 266 return false;
257 } 267 }
258 268
269 uint8_t save_byte = inbuf [pkt_len]; // rather ugly
259 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ 270 inbuf [pkt_len] = 0; /* temporarily terminate buffer - useful for string data */
260 271
261 /* First, break out beginning word. There are at least 272 /* First, break out beginning word. There are at least
262 * a few commands that do not have any paremeters. If 273 * a few commands that do not have any paremeters. If
263 * we get such a command, don't worry about trying 274 * we get such a command, don't worry about trying
264 * to break it up. 275 * to break it up.
… …
275 { 286 {
276 data = (char *)inbuf + 2; // better read garbage than segfault 287 data = (char *)inbuf + 2; // better read garbage than segfault
277 datalen = 0; 288 datalen = 0;
278 } 289 }
279 290
280 for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt) 291 for (packet_type *pkt = packets; pkt < packets + array_length (packets); ++pkt)
281 if (!strcmp ((char *)inbuf + 2, pkt->name)) 292 if (!strcmp ((char *)inbuf + 2, pkt->name))
282 { 293 {
283 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen)) 294 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
284 queue_command (pkt, data, datalen); 295 queue_command (pkt, data, datalen);
285 else 296 else
… …
288 goto next_packet; 299 goto next_packet;
289 } 300 }
290 301
291 // If we get here, we didn't find a valid command. 302 // 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); 303 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
304
293next_packet: 305next_packet:
306 inbuf [pkt_len] = save_byte; // rather ugly
294 skip_packet (pkt_len); 307 skip_packet (pkt_len);
295 308
296 // input buffer has space again 309 // input buffer has space again
297 socket_ev.poll (socket_ev.poll () | EV_READ); 310 socket_ev.poll (socket_ev.poll () | EV_READ);
298 311

Diff Legend

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