Merge pull request #92 from play-iot/release/vpnc/0.9.5

Release/vpnc/0.9.5

Author: zero88

cli/CHANGELOG-VPNC.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [v0.9.5](https://github.com/play-iot/iot-vpn/tree/vpnc/v0.9.5) (2021-06-14)
+
+### Changes
+
+- Resolve [#85](https://github.com/play-iot/iot-vpn/issues/85)
+- Resolve [#86](https://github.com/play-iot/iot-vpn/issues/86)
+- Resolve [#66](https://github.com/play-iot/iot-vpn/issues/66)
+
 ## [v0.9.4](https://github.com/play-iot/iot-vpn/tree/vpnc/v0.9.4) (2021-06-10)
 
 ### Changes

cli/python/src/client/cmd_client.py

@@ -383,7 +383,7 @@ def lease_vpn_ip(self, account: str, log_lvl=logger.DEBUG):
         loop_interval(lambda: self.get_vpn_status(account)['connected'],
                       'Unable connect VPN. Please check log for more detail', max_retries=3, interval=1)
         nic = self.opts.account_to_nic(account)
-        if not self.device.dns_resolver.is_enable_connman_dhcp():
+        if self.device.dns_resolver.is_connman() and not self.device.dns_resolver.is_enable_connman_dhcp():
             logger.log(logger.WARN, f'Please lease VPN IP manually by ' +
                        f'[{self.device.ip_resolver.lease_ip(account, nic, daemon=True, is_execute=False)}]')
             return

cli/python/src/client/device_resolver.py

@@ -547,7 +547,9 @@ def is_connman(self) -> bool:
         return self.kind is DNSResolverType.CONNMAN
 
     def is_enable_connman_dhcp(self) -> bool:
-        return self.is_connman() and FileHelper.read_file_by_line(self.connman_dhcp, '0').lower() in ('true', 't', '1')
+        yes_ = ('true', 't', 'yes', '1')
+        return self.is_connman() and FileHelper.read_file_by_line(self.connman_dhcp,
+                                                                  fallback_if_not_exists='0').lower() in yes_
 
     def is_dnsmasq_available(self):
         return self.kind.is_dnsmasq() or self._is_dnsmasq