Changeset 10434 for code

Timestamp:

May 7, 2015, 5:21:45 PM (9 years ago)

Author:

frovelli

Message:

Implemented playercount in multiplayer lobby

Location:

code/branches/multiplayerFS15/src/libraries/network

Files:

• LANDiscoverable.cc (modified) (2 diffs)
• LANDiscoverable.h (modified) (2 diffs)
• LANDiscovery.cc (modified) (2 diffs)
• LANDiscovery.h (modified) (1 diff)
• MasterServer.cc (modified) (4 diffs)
• MasterServer.h (modified) (2 diffs)
• Server.cc (modified) (4 diffs)
• ServerList.cc (modified) (1 diff)
• ServerList.h (modified) (1 diff)
• WANDiscoverable.cc (modified) (3 diffs)
• WANDiscoverable.h (modified) (1 diff)
• WANDiscovery.cc (modified) (2 diffs)
• WANDiscovery.h (modified) (1 diff)
• packet/ServerInformation.cc (modified) (1 diff)
• packet/ServerInformation.h (modified) (2 diffs)

code/branches/multiplayerFS15/src/libraries/network/LANDiscoverable.cc

@@ -57 +57 @@
   void LANDiscoverable::setConfigValues()
   {
-    /* update msaddress string from orxonox.ini config file, if it
+    /* update ownName string from orxonox.ini config file, if it
      * has changed.
      */
-    SetConfigValueExternal(ownName, "WANDiscovery", "ownName", "tme213");
+    SetConfigValueExternal(ownName, "Discovery", "ownName", "tme213");
   }
 
@@ -120 +120 @@
             packet::ServerInformation info;
             info.setServerName(this->ownName);
+            info.setClientNumber(this->clientNumber);
             info.send(event.peer);
 //             ENetPacket* packet = enet_packet_create( LAN_DISCOVERY_ACK, strlen(LAN_DISCOVERY_ACK)+1, ENET_PACKET_FLAG_RELIABLE );

code/branches/multiplayerFS15/src/libraries/network/LANDiscoverable.h

@@ -43 +43 @@
       void setActivity( bool bActive );
       void update();
+      void updateClientNumber(int clientNumber) {this->clientNumber = clientNumber;}
+;
       /** Function used for the configuration file parameter update */
       void setConfigValues();
@@ -50 +52 @@
       ENetHost*       host_;
       std::string     ownName;
+      int clientNumber;
   };
 

code/branches/multiplayerFS15/src/libraries/network/LANDiscovery.cc

@@ -89 +89 @@
           {
             packet::ServerInformation info(&event);
-            orxout(internal_info, context::network) << "Received LAN discovery server information; Name: " << info.getServerName() << ", Address: " << info.getServerIP() << ", RTT: " << info.getServerRTT() << endl;
+            orxout(internal_info, context::network) << "Received LAN discovery server information; Name: " << info.getServerName() << ", Address: " << info.getServerIP() << ", Players: " << info.getClientNumber() << ", RTT: " << info.getServerRTT() << endl;
             std::vector<packet::ServerInformation>::iterator it;
             for( it=this->servers_.begin(); it!=this->servers_.end(); ++it )
@@ -132 +132 @@
       return Ogre::StringConverter::toString(serverrtt);
     }
-
   }
 
-
+  std::string LANDiscovery::getServerListItemPlayerNumber(unsigned int index)
+  {
+    if( index >= this->servers_.size() )
+      return BLANKSTRING;
+    else{
+      int playerNumber = this->servers_[index].getClientNumber();
+      return Ogre::StringConverter::toString(playerNumber);
+    }
+  }
 } // namespace orxonox

code/branches/multiplayerFS15/src/libraries/network/LANDiscovery.h

@@ -53 +53 @@
       std::string getServerListItemIP( unsigned int index ); // tolua_export
       std::string getServerListItemRTT( unsigned int index ); // tolua_export
+      std::string getServerListItemPlayerNumber( unsigned int index ); // tolua_export
       static LANDiscovery& getInstance(){ return Singleton<LANDiscovery>::getInstance(); } // tolua_export
 

code/branches/multiplayerFS15/src/libraries/network/MasterServer.cc

@@ -127 +127 @@
       /* send this particular server */
       /* build reply string */
-      int packetlen = MSPROTO_SERVERLIST_ITEM_LEN + 1 + (*i).ServerInfo.getServerIP().length() + 1 + (*i).ServerInfo.getServerName().length() + 1;
+      int packetlen = MSPROTO_SERVERLIST_ITEM_LEN + 1 + (*i).ServerInfo.getServerIP().length() + 1 + (*i).ServerInfo.getServerName().length() + 1 + sizeof((*i).ServerInfo.getClientNumber()) + 1;
       char *tosend = (char *)calloc(packetlen ,1 );
       if( !tosend )
@@ -133 +133 @@
         continue;
       }
-      sprintf( tosend, "%s %s %s", MSPROTO_SERVERLIST_ITEM,
-          (*i).ServerInfo.getServerIP().c_str(), (*i).ServerInfo.getServerName().c_str());
+      sprintf( tosend, "%s %s %s %u", MSPROTO_SERVERLIST_ITEM,
+          (*i).ServerInfo.getServerIP().c_str(), (*i).ServerInfo.getServerName().c_str(), (*i).ServerInfo.getClientNumber());
 
       /* create packet from it */
@@ -300 +300 @@
         orxout(internal_info, context::master_server) << "Removed server " << ip << " from list." << endl;
       }
+      /* TODO add hook for disconnect here */
 
       else if( !strncmp( (char *)event->packet->data
@@ -317 +318 @@
       }
 
-      /* TODO add hook for disconnect here */
+      else if( !strncmp( (char *)event->packet->data
+        + MSPROTO_GAME_SERVER_LEN+1,
+        MSPROTO_SET_CLIENTS, MSPROTO_SET_CLIENTS_LEN ) )
+      {
+        /* create string from peer data */
+        std::string ip = std::string( addrconv );
+        std::string data (event->packet->data,event->packet->data + event->packet->dataLength );
+        std::string textform= data.substr(MSPROTO_GAME_SERVER_LEN + 1 + MSPROTO_SET_CLIENTS_LEN + 1);
+        int clientNumber = Ogre::StringConverter::parseInt(textform);
+
+        this->mainlist.setClientsByAddress( ip, clientNumber);
+
+        /* tell the user */
+        orxout(internal_info, context::master_server) << "Updated server " << ip << " with new client number " << clientNumber << endl;
+      }
     }
     else if( !strncmp( (char *)event->packet->data, MSPROTO_CLIENT,

code/branches/multiplayerFS15/src/libraries/network/MasterServer.h

@@ -49 +49 @@
 #include <cstdio>
 
-namespace orxonox 
+#include <OgreStringConverter.h>
+
+
+namespace orxonox
 {
   /* singleton */
@@ -63 +66 @@
       /* static pointer for commands */
       static MasterServer *instance;
-      static MasterServer *getInstance() 
+      static MasterServer *getInstance()
         { return instance; }
-      static void setInstance( MasterServer *setto ) 
+      static void setInstance( MasterServer *setto )
         { instance = setto;  }
-      
+
       /* functions for commands */
       static void listServers( void );

code/branches/multiplayerFS15/src/libraries/network/Server.cc

@@ -114 +114 @@
     /* make discoverable on LAN */
     LANDiscoverable::setActivity(true);
+    LANDiscoverable::updateClientNumber(0);
 
     /* make discoverable on WAN */
     WANDiscoverable::setActivity(true);
+    WANDiscoverable::updateClientNumber(0);
 
     /* done */
@@ -289 +291 @@
     // inform all the listeners
     this->clientIDs_.push_back(peerID);
+    WANDiscoverable::updateClientNumber(this->clientIDs_.size());
+    LANDiscoverable::updateClientNumber(this->clientIDs_.size());
+
     ClientConnectionListener::broadcastClientConnected(peerID);
     GamestateManager::addPeer(peerID);
@@ -295 +300 @@
 
     orxout(internal_info, context::network) << "Server: added client id: " << peerID << endl;
+
     createClient(peerID);
 }
@@ -315 +321 @@
     }
   }
+  WANDiscoverable::updateClientNumber(this->clientIDs_.size());
+  LANDiscoverable::updateClientNumber(this->clientIDs_.size());
+
   ClientConnectionListener::broadcastClientDisconnected(peerID);
   GamestateManager::removePeer(peerID);

code/branches/multiplayerFS15/src/libraries/network/ServerList.cc

@@ -159 +159 @@
   };
 
+  bool ServerList::setClientsByAddress( std::string address, int clientNumber ){
+    /* get an iterator */
+    std::list<ServerListElem>::iterator i;
+
+    /* loop through list elements */
+    for( i = serverlist.begin(); i != serverlist.end(); ++i )
+      if( (*i).ServerInfo.getServerIP() == address )
+      { /* found this adress, rename and quit */
+        (*i).ServerInfo.setClientNumber( clientNumber );
+        return true;
+      }
+    return false;
+  };
+
 }

code/branches/multiplayerFS15/src/libraries/network/ServerList.h

@@ -94 +94 @@
       bool setNameByAddress( std::string address, std::string name  );
 
