diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-09-27 19:47:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 19:47:36 +0200 |
| commit | ad7daf7b52348e1b71aa803be10de5b2134cba11 (patch) | |
| tree | e5a528d0e9be11f678d113dde3ec4b49f3d96c26 /src/network/connectionthreads.h | |
| parent | 50b2185ced9dc64e054ce743bbc22d15ecdf6192 (diff) | |
| download | minetest-ad7daf7b52348e1b71aa803be10de5b2134cba11.tar.xz | |
Add session_t typedef + remove unused functions (#6470)
* Add session_t typedef + remove unused functions
u16 peer_id is used everywhere, to be more consistent and permit some evolutions on this type in the future (i'm working on a PoC), uniformize u16 peer_id to SessionId peer_id
Diffstat (limited to 'src/network/connectionthreads.h')
| -rw-r--r-- | src/network/connectionthreads.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/network/connectionthreads.h b/src/network/connectionthreads.h index 82a08d36c..57825e1a1 100644 --- a/src/network/connectionthreads.h +++ b/src/network/connectionthreads.h @@ -53,22 +53,22 @@ private: void runTimeouts(float dtime); void rawSend(const BufferedPacket &packet); bool rawSendAsPacket( - u16 peer_id, u8 channelnum, SharedBuffer<u8> data, bool reliable); + session_t peer_id, u8 channelnum, SharedBuffer<u8> data, bool reliable); void processReliableCommand(ConnectionCommand &c); void processNonReliableCommand(ConnectionCommand &c); void serve(Address bind_address); void connect(Address address); void disconnect(); - void disconnect_peer(u16 peer_id); - void send(u16 peer_id, u8 channelnum, SharedBuffer<u8> data); + void disconnect_peer(session_t peer_id); + void send(session_t peer_id, u8 channelnum, SharedBuffer<u8> data); void sendReliable(ConnectionCommand &c); void sendToAll(u8 channelnum, SharedBuffer<u8> data); void sendToAllReliable(ConnectionCommand &c); void sendPackets(float dtime); - void sendAsPacket(u16 peer_id, u8 channelnum, SharedBuffer<u8> data, + void sendAsPacket(session_t peer_id, u8 channelnum, SharedBuffer<u8> data, bool ack = false); void sendAsPacketReliable(BufferedPacket &p, Channel *channel); @@ -106,9 +106,9 @@ private: // Returns next data from a buffer if possible // If found, returns true; if not, false. // If found, sets peer_id and dst - bool getFromBuffers(u16 &peer_id, SharedBuffer<u8> &dst); + bool getFromBuffers(session_t &peer_id, SharedBuffer<u8> &dst); - bool checkIncomingBuffers(Channel *channel, u16 &peer_id, SharedBuffer<u8> &dst); + bool checkIncomingBuffers(Channel *channel, session_t &peer_id, SharedBuffer<u8> &dst); /* Processes a packet with the basic header stripped out. @@ -119,7 +119,7 @@ private: reliable: true if recursing into a reliable packet */ SharedBuffer<u8> processPacket(Channel *channel, SharedBuffer<u8> packetdata, - u16 peer_id, u8 channelnum, bool reliable); + session_t peer_id, u8 channelnum, bool reliable); SharedBuffer<u8> handlePacketType_Control(Channel *channel, SharedBuffer<u8> packetdata, Peer *peer, u8 channelnum, |