Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/trunk/src/libraries/network/PeerList.cc @ 8858

Last change on this file since 8858 was 8858, checked in by landauf, 13 years ago

merged output branch back to trunk.

Changes:

  • you have to include util/Output.h instead of util/Debug.h
  • COUT(x) is now called orxout(level)
  • output levels are now defined by an enum instead of numbers. see util/Output.h for the definition
  • it's possible to use output contexts with orxout(level, context). see util/Output.h for some common contexts. you can define more contexts
  • you must use 'endl' at the end of an output message, '\n' does not flush the message

Output levels:

  • instead of COUT(0) use orxout()
  • instead of COUT(1) use orxout(user_error) or orxout(internal_error)
  • instead of COUT(2) use orxout(user_warning) or orxout(internal_warning)
  • instead of COUT(3) use orxout(user_status/user_info) or orxout(internal_status/internal_info)
  • instead of COUT(4) use orxout(verbose)
  • instead of COUT(5) use orxout(verbose_more)
  • instead of COUT(6) use orxout(verbose_ultra)

Guidelines:

  • user_* levels are for the user, visible in the console and the log-file
  • internal_* levels are for developers, visible in the log-file
  • verbose_* levels are for debugging, only visible if the context of the output is activated

Usage in C++:

  • orxout() << "message" << endl;
  • orxout(level) << "message" << endl;
  • orxout(level, context) << "message" << endl;

Usage in Lua:

  • orxout("message")
  • orxout(orxonox.level.levelname, "message")
  • orxout(orxonox.level.levelname, "context", "message")

Usage in Tcl (and in the in-game-console):

  • orxout levelname message
  • orxout_context levelname context message
  • shortcuts: log message, error message, warning message, status message, info message, debug message
  • Property svn:eol-style set to native
File size: 2.5 KB
Line 
1/*
2 *   ORXONOX - the hottest 3D action shooter ever to exist
3 *                    > www.orxonox.net <
4 *
5 *
6 *   License notice:
7 *
8 *   This program is free software; you can redistribute it and/or
9 *   modify it under the terms of the GNU General Public License
10 *   as published by the Free Software Foundation; either version 2
11 *   of the License, or (at your option) any later version.
12 *
13 *   This program is distributed in the hope that it will be useful,
14 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
15 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16 *   GNU General Public License for more details.
17 *
18 *   You should have received a copy of the GNU General Public License
19 *   along with this program; if not, write to the Free Software
20 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
21 *
22 *   Author:
23 *      Sandro 'smerkli' Merkli
24 *   Co-authors:
25 *      ...
26 *
27 */
28
29#include "PeerList.h"
30
31#include <cstdio>
32#include "util/Output.h"
33#include "network/packet/ServerInformation.h"
34
35namespace orxonox
36{
37  PeerList::PeerList() { }
38  PeerList::~PeerList() { }
39
40  int 
41  PeerList::addPeer( ENetPeer *toadd )
42  { /* error correction */
43    if( toadd == NULL ) 
44    { orxout(internal_error, context::master_server) << "PeerList::addPeer: empty peer given." << endl;
45      return -1;
46    }
47
48    /* if all went well, push to back of list */
49    this->peerlist.push_back( toadd );
50    return 0;
51  }
52
53  bool sub_compAddr( ENetAddress addr1, ENetAddress addr2 )
54  { 
55    for( int i = 0; i < 16; ++i )
56      if( addr1.host.addr[i] < addr2.host.addr[i] )
57        return -i;
58      else if( addr1.host.addr[i] > addr2.host.addr[i] )
59        return i;
60
61    return 0;
62  }
63   
64
65  bool
66  PeerList::remPeerByAddr( ENetAddress addr )
67  { /* get an iterator */
68    std::list<ENetPeer *>::iterator i;
69
70    /* loop through list elements */
71    for( i = peerlist.begin(); i != peerlist.end(); ++i ) 
72      if( !sub_compAddr((*i)->address, addr ) )
73      { /* found this name, remove and quit */
74        this->peerlist.remove( *i );
75        return true;
76      }
77
78    /* not found */
79    return false;
80  }
81
82  ENetPeer *
83  PeerList::findPeerByAddr( ENetAddress addr )
84  { /* get an iterator */
85    std::list<ENetPeer *>::iterator i;
86
87    /* loop through list elements */
88    for( i = peerlist.begin(); i != peerlist.end(); ++i ) 
89      if( !sub_compAddr((*i)->address, addr ) )
90        /* found this name, remove and quit */
91        return *i;
92
93    /* not found */
94    return NULL;
95  }
96
97}
98
Note: See TracBrowser for help on using the repository browser.