gsadmin/desktop-edge-win
1
0
Fork 0
mirror of https://github.com/openziti/desktop-edge-win.git synced 2026-10-14 00:29:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #171 from openziti/release-1.2.13-tweaks

Browse Source 
Release 1.2.13 tweaks
This commit is contained in:
dovholuknf
2020-10-29 10:06:07 -04:00
committed by GitHub
parent e13ceb564f c18137a8b2
commit 03148d65e5
14 changed files with 172 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
service/build.bat
+15 -1
View File
@@ -1,4 +1,18 @@
@echo off
REM Copyright NetFoundry, Inc.
REM
REM Licensed under the Apache License, Version 2.0 (the "License");
REM you may not use this file except in compliance with the License.
REM You may obtain a copy of the License at
REM
REM https://www.apache.org/licenses/LICENSE-2.0
REM
REM Unless required by applicable law or agreed to in writing, software
REM distributed under the License is distributed on an "AS IS" BASIS,
REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
REM See the License for the specific language governing permissions and
REM limitations under the License.
REM
set CURDIR=%CD%
set SVC_ROOT_DIR=%~dp0
@@ -41,7 +55,7 @@ cd %SVC_ROOT_DIR%
SET REPO_URL=https://github.com/openziti/ziti-tunneler-sdk-c.git
SET ZITI_TUNNEL_REPO_BRANCH=v0.6.11
SET TUNNELER_SDK_DIR=%SVC_ROOT_DIR%deps\ziti-tunneler-sdk-c\
SET CGO_CFLAGS=-DNOGDI -O3 -g3 -I %TUNNELER_SDK_DIR%install\include
SET CGO_CFLAGS=-DNOGDI -I %TUNNELER_SDK_DIR%install\include
SET CGO_LDFLAGS=-L %TUNNELER_SDK_DIR%install\lib
if exist %SVC_ROOT_DIR%ziti.dll (
service/cziti/cbuff.go
+17
View File
@@ -1,3 +1,20 @@
/*
* Copyright NetFoundry, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package cziti
var cbuff = make([][]byte, MaxDnsRequests)
service/cziti/dns-proxy.go
+10 -3
View File
@@ -183,7 +183,9 @@ func runListener(ip *net.IP, port int, reqch chan dnsreq) {
log.Panicf("An unexpected and unrecoverable error has occurred while %s: %v", "reading a udp message", err)
}
}
if len(reqch) == cap(reqch) {
log.Warn("DNS req will be blocked. If this warning is continuously displayed please report")
}
reqch <- dnsreq{
q: b[:nb],
s: server,
@@ -203,6 +205,9 @@ type proxiedReq struct {
}
func proxyDNS(req *dns.Msg, peer *net.UDPAddr, serv *net.UDPConn, ipVer int) {
if len(proxiedRequests) == cap(proxiedRequests) {
log.Warn("proxiedRequests will be blocked. If this warning is continuously displayed please report")
}
proxiedRequests <- &proxiedReq{
req: req,
peer: peer,
@@ -224,10 +229,9 @@ func dnsPanicRecover(localDnsServers []net.IP) {
}
func runDNSproxy(upstreamDnsServers []string, localDnsServers []net.IP) {
log.Infof("restarting DNS proxy")
log.Infof("starting DNS proxy upstream: %v, local: %v", upstreamDnsServers, localDnsServers)
domains = GetConnectionSpecificDomains()
log.Infof("ConnectionSpecificDomains: %v", domains)
log.Infof("dnsServers: %v", upstreamDnsServers)
defer func() {
if err := recover(); err != nil {
log.Errorf("Recovering from panic due to DNS-related issue. %v", err)
@@ -279,6 +283,9 @@ func runDNSproxy(upstreamDnsServers []string, localDnsServers []net.IP) {
log.Warnf("odd error: %v", err)
}
} else {
if len(respChan) == cap(respChan) {
log.Warn("respChan will be blocked. If this warning is continuously displayed please report")
}
respChan <- resp[:n]
}
}
service/cziti/windns.go
+16 -14
View File
@@ -110,7 +110,7 @@ func ReplaceDNS(ips []net.IP) {
}
ipsAsString := strings.Join(ipsStrArr, ",")
log.Infof("Injecting DNS servers [%s] onto interfaces", ipsAsString)
log.Infof("injecting DNS servers [%s] onto interfaces", ipsAsString)
script := fmt.Sprintf(`$dnsinfo=Get-DnsClientServerAddress
$dnsIps=@(%s)
@@ -119,31 +119,33 @@ $dnsIps=@(%s)
$IPv4=2
$IPv6=23
$dnsPerInterface = @{}
$dnsUpdates = @{}
foreach ($dns in $dnsinfo)
{
if($dnsPerInterface[$dns.InterfaceIndex] -eq $null) {
$dnsPerInterface[$dns.InterfaceIndex]=[System.Collections.ArrayList]@()
} else {
if($dnsUpdates[$dns.InterfaceIndex] -eq $null) { $dnsUpdates[$dns.InterfaceIndex]=[System.Collections.ArrayList]@() }
if($dns.AddressFamily -eq $IPv6) {
$dnsServers=$dns.ServerAddresses
$ArrList=[System.Collections.ArrayList]@($dnsServers)
foreach ($dnsIp in $dnsIps)
{
if(($dnsServers -ne $null) -and ($ArrList.Contains($dnsIp)) ) {
# uncomment when debugging echo ($dns.InterfaceAlias + " IPv4 already contains ${dnsIp}")
$dnsUpdates[$dns.InterfaceIndex].AddRange($ArrList)
}
elseif($dns.AddressFamily -eq $IPv4){
$dnsServers=$dns.ServerAddresses
$ArrList=[System.Collections.ArrayList]@($dnsServers)
foreach($d in $dnsIps) {
if(($dnsServers -ne $null) -and ($dnsServers.Contains($d)) ) {
# uncomment when debugging echo ($dns.InterfaceAlias + " IPv4 already contains 127.0.0.1")
} else {
$ArrList.Insert(0, $dnsIp)
$ArrList.Insert(0,$d)
}
}
$dnsPerInterface[$dns.InterfaceIndex].AddRange($ArrList)
$dnsUpdates[$dns.InterfaceIndex].AddRange($ArrList)
}
}
foreach ($key in $dnsPerInterface.Keys)
foreach ($key in $dnsUpdates.Keys)
{
$dnsServers=$dnsPerInterface[$key]
Set-DnsClientServerAddress -InterfaceIndex $key -ServerAddresses ($dnsServers)
Set-DnsClientServerAddress -InterfaceIndex $key -ServerAddresses ($dnsUpdates[$key])
}`, ipsAsString)
cmd := exec.Command("powershell", "-Command", script)
service/publish.bat
+14
View File
@@ -1,4 +1,18 @@
@echo off
REM Copyright NetFoundry, Inc.
REM
REM Licensed under the Apache License, Version 2.0 (the "License");
REM you may not use this file except in compliance with the License.
REM You may obtain a copy of the License at
REM
REM https://www.apache.org/licenses/LICENSE-2.0
REM
REM Unless required by applicable law or agreed to in writing, software
REM distributed under the License is distributed on an "AS IS" BASIS,
REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
REM See the License for the specific language governing permissions and
REM limitations under the License.
REM
set CURDIR=%CD%
set SVC_ROOT_DIR=%~dp0
service/publish.bat.swp
BIN
View File
Binary file not shown.
service/quick.bat
+15
View File
@@ -1 +1,16 @@
@echo off
REM Copyright NetFoundry, Inc.
REM
REM Licensed under the Apache License, Version 2.0 (the "License");
REM you may not use this file except in compliance with the License.
REM You may obtain a copy of the License at
REM
REM https://www.apache.org/licenses/LICENSE-2.0
REM
REM Unless required by applicable law or agreed to in writing, software
REM distributed under the License is distributed on an "AS IS" BASIS,
REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
REM See the License for the specific language governing permissions and
REM limitations under the License.
REM
call build quick
service/reset-nw.bat
-1
View File
@@ -1 +0,0 @@
get-netipinterface | ForEach-Object { Set-DnsClientServerAddress -InterfaceIndex $_.ifIndex -ResetServerAddresses}
service/reset-nw.ps1
+15
View File
@@ -0,0 +1,15 @@
# Copyright NetFoundry, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
get-netipinterface | ForEach-Object { Set-DnsClientServerAddress -InterfaceIndex $_.ifIndex -ResetServerAddresses}
service/set-env.bat
+18 -3
View File
@@ -1,4 +1,19 @@
set SVC_ROOT_DIR=%~dp0
SET TUNNELER_SDK_DIR=%SVC_ROOT_DIR%deps\ziti-tunneler-sdk-c\
SET CGO_CFLAGS=-DNOGDI -I %TUNNELER_SDK_DIR%install\include
@echo off
REM Copyright NetFoundry, Inc.
REM
REM Licensed under the Apache License, Version 2.0 (the "License");
REM you may not use this file except in compliance with the License.
REM You may obtain a copy of the License at
REM
REM https://www.apache.org/licenses/LICENSE-2.0
REM
REM Unless required by applicable law or agreed to in writing, software
REM distributed under the License is distributed on an "AS IS" BASIS,
REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
REM See the License for the specific language governing permissions and
REM limitations under the License.
REM
set SVC_ROOT_DIR=%~dp0
SET TUNNELER_SDK_DIR=%SVC_ROOT_DIR%deps\ziti-tunneler-sdk-c\
SET CGO_CFLAGS=-DNOGDI -I %TUNNELER_SDK_DIR%install\include
SET CGO_LDFLAGS=-L %TUNNELER_SDK_DIR%install\lib
service/ziti-tunnel/api/api.go
+17
View File
@@ -1,3 +1,20 @@
/*
* Copyright NetFoundry, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package api
import (
service/ziti-tunnel/constants/consts.go
+17 -2
View File
@@ -1,3 +1,20 @@
/*
* Copyright NetFoundry, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package constants
const(
@@ -5,6 +22,4 @@ const(
Ipv4MaxMask = 8
Ipv4MinMask = 28
Ipv4DefaultMask = 24
DnsIpv4Default = "127.0.0.1"
)
service/ziti-tunnel/service/state.go
+1 -1
View File
@@ -155,7 +155,7 @@ func (t *RuntimeState) CreateTun(ipv4 string, ipv4mask int) (net.IP, error) {
if err != nil {
return nil, fmt.Errorf("failed to set IP address to %v: (%v)", ip, err)
}
dnsServers := []net.IP{ ip }
log.Infof("adding DNS servers to TUN: %s", dnsServers)
service/ziti-tunnel/util/detect-ip-changes.go
+17
View File
@@ -1,3 +1,20 @@
/*
* Copyright NetFoundry, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package util
import (