From: Plamen Dimitrov Date: Fri, 4 Oct 2019 14:59:21 +0000 (+0700) Subject: Extend the port forwarding mk_config function to proper port selection X-Git-Tag: v1.6.2~3^2 X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=2d4e02973caca9c832cb5f07df3cddb5c826e26f;p=pyi2ncommon Extend the port forwarding mk_config function to proper port selection --- diff --git a/src/mk_config.py b/src/mk_config.py index fed8a53..f04cea7 100644 --- a/src/mk_config.py +++ b/src/mk_config.py @@ -298,13 +298,17 @@ def provider_proxy(mode="ROUTER", ip="1.2.3.4", localip=None, proxy_port=3128, f return provider_cnf -def port_forwarding(dst_port_end="", protocol_type="TCP", src_port_end="", suffix="host"): +def port_forwarding(src_port="1234", src_port_end="", + dst_port="1234", dst_port_end="", + protocol_type="TCP", suffix="host"): """ Generate and save a port forwarding configuration file. - :param str dst_port_end: port forwarding destination port end + :param str src_port: forwarded source port + :param str src_port_end: forwarded source port end for a port range + :param str dst_port: forwarded destination port + :param str dst_port_end: forwarded destination port end for a port range :param str protocol_type: port forwarding protocol type - :param str src_port_end: port forwarding source port end :param str suffix: optional suffix to use for config identification :returns: generated config filename :rtype: str @@ -316,10 +320,10 @@ def port_forwarding(dst_port_end="", protocol_type="TCP", src_port_end="", suffi data=value_id, filename=portforward_client_cnf, vals=[(Child, ("PORT_FORWARDING_DST_IP_REF", 0, "1")), - (Child, ("PORT_FORWARDING_DST_PORT", 0, "123")), + (Child, ("PORT_FORWARDING_DST_PORT", 0, dst_port)), (Child, ("PORT_FORWARDING_DST_PORT_END", 0, dst_port_end)), (Child, ("PORT_FORWARDING_PROTOCOL_TYPE", 0, protocol_type)), - (Child, ("PORT_FORWARDING_SRC_PORT", 0, "123")), + (Child, ("PORT_FORWARDING_SRC_PORT", 0, src_port)), (Child, ("PORT_FORWARDING_SRC_PORT_END", 0, src_port_end))])