From 6e2eb1aea089b9681f7d04cbe0fa1f2a313c5cde Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Tue, 27 Aug 2024 21:56:23 +0000 Subject: [PATCH] Allocate jobids randomly, Steam seems to do that now --- daemon/src/connection.rs | 11 +++-------- flake.nix | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/daemon/src/connection.rs b/daemon/src/connection.rs index a8dafd8..21bfa7f 100644 --- a/daemon/src/connection.rs +++ b/daemon/src/connection.rs @@ -55,8 +55,6 @@ pub async fn bootstrap_find_servers() -> eyre::Result> { struct SessionInner { /// Steam ID of current user. When set to None we are not logged in steam_id: Option, - /// Next jobid to use for messages that start a "job" - next_jobid: u64, /// Realm we're connecting to. AIUI this corresponds to account universe. /// Should normally be 1 for Public realm: u32, @@ -69,9 +67,9 @@ struct SessionInner { /// Waker for the sending thread send_waker: Option, - /// Recievers waiting for responses by job id + /// Recievers waiting for responses by jobid receive_wakers: HashMap, - /// Messages ready for receivers by job id + /// Messages ready for receivers by jobid /// TODO: Support multiple messages for same job ID receive_messages: HashMap, @@ -81,9 +79,7 @@ struct SessionInner { impl SessionInner { pub fn alloc_jobid(&mut self) -> u64 { - let jobid = self.next_jobid; - self.next_jobid += 1; - jobid + rand::random() } pub fn wake_sender(&mut self) { @@ -221,7 +217,6 @@ impl CMSession { let inner = SessionInner { steam_id: None, - next_jobid: 0, realm: 1, client_session_id: 0, send_queue: VecDeque::new(), diff --git a/flake.nix b/flake.nix index 0d9d6df..99b049d 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,7 @@ protobuf ]; RUST_SRC_PATH = "${rustPackages.rustPlatform.rustLibSrc}"; - RUST_LOG = "trace"; + RUST_LOG = "debug,vapored=trace,vapore-client=trace"; }; formatter = pkgs.nixfmt-rfc-style;