+      bool setClientsByAddress( std::string address, int clientNumber );
+
       /* SEARCHING */
       /* \param address The address of the server that is to be

code/branches/multiplayerFS15/src/libraries/network/WANDiscoverable.cc

@@ -58 +58 @@
      * has changed.
      */
-    SetConfigValueExternal(msaddress, "WANDiscovery", "msaddress", "orxonox.net");
-    SetConfigValueExternal(ownName, "WANDiscovery", "ownName", "tme213");
+    SetConfigValueExternal(msaddress, "Discovery", "msaddress", "orxonox.net");
+    SetConfigValueExternal(ownName, "Discovery", "ownName", "tme213");
 //     SetConfigValue( msaddress, "orxonox.net");
   }
@@ -106 +106 @@
     orxout(verbose, context::master_server) << "Initialization of WANDiscoverable complete." << endl;
 
+    // Now register the server at the master server
+    this->msc.sendRequest( MSPROTO_GAME_SERVER " " MSPROTO_REGISTER_SERVER );
+
     std::string request = MSPROTO_GAME_SERVER " " MSPROTO_SET_NAME " ";
     request += this->ownName;
-
-    // Now register the server at the master server
-    this->msc.sendRequest( MSPROTO_GAME_SERVER " " MSPROTO_REGISTER_SERVER );
     this->msc.sendRequest( request );
-
 
     return true;
@@ -123 +122 @@
   }
 
+  void WANDiscoverable::updateClientNumber(int clientNumber)
+  {
+    orxout(verbose, context::master_server) << "Sending new number of clients: " << clientNumber << endl;
+    std::string request = MSPROTO_GAME_SERVER " " MSPROTO_SET_CLIENTS " ";
+    std::stringstream ss;
+    ss << clientNumber;
+    request +=  ss.str();
+
+    this->msc.sendRequest( request );
+  }
+
 
 

code/branches/multiplayerFS15/src/libraries/network/WANDiscoverable.h

@@ -58 +58 @@
       void setActivity( bool bActive );
 
+      void updateClientNumber(int clientNumber);
+
       /** Master server communications object */
       MasterServerComm msc;

code/branches/multiplayerFS15/src/libraries/network/WANDiscovery.cc

@@ -96 +96 @@
       int separator = datastr.find(" ");
       toadd.setServerIP(datastr.substr(0,separator));
-      toadd.setServerName(datastr.substr(separator+1));
+      int secondsep = datastr.find(" ", separator + 1);
+      toadd.setServerName(datastr.substr(separator + 1, secondsep - separator - 1));
+      toadd.setClientNumber(Ogre::StringConverter::parseInt(datastr.substr(secondsep+1)));
+
+      orxout(internal_info, context::network) << "Received WAN discovery server information; Name: " << toadd.getServerName() << ", Address: " << toadd.getServerIP() << ", Players: " << toadd.getClientNumber() << ", RTT: " << toadd.getServerRTT() << endl;
 
       /* add to list */
@@ -169 +173 @@
 
   }
+  std::string WANDiscovery::getServerListItemPlayerNumber(unsigned int index)
+  {
+    if( index >= this->servers_.size() )
+      return BLANKSTRING;
+    else{
+      int playerNumber = this->servers_[index].getClientNumber();
+      return Ogre::StringConverter::toString(playerNumber);
+    }
+  }
 
 } // namespace orxonox

code/branches/multiplayerFS15/src/libraries/network/WANDiscovery.h

@@ -87 +87 @@
       std::string getServerListItemRTT( unsigned int index ); // tolua_export
 
+      /** \param index Index to get the RTT of
+       * \return The number of players on the server
+       *
+       * Get the number of players on the server
+       */
+      std::string getServerListItemPlayerNumber( unsigned int index ); // tolua_export
+
       /* todo: might make this private and use getter/setter methods
        * at some later time.

code/branches/multiplayerFS15/src/libraries/network/packet/ServerInformation.cc

@@ -42 +42 @@
     ServerInformation::ServerInformation()
     {
-
     }
 

code/branches/multiplayerFS15/src/libraries/network/packet/ServerInformation.h

@@ -51 +51 @@
         void          setServerIP( std::string IP ) { this->serverIP_ = IP; }
         std::string   getServerIP() { return this->serverIP_; }
+        void          setClientNumber( int clientNumber ) { this->clientNumber_ = clientNumber; }
+        int           getClientNumber() { return this->clientNumber_; }
         uint32_t      getServerRTT() { return this->serverRTT_; }
 
@@ -57 +59 @@
         std::string   serverIP_;
         uint32_t      serverRTT_;
+        int           clientNumber_;
     };