Commit 1437b43d authored by Max Lv's avatar Max Lv

Refine the code style

parent 8e3d20b6
...@@ -71,7 +71,6 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro ...@@ -71,7 +71,6 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro
*/ */
fun start(service: BaseService.Interface, stat: File, configFile: File, mode: String, fun start(service: BaseService.Interface, stat: File, configFile: File, mode: String,
dnsRelay: Boolean = true) { dnsRelay: Boolean = true) {
// setup traffic monitor path // setup traffic monitor path
trafficMonitor = TrafficMonitor(stat) trafficMonitor = TrafficMonitor(stat)
...@@ -92,9 +91,9 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro ...@@ -92,9 +91,9 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro
// local SOCKS5 proxy // local SOCKS5 proxy
val proxyConfig = JSONObject() val proxyConfig = JSONObject()
proxyConfig.put("local_address", "${DataStore.listenAddress}") proxyConfig.put("local_address", DataStore.listenAddress)
proxyConfig.put("local_port", DataStore.portProxy) proxyConfig.put("local_port", DataStore.portProxy)
proxyConfig.put("local_udp_address", "${DataStore.listenAddress}") proxyConfig.put("local_udp_address", DataStore.listenAddress)
proxyConfig.put("local_udp_port", DataStore.portProxy) proxyConfig.put("local_udp_port", DataStore.portProxy)
proxyConfig.put("mode", mode) proxyConfig.put("mode", mode)
localConfigs.put(proxyConfig) localConfigs.put(proxyConfig)
...@@ -106,10 +105,10 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro ...@@ -106,10 +105,10 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro
throw BaseService.ExpectedExceptionWrapper(e) throw BaseService.ExpectedExceptionWrapper(e)
}.let { dns -> }.let { dns ->
val dnsConfig = JSONObject() val dnsConfig = JSONObject()
dnsConfig.put("local_address", "${DataStore.listenAddress}") dnsConfig.put("local_address", DataStore.listenAddress)
dnsConfig.put("local_port", DataStore.portLocalDns) dnsConfig.put("local_port", DataStore.portLocalDns)
dnsConfig.put("local_dns_address", "local_dns_path") dnsConfig.put("local_dns_address", "local_dns_path")
dnsConfig.put("remote_dns_address", "${dns.host ?: "0.0.0.0"}") dnsConfig.put("remote_dns_address", dns.host ?: "0.0.0.0")
dnsConfig.put("remote_dns_port", if (dns.port < 0) 53 else dns.port) dnsConfig.put("remote_dns_port", if (dns.port < 0) 53 else dns.port)
dnsConfig.put("protocol", "dns") dnsConfig.put("protocol", "dns")
localConfigs.put(dnsConfig) localConfigs.put(dnsConfig)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment