summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls Piņķis <emils@mullvad.net>2019-02-27 21:43:44 +0000
committerEmīls Piņķis <emils@mullvad.net>2019-02-28 14:58:08 +0000
commitd9f4ae03f4874d5543b4b0557be63b31a90f9757 (patch)
tree0aa6a8edfd25af88bdc748450198b0516f22db27
parent91a849d9b1dec24cdbd7ac137102e02472dbaf64 (diff)
downloadmullvadvpn-d9f4ae03f4874d5543b4b0557be63b31a90f9757.tar.xz
mullvadvpn-d9f4ae03f4874d5543b4b0557be63b31a90f9757.zip
Decrease log spam about removing already removed routes
-rw-r--r--talpid-core/src/tunnel/wireguard/mod.rs10
1 files changed, 9 insertions, 1 deletions
diff --git a/talpid-core/src/tunnel/wireguard/mod.rs b/talpid-core/src/tunnel/wireguard/mod.rs
index 2533d2034a..23fab152f3 100644
--- a/talpid-core/src/tunnel/wireguard/mod.rs
+++ b/talpid-core/src/tunnel/wireguard/mod.rs
@@ -94,12 +94,20 @@ impl WireguardMonitor {
}
}
- pub fn wait(self) -> Result<()> {
+ pub fn wait(mut self) -> Result<()> {
let wait_result = match self.close_msg_receiver.recv() {
Ok(CloseMsg::PingErr) => Err(ErrorKind::PingTimeoutError.into()),
Ok(CloseMsg::Stop) => Ok(()),
Err(_) => Ok(()),
};
+
+ // Clear routes manually - otherwise there will be some log spam since the tunnel device
+ // can be removed before the routes are cleared, which automatically clears some of the
+ // routes that were set.
+ if let Err(e) = self.router.delete_routes() {
+ log::error!("Failed to remove a route from the routing table - {}", e);
+ }
+
if let Err(e) = self.tunnel.stop() {
log::error!("Failed to stop tunnel - {}", e);
}