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.78 by root, Fri Apr 30 20:43:18 2010 UTC vs.
Revision 1.86 by root, Tue Oct 30 17:07:50 2012 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,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * 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
7 * 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
8 * 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
9 * option) any later version. 9 * option) any later version.
10 * 10 *
11 * 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,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details. 14 * GNU General Public License for more details.
15 * 15 *
16 * You should have received a copy of the Affero GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
17 * and the GNU General Public License along with this program. If not, see 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>. 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;
24 24
53 // write a nop to the socket at least every IDLE_NOP seconds. 53 // write a nop to the socket at least every IDLE_NOP seconds.
54 if (!outputbuffer.len) 54 if (!outputbuffer.len)
55 { 55 {
56 if (last_send + IDLE_PING <= NOW && pl && pl->active) 56 if (last_send + IDLE_PING <= NOW && pl && pl->active)
57 { 57 {
58 // this is a bit ugly, but map1/map1a seem to be the only 58 // this is a bit ugly, but map1a seems to be the only
59 // nop'able commands and they are quite small. 59 // nop'able command and it is quite small.
60 packet sl (mapmode == Map1Cmd ? "map1" : "map1a"); 60 packet sl ("map1a");
61 send_packet (sl); 61 send_packet (sl);
62 } 62 }
63 else 63 else
64 return; 64 return;
65 } 65 }
310 socket_ev.poll (socket_ev.poll () | EV_READ); 310 socket_ev.poll (socket_ev.poll () | EV_READ);
311 311
312 return true; 312 return true;
313} 313}
314 314
315void
316client::inbuf_handle ()
317{
318 if (!handle_packet ())
319 return;
320
321 while (handle_packet ())
322 ;
323
324 flush ();
325}
326
315// callback called when socket is either readable or writable 327// callback called when socket is either readable or writable
316void 328void
317client::socket_cb (iow &w, int revents) 329client::socket_cb (iow &w, int revents)
318{ 330{
319 //TODO remove when we have better socket cleanup logic 331 //TODO remove when we have better socket cleanup logic
363 // should not be here, normally 375 // should not be here, normally
364 } 376 }
365 else 377 else
366 { 378 {
367 inbuf_len += amount; 379 inbuf_len += amount;
368 380 inbuf_handle ();
369 if (handle_packet ())
370 {
371 while (handle_packet ())
372 ;
373
374 flush ();
375 }
376 } 381 }
377 } 382 }
378} 383}
379 384
380/******************************************************************************* 385/*******************************************************************************
528 *cur++ = ' '; 533 *cur++ = ' ';
529} 534}
530 535
531packet &packet::operator <<(const ber32 v) 536packet &packet::operator <<(const ber32 v)
532{ 537{
533 enum { maxlen = 32 / 7 + 1}; 538 enum { maxlen = 32 / 7 + 1 };
534 uint8 buf[maxlen]; 539 uint8 buf[maxlen];
535 uint8 *p = buf + maxlen; 540 uint8 *p = buf + maxlen;
536 uint32 val = v.val; 541 uint32 val = v.val;
537 542
538 *--p = val & 0x7F; 543 *--p = val & 0x7F;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines