From 318413b119c5f0e988079bb7bede1a4a86583a7a Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Thu, 21 May 2020 23:42:27 -0400 Subject: use the crate version for the protocol version --- src/bin/rbw-agent/actions.rs | 2 +- src/bin/rbw/commands.rs | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src/bin') diff --git a/src/bin/rbw-agent/actions.rs b/src/bin/rbw-agent/actions.rs index e1124e0..d2b38dc 100644 --- a/src/bin/rbw-agent/actions.rs +++ b/src/bin/rbw-agent/actions.rs @@ -299,7 +299,7 @@ pub async fn encrypt( pub async fn version(sock: &mut crate::sock::Sock) -> anyhow::Result<()> { sock.send(&rbw::protocol::Response::Version { - version: rbw::protocol::VERSION, + version: rbw::protocol::version(), }) .await .context("failed to send response")?; diff --git a/src/bin/rbw/commands.rs b/src/bin/rbw/commands.rs index 2934de3..ff6f51e 100644 --- a/src/bin/rbw/commands.rs +++ b/src/bin/rbw/commands.rs @@ -784,22 +784,23 @@ pub fn stop_agent() -> anyhow::Result<()> { fn ensure_agent() -> anyhow::Result<()> { ensure_agent_once()?; - let version = version_or_quit()?; - if version != rbw::protocol::VERSION { + let client_version = rbw::protocol::version(); + let agent_version = version_or_quit()?; + if agent_version != client_version { log::debug!( "client protocol version is {} but agent protocol version is {}", - rbw::protocol::VERSION, - version + client_version, + agent_version ); crate::actions::quit()?; ensure_agent_once()?; - let version = version_or_quit()?; - if version != rbw::protocol::VERSION { + let agent_version = version_or_quit()?; + if agent_version != client_version { crate::actions::quit()?; return Err(anyhow::anyhow!( "incompatible protocol versions: client ({}), agent ({})", - rbw::protocol::VERSION, - version + client_version, + agent_version )); } } -- cgit v1.2.3-54-g00ecf