- Timestamp:
- Jan 10, 2016, 1:54:11 PM (8 years ago)
- Location:
- code/branches/cpp11_v3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3
- Property svn:mergeinfo changed
-
code/branches/cpp11_v3/src/libraries/network/MasterServer.cc
r10624 r11054 43 43 44 44 /* forward declaration so the linker doesn't complain */ 45 MasterServer *MasterServer::instance = NULL;45 MasterServer *MasterServer::instance = nullptr; 46 46 47 47 /* command: list servers */ … … 49 49 MasterServer::listServers( void ) 50 50 { 51 /* get an iterator */52 std::list<ServerListElem>::iterator i;53 54 51 /* print list header */ 55 52 orxout(user_info) << "List of connected servers" << std::endl; 56 53 57 54 /* loop through list elements */ 58 for( i = MasterServer::getInstance()->mainlist.serverlist.begin(); 59 i != MasterServer::getInstance()->mainlist.serverlist.end(); ++i ) 55 for( const ServerListElem& elem : MasterServer::getInstance()->mainlist.serverlist ) 60 56 { 61 orxout(user_info) << " " << (*i).ServerInfo.getServerIP() << std::endl;57 orxout(user_info) << " " << elem.ServerInfo.getServerIP() << std::endl; 62 58 } 63 59 … … 112 108 MasterServer::helper_sendlist( ENetEvent *event ) 113 109 { 114 /* get an iterator */115 std::list<ServerListElem>::iterator i;116 117 110 /* packet holder */ 118 111 ENetPacket *reply; 119 112 120 113 /* loop through list elements */ 121 for( i = mainlist.serverlist.begin(); i 122 != mainlist.serverlist.end(); ++i ) 114 for( const ServerListElem& elem : mainlist.serverlist ) 123 115 { 124 116 /* send this particular server */ 125 117 /* build reply string */ 126 int packetlen = MSPROTO_SERVERLIST_ITEM_LEN + 1 + (*i).ServerInfo.getServerIP().length() + 1 + (*i).ServerInfo.getServerName().length() + 1 + sizeof((*i).ServerInfo.getClientNumber()) + 1;118 int packetlen = MSPROTO_SERVERLIST_ITEM_LEN + 1 + elem.ServerInfo.getServerIP().length() + 1 + elem.ServerInfo.getServerName().length() + 1 + sizeof(elem.ServerInfo.getClientNumber()) + 1; 127 119 char *tosend = (char *)calloc(packetlen ,1 ); 128 120 if( !tosend ) … … 131 123 } 132 124 sprintf( tosend, "%s %s %s %u", MSPROTO_SERVERLIST_ITEM, 133 (*i).ServerInfo.getServerIP().c_str(), (*i).ServerInfo.getServerName().c_str(), (*i).ServerInfo.getClientNumber());125 elem.ServerInfo.getServerIP().c_str(), elem.ServerInfo.getServerName().c_str(), elem.ServerInfo.getClientNumber()); 134 126 135 127 /* create packet from it */ … … 167 159 MasterServer::helper_cleanupServers( void ) 168 160 { 169 /* get an iterator */170 std::list<ServerListElem>::iterator i;171 172 161 if( mainlist.serverlist.size() == 0 ) 173 162 return; 174 163 175 164 /* loop through list elements */ 176 for( i = mainlist.serverlist.begin(); i 177 != mainlist.serverlist.end(); ++i ) 165 for( const ServerListElem& elem : mainlist.serverlist ) 178 166 { /* see if we have a disconnected peer */ 179 if( (*i).peer &&180 ( (*i).peer->state == ENET_PEER_STATE_DISCONNECTED ||181 (*i).peer->state == ENET_PEER_STATE_ZOMBIE ))167 if( elem.peer && 168 (elem.peer->state == ENET_PEER_STATE_DISCONNECTED || 169 elem.peer->state == ENET_PEER_STATE_ZOMBIE )) 182 170 { 183 171 /* Remove it from the list */ 184 orxout(internal_warning) << (char*) (*i).peer->data << " timed out.\n";185 mainlist.delServerByName( (*i).ServerInfo.getServerName() );172 orxout(internal_warning) << (char*)elem.peer->data << " timed out.\n"; 173 mainlist.delServerByName( elem.ServerInfo.getServerName() ); 186 174 187 175 /* stop iterating, we manipulated the list */ … … 345 333 /***** ENTER MAIN LOOP *****/ 346 334 ENetEvent *event = (ENetEvent *)calloc(sizeof(ENetEvent), sizeof(char)); 347 if( event == NULL)335 if( event == nullptr ) 348 336 { 349 337 orxout(user_error, context::master_server) << "Could not create ENetEvent structure, exiting." << endl;
Note: See TracChangeset
for help on using the changeset viewer.