Merge pull request #293 from openziti/release-1.6.29

flushes the dns when setting up dns

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")]

Installer/ZitiDesktopEdge.aip

@@ -22,10 +22,10 @@
     <ROW Property="CTRLS" Value="2"/>
     <ROW Property="Manufacturer" Value="NetFoundry, Inc."/>
     <ROW Property="MsiLogging" MultiBuildValue="AnyCPU_Release:vp"/>
-    <ROW Property="ProductCode" Value="1033:{E7E502E6-7CA7-4DF5-8C75-973586320096} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{D1B9DA4D-98E7-48A3-844D-C4EC0F387A54} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Ziti Desktop Edge"/>
-    <ROW Property="ProductVersion" Value="1.6.28" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.6.29" Type="32"/>
     <ROW Property="REBOOT" MultiBuildValue="AnyCPU_Release:Suppress"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{CB7E173A-663D-4A23-BB22-D1E8D885C2F3}"/>

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")]

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)

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)
+	}
+}

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"
 )

version

@@ -1 +1 @@
-1.6.28
+1.6.29