From 6ee2d505468cd130cdb8873d1d3dbaba9ae37524 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Thu, 11 Mar 2021 13:32:29 -0500 Subject: [PATCH] ok - really fix the netifAddroute this time --- service/cziti/ctun.go | 4 ++-- service/cziti/dns.go | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/service/cziti/ctun.go b/service/cziti/ctun.go index 64e25470..006c4a9f 100644 --- a/service/cziti/ctun.go +++ b/service/cziti/ctun.go @@ -290,7 +290,7 @@ func netifAddRoute(_ C.netif_handle, dest *C.char) C.int { return 1 } - _ = dnsMgrPrivate.tun.AddRoute(*cidr, dnsip, 1) + _ = goapi.AddRoute(*cidr, dnsip, 1) } else { log.Debugf("route appears to be an IP (not CIDR): %s", routeAsString) @@ -299,7 +299,7 @@ func netifAddRoute(_ C.netif_handle, dest *C.char) C.int { log.Errorf("An error occurred while parsing IP: %s", routeAsString) return 1 } - _ = dnsMgrPrivate.tun.AddRoute(net.IPNet{IP: ip, Mask: net.IPMask{255, 255, 255, 255}}, dnsip, 1) + _ = goapi.AddRoute(net.IPNet{IP: ip, Mask: net.IPMask{255, 255, 255, 255}}, dnsip, 1) } return 0 } diff --git a/service/cziti/dns.go b/service/cziti/dns.go index 41ecc4c7..c029b04d 100644 --- a/service/cziti/dns.go +++ b/service/cziti/dns.go @@ -21,7 +21,6 @@ import "C" import ( "encoding/binary" "fmt" - "github.com/openziti/desktop-edge-win/service/ziti-tunnel/api" "net" "strings" "sync" @@ -43,7 +42,6 @@ type dnsImpl struct { ipCount uint32 serviceMap map[string]*ctxService hostnameMap map[string]*ctxIp - tun api.DesktopEdgeIface } func (dns *dnsImpl) ApplyDNS(dnsNameToReg string, ip string) {