- Timestamp:
- Dec 30, 2015, 11:34:25 PM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/libraries/network/Connection.cc
r10919 r11006 81 81 { 82 82 // this->overallMutex_->lock(); 83 outgoingEvent outEvent = { peerID, outgoingEventType::disconnectPeer, nullptr, 0 };83 outgoingEvent outEvent = { peerID, OutgoingEventType::disconnectPeer, nullptr, 0 }; 84 84 85 85 this->outgoingEventsMutex_->lock(); … … 91 91 void Connection::disconnectPeers() 92 92 { 93 outgoingEvent outEvent = { 0, outgoingEventType::disconnectPeers, nullptr, 0 };93 outgoingEvent outEvent = { 0, OutgoingEventType::disconnectPeers, nullptr, 0 }; 94 94 95 95 this->outgoingEventsMutex_->lock(); … … 101 101 { 102 102 // this->overallMutex_->lock(); 103 outgoingEvent outEvent = { peerID, outgoingEventType::sendPacket, packet, channelID };103 outgoingEvent outEvent = { peerID, OutgoingEventType::sendPacket, packet, channelID }; 104 104 105 105 this->outgoingEventsMutex_->lock(); … … 112 112 { 113 113 // this->overallMutex_->lock(); 114 outgoingEvent outEvent = { 0, outgoingEventType::broadcastPacket, packet, channelID };114 outgoingEvent outEvent = { 0, OutgoingEventType::broadcastPacket, packet, channelID }; 115 115 116 116 this->outgoingEventsMutex_->lock(); … … 197 197 switch( event.type ) 198 198 { 199 case outgoingEventType::sendPacket:199 case OutgoingEventType::sendPacket: 200 200 // check whether the peer is still/already in the peer list 201 201 if( this->peerMap_.find(event.peerID) != this->peerMap_.end() ) … … 211 211 } 212 212 break; 213 case outgoingEventType::disconnectPeer:213 case OutgoingEventType::disconnectPeer: 214 214 if( this->peerMap_.find(event.peerID) != this->peerMap_.end() ) 215 215 { … … 223 223 } 224 224 break; 225 case outgoingEventType::disconnectPeers:225 case OutgoingEventType::disconnectPeers: 226 226 disconnectPeersInternal(); 227 227 break; 228 case outgoingEventType::broadcastPacket:228 case OutgoingEventType::broadcastPacket: 229 229 enet_host_broadcast( this->host_, event.channelID, event.packet ); 230 230 break; … … 271 271 switch( inEvent.type ) 272 272 { 273 case incomingEventType::peerConnect:273 case IncomingEventType::peerConnect: 274 274 addPeer(inEvent.peerID); 275 275 break; 276 case incomingEventType::peerDisconnect:276 case IncomingEventType::peerDisconnect: 277 277 removePeer(inEvent.peerID); 278 278 break; 279 case incomingEventType::receivePacket:279 case IncomingEventType::receivePacket: 280 280 processPacket(inEvent.packet); 281 281 break; … … 322 322 323 323 // create new peerEvent and return it 324 incomingEvent inEvent = { peerID, incomingEventType::peerConnect, nullptr };324 incomingEvent inEvent = { peerID, IncomingEventType::peerConnect, nullptr }; 325 325 return inEvent; 326 326 } … … 337 337 338 338 // create new peerEvent and return it 339 incomingEvent inEvent = { peerID, incomingEventType::peerDisconnect, nullptr };339 incomingEvent inEvent = { peerID, IncomingEventType::peerDisconnect, nullptr }; 340 340 return inEvent; 341 341 } … … 351 351 352 352 // create new peerEvent and return it 353 incomingEvent inEvent = { peerID, incomingEventType::receivePacket, p };353 incomingEvent inEvent = { peerID, IncomingEventType::receivePacket, p }; 354 354 return inEvent; 355 355 }
Note: See TracChangeset
for help on using the changeset viewer.