Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

source: code/trunk/src/libraries/network/WANDiscovery.cc @ 8733

Last change on this file since 8733 was 8351, checked in by rgrieder, 14 years ago

Merged kicklib2 branch back to trunk (includes former branches ois_update, mac_osx and kicklib).

Notes for updating

Linux:
You don't need an extra package for CEGUILua and Tolua, it's already shipped with CEGUI.
However you do need to make sure that the OgreRenderer is installed too with CEGUI 0.7 (may be a separate package).
Also, Orxonox now recognises if you install the CgProgramManager (a separate package available on newer Ubuntu on Debian systems).

Windows:
Download the new dependency packages versioned 6.0 and use these. If you have problems with that or if you don't like the in game console problem mentioned below, you can download the new 4.3 version of the packages (only available for Visual Studio 2005/2008).

Key new features:

  • *Support for Mac OS X*
  • Visual Studio 2010 support
  • Bullet library update to 2.77
  • OIS library update to 1.3
  • Support for CEGUI 0.7 —> Support for Arch Linux and even SuSE
  • Improved install target
  • Compiles now with GCC 4.6
  • Ogre Cg Shader plugin activated for Linux if available
  • And of course lots of bug fixes

There are also some regressions:

  • No support for CEGUI 0.5, Ogre 1.4 and boost 1.35 - 1.39 any more
  • In game console is not working in main menu for CEGUI 0.7
  • Tolua (just the C lib, not the application) and CEGUILua libraries are no longer in our repository. —> You will need to get these as well when compiling Orxonox
  • And of course lots of new bugs we don't yet know about
  • Property svn:eol-style set to native
File size: 4.7 KB
RevLine 
[7161]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:
[7631]23 *      Fabian 'x3n' Landau (original)
[7161]24 *   Co-authors:
[7631]25 *      Sandro 'smerkli' Merkli (adaptions to WAN)
[7161]26 *      ...
27 *
28 */
29
[7630]30#include "WANDiscovery.h"
[7161]31
32#include <enet/enet.h>
33#include <cstring>
34
[7284]35#include "util/ScopedSingletonManager.h"
[7161]36#include "core/CoreIncludes.h"
37
38
39namespace orxonox
[7284]40{
[7801]41  ManageScopedSingleton(WANDiscovery, ScopeID::Graphics, true);
[7284]42
[7737]43
[7630]44  WANDiscovery::WANDiscovery()
[7161]45  {
[7737]46    /* debugging output */
[7672]47    COUT(4) << "Creating WANDiscovery.\n";
[7737]48 
[7750]49    /* register object in orxonox */
[7737]50    RegisterObject(WANDiscovery);
[7631]51
[7750]52    /* check for the masterserver address option in orxonox.ini */
[7737]53    this->setConfigValues();
54
[7631]55    /* initialize it and see if it worked */
56    if( msc.initialize() )
[7672]57      COUT(2) << "Error: could not initialize master server communications!\n";
[7631]58
59    /* connect and see if it worked */
[7744]60    if( msc.connect( this->msaddress.c_str(), ORX_MSERVER_PORT ) )
[7688]61      COUT(2) << "Error: could not connect to master server at " 
[7739]62        << this->msaddress << std::endl;
[7667]63
[7737]64    /* debugging output */
[7672]65    COUT(4) << "Initialization of WANDiscovery complete.\n";
[7161]66  }
67
[7739]68  void WANDiscovery::setConfigValues()
69  {
[7750]70    /* update msaddress string from orxonox.ini config file, if it
71     * has changed.
72     */
[8327]73    SetConfigValue( msaddress, "master.orxonox.net");
[7739]74  } 
75
[7630]76  WANDiscovery::~WANDiscovery()
[7631]77  { 
78    /* clear server list */
79    this->servers_.clear(); 
[7161]80  }
[7284]81
[7631]82  /* callback for the network reply poller */
[7657]83  int rhandler( char *addr, ENetEvent *ev )
[7631]84  { 
[7657]85    /* error recognition */
86    if( !ev || !ev->packet || !ev->packet->data )
87    { COUT(2) << "Bad arguments received in WANDiscovery's reply handler.\n";
88      return 0;
89    }
90
[7650]91    /* handle incoming data */
92    /* if a list entry arrives add to list */
[7651]93    if( !strncmp( (char*)ev->packet->data, MSPROTO_SERVERLIST_ITEM,
[7650]94      MSPROTO_SERVERLIST_ITEM_LEN ) )
95    { 
96      /* create server structure from that item */
[7651]97      packet::ServerInformation toadd;
[7631]98
[7747]99      /* fill in data, -1 for the index: index should be length -1 */
[7651]100      toadd.setServerName( std::string((char*)ev->packet->data + 
[7749]101        MSPROTO_SERVERLIST_ITEM_LEN+1) );
[7651]102      toadd.setServerIP( std::string((char*)ev->packet->data + 
[7749]103        MSPROTO_SERVERLIST_ITEM_LEN+1) );
[7650]104
105      /* add to list */
[7657]106      WANDiscovery::getInstance().servers_.push_back( toadd );
[7650]107    }
[7651]108    else if( !strncmp( (char*)ev->packet->data, MSPROTO_SERVERLIST_END,
[7650]109      MSPROTO_SERVERLIST_END_LEN ) )
[7672]110    { 
[7749]111      /* this is the only case where 2 should be returned,
[7672]112       * as 1 is used to signal that we're done receiving
113       * the list
114       */
[7692]115      return 2; 
[7672]116    }
[7650]117
[7631]118    /* done handling, return all ok code 0 */
[7692]119    return 1;
[7631]120  }
121 
[7630]122  void WANDiscovery::discover()
[7161]123  {
[7631]124    /* clear list */
[7161]125    this->servers_.clear();
[7631]126
127    /* send request to server */
[7657]128    this->msc.sendRequest( MSPROTO_CLIENT " " MSPROTO_REQ_LIST );
[7631]129
[7672]130    /* poll for replies */
[7692]131    int i = WANDISC_MAXTRIES;
132    while( i > 0 )
133    {
134      /* poll for reply and act according to what was received */
[7763]135      switch( this->msc.pollForReply( rhandler, 500 ) )
[7692]136      { case 0: /* no event occured, decrease timeout */
137          --i; break;
138        case 1: /* got a list element, continue */ 
139          break;
140        case 2: /* done. */
141          i = 0; break;
142      }
143    }
[7630]144  }
[7284]145
[7630]146  std::string WANDiscovery::getServerListItemName(unsigned int index)
147  {
[7631]148    /* if the index is out of range, return empty */
149    if( index >= this->servers_.size() )
150      return BLANKSTRING;
151    else
152      /* else return the name of the server */
153      return this->servers_[index].getServerName();
[7161]154  }
[7284]155
[7630]156  std::string WANDiscovery::getServerListItemIP(unsigned int index)
[7161]157  {
[7631]158    /* if the index is out of range, return empty */
159    if( index >= this->servers_.size() )
160      return BLANKSTRING;
161    else
162      /* else return the IP of the server */
163      return this->servers_[index].getServerIP();
[7161]164  }
[7284]165
166
[7161]167} // namespace orxonox
Note: See TracBrowser for help on using the repository browser.