diff --git a/DesktopEdge/Properties/AssemblyInfo.cs b/DesktopEdge/Properties/AssemblyInfo.cs index 47026af6..dfa4cdd1 100644 --- a/DesktopEdge/Properties/AssemblyInfo.cs +++ b/DesktopEdge/Properties/AssemblyInfo.cs @@ -50,6 +50,6 @@ using System.Windows; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -// [assembly: AssemblyVersion("1.6.28.0")] -[assembly: AssemblyVersion("1.6.28.0")] -[assembly: AssemblyFileVersion("1.6.28.0")] +// [assembly: AssemblyVersion("1.6.29.0")] +[assembly: AssemblyVersion("1.6.29.0")] +[assembly: AssemblyFileVersion("1.6.29.0")] diff --git a/Installer/ZitiDesktopEdge.aip b/Installer/ZitiDesktopEdge.aip index 45e5fc0d..54bac852 100644 --- a/Installer/ZitiDesktopEdge.aip +++ b/Installer/ZitiDesktopEdge.aip @@ -22,10 +22,10 @@ - + - + diff --git a/ZitiUpdateService/Properties/AssemblyInfo.cs b/ZitiUpdateService/Properties/AssemblyInfo.cs index f107a650..9798b236 100644 --- a/ZitiUpdateService/Properties/AssemblyInfo.cs +++ b/ZitiUpdateService/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -// [assembly: AssemblyVersion("1.6.28.0")] -[assembly: AssemblyVersion("1.6.28.0")] -[assembly: AssemblyFileVersion("1.6.28.0")] +// [assembly: AssemblyVersion("1.6.29.0")] +[assembly: AssemblyVersion("1.6.29.0")] +[assembly: AssemblyFileVersion("1.6.29.0")] diff --git a/service/cziti/dns-proxy.go b/service/cziti/dns-proxy.go index 33b474a6..e73aa905 100644 --- a/service/cziti/dns-proxy.go +++ b/service/cziti/dns-proxy.go @@ -224,6 +224,7 @@ func dnsPanicRecover(localDnsServers []net.IP) { } func runDNSproxy(upstreamDnsServers []string, localDnsServers []net.IP) { + FlushDNS() //do this in case the services come back in different order and the ip returned is no longer the same log.Infof("starting DNS proxy upstream: %v, local: %v", upstreamDnsServers, localDnsServers) domains = GetConnectionSpecificDomains() log.Infof("ConnectionSpecificDomains: %v", domains) diff --git a/service/cziti/windns.go b/service/cziti/windns.go index a7881caf..bd3b2263 100644 --- a/service/cziti/windns.go +++ b/service/cziti/windns.go @@ -157,3 +157,17 @@ foreach ($key in $dnsUpdates.Keys) log.Errorf("ERROR resetting DNS (%v)", err) } } + +func FlushDNS() { + log.Info("flushing DNS cache using ipconfig /flushdns") + script := `ipconfig /flushdns` + + cmd := exec.Command("cmd", "-Command", script) + cmd.Stderr = os.Stdout + cmd.Stdout = os.Stdout + + err := cmd.Run() + if err != nil { + log.Errorf("ERROR flushing DNS: %v", err) + } +} \ No newline at end of file diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index 49f459ba..ff08f037 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -20,9 +20,9 @@ package main const ( - Version = "1.6.28" - Revision = "451b83e4ed10" - Branch = "release-1.6.28" + Version = "1.6.29" + Revision = "f0f63d31f3be" + Branch = "release-1.6.29" BuildUser = "" - BuildDate = "2021-01-12 21:38:11" + BuildDate = "2021-01-12 21:39:24" ) diff --git a/version b/version index 10010a4b..69e4e621 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.6.28 +1.6.29