gandc/mtprotoproxy
1
0
Fork 0
mirror of https://github.com/alexbers/mtprotoproxy.git synced 2026-03-14 07:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

move socks handling in the config parsing

Browse Source
This commit is contained in:
Alexander Bersenev
2019-09-20 15:40:33 +05:00
parent 23c7b0d53b
commit 79eaabdd23
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mtprotoproxy.py
View File

@@ -154,6 +154,12 @@ def init_config():
conf_dict.setdefault("SOCKS5_HOST", None) conf_dict.setdefault("SOCKS5_HOST", None)
conf_dict.setdefault("SOCKS5_PORT", None) conf_dict.setdefault("SOCKS5_PORT", None)
# apply socks settings in place
if conf_dict.setdefault("SOCKS5_HOST") and conf_dict.setdefault("SOCKS5_PORT"):
import socks
socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, config.SOCKS5_HOST, config.SOCKS5_PORT)
socket.socket = socks.socksocket
# user tcp connection limits, the mapping from name to the integer limit # user tcp connection limits, the mapping from name to the integer limit
# one client can create many tcp connections, up to 8 # one client can create many tcp connections, up to 8
conf_dict.setdefault("USER_MAX_TCP_CONNS", {}) conf_dict.setdefault("USER_MAX_TCP_CONNS", {})
@@ -1869,12 +1875,6 @@ async def update_middle_proxy_info():
await asyncio.sleep(config.PROXY_INFO_UPDATE_PERIOD) await asyncio.sleep(config.PROXY_INFO_UPDATE_PERIOD)
def init_socks():
import socks
socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, config.SOCKS5_HOST, config.SOCKS5_PORT)
socket.socket = socks.socksocket
def init_ip_info(): def init_ip_info():
global my_ip_info global my_ip_info
global disable_middle_proxy global disable_middle_proxy
@@ -2040,8 +2040,6 @@ def main():
init_stats() init_stats()
init_proxy_start_time() init_proxy_start_time()
init_socks()
if sys.platform == "win32": if sys.platform == "win32":
loop = asyncio.ProactorEventLoop() loop = asyncio.ProactorEventLoop()
asyncio.set_event_loop(loop) asyncio.set_event_loop(loop)
@@ -2117,8 +2115,6 @@ def main():
if __name__ == "__main__": if __name__ == "__main__":
init_config() init_config()
if config.SOCKS5_HOST and config.SOCKS5_PORT:
init_socks()
init_ip_info() init_ip_info()
print_tg_info() print_tg_info()
main() main()