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

Merge remote-tracking branch 'origin/master' into svc-comms

Browse Source
This commit is contained in:
dovholuknf
2020-04-23 21:37:21 -04:00
parent 9ad0e375a4 10938d08a7
commit 521e2b7e51
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wintun-testing/cziti/cziti-cli/main.go
+3 -3
View File
@@ -38,7 +38,7 @@ func main() {
}
}
var commands = make(map[string]func([]string)error)
var commands = make(map[string]func([]string) error)
func init() {
commands["quit"] = quit
@@ -77,7 +77,7 @@ func quit(_ []string) error {
return nil
}
func help(_[]string) error {
func help(_ []string) error {
fmt.Println("available commands:")
for k, _ := range commands {
fmt.Println("\t", k)
@@ -108,4 +108,4 @@ func list(args []string) error {
fmt.Printf("\t%d:\t%s@%s\n", i, c.Name(), c.Controller())
}
return nil
}
}
wintun-testing/cziti/dns.go
+6 -6
View File
@@ -16,6 +16,7 @@ type DnsManager interface {
DeregisterService(ctx *CZitiCtx, name string)
GetService(ip net.IP, port uint16) (*CZitiCtx, string, error)
}
const defaultCidr = "169.254.0.0"
const defaultMaskBits = 16
@@ -23,7 +24,7 @@ var initOnce = sync.Once{}
var DNS = &dnsImpl{}
type dnsImpl struct {
cidr uint32
cidr uint32
counter uint32
serviceMap map[string]ctxService
@@ -35,7 +36,7 @@ type dnsImpl struct {
}
type ctxService struct {
ctx *CZitiCtx
ctx *CZitiCtx
name string
}
@@ -69,11 +70,11 @@ func (dns *dnsImpl) RegisterService(dnsName string, port uint16, ctx *CZitiCtx,
return nextIp, nil
}
func (dns *dnsImpl)Resolve(dnsName string) net.IP {
func (dns *dnsImpl) Resolve(dnsName string) net.IP {
return dns.hostnameMap[dnsName]
}
func (dns *dnsImpl)DeregisterService(ctx *CZitiCtx, name string) {
func (dns *dnsImpl) DeregisterService(ctx *CZitiCtx, name string) {
for k, sc := range dns.serviceMap {
if sc.ctx == ctx && sc.name == name {
delete(dns.serviceMap, k)
@@ -82,7 +83,7 @@ func (dns *dnsImpl)DeregisterService(ctx *CZitiCtx, name string) {
}
}
func (this *dnsImpl)GetService(ip net.IP, port uint16) (*CZitiCtx, string, error) {
func (this *dnsImpl) GetService(ip net.IP, port uint16) (*CZitiCtx, string, error) {
ipv4 := binary.BigEndian.Uint32(ip)
dns, found := this.ipMap[ipv4]
if !found {
@@ -108,4 +109,3 @@ func DnsInit(ip string, maskBits int) {
DNS.counter = 2
})
}