aboutsummaryrefslogtreecommitdiff
path: root/server/client-lib/src/network/tokio.rs
diff options
context:
space:
mode:
Diffstat (limited to 'server/client-lib/src/network/tokio.rs')
-rw-r--r--server/client-lib/src/network/tokio.rs19
1 files changed, 10 insertions, 9 deletions
diff --git a/server/client-lib/src/network/tokio.rs b/server/client-lib/src/network/tokio.rs
index d42d0fc1..6e7f0902 100644
--- a/server/client-lib/src/network/tokio.rs
+++ b/server/client-lib/src/network/tokio.rs
@@ -15,21 +15,21 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
use futures_util::{
- stream::{SplitSink, SplitStream, StreamExt},
SinkExt, TryStreamExt,
+ stream::{SplitSink, SplitStream, StreamExt},
};
use hurrycurry_protocol::{PacketC, PacketS, VERSION};
use log::{debug, info, warn};
use std::sync::atomic::{AtomicBool, Ordering};
use tokio::{net::TcpStream, sync::RwLock};
-use tokio_tungstenite::{client_async_tls_with_config, MaybeTlsStream, WebSocketStream};
+use tokio_tungstenite::{MaybeTlsStream, WebSocketStream, client_async_tls_with_config};
use tungstenite::{
- client::{uri_mode, IntoClientRequest},
+ Message,
+ client::{IntoClientRequest, uri_mode},
http::Request,
stream::Mode,
- Message,
};
pub struct Network {
@@ -98,11 +98,12 @@ impl Network {
major,
supports_bincode,
} = &packet
+ && *minor == VERSION.0
+ && *major == VERSION.1
+ && *supports_bincode
{
- if *minor == VERSION.0 && *major == VERSION.1 && *supports_bincode {
- info!("Binary protocol format enabled.");
- self.use_binary.store(true, Ordering::Relaxed);
- }
+ info!("Binary protocol format enabled.");
+ self.use_binary.store(true, Ordering::Relaxed);
}
return Ok(Some(packet));
}