From abc5de51dcbc79025b2500a92ac1490f62d2a692 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Thu, 1 Oct 2020 16:33:03 -0400 Subject: [PATCH] don't use master for tunnel sdk - use tag. better logging again --- service/build.bat | 2 +- service/cziti/sdk.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/service/build.bat b/service/build.bat index c4b51c6c..c3398808 100644 --- a/service/build.bat +++ b/service/build.bat @@ -34,7 +34,7 @@ echo changing to service folder: %SVC_ROOT_DIR% cd %SVC_ROOT_DIR% SET REPO_URL=https://github.com/openziti/ziti-tunneler-sdk-c.git -SET ZITI_TUNNEL_REPO_BRANCH=master +SET ZITI_TUNNEL_REPO_BRANCH=v0.6.7 SET TUNNELER_SDK_DIR=%SVC_ROOT_DIR%deps\ziti-tunneler-sdk-c\ SET CGO_CFLAGS=-DNOGDI -I %TUNNELER_SDK_DIR%install\include SET CGO_LDFLAGS=-L %TUNNELER_SDK_DIR%install\lib diff --git a/service/cziti/sdk.go b/service/cziti/sdk.go index 74c5cd25..1c09b3cd 100644 --- a/service/cziti/sdk.go +++ b/service/cziti/sdk.go @@ -166,7 +166,7 @@ func serviceCB(ziti_ctx C.ziti_context, service *C.ziti_service, status C.int, t name := C.GoString(service.name) svcId := C.GoString(service.id) - log.Debugf("============ INSIDE serviceCB - status: %s:%s - %v, %v, %v ============", name, svcId, status, C.ZITI_SERVICE_UNAVAILABLE, C.ZITI_OK) + log.Debugf("============ INSIDE serviceCB - status: %s:%s - %v, %v ============", name, svcId, status, service.perm_flags) if status == C.ZITI_SERVICE_UNAVAILABLE { found, ok := ctx.Services.Load(svcId) fs := found.(Service) @@ -190,6 +190,7 @@ func serviceCB(ziti_ctx C.ziti_context, service *C.ziti_service, status C.int, t r := C.ziti_service_get_config(service, C.CString("ziti-tunneler-server.v1"), unsafe.Pointer(&v1Config), (*[0]byte)(C.parse_ziti_server_cfg_v1)) if (r == 0) { for _, t := range devMap { + log.Debugf("setting up hosted service for service %s on %v:%v", service.name, v1Config.hostname, v1Config.port) C.ziti_tunneler_host_v1(C.tunneler_context(t.tunCtx), unsafe.Pointer(ctx.zctx), service.name, v1Config.protocol, v1Config.hostname, v1Config.port) } C.free_ziti_server_cfg_v1(&v1Config)