dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-08-28 21:28:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

ui: enable private message routing by default for all unknown servers (#4461)

Browse Source
This commit is contained in:
Evgeny Poberezkin
2024-07-15 23:13:33 +01:00
committed by GitHub
parent 7138b09bae
commit b4ae3b9431
2 changed files with 17 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/ios/SimpleXChat/APITypes.swift
+8 -18
View File
@@ -1287,42 +1287,32 @@ public struct NetCfg: Codable, Equatable, Hashable {
var socksMode: SocksMode = .always
public var hostMode: HostMode = .publicHost
public var requiredHostMode = true
public var sessionMode: TransportSessionMode
public var smpProxyMode: SMPProxyMode = .never
public var smpProxyFallback: SMPProxyFallback = .allow
public var sessionMode = TransportSessionMode.user
public var smpProxyMode: SMPProxyMode = .unknown
public var smpProxyFallback: SMPProxyFallback = .allowProtected
public var tcpConnectTimeout: Int // microseconds
public var tcpTimeout: Int // microseconds
public var tcpTimeoutPerKb: Int // microseconds
public var rcvConcurrency: Int // pool size
public var tcpKeepAlive: KeepAliveOpts?
public var tcpKeepAlive: KeepAliveOpts? = KeepAliveOpts.defaults
public var smpPingInterval: Int // microseconds
public var smpPingCount: Int // times
public var logTLSErrors: Bool
public var smpPingCount: Int = 3 // times
public var logTLSErrors: Bool = false
public static let defaults: NetCfg = NetCfg(
socksProxy: nil,
sessionMode: TransportSessionMode.user,
tcpConnectTimeout: 25_000_000,
tcpTimeout: 15_000_000,
tcpTimeoutPerKb: 10_000,
rcvConcurrency: 12,
tcpKeepAlive: KeepAliveOpts.defaults,
smpPingInterval: 1200_000_000,
smpPingCount: 3,
logTLSErrors: false
smpPingInterval: 1200_000_000
)
public static let proxyDefaults: NetCfg = NetCfg(
socksProxy: nil,
sessionMode: TransportSessionMode.user,
tcpConnectTimeout: 35_000_000,
tcpTimeout: 20_000_000,
tcpTimeoutPerKb: 15_000,
rcvConcurrency: 8,
tcpKeepAlive: KeepAliveOpts.defaults,
smpPingInterval: 1200_000_000,
smpPingCount: 3,
logTLSErrors: false
smpPingInterval: 1200_000_000
)
public var enableKeepAlive: Bool { tcpKeepAlive != nil }
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
+9 -23
View File
@@ -3306,18 +3306,18 @@ data class ParsedServerAddress (
data class NetCfg(
val socksProxy: String?,
val socksMode: SocksMode = SocksMode.Always,
val hostMode: HostMode,
val requiredHostMode: Boolean,
val sessionMode: TransportSessionMode,
val smpProxyMode: SMPProxyMode,
val smpProxyFallback: SMPProxyFallback,
val hostMode: HostMode = HostMode.OnionViaSocks,
val requiredHostMode: Boolean = false,
val sessionMode: TransportSessionMode = TransportSessionMode.User,
val smpProxyMode: SMPProxyMode = SMPProxyMode.Unknown,
val smpProxyFallback: SMPProxyFallback = SMPProxyFallback.AllowProtected,
val tcpConnectTimeout: Long, // microseconds
val tcpTimeout: Long, // microseconds
val tcpTimeoutPerKb: Long, // microseconds
val rcvConcurrency: Int, // pool size
val tcpKeepAlive: KeepAliveOpts?,
val tcpKeepAlive: KeepAliveOpts? = KeepAliveOpts.defaults,
val smpPingInterval: Long, // microseconds
val smpPingCount: Int,
val smpPingCount: Int = 3,
val logTLSErrors: Boolean = false,
) {
val useSocksProxy: Boolean get() = socksProxy != null
@@ -3336,35 +3336,21 @@ data class NetCfg(
val defaults: NetCfg =
NetCfg(
socksProxy = null,
hostMode = HostMode.OnionViaSocks,
requiredHostMode = false,
sessionMode = TransportSessionMode.User,
smpProxyMode = SMPProxyMode.Never,
smpProxyFallback = SMPProxyFallback.Allow,
tcpConnectTimeout = 25_000_000,
tcpTimeout = 15_000_000,
tcpTimeoutPerKb = 10_000,
rcvConcurrency = 12,
tcpKeepAlive = KeepAliveOpts.defaults,
smpPingInterval = 1200_000_000,
smpPingCount = 3
smpPingInterval = 1200_000_000
)
val proxyDefaults: NetCfg =
NetCfg(
socksProxy = ":9050",
hostMode = HostMode.OnionViaSocks,
requiredHostMode = false,
sessionMode = TransportSessionMode.User,
smpProxyMode = SMPProxyMode.Never,
smpProxyFallback = SMPProxyFallback.Allow,
tcpConnectTimeout = 35_000_000,
tcpTimeout = 20_000_000,
tcpTimeoutPerKb = 15_000,
rcvConcurrency = 8,
tcpKeepAlive = KeepAliveOpts.defaults,
smpPingInterval = 1200_000_000,
smpPingCount = 3
smpPingInterval = 1200_000_000
)
}