aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfelinae982020-08-15 23:41:04 +0800
committerGitHub2020-08-15 23:41:04 +0800
commit8a54350a9f499ecea7ff3908cf6da5b39a939ede (patch)
tree3219a3264c0dcf28250f0181268d1a7933d981ac
parent841a047cabe7c8e52c97c0e431e302cf9c70fdcf (diff)
parent33cd23c6f3f4d7862aa65be451a5b4e494ffb707 (diff)
downloadaur-8a54350a9f499ecea7ff3908cf6da5b39a939ede.tar.gz
Merge pull request #1 from sep2/master
chore: support mixed port feature
-rwxr-xr-xclashup2
1 files changed, 2 insertions, 0 deletions
diff --git a/clashup b/clashup
index 88212de76da4..db9d43ece0a8 100755
--- a/clashup
+++ b/clashup
@@ -19,6 +19,7 @@ class ClashUp:
"http_port": 7890,
"socks5_port": 7891,
"redir_port": 7892,
+ "mixed_port": 7893,
"allow_lan": true,
"external_controller": "127.0.0.1:9090",
"subscribe_url": "",
@@ -67,6 +68,7 @@ class ClashUp:
self._load_conf(config, 'http_port', 'port')
self._load_conf(config, 'socks5_port', 'socks-port')
self._load_conf(config, 'redir_port', 'redir-port')
+ self._load_conf(config, 'mixed_port', 'mixed-port')
self._load_conf(config, 'allow_lan', 'allow-lan')
self._load_conf(config, 'external_controller', 'external-controller')
config['rules'] = self.config.get('custom_rules', []) + config.get('rules', [])