Megre source code Volter-p2p in main

Author: unitdevgcc

README.md

@@ -35,8 +35,4 @@ sudo ./volter-client \
   --mtu 1420
 ```
 
-Windows (администратор, `wintun.dll` рядом с exe или из релиза):
-
-## systemd
-
-Пример юнита: [contrib/volter-client.service](contrib/volter-client.service).
+Windows (администратор, `wintun.dll` рядом с exe или из релиза):

android/.gitignore

@@ -8,6 +8,7 @@ local.properties
 
 key.properties
 keystore.properties
+volter.defaults.properties
 
 
 .idea/

android/app/build.gradle.kts

@@ -1,3 +1,5 @@
+import java.util.Properties
+
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
@@ -18,6 +20,25 @@ fun volterVersionCode(): Int =
         ?: (project.findProperty("ptera.versionCode") as String?)?.toIntOrNull()
         ?: 1
 
+val volterDefaultsFile = rootProject.file("volter.defaults.properties")
+val volterDefaults = Properties().apply {
+    if (volterDefaultsFile.exists()) {
+        volterDefaultsFile.inputStream().use { load(it) }
+    }
+}
+
+fun escVolterBuildString(s: String): String =
+    s.replace("\\", "\\\\").replace("\"", "\\\"")
+
+val volterMeshBootstrapPub = volterDefaults.getProperty("bootstrapPubKey", "").trim()
+val volterMeshDhtSecret = volterDefaults.getProperty("dhtRpcSecret", "").trim()
+val volterMeshRelayPeerId = volterDefaults.getProperty("relayPeerId", "").trim()
+val volterDhtUdpPort = volterDefaults.getProperty("dhtUdpPort", "4001").trim().toIntOrNull() ?: 4001
+val volterDhtFindEnabled =
+    volterDefaults.getProperty("dhtFindEnabled", "true").trim().equals("true", ignoreCase = true)
+
+val volterMeshDefaultsEnabled = volterMeshBootstrapPub.isNotEmpty()
+
 val ciDebugKeystore = file("ci-debug.keystore")
 val ciKeystorePass =
     System.getenv("VOLTER_CI_KEYSTORE_PASS") ?: System.getenv("PTERA_CI_KEYSTORE_PASS")
@@ -36,6 +57,13 @@ android {
 
         versionCode = volterVersionCode()
         versionName = volterVersionName()
+
+        buildConfigField("boolean", "VOLTER_MESH_DEFAULTS", "$volterMeshDefaultsEnabled")
+        buildConfigField("String", "VOLTER_BOOTSTRAP_PUB_KEY", "\"${escVolterBuildString(volterMeshBootstrapPub)}\"")
+        buildConfigField("String", "VOLTER_DHT_RPC_SECRET", "\"${escVolterBuildString(volterMeshDhtSecret)}\"")
+        buildConfigField("String", "VOLTER_RELAY_PEER_ID", "\"${escVolterBuildString(volterMeshRelayPeerId)}\"")
+        buildConfigField("int", "VOLTER_DHT_UDP_PORT", "$volterDhtUdpPort")
+        buildConfigField("boolean", "VOLTER_DHT_FIND_ENABLED", "$volterDhtFindEnabled")
     }
 
     signingConfigs {

android/app/src/main/java/dev/c0redev/volter/core/CoreBridge.kt

@@ -133,6 +133,17 @@ object CoreBridge {
         return QuicIPsResult(ips = out, error = err)
     }
 
+    fun meshStatus(): String {
+        return try {
+            val c = Class.forName("core.Core")
+            val m = c.getMethod("meshStatus")
+            m.invoke(null) as String
+        } catch (e: Exception) {
+            VolterLog.w("meshStatus: ${e.message}")
+            """{"error":"meshStatus unavailable: rebuild volter-core.aar (gomobile bind) or update native layer","detail":"${e.message}"}"""
+        }
+    }
+
     private fun nullableErr(j: JSONObject, key: String): String? {
         if (!j.has(key) || j.isNull(key)) return null
         val s = j.optString(key, "")

android/app/src/main/java/dev/c0redev/volter/domain/model/ClientSettings.kt

@@ -8,6 +8,7 @@ data class ClientSettings(
     val proxyListen: String = "127.0.0.1:1080",
     val ipv6Tunnel: Boolean = false,
     val dualTun: Boolean = true,
+    val volterMesh: Boolean = true,
     val transportPreference: String = TRANSPORT_AUTO,
 ) {
     fun toJson(): JSONObject {
@@ -17,6 +18,7 @@ data class ClientSettings(
         if (proxyListen.isNotBlank()) j.put("proxyListen", proxyListen)
         j.put("ipv6Tunnel", ipv6Tunnel)
         j.put("dualTun", dualTun)
+        j.put("volterMesh", volterMesh)
         j.put("transportPreference", Companion.normalizedTransportPreference(transportPreference))
         return j
     }
@@ -43,6 +45,7 @@ data class ClientSettings(
                 proxyListen = j.optString("proxyListen", "127.0.0.1:1080"),
                 ipv6Tunnel = j.optBoolean("ipv6Tunnel", false),
                 dualTun = j.optBoolean("dualTun", true),
+                volterMesh = j.optBoolean("volterMesh", true),
                 transportPreference = normalizedTransportPreference(j.optString("transportPreference", TRANSPORT_AUTO)),
             )
         }

android/app/src/main/java/dev/c0redev/volter/domain/model/Config.kt

@@ -18,6 +18,7 @@ data class Config(
     val tunCIDR6: String? = null,
     val dualTransport: Boolean? = null,
     val protection: ProtectionOptions? = null,
+    val relay: RelayOptions? = null,
 ) {
     fun withCloudDefaults(serverMode: String, probeIPv6: Boolean): Config {
         val noPin = quicCertPinSHA256.isNullOrBlank()
@@ -82,6 +83,7 @@ data class Config(
         tunCIDR6?.let { j.put("tunCIDR6", it) }
         dualTransport?.let { j.put("dualTransport", it) }
         protection?.let { j.put("protection", it.toJson()) }
+        relay?.let { j.put("relay", it.toJson()) }
         return j
     }
 
@@ -132,6 +134,7 @@ data class Config(
                     else -> j.optBoolean("dualTransport", true)
                 },
                 protection = j.optJSONObject("protection")?.let { ProtectionOptions.fromJson(it) },
+                relay = j.optJSONObject("relay")?.let { RelayOptions.fromJson(it) },
             )
         }
 
@@ -167,14 +170,14 @@ data class Config(
         fun parseShareUri(raw: String): Pair<String, Config>? {
             val cfg = parseVolterUriConfig(raw) ?: return null
             val name = parseVolterUriName(raw)?.ifBlank { "imported" } ?: "imported"
-            return sanitizeName(name) to cfg.copy(protection = null)
+            return sanitizeName(name) to cfg.copy(protection = null, relay = null)
         }
 
         fun buildShareUri(name: String, cfg: Config): String {
             val payload = JSONObject()
             payload.put("v", 1)
             payload.put("n", sanitizeName(name))
-            payload.put("c", cfg.copy(protection = null).toJson())
+            payload.put("c", cfg.copy(protection = null, relay = null).toJson())
             val b = Base64.encodeToString(payload.toString().toByteArray(Charsets.UTF_8), Base64.URL_SAFE or Base64.NO_WRAP or Base64.NO_PADDING)
             return "volter://$b"
         }
@@ -231,6 +234,27 @@ data class Config(
             return if (idx > 0) s.substring(0, idx) else s
         }
 
+        
+        fun tcpPortFromServer(server: String): Int? {
+            val s = server.trim()
+            if (s.startsWith("[")) {
+                val end = s.indexOf(']')
+                if (end <= 0 || end >= s.lastIndex || s[end + 1] != ':') return null
+                return s.substring(end + 2).toIntOrNull()?.takeIf { it in 1..65535 }
+            }
+            val idx = s.lastIndexOf(':')
+            if (idx <= 0 || idx == s.lastIndex) return null
+            return s.substring(idx + 1).toIntOrNull()?.takeIf { it in 1..65535 }
+        }
+
+        
+        fun tcpAuthorityForHttp(server: String): String? {
+            val port = tcpPortFromServer(server) ?: return null
+            val host = hostFromServer(server)
+            val hostPart = if (host.contains(':')) "[$host]" else host
+            return "$hostPart:$port"
+        }
+
         fun quicHostPort(host: String, port: Int): String {
             val h = host.trim().removePrefix("[").removeSuffix("]")
             return if (h.contains(":")) "[$h]:$port" else "$h:$port"

android/app/src/main/java/dev/c0redev/volter/domain/model/ProtectionOptions.kt

@@ -16,7 +16,6 @@ data class ProtectionOptions(
     val magicSplit: String? = null,
     val junkStyle: String? = null,
     val flushPolicy: String? = null,
-    /** tls_record | tls_ch_shape | smb1_shape | mc_frame | rotate */
     val preambleProfile: String? = null,
     val preambleRotate: Boolean = false,
 ) {

android/app/src/main/java/dev/c0redev/volter/domain/model/RelayOptions.kt

@@ -0,0 +1,204 @@
+package dev.c0redev.volter.domain.model
+
+import dev.c0redev.volter.json.optJSONArrayStringList
+import dev.c0redev.volter.json.optNullableBoolean
+import dev.c0redev.volter.json.optNullableInt
+import dev.c0redev.volter.json.optNullableString
+import dev.c0redev.volter.json.putStringListIfNonempty
+import org.json.JSONObject
+
+
+data class RelayOptions(
+    val peerId: String? = null,
+    val privateKey: String? = null,
+    val allowedClasses: List<String>? = null,
+    val maxConcurrent: Int? = null,
+    val budgetKbps: Int? = null,
+    val discoverySigned: String? = null,
+    val discoveryURL: String? = null,
+    val gossipEnabled: Boolean? = null,
+    val bootstrapPubKey: String? = null,
+    val emergencyPolicyURL: String? = null,
+    val emergencyPolicyPubKey: String? = null,
+    val pathAggressive: Boolean? = null,
+    val pathCooldownMs: Int? = null,
+    val stunServers: List<String>? = null,
+    val turnUrls: List<String>? = null,
+    val gossipPeers: List<String>? = null,
+    val gossipIntervalSec: Int? = null,
+    val gossipMaxAgeSec: Int? = null,
+    val geoAllowCountries: List<String>? = null,
+    val geoDenyCountries: List<String>? = null,
+    val stakeMin: Int? = null,
+    val peerPathFromDiscovery: Boolean? = null,
+    val peerRelayUseQuic: Boolean? = null,
+    val peerRelayUseUdp: Boolean? = null,
+    val peerRelayUdpListen: String? = null,
+    val peerRelayUdpAdvertise: String? = null,
+    val peerQuicServerName: String? = null,
+    val dhtFindUrls: List<String>? = null,
+    val stakeRegistryURL: String? = null,
+    val stakeRegistryPubKey: String? = null,
+    val stakeReputationFile: String? = null,
+    val stakeBonusHttpUrl: String? = null,
+    val stakeMerkleFile: String? = null,
+    val stakeMerkleRootUrl: String? = null,
+    val dhtRpcListenUdp: String? = null,
+    val dhtRpcSecret: String? = null,
+    val dhtRpcSeedPeers: List<String>? = null,
+    val dhtRpcIntervalSec: Int? = null,
+    val dhtRpcFindK: Int? = null,
+    val dhtIterativeRounds: Int? = null,
+    val dhtIterativeAlpha: Int? = null,
+    val dhtPublishSrflx: Boolean? = null,
+    val symmetricNatHolePunch: Boolean? = null,
+) {
+    fun toJson(): JSONObject {
+        val j = JSONObject()
+        peerId?.takeIf { it.isNotBlank() }?.let { j.put("peerId", it) }
+        privateKey?.takeIf { it.isNotBlank() }?.let { j.put("privateKey", it) }
+        j.putStringListIfNonempty("allowedClasses", allowedClasses)
+        maxConcurrent?.takeIf { it != 0 }?.let { j.put("maxConcurrent", it) }
+        budgetKbps?.takeIf { it != 0 }?.let { j.put("budgetKbps", it) }
+        discoverySigned?.takeIf { it.isNotBlank() }?.let { j.put("discoverySigned", it) }
+        discoveryURL?.takeIf { it.isNotBlank() }?.let { j.put("discoveryURL", it) }
+        gossipEnabled?.let { j.put("gossipEnabled", it) }
+        bootstrapPubKey?.takeIf { it.isNotBlank() }?.let { j.put("bootstrapPubKey", it) }
+        emergencyPolicyURL?.takeIf { it.isNotBlank() }?.let { j.put("emergencyPolicyURL", it) }
+        emergencyPolicyPubKey?.takeIf { it.isNotBlank() }?.let { j.put("emergencyPolicyPubKey", it) }
+        pathAggressive?.let { j.put("pathAggressive", it) }
+        pathCooldownMs?.takeIf { it != 0 }?.let { j.put("pathCooldownMs", it) }
+        j.putStringListIfNonempty("stunServers", stunServers)
+        j.putStringListIfNonempty("turnUrls", turnUrls)
+        j.putStringListIfNonempty("gossipPeers", gossipPeers)
+        gossipIntervalSec?.takeIf { it != 0 }?.let { j.put("gossipIntervalSec", it) }
+        gossipMaxAgeSec?.takeIf { it != 0 }?.let { j.put("gossipMaxAgeSec", it) }
+        j.putStringListIfNonempty("geoAllowCountries", geoAllowCountries)
+        j.putStringListIfNonempty("geoDenyCountries", geoDenyCountries)
+        stakeMin?.takeIf { it != 0 }?.let { j.put("stakeMin", it) }
+        peerPathFromDiscovery?.let { j.put("peerPathFromDiscovery", it) }
+        peerRelayUseQuic?.let { j.put("peerRelayUseQuic", it) }
+        peerRelayUseUdp?.let { j.put("peerRelayUseUdp", it) }
+        peerRelayUdpListen?.takeIf { it.isNotBlank() }?.let { j.put("peerRelayUdpListen", it) }
+        peerRelayUdpAdvertise?.takeIf { it.isNotBlank() }?.let { j.put("peerRelayUdpAdvertise", it) }
+        peerQuicServerName?.takeIf { it.isNotBlank() }?.let { j.put("peerQuicServerName", it) }
+        j.putStringListIfNonempty("dhtFindUrls", dhtFindUrls)
+        stakeRegistryURL?.takeIf { it.isNotBlank() }?.let { j.put("stakeRegistryURL", it) }
+        stakeRegistryPubKey?.takeIf { it.isNotBlank() }?.let { j.put("stakeRegistryPubKey", it) }
+        stakeReputationFile?.takeIf { it.isNotBlank() }?.let { j.put("stakeReputationFile", it) }
+        stakeBonusHttpUrl?.takeIf { it.isNotBlank() }?.let { j.put("stakeBonusHttpUrl", it) }
+        stakeMerkleFile?.takeIf { it.isNotBlank() }?.let { j.put("stakeMerkleFile", it) }
+        stakeMerkleRootUrl?.takeIf { it.isNotBlank() }?.let { j.put("stakeMerkleRootUrl", it) }
+        dhtRpcListenUdp?.takeIf { it.isNotBlank() }?.let { j.put("dhtRpcListenUdp", it) }
+        dhtRpcSecret?.takeIf { it.isNotBlank() }?.let { j.put("dhtRpcSecret", it) }
+        j.putStringListIfNonempty("dhtRpcSeedPeers", dhtRpcSeedPeers)
+        dhtRpcIntervalSec?.takeIf { it != 0 }?.let { j.put("dhtRpcIntervalSec", it) }
+        dhtRpcFindK?.takeIf { it != 0 }?.let { j.put("dhtRpcFindK", it) }
+        dhtIterativeRounds?.takeIf { it != 0 }?.let { j.put("dhtIterativeRounds", it) }
+        dhtIterativeAlpha?.takeIf { it != 0 }?.let { j.put("dhtIterativeAlpha", it) }
+        dhtPublishSrflx?.let { j.put("dhtPublishSrflx", it) }
+        symmetricNatHolePunch?.let { j.put("symmetricNatHolePunch", it) }
+        return j
+    }
+
+    companion object {
+        fun fromJson(j: JSONObject): RelayOptions {
+            fun list(key: String) = j.optJSONArrayStringList(key)
+            return RelayOptions(
+                peerId = j.optNullableString("peerId"),
+                privateKey = j.optNullableString("privateKey"),
+                allowedClasses = list("allowedClasses"),
+                maxConcurrent = j.optNullableInt("maxConcurrent"),
+                budgetKbps = j.optNullableInt("budgetKbps"),
+                discoverySigned = j.optNullableString("discoverySigned"),
+                discoveryURL = j.optNullableString("discoveryURL"),
+                gossipEnabled = j.optNullableBoolean("gossipEnabled"),
+                bootstrapPubKey = j.optNullableString("bootstrapPubKey"),
+                emergencyPolicyURL = j.optNullableString("emergencyPolicyURL"),
+                emergencyPolicyPubKey = j.optNullableString("emergencyPolicyPubKey"),
+                pathAggressive = j.optNullableBoolean("pathAggressive"),
+                pathCooldownMs = j.optNullableInt("pathCooldownMs"),
+                stunServers = list("stunServers"),
+                turnUrls = list("turnUrls"),
+                gossipPeers = list("gossipPeers"),
+                gossipIntervalSec = j.optNullableInt("gossipIntervalSec"),
+                gossipMaxAgeSec = j.optNullableInt("gossipMaxAgeSec"),
+                geoAllowCountries = list("geoAllowCountries"),
+                geoDenyCountries = list("geoDenyCountries"),
+                stakeMin = j.optNullableInt("stakeMin"),
+                peerPathFromDiscovery = j.optNullableBoolean("peerPathFromDiscovery"),
+                peerRelayUseQuic = j.optNullableBoolean("peerRelayUseQuic"),
+                peerRelayUseUdp = j.optNullableBoolean("peerRelayUseUdp"),
+                peerRelayUdpListen = j.optNullableString("peerRelayUdpListen"),
+                peerRelayUdpAdvertise = j.optNullableString("peerRelayUdpAdvertise"),
+                peerQuicServerName = j.optNullableString("peerQuicServerName"),
+                dhtFindUrls = list("dhtFindUrls"),
+                stakeRegistryURL = j.optNullableString("stakeRegistryURL"),
+                stakeRegistryPubKey = j.optNullableString("stakeRegistryPubKey"),
+                stakeReputationFile = j.optNullableString("stakeReputationFile"),
+                stakeBonusHttpUrl = j.optNullableString("stakeBonusHttpUrl"),
+                stakeMerkleFile = j.optNullableString("stakeMerkleFile"),
+                stakeMerkleRootUrl = j.optNullableString("stakeMerkleRootUrl"),
+                dhtRpcListenUdp = j.optNullableString("dhtRpcListenUdp"),
+                dhtRpcSecret = j.optNullableString("dhtRpcSecret"),
+                dhtRpcSeedPeers = list("dhtRpcSeedPeers"),
+                dhtRpcIntervalSec = j.optNullableInt("dhtRpcIntervalSec"),
+                dhtRpcFindK = j.optNullableInt("dhtRpcFindK"),
+                dhtIterativeRounds = j.optNullableInt("dhtIterativeRounds"),
+                dhtIterativeAlpha = j.optNullableInt("dhtIterativeAlpha"),
+                dhtPublishSrflx = j.optNullableBoolean("dhtPublishSrflx"),
+                symmetricNatHolePunch = j.optNullableBoolean("symmetricNatHolePunch"),
+            )
+        }
+    }
+}
+
+
+fun RelayOptions.withUserOverlay(user: RelayOptions?): RelayOptions {
+    if (user == null) return this
+    return copy(
+        peerId = user.peerId ?: peerId,
+        privateKey = user.privateKey ?: privateKey,
+        allowedClasses = user.allowedClasses ?: allowedClasses,
+        maxConcurrent = user.maxConcurrent ?: maxConcurrent,
+        budgetKbps = user.budgetKbps ?: budgetKbps,
+        discoverySigned = user.discoverySigned ?: discoverySigned,
+        discoveryURL = user.discoveryURL ?: discoveryURL,
+        gossipEnabled = user.gossipEnabled ?: gossipEnabled,
+        bootstrapPubKey = user.bootstrapPubKey ?: bootstrapPubKey,
+        emergencyPolicyURL = user.emergencyPolicyURL ?: emergencyPolicyURL,
+        emergencyPolicyPubKey = user.emergencyPolicyPubKey ?: emergencyPolicyPubKey,
+        pathAggressive = user.pathAggressive ?: pathAggressive,
+        pathCooldownMs = user.pathCooldownMs ?: pathCooldownMs,
+        stunServers = user.stunServers ?: stunServers,
+        turnUrls = user.turnUrls ?: turnUrls,
+        gossipPeers = user.gossipPeers ?: gossipPeers,
+        gossipIntervalSec = user.gossipIntervalSec ?: gossipIntervalSec,
+        gossipMaxAgeSec = user.gossipMaxAgeSec ?: gossipMaxAgeSec,
+        geoAllowCountries = user.geoAllowCountries ?: geoAllowCountries,
+        geoDenyCountries = user.geoDenyCountries ?: geoDenyCountries,
+        stakeMin = user.stakeMin ?: stakeMin,
+        peerPathFromDiscovery = user.peerPathFromDiscovery ?: peerPathFromDiscovery,
+        peerRelayUseQuic = user.peerRelayUseQuic ?: peerRelayUseQuic,
+        peerRelayUseUdp = user.peerRelayUseUdp ?: peerRelayUseUdp,
+        peerRelayUdpListen = user.peerRelayUdpListen ?: peerRelayUdpListen,
+        peerRelayUdpAdvertise = user.peerRelayUdpAdvertise ?: peerRelayUdpAdvertise,
+        peerQuicServerName = user.peerQuicServerName ?: peerQuicServerName,
+        dhtFindUrls = user.dhtFindUrls ?: dhtFindUrls,
+        stakeRegistryURL = user.stakeRegistryURL ?: stakeRegistryURL,
+        stakeRegistryPubKey = user.stakeRegistryPubKey ?: stakeRegistryPubKey,
+        stakeReputationFile = user.stakeReputationFile ?: stakeReputationFile,
+        stakeBonusHttpUrl = user.stakeBonusHttpUrl ?: stakeBonusHttpUrl,
+        stakeMerkleFile = user.stakeMerkleFile ?: stakeMerkleFile,
+        stakeMerkleRootUrl = user.stakeMerkleRootUrl ?: stakeMerkleRootUrl,
+        dhtRpcListenUdp = user.dhtRpcListenUdp ?: dhtRpcListenUdp,
+        dhtRpcSecret = user.dhtRpcSecret ?: dhtRpcSecret,
+        dhtRpcSeedPeers = user.dhtRpcSeedPeers ?: dhtRpcSeedPeers,
+        dhtRpcIntervalSec = user.dhtRpcIntervalSec ?: dhtRpcIntervalSec,
+        dhtRpcFindK = user.dhtRpcFindK ?: dhtRpcFindK,
+        dhtIterativeRounds = user.dhtIterativeRounds ?: dhtIterativeRounds,
+        dhtIterativeAlpha = user.dhtIterativeAlpha ?: dhtIterativeAlpha,
+        dhtPublishSrflx = user.dhtPublishSrflx ?: dhtPublishSrflx,
+        symmetricNatHolePunch = user.symmetricNatHolePunch ?: symmetricNatHolePunch,
+    )
+}