diff --git a/release-notes.md b/release-notes.md index ad08f3f4..a10ca63d 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,3 +1,15 @@ +# Release 0.0.17 + +* What's New + +* Bug fixes + * [#59](https://github.com/openziti/desktop-edge-win/issues/59) - too many services blocked service from accepting connections from the UI + + +# Release 0.0.16 + +- tracking lost + # Release 0.0.15 * What's New diff --git a/service/ziti-tunnel/service/ipc.go b/service/ziti-tunnel/service/ipc.go index 4e1f4e3f..ca212988 100644 --- a/service/ziti-tunnel/service/ipc.go +++ b/service/ziti-tunnel/service/ipc.go @@ -227,6 +227,11 @@ func initialize(ipv4 string, ipv4mask int) error { } setTunInfo(rts.state, ipv4, ipv4mask) + // connect any identities that are enabled + for _, id := range rts.state.Identities { + connectIdentity(id) + } + log.Debugf("initial state loaded from configuration file") return nil } @@ -690,9 +695,9 @@ func respondWithError(out *json.Encoder, msg string, code int, err error) { } func connectIdentity(id *dto.Identity) { + log.Infof("connecting identity: %s", id.Name) if !id.Connected { - log.Infof("connecting identity: %s", id.Name) //tell the c sdk to use the file from the id and connect rts.LoadIdentity(id) activeIds[id.FingerPrint] = id @@ -726,12 +731,11 @@ func disconnectIdentity(id *dto.Identity) error { if id.Connected { log.Debugf("ranging over services all services to remove intercept and deregister the service") if len(id.Services) < 1 { - log.Infof("identity with fingerprint %s has no services to remove/disconnect/unregister", id.FingerPrint) - } else { - for _, s := range id.Services { - cziti.RemoveIntercept(s.Id) - cziti.DNS.DeregisterService(id.ZitiContext, s.Name) - } + log.Errorf("identity with fingerprint %s has no services?", id.FingerPrint) + } + for _, s := range id.Services { + cziti.RemoveIntercept(s.Id) + cziti.DNS.DeregisterService(id.ZitiContext, s.Name) } id.Connected = false } else { @@ -757,7 +761,7 @@ func removeIdentity(out *json.Encoder, fingerprint string) { rts.RemoveByIdentity(*id) //remove the file from the filesystem - first verify it's the proper file - log.Debugf("removing identity file for fingerprint %s at %s", id.FingerPrint, id.Path()) + log.Debug("removing identity file for fingerprint %s at %s", id.FingerPrint, id.Path()) err = os.Remove(id.Path()) if err != nil { log.Warn("could not remove file: %s", config.Path()+id.FingerPrint+".json") diff --git a/service/ziti-tunnel/service/state.go b/service/ziti-tunnel/service/state.go index a2fb08be..4e86942c 100644 --- a/service/ziti-tunnel/service/state.go +++ b/service/ziti-tunnel/service/state.go @@ -145,6 +145,7 @@ func (t *RuntimeState) CreateTun(ipv4 string, ipv4mask int) error { if ipv4mask < 8 || ipv4mask > 24 { log.Warnf("provided mask is invalid: %d. using default value: %d", ipv4mask, Ipv4mask) ipv4mask = Ipv4mask + rts.UpdateIpv4Mask(ipv4mask) } ip, ipnet, err := net.ParseCIDR(fmt.Sprintf("%s/%d", ipv4, ipv4mask)) if err != nil { diff --git a/version b/version index e3b86dd9..cd231804 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.0.16 +0.0.17