From 91d7b2692441459d426b0cbc4fd64dcc4e91f22d Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Fri, 20 Nov 2020 21:11:55 -0500 Subject: [PATCH] update release notes and commit the mask changes --- release-notes.md | 22 +++++++++++++++++++++- service/ziti-tunnel/constants/consts.go | 2 +- service/ziti-tunnel/service/ipc.go | 2 +- service/ziti-tunnel/service/state.go | 5 +++++ 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/release-notes.md b/release-notes.md index d3d549f2..09954ed0 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,4 +1,24 @@ -# Release 1.4.3 +# Release 1.4.5 + +## What's New +* closes #216 - The big change is that the big button now will send a message to the monitor service which will have the proper rights to stop and start the data service (`ziti`). + +## Other changes: +* Changed the default mask to /10 as to not be different +* Changed the minimum allowable mask to be /16 +* Migrate any masks > /16 to /16 +* fixes #220 - Alphabetize the service list + +## Bugs fixed: +* fixes #221 - Cleanup previous update files +* fixes #218 - 0 length config cause panic +* fixes #211 - segv on hosted service + +## Dependency Updates +* update to github.com/openziti/sdk-golang v0.14.12 + +# Release 1.4.4 +(skipped 1.4.3 by mistake) ## What's New diff --git a/service/ziti-tunnel/constants/consts.go b/service/ziti-tunnel/constants/consts.go index 3da9d869..02961102 100644 --- a/service/ziti-tunnel/constants/consts.go +++ b/service/ziti-tunnel/constants/consts.go @@ -20,6 +20,6 @@ package constants const( Ipv4ip = "100.64.0.1" Ipv4MaxMask = 8 - Ipv4MinMask = 24 + Ipv4MinMask = 16 Ipv4DefaultMask = 10 ) \ No newline at end of file diff --git a/service/ziti-tunnel/service/ipc.go b/service/ziti-tunnel/service/ipc.go index ab8c97ad..5d75df94 100644 --- a/service/ziti-tunnel/service/ipc.go +++ b/service/ziti-tunnel/service/ipc.go @@ -104,7 +104,7 @@ func SubMain(ops chan string, changes chan<- svc.Status) error { _ = logging.Elog.Info(InformationEvent, SvcName+" status set to running") log.Info(SvcName + " status set to running. starting cancel loop") - rts.SaveState() + rts.SaveState() //if we get this far it means things seem to be working. backup the config waitForStopRequest(ops) diff --git a/service/ziti-tunnel/service/state.go b/service/ziti-tunnel/service/state.go index 6a3c842e..bc4cf6a4 100644 --- a/service/ziti-tunnel/service/state.go +++ b/service/ziti-tunnel/service/state.go @@ -262,6 +262,11 @@ func (t *RuntimeState) LoadConfig() { //any specific code needed when starting the process. some values need to be cleared TunStarted = time.Now() //reset the time on startup + + if rts.state.TunIpv4Mask > constants.Ipv4MinMask { + log.Warnf("provided mask: [%d] is smaller than the minimum permitted: [%d] and will be changed", rts.state.TunIpv4Mask, constants.Ipv4MinMask) + rts.UpdateIpv4Mask(constants.Ipv4MinMask) + } } func readConfig(t *RuntimeState, filename string) error {