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.29 by root, Thu Dec 21 23:37:06 2006 UTC vs.
Revision 1.34 by pippijn, Thu Mar 1 12:28:17 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 1992 Frank Tore Johansen 5 * Copyright (C) 1992 Frank Tore Johansen
5 6 *
6 This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
7 it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
8 the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
9 (at your option) any later version. 10 * (at your option) any later version.
10 11 *
11 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,
12 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 GNU General Public License for more details. 15 * GNU General Public License for more details.
15 16 *
16 You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
17 along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
18 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
19 20 *
20 The author can be reached via e-mail to mark@pyramid.com 21 * The author can be reached via e-mail to mark@pyramid.com
21*/ 22 */
22 23
23/** 24/**
24 * \file 25 * \file
25 * Low-level socket-related functions. 26 * Low-level socket-related functions.
26 * 27 *
27 * \date 2003-12-02 28 * \date 2003-12-02
… …
185 186
186/** 187/**
187 * Dispatch table for the server. 188 * Dispatch table for the server.
188 */ 189 */
189static struct packet_type packets[] = { 190static struct packet_type packets[] = {
190 {"ncom", PC(NewPlayerCmd) PF_PLAYING }, 191 {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 },
191 {"command", PC(PlayerCmd) PF_PLAYING }, 192 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 },
192 193
193 {"examine", PC(ExamineCmd) PF_PLAYING }, 194 {"examine", PC(ExamineCmd) PF_PLAYING },
194 {"apply", PC(ApplyCmd) PF_PLAYING }, 195 {"apply", PC(ApplyCmd) PF_PLAYING },
195 {"lookat", PC(LookAt) PF_PLAYING }, 196 {"lookat", PC(LookAt) PF_PLAYING },
196 {"lock", PC(LockItem) PF_PLAYING }, 197 {"lock", PC(LockItem) PF_PLAYING },
… …
219{ 220{
220 return (!(pkt->flags & PF_PLAYER) || pl) 221 return (!(pkt->flags & PF_PLAYER) || pl)
221 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING); 222 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING);
222} 223}
223 224
225// HACK: some commands currently should be executed
226// even when the player is frozen. this hack detects
227// those commands. it should be folded into may_execute,
228// but kept seperate to emphasise the hack aspect, i.e.
229// do it better, then remove.
230static bool
231always_immediate (const client *ns, const packet_type *pkt, const char *data, int len)
232{
233 if (!(pkt->flags & (PF_COMMAND0 | PF_COMMAND6)))
234 return false;
235
236 if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map)
237 return false;
238
239 if (pkt->flags & PF_COMMAND6)
240 {
241 data += 6;
242 len -= 6;
243 }
244
245 if (len > 4 && !strncmp (data, "say " , 4))
246 return true;
247 if (len > 5 && !strncmp (data, "chat ", 5))
248 return true;
249
250 return false;
251}
252
224void 253void
225client::execute (const packet_type *pkt, char *data, int datalen) 254client::execute (const packet_type *pkt, char *data, int datalen)
226{ 255{
227 if (may_execute (pkt)) 256 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen))
228 { 257 {
229 //TODO: only one format 258 //TODO: only one format
230 if (pkt->flags & PF_PLAYER) 259 if (pkt->flags & PF_PLAYER)
231 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); 260 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
232 else 261 else
… …
273 } 302 }
274 303
275 for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt) 304 for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt)
276 if (!strcmp ((char *)inbuf + 2, pkt->name)) 305 if (!strcmp ((char *)inbuf + 2, pkt->name))
277 { 306 {
278 if (pkt->flags & PF_PLAYER) 307 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
279 queue_command (pkt, data, datalen); 308 queue_command (pkt, data, datalen);
280 else 309 else
281 execute (pkt, data, datalen); 310 execute (pkt, data, datalen);
282 311
283 goto next_packet; 312 goto next_packet;
… …
380 */ 409 */
381void 410void
382client::send (void *buf_, int len) 411client::send (void *buf_, int len)
383{ 412{
384 char *buf = (char *)buf_; 413 char *buf = (char *)buf_;
385 char *pos = buf;
386 int amt = 0;
387 414
388 if (destroyed () || !buf) 415 if (destroyed () || !buf)
389 return; 416 return;
390 417
391 if ((len + outputbuffer.len) > SOCKETBUFSIZE) 418 if (len + outputbuffer.len > SOCKETBUFSIZE)
392 { 419 {
393 LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd); 420 LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd);
394 destroy (); 421 destroy ();
395 return; 422 return;
396 } 423 }

Diff Legend

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