- Timestamp:
- Oct 10, 2018, 3:06:55 PM (6 years ago)
- Location:
- code/branches/mergeFS18
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/mergeFS18
- Property svn:mergeinfo changed
/code/branches/Masterserver_FS18 (added) merged: 11816,11829,11842,11856,11858,11880,11889,11905,11907,11910,11929-11930,11937,11962-11963,11973,11983,11990
- Property svn:mergeinfo changed
-
code/branches/mergeFS18/src/libraries/network/Connection.h
r11071 r12027 96 96 97 97 protected: 98 Connection(uint32_t firstPeerID = NETWORK_PEER_ID_SERVER +1);98 Connection(uint32_t firstPeerID = NETWORK_PEER_ID_SERVER + 1); 99 99 100 100 void startCommunicationThread(); … … 110 110 void processQueue(); 111 111 void waitOutgoingQueue(); // wait for the outgoing queue to become empty (everything processed by communication thread) 112 virtual void addPeer(uint32_t peerID) =0;113 virtual void removePeer(uint32_t peerID) =0;114 virtual void processPacket( packet::Packet* packet) =0;112 virtual void addPeer(uint32_t peerID) = 0; 113 virtual void removePeer(uint32_t peerID) = 0; 114 virtual void processPacket( packet::Packet* packet) = 0; 115 115 116 116 incomingEvent preprocessConnectEvent(ENetEvent& event); … … 124 124 125 125 ENetHost* host_; 126 126 127 private: 127 128 void communicationThread(); … … 130 131 bool bCommunicationThreadRunning_; 131 132 ENetAddress* bindAddress_; 133 134 // Queue for incoming events 132 135 std::deque<incomingEvent> incomingEvents_; 136 137 // Queue for outgoing events 133 138 std::deque<outgoingEvent> outgoingEvents_; 139 134 140 boost::mutex* incomingEventsMutex_; 135 141 boost::mutex* outgoingEventsMutex_;
Note: See TracChangeset
for help on using the changeset viewer.