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.71 by root, Mon Oct 12 14:00:59 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 it under 6 * Deliantra is free software: you can redistribute it and/or modify it under
8 * the terms of the Affero GNU General Public License as published by the 7 * the terms of the Affero GNU General Public License as published by the
9 * Free Software Foundation, either version 3 of the License, or (at your 8 * Free Software Foundation, either version 3 of the License, or (at your
10 * option) any later version. 9 * option) any later version.
158 157
159// SocketCommand, PlayingCommand, should not exist with those ugly casts 158// SocketCommand, PlayingCommand, should not exist with those ugly casts
160#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb), 159#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb),
161#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 |
162 161
162static void
163NopCmd (char *, int, client *)
164{
165 // do nothing
166}
167
163/** 168/**
164 * Dispatch table for the server. 169 * Dispatch table for the server.
165 */ 170 */
166static struct packet_type packets[] = { 171static struct packet_type packets[] = {
167 {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 }, 172 {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 },
172 {"apply", PC(ApplyCmd) PF_PLAYING }, 177 {"apply", PC(ApplyCmd) PF_PLAYING },
173 {"lookat", PC(LookAt) PF_PLAYING }, 178 {"lookat", PC(LookAt) PF_PLAYING },
174 {"lock", PC(LockItem) PF_PLAYING }, 179 {"lock", PC(LockItem) PF_PLAYING },
175 {"mark", PC(MarkItem) PF_PLAYING }, 180 {"mark", PC(MarkItem) PF_PLAYING },
176 {"move", PC(MoveCmd) PF_PLAYING }, 181 {"move", PC(MoveCmd) PF_PLAYING },
177 {"ext", PC(ExtCmd) 0 }, // CF+ 182 {"ext", PC(ExtCmd) 0 }, // CF+/Deliantra
178 {"mapredraw", PC(MapRedrawCmd) 0 }, 183 {"mapredraw", PC(MapRedrawCmd) 0 },
179 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+ 184 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+/Deliantra
180 185
181 {"reply", SC(ReplyCmd) 0 }, 186 {"reply", SC(ReplyCmd) 0 },
182 {"exti", SC(ExtiCmd) 0 }, // CF+ 187 {"exti", SC(ExtiCmd) 0 }, // CF+/Deliantra
183 {"addme", SC(AddMeCmd) 0 }, 188 {"addme", SC(AddMeCmd) 0 },
184 {"askface", SC(AskFaceCmd) 0 }, 189 {"askface", SC(AskFaceCmd) 0 },
185 {"requestinfo", SC(RequestInfo) 0 }, 190 {"requestinfo", SC(RequestInfo) 0 },
186 {"setsound", SC(SetSound) 0 }, 191 {"setsound", SC(SetSound) 0 },
187 {"setup", SC(SetUp) 0 }, 192 {"setup", SC(SetUp) 0 },
188 {"version", SC(VersionCmd) 0 }, 193 {"version", SC(VersionCmd) 0 },
189 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */ 194
195 {"toggleextendedtext", SC(NopCmd) 0 }, // deliantra: disabled
190}; 196};
191 197
192bool 198bool
193client::may_execute (const packet_type *pkt) const 199client::may_execute (const packet_type *pkt) const
194{ 200{
232{ 238{
233 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen)) 239 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen))
234 { 240 {
235 //TODO: only one format 241 //TODO: only one format
236 if (pkt->flags & PF_PLAYER) 242 if (pkt->flags & PF_PLAYER)
243 {
237 ((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 }
238 else 247 else
239 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 248 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
240 } 249 }
241 else 250 else
242 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);
255 pl && pl->ob ? &pl->ob->name : "[anonymous]"); 264 pl && pl->ob ? &pl->ob->name : "[anonymous]");
256 destroy (); 265 destroy ();
257 return false; 266 return false;
258 } 267 }
259 268
269 uint8_t save_byte = inbuf [pkt_len]; // rather ugly
260 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ 270 inbuf [pkt_len] = 0; /* temporarily terminate buffer - useful for string data */
261 271
262 /* First, break out beginning word. There are at least 272 /* First, break out beginning word. There are at least
263 * a few commands that do not have any paremeters. If 273 * a few commands that do not have any paremeters. If
264 * we get such a command, don't worry about trying 274 * we get such a command, don't worry about trying
265 * to break it up. 275 * to break it up.
276 { 286 {
277 data = (char *)inbuf + 2; // better read garbage than segfault 287 data = (char *)inbuf + 2; // better read garbage than segfault
278 datalen = 0; 288 datalen = 0;
279 } 289 }
280 290
281 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)
282 if (!strcmp ((char *)inbuf + 2, pkt->name)) 292 if (!strcmp ((char *)inbuf + 2, pkt->name))
283 { 293 {
284 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen)) 294 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
285 queue_command (pkt, data, datalen); 295 queue_command (pkt, data, datalen);
286 else 296 else
289 goto next_packet; 299 goto next_packet;
290 } 300 }
291 301
292 // If we get here, we didn't find a valid command. 302 // If we get here, we didn't find a valid command.
293 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
294next_packet: 305next_packet:
306 inbuf [pkt_len] = save_byte; // rather ugly
295 skip_packet (pkt_len); 307 skip_packet (pkt_len);
296 308
297 // input buffer has space again 309 // input buffer has space again
298 socket_ev.poll (socket_ev.poll () | EV_READ); 310 socket_ev.poll (socket_ev.poll () | EV_READ);
299 311

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines