From a52ab9103f276a19d34b680841706e78f9bc7000 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 12 Jan 2021 16:15:23 -0500 Subject: [PATCH 1/4] try a release which also flushes the dns --- service/cziti/dns-proxy.go | 1 + service/cziti/windns.go | 14 ++++++++++++++ 2 files changed, 15 insertions(+) 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 From 8a606b2d67219a051648259363aeca7789338eee Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 12 Jan 2021 21:27:31 +0000 Subject: [PATCH 2/4] [ci skip] committing updated version related files --- service/ziti-tunnel/version.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index 79f75c36..e2de17d3 100644 --- a/service/ziti-tunnel/version.go +++ b/service/ziti-tunnel/version.go @@ -21,8 +21,8 @@ package main const ( Version = "1.6.28" - Revision = "83bef5a93915" - Branch = "release-1.6.28" + Revision = "edf2e5231862" + Branch = "release-1.6.29" BuildUser = "" - BuildDate = "2021-01-12 20:48:03" + BuildDate = "2021-01-12 21:21:11" ) From 5a294f2295b92432da31a40cbde11418ccc0567b Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 12 Jan 2021 16:28:38 -0500 Subject: [PATCH 3/4] missed the version file again! lol --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 10010a4b..69e4e621 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.6.28 +1.6.29 From 8de024b02aca820c3d6b514b5e37825e8a7f422d Mon Sep 17 00:00:00 2001 From: ziti-ci Date: Tue, 12 Jan 2021 21:45:51 +0000 Subject: [PATCH 4/4] [ci skip] committing updated version related files --- DesktopEdge/Properties/AssemblyInfo.cs | 6 +++--- Installer/ZitiDesktopEdge.aip | 4 ++-- ZitiUpdateService/Properties/AssemblyInfo.cs | 6 +++--- service/ziti-tunnel/version.go | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) 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/ziti-tunnel/version.go b/service/ziti-tunnel/version.go index e2de17d3..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 = "edf2e5231862" + Version = "1.6.29" + Revision = "f0f63d31f3be" Branch = "release-1.6.29" BuildUser = "" - BuildDate = "2021-01-12 21:21:11" + BuildDate = "2021-01-12 21:39:24" )