Merge pull request #233 from openziti/tunneler-1.2.0

update tunneler SDK v1.2.0
openziti · Oct 10, 2024 · 835a867 · 835a867
2 parents adc0d02 + a43df24
commit 835a867
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ android = "8.7.0"
 kotlin = "2.0.20"
 
 # ziti projects
-ziti-tunnel-sdk = "2.0.0-alpha27"
+ziti-tunnel-sdk = "1.2.0"
 
 # 3rd part deps
 kotlinx-serialization-json = "1.7.3"

diff --git a/tunnel/src/main/cpp/netif.cpp b/tunnel/src/main/cpp/netif.cpp
@@ -96,10 +96,14 @@ static void netif_read(uv_stream_t *, ssize_t len, const uv_buf_t *b) {
 }
 
 jdouble JNICALL get_up_rate(JNIEnv *, jobject) {
-    return metrics_rate_get(&NETIF.up);
+    double up = 0.0;
+    metrics_rate_get(&NETIF.up, &up);
+    return up;
 }
 jdouble JNICALL get_down_rate(JNIEnv *, jobject) {
-    return metrics_rate_get(&NETIF.down);
+    double down = 0.0;
+    metrics_rate_get(&NETIF.down, &down);
+    return down;
 }
 
 extern int android_netif_do(netif_cmd cmd, int fd) {

diff --git a/tunnel/vcpkg.json b/tunnel/vcpkg.json
@@ -11,5 +11,5 @@
     "json-c"
   ],
   "overrides": [],
-  "builtin-baseline": "1de2026f28ead93ff1773e6e680387643e914ea1"
+  "builtin-baseline": "c82f74667287d3dc386bce81e44964370c91a289"
 }