From 39d593364d0432001e9cfe2089ffb5b8d5d00d1d Mon Sep 17 00:00:00 2001 From: Terrtia Date: Wed, 31 Mar 2021 11:43:54 +0200 Subject: [PATCH] chg: [D4Server] add server port in config --- server/configs/server.conf.sample | 1 + server/server.py | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/server/configs/server.conf.sample b/server/configs/server.conf.sample index e9abf75..6e18637 100644 --- a/server/configs/server.conf.sample +++ b/server/configs/server.conf.sample @@ -4,6 +4,7 @@ use_default_save_directory = yes save_directory = None [D4_Server] +server_port=4443 # registration or shared-secret server_mode = registration default_hmac_key = private key to change diff --git a/server/server.py b/server/server.py index 3e1d21d..161ea48 100755 --- a/server/server.py +++ b/server/server.py @@ -13,6 +13,8 @@ import logging import logging.handlers +import configparser + from twisted.internet import ssl, task, protocol, endpoints, defer from twisted.python import log from twisted.python.modules import getModule @@ -45,8 +47,16 @@ redis_server_metadata = config_loader.get_redis_conn("Redis_METADATA", decode_responses=False) # get server_mode +try: + D4server_port = config_loader.get_config_int("D4_Server", "server_port") +except configparser.NoOptionError: + D4server_port = 4443 + server_mode = config_loader.get_config_str("D4_Server", "server_mode") -hmac_key = config_loader.get_config_str("D4_Server", "default_hmac_key") +try: + hmac_key = config_loader.get_config_str("D4_Server", "default_hmac_key") +except configparser.NoOptionError: + hmac_key = 'private key to change' config_loader = None ### ### @@ -555,7 +565,7 @@ def main(reactor): certificate = ssl.PrivateCertificate.loadPEM(certData) factory = protocol.Factory.forProtocol(D4_Server) # use interface to support both IPv4 and IPv6 - reactor.listenSSL(4443, factory, certificate.options(), interface='::') + reactor.listenSSL(D4server_port, factory, certificate.options(), interface='::') return defer.Deferred()