summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-09-15 15:51:30 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-09-15 15:51:30 +0000
commite81403b62dc38918a5fd89086ed81fbd07fbb41e (patch)
tree3a16e0b2e812fc258b3c8cedb4cf80d3206aa09f
parent144f605291fde938c85df9b24ca125eb43e30d8b (diff)
downloadmullvadvpn-e81403b62dc38918a5fd89086ed81fbd07fbb41e.tar.xz
mullvadvpn-e81403b62dc38918a5fd89086ed81fbd07fbb41e.zip
Show retry count in log
-rw-r--r--mullvad-jni/src/vpn_service_tun_provider.rs8
1 files changed, 6 insertions, 2 deletions
diff --git a/mullvad-jni/src/vpn_service_tun_provider.rs b/mullvad-jni/src/vpn_service_tun_provider.rs
index 3e15ee7e2e..49740f5e9f 100644
--- a/mullvad-jni/src/vpn_service_tun_provider.rs
+++ b/mullvad-jni/src/vpn_service_tun_provider.rs
@@ -95,7 +95,7 @@ impl VpnServiceTunProvider {
}
fn get_tun_fd(&mut self, config: TunConfig) -> Result<RawFd, Error> {
- for _ in 0..MAX_PREPARE_TUN_ATTEMPTS {
+ for retry in 1..=MAX_PREPARE_TUN_ATTEMPTS {
let tun = self.prepare_tun(config.clone())?;
match Self::duplicate_tun(tun) {
@@ -104,7 +104,11 @@ impl VpnServiceTunProvider {
Some(libc::EBADF) => {
self.active_tun = None;
- log::warn!("VpnService returned a bad file descriptor, retrying");
+ log::warn!(
+ "VpnService returned a bad file descriptor, retrying ({}/{})",
+ retry,
+ MAX_PREPARE_TUN_ATTEMPTS
+ );
}
_ => return Err(Error::DuplicateTunFd(error)),
},