Merge branch 'server-operators' into dc/android-desktop-server-operators

This commit is contained in:
spaced4ndy
2024-11-21 21:16:10 +04:00
6 changed files with 43 additions and 13 deletions
@@ -4113,7 +4113,7 @@ data class NetCfg(
val hostMode: HostMode = HostMode.OnionViaSocks,
val requiredHostMode: Boolean = false,
val sessionMode: TransportSessionMode = TransportSessionMode.default,
val smpProxyMode: SMPProxyMode = SMPProxyMode.Unknown,
val smpProxyMode: SMPProxyMode = SMPProxyMode.Always,
val smpProxyFallback: SMPProxyFallback = SMPProxyFallback.AllowProtected,
val smpWebPort: Boolean = false,
val tcpConnectTimeout: Long, // microseconds