Fix/keep alive stuff #128
Merged
Fix/keep alive stuff #128
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add chat components
Feat/text - compilation errors fixed
|
|
||
| if matches!(*conn_state, ConnectionState::Play) | ||
| && (current_time - keep_alive.id) >= fifteen_seconds_ms | ||
| && (current_time - keep_alive.id) >= 15000 |
There was a problem hiding this comment.
Could you rename the field id to timestamp instead? Since I feel like it'd make more sense in the future when looking at this code. Since right now it looks like a quite weird calculation between an id and timestamp :)
| .ok() | ||
| .unwrap(); | ||
|
|
||
| if (current_time - keep_alive.id) >= 30000 { |
There was a problem hiding this comment.
Here are well. id -> timestamp
Comment on lines
10
to
11
| pub struct IncomingKeepAlivePacket { | ||
| pub struct IncomingKeepAlive { |
There was a problem hiding this comment.
Please keep packets have a prefix Packet since they're publicly exported and it'd be confusing.
|
|
||
| #[derive(NetEncode)] | ||
| #[packet(packet_id = 0x1D)] | ||
| pub struct Disconnect { |
There was a problem hiding this comment.
Same here. Suffix with Packet
src/lib/net/src/utils/state.rs
Outdated
| Ok(control) => { | ||
| control | ||
| .should_disconnect | ||
| .store(true, std::sync::atomic::Ordering::Relaxed); |
There was a problem hiding this comment.
Why is there an atomic inside of a component? Components' are already protected with read-write locks.
There was a problem hiding this comment.
didnt know, will change
|
thanks bbg |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR kicks inactive players and remove them from the universe
Description
Keep alives are now stored in the Incoming and Outgoing Keep alive packet, if the last incoming keep alive is not the same as the last outgoing one the client should be kicked and if a client fails to send a keep alive for 30 its also kicked, also now if it takes more than 2 seconds to read a packet the connection loop will skip to the next iteration to prevent the loop from hanging.
Motivation and Context
This change was implemented to make sure inactive or invalid clients are kicked
How has this been tested?
Ive connected to the server with two clients and disconnected them by turning off their internet, if I turn the interned back on within 30 seconds nothing happens, otherwise the client is kicked.
Screenshots (if appropriate):
Types of changes
Checklist:
My code follows the code style of this project.
I have added tests to cover my changes.
All new and existing tests passed.
Clippy passes with no warnings.