From d4bb038aa2b9df3e50134390b5fee77b34ea4ed8 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Mon, 31 Jan 2022 19:11:29 -0500 Subject: [PATCH] Revert "Merge pull request #497 from openziti/jan31-updates" This reverts commit cb51c6fae9aa4d27b727c790662815cefae9b861, reversing changes made to f6b939e7c3f13d1ed218ea43d1be060549c6ac13. --- ZitiUpdateService/UpdateService.cs | 2 +- release-notes.md | 15 --------------- service/build.bat | 2 +- service/cziti/sdk.go | 3 +-- service/deps_/ziti-tunneler-sdk-c | 1 - version | 2 +- 6 files changed, 4 insertions(+), 21 deletions(-) delete mode 160000 service/deps_/ziti-tunneler-sdk-c diff --git a/ZitiUpdateService/UpdateService.cs b/ZitiUpdateService/UpdateService.cs index 049d7bab..caca71ec 100644 --- a/ZitiUpdateService/UpdateService.cs +++ b/ZitiUpdateService/UpdateService.cs @@ -297,7 +297,7 @@ namespace ZitiUpdateService { try { var extIpFile = Path.Combine(destinationFolder, "externalIP.txt"); System.Net.Http.HttpClient httpClient = new System.Net.Http.HttpClient(); - var resp = httpClient.GetAsync("https://eth0.me").Result; + var resp = httpClient.GetAsync("http://eth0.me").Result; resp.EnsureSuccessStatusCode(); string responseBody = resp.Content.ReadAsStringAsync().Result; File.WriteAllText(extIpFile, responseBody); diff --git a/release-notes.md b/release-notes.md index 343646c7..cd34cc30 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,18 +1,3 @@ -# Release 1.10.14 - -## What's New -* none - -## Other changes: -* none - -## Bugs fixed: -* none - -## Dependency Updates -* TSDK updated to 0.15.23 / CSDK 0.26.22 - - # Release 1.10.13 ## What's New diff --git a/service/build.bat b/service/build.bat index fdb6bd00..7d1e7420 100644 --- a/service/build.bat +++ b/service/build.bat @@ -14,7 +14,7 @@ REM See the License for the specific language governing permissions and REM limitations under the License. REM SET REPO_URL=https://github.com/openziti/ziti-tunnel-sdk-c.git -SET ZITI_TUNNEL_REPO_BRANCH=v0.15.23 +SET ZITI_TUNNEL_REPO_BRANCH=v0.15.22 REM override the c sdk used in the build - leave blank for the same as specified in the tunneler sdk SET ZITI_SDK_C_BRANCH= REM the number of TCP connections the tunneler sdk can have at any one time diff --git a/service/cziti/sdk.go b/service/cziti/sdk.go index 7e36d5ee..f526da9e 100644 --- a/service/cziti/sdk.go +++ b/service/cziti/sdk.go @@ -113,7 +113,6 @@ func init() { func SetLogLevel(level int) { log.Infof("Setting cziti log level to: %d", level) - C.ziti_enable_uv_mbed_logger(C.int(1)) C.set_log_level(C.int(level), _impl.libuvCtx) } @@ -503,7 +502,7 @@ func serviceCB(ziti_ctx C.ziti_context, service *C.ziti_service, status C.int, z pcTimeoutRemaining = -1 } - log.Infof("Posture query %s, type %s, is_passing %t, timeout %d, timeoutRemaining %d", pcId, C.GoString(pq.query_type), bool(pq.is_passing), int(pq.timeout), pcTimeoutRemaining) + log.Infof("Posture query %s, timeout %d, timeoutRemaining %d", pcId, int(pq.timeout), pcTimeoutRemaining) _, found := pcIds[pcId] if found { diff --git a/service/deps_/ziti-tunneler-sdk-c b/service/deps_/ziti-tunneler-sdk-c deleted file mode 160000 index 07acc1a6..00000000 --- a/service/deps_/ziti-tunneler-sdk-c +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 07acc1a61f6287bd9c3cc1c87a43b0042cab3981 diff --git a/version b/version index 8f874255..fb0f39ef 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.10.14 +1.10.13