From f92f5d576952ffb58e84157da0fae82eb9c42aa6 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Fri, 29 May 2026 13:35:47 -0500 Subject: [PATCH] Revert "fix(takserver): emit *:-1:stcp contact endpoint so directed TAK-Talk/GeoChat routes over the mesh; SDK v0.5.1" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit landed on main outside the PR process and pins takpacket-sdk 0.5.1, which is not yet published to Maven Central — breaking the build. Reverting to restore a green main; the fix is being re-submitted as a pull request that will merge once 0.5.1 is available on Central. Co-Authored-By: Claude Opus 4.8 (1M context) --- .../kotlin/org/meshtastic/core/takserver/TAKDefaults.kt | 8 +------- gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/core/takserver/src/commonMain/kotlin/org/meshtastic/core/takserver/TAKDefaults.kt b/core/takserver/src/commonMain/kotlin/org/meshtastic/core/takserver/TAKDefaults.kt index 3ac0226d7f..e228bd2673 100644 --- a/core/takserver/src/commonMain/kotlin/org/meshtastic/core/takserver/TAKDefaults.kt +++ b/core/takserver/src/commonMain/kotlin/org/meshtastic/core/takserver/TAKDefaults.kt @@ -24,13 +24,7 @@ import org.meshtastic.proto.User // a single exported data package (containing truststore.p12 + client.p12) works for // both Meshtastic-iOS and Meshtastic-Android without reconfiguration in ATAK/iTAK. internal const val DEFAULT_TAK_PORT = 8089 - -// Default contact endpoint for mesh peers (the real endpoint is never carried over -// LoRa). MUST be the TAK "reply via this server" form `*:-1:stcp`: it makes ATAK route -// directed GeoChat / TAK-Talk (``) back down the Meshtastic server stream. A -// concrete host (e.g. `0.0.0.0:4242:tcp`) makes ATAK attempt a dead direct connection, -// so directed messages never reach the mesh while broadcast PLI still works. -internal const val DEFAULT_TAK_ENDPOINT = "*:-1:stcp" +internal const val DEFAULT_TAK_ENDPOINT = "0.0.0.0:4242:tcp" // Bundled certificate password — matches iOS (`"meshtastic"`). Used for the // server.p12 / client.p12 PKCS#12 files shipped under `tak_certs/` on the classpath. diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 741786c249..c355c41c37 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -88,7 +88,7 @@ kable = "0.43.0" mqttastic = "0.3.6" jmdns = "3.6.3" qrcode-kotlin = "4.5.0" -takpacket-sdk = "0.5.1" +takpacket-sdk = "0.5.0" # Gradle Plugins develocity = "4.4.2"