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

Merge pull request #429 from openziti/move-the-pointer

Browse Source 
before continuing - move the pointer to avoid the inf. loop
This commit is contained in:
dovholuknf
2021-08-27 15:59:54 -04:00
committed by GitHub
parent db0827a7e8 1cdcb92c93
commit 21ba076d4a
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
service/cziti/sdk.go
+1 -2
View File
@@ -425,6 +425,7 @@ func serviceCB(ziti_ctx C.ziti_context, service *C.ziti_service, status C.int, z
if C.GoString(pqs.policy_type) == "Bind" {
log.Tracef("Posture Query set returned a Bind policy: %s [ignored]", C.GoString(pqs.policy_id))
// posture check does not consider bind policies
it = C.model_map_it_next(it)
continue
} else {
log.Tracef("Posture Query set returned a %s policy: %s, is_passing %t", C.GoString(pqs.policy_type), C.GoString(pqs.policy_id), pqs.is_passing)
@@ -486,7 +487,6 @@ func serviceCB(ziti_ctx C.ziti_context, service *C.ziti_service, status C.int, z
it = C.model_map_it_next(it)
}
//find all posture checks sets...
for setIdx := 0; true; setIdx++ {
pqs := C.posture_query_set_get(service.posture_query_set, C.int(setIdx))
@@ -494,7 +494,6 @@ func serviceCB(ziti_ctx C.ziti_context, service *C.ziti_service, status C.int, z
break
}
}
svc = &dto.Service{
service/ziti-tunnel/service/ipc.go
+2 -2
View File
@@ -1207,9 +1207,9 @@ func broadcastNotification() {
var notificationMaxTimeout int32 = -1
switch mfaState := id.CId.GetMFAState(int32((constants.MaximumFrequency + rts.state.NotificationFrequency) * 60)); mfaState {
case constants.MfaAllSvcTimeout:
notificationMessage = fmt.Sprintf("All of the services of identity %s are timed out", id.Name)
notificationMessage = fmt.Sprintf("All of the services of identity %s have timed out", id.Name)
case constants.MfaFewSvcTimeout:
notificationMessage = fmt.Sprintf("Some of the services of identity %s are timed out", id.Name)
notificationMessage = fmt.Sprintf("Some of the services of identity %s have timed out", id.Name)
case constants.MfaNearingTimeout:
notificationMinTimeout = id.CId.GetRemainingTime(id.CId.MfaMinTimeout, id.CId.MfaMinTimeoutRem)
notificationMessage = fmt.Sprintf("Some of the services of identity %s are timing out in %s", id.Name, secondsToReadableFmt(notificationMinTimeout))