From e7ae9c8afe26b349cb037e9104823c3acd72cd67 Mon Sep 17 00:00:00 2001
From: dovholuknf <46322585+dovholuknf@users.noreply.github.com>
Date: Thu, 11 Jun 2020 15:32:46 -0400
Subject: [PATCH] minor updates to build etc

---
 service/build.bat                    | 22 +++++++------
 service/publish.bat                  |  4 ++-
 service/quick-build.bat              | 46 ----------------------------
 service/ziti-tunnel/service/state.go |  4 ---
 4 files changed, 16 insertions(+), 60 deletions(-)
 delete mode 100644 service/quick-build.bat

diff --git a/service/build.bat b/service/build.bat
index ba878c9f..4f5d1196 100644
--- a/service/build.bat
+++ b/service/build.bat
@@ -7,6 +7,7 @@ set GO111MODULE=on
 cd /d %ZITI_TUNNEL_WIN_ROOT%
 
 IF "%BUILD_VERSION%"=="" GOTO BUILD_VERSION_ERROR
+IF "%1"=="quick" GOTO QUICK
 
 echo fetching ziti-ci
 call %SVC_ROOT_DIR%/../get-ziti-ci.bat
@@ -15,10 +16,11 @@ ziti-ci version
 echo generating version info - this will pushed from publish.bat in CI
 ziti-ci generate-build-info --useVersion=false %SVC_ROOT_DIR%/ziti-tunnel/version.go main
 
-cd service
+:QUICK
+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=5s-moving-avg
 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
@@ -81,20 +83,20 @@ if not exist %SVC_ROOT_DIR%ziti.dll (
         goto FAIL
     )
 
-    echo changing back to %BEFORE_GIT%
-    cd %BEFORE_GIT%
-
     if not exist %TUNNELER_SDK_DIR%build mkdir %TUNNELER_SDK_DIR%build
     if not exist %TUNNELER_SDK_DIR%install mkdir %TUNNELER_SDK_DIR%install
 
     cmake -G Ninja -S %TUNNELER_SDK_DIR% -B %TUNNELER_SDK_DIR%build -DCMAKE_INSTALL_PREFIX=%TUNNELER_SDK_DIR%install
     cmake --build %TUNNELER_SDK_DIR%build --target install
-    if %ERRORLEVEL% GEQ 1 (
-        SET ACTUAL_ERR=%ERRORLEVEL%
+    SET ACTUAL_ERR=%ERRORLEVEL%
+    if %ACTUAL_ERR% NEQ 0 (
         echo.
         echo Build of %TUNNELER_SDK_DIR%build failed
         echo.
         goto FAIL
+    ) else (
+        echo.
+        echo result of ninja build: %ACTUAL_ERR%
     )
 
     cp %TUNNELER_SDK_DIR%install\lib\ziti.dll %SVC_ROOT_DIR%
@@ -109,14 +111,16 @@ if not exist %SVC_ROOT_DIR%ziti.dll (
 )
 
 go build -a ./ziti-tunnel
-if %ERRORLEVEL% GEQ 1 (
-    SET ACTUAL_ERR=%ERRORLEVEL%
+SET ACTUAL_ERR=%ERRORLEVEL%
+if %ACTUAL_ERR% NEQ 0 (
     echo.
     echo Building ziti-tunnel failed
     echo.
     goto FAIL
 )
 
+IF "%1"=="quick" GOTO END
+
 echo creating the distribution zip file
 zip ziti-tunnel-win.zip *.dll ziti*exe
 
diff --git a/service/publish.bat b/service/publish.bat
index 7ed5987d..98a75894 100644
--- a/service/publish.bat
+++ b/service/publish.bat
@@ -1,4 +1,5 @@
 @echo off
+set CURDIR=%CD%
 set SVC_ROOT_DIR=%~dp0
 
 set /p BUILD_VERSION=<%SVC_ROOT_DIR%..\version
@@ -34,4 +35,5 @@ git commit -m "[ci skip] committing updated version information"
 git push
 @echo git push complete: %ERRORLEVEL%
 
-@echo publish script has completed
\ No newline at end of file
+cd %CURDIR%
+@echo publish script has completed
diff --git a/service/quick-build.bat b/service/quick-build.bat
deleted file mode 100644
index c0459182..00000000
--- a/service/quick-build.bat
+++ /dev/null
@@ -1,46 +0,0 @@
-@echo off
-SET CURDIR=%CD%
-set SVC_ROOT_DIR=%~dp0
-set ZITI_TUNNEL_WIN_ROOT=%SVC_ROOT_DIR%..\
-cd %ZITI_TUNNEL_WIN_ROOT%
-
-SET REPO_URL=https://github.com/openziti/ziti-tunneler-sdk-c.git
-SET REPO_BRANCH=update-submodule-to-https-vs-git
-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
-mkdir %TUNNELER_SDK_DIR%
-
-if not exist %SVC_ROOT_DIR%ziti.dll (
-    if not exist %TUNNELER_SDK_DIR%\build mkdir %TUNNELER_SDK_DIR%\build
-    if not exist %TUNNELER_SDK_DIR%\install mkdir %TUNNELER_SDK_DIR%\install
-
-    cmake -G Ninja -S %TUNNELER_SDK_DIR% -B %TUNNELER_SDK_DIR%\build -DCMAKE_INSTALL_PREFIX=%TUNNELER_SDK_DIR%\install
-    cmake --build %TUNNELER_SDK_DIR%\build --target install
-
-    echo ERROR LEVEL: %ERRORLEVEL%
-    echo ERROR LEVEL: %ERRORLEVEL%
-    echo ERROR LEVEL: %ERRORLEVEL%
-    echo ERROR LEVEL: %ERRORLEVEL%
-    echo ERROR LEVEL: %ERRORLEVEL%
-
-    cp %TUNNELER_SDK_DIR%\install\lib\ziti.dll %SVC_ROOT_DIR%
-    cp %TUNNELER_SDK_DIR%\install\lib\libuv.dll %SVC_ROOT_DIR%
-
-    @echo COPIED dlls to %SVC_ROOT_DIR%
-    cd %SVC_ROOT_DIR%
-) else (
-    @echo ------------------------------------------------------------------------------
-    @echo SKIPPED BUILDING ziti.dll because ziti.dll was found at %SVC_ROOT_DIR%ziti.dll
-    @echo ------------------------------------------------------------------------------
-)
-
-cd /d %SVC_ROOT_DIR%
-go build -a ./ziti-tunnel
-if %ERRORLEVEL% GEQ 1 (
-    cd /d %CURDIR%
-    EXIT /B %ERRORLEVEL%
-)
-
-:END
-cd /d %CURDIR%
\ No newline at end of file
diff --git a/service/ziti-tunnel/service/state.go b/service/ziti-tunnel/service/state.go
index e976ff1e..e69c9c75 100644
--- a/service/ziti-tunnel/service/state.go
+++ b/service/ziti-tunnel/service/state.go
@@ -230,10 +230,6 @@ func noZiti() bool {
 
 func (t *RuntimeState) Close() {
 	if t.tun != nil {
-		log.Debug("TODO: actually close the tun - or disable all the identities etc.")
-		/*
-			cziti.Stop()
-		*/
 		tu := *t.tun
 		err := tu.Close()
 		if err != nil {