diff options
| -rw-r--r-- | data/templates/openvpn/server.conf.tmpl | 2 | ||||
| -rw-r--r-- | interface-definitions/include/port-number.xml.i | 2 | ||||
| -rw-r--r-- | interface-definitions/interfaces-wireguard.xml.in | 19 | ||||
| -rwxr-xr-x | src/op_mode/show_nat_translations.py | 6 |
4 files changed, 21 insertions, 8 deletions
diff --git a/data/templates/openvpn/server.conf.tmpl b/data/templates/openvpn/server.conf.tmpl index 9fc281afc..462d73c02 100644 --- a/data/templates/openvpn/server.conf.tmpl +++ b/data/templates/openvpn/server.conf.tmpl @@ -103,7 +103,7 @@ ccd-exclusive {% endif %} {% if server.push_route is defined and server.push_route is not none %} {% for route in server.push_route %} -push "route {{ route }}" +push "route {{ route | address_from_cidr }} {{ route | netmask_from_cidr }}" {% endfor %} {% endif %} {% if server.name_server is defined and server.name_server is not none %} diff --git a/interface-definitions/include/port-number.xml.i b/interface-definitions/include/port-number.xml.i index 0d0747811..81c192628 100644 --- a/interface-definitions/include/port-number.xml.i +++ b/interface-definitions/include/port-number.xml.i @@ -1,7 +1,7 @@ <!-- included start from port-number.xml.i --> <leafNode name="port"> <properties> - <help>Port number used to establish connection</help> + <help>Port number used by connection</help> <valueHelp> <format>u32:1-65535</format> <description>Numeric IP port</description> diff --git a/interface-definitions/interfaces-wireguard.xml.in b/interface-definitions/interfaces-wireguard.xml.in index e54ef12f7..92c9f510c 100644 --- a/interface-definitions/interfaces-wireguard.xml.in +++ b/interface-definitions/interfaces-wireguard.xml.in @@ -90,21 +90,32 @@ </leafNode> <leafNode name="address"> <properties> - <help>IP address of tunnel remote end</help> + <help>IP address of tunnel endpoint</help> <valueHelp> <format>ipv4</format> - <description>IPv4 address to listen for incoming connections</description> + <description>IPv4 address of remote tunnel endpoint</description> </valueHelp> <valueHelp> <format>ipv6</format> - <description>IPv6 address to listen for incoming connections</description> + <description>IPv6 address of remote tunnel endpoint</description> </valueHelp> <constraint> <validator name="ip-address"/> </constraint> </properties> </leafNode> - #include <include/port-number.xml.i> + <leafNode name="port"> + <properties> + <help>Port number used for tunnel endpoint</help> + <valueHelp> + <format>u32:1-65535</format> + <description>Numeric IP port</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-65535"/> + </constraint> + </properties> + </leafNode> <leafNode name="persistent-keepalive"> <properties> <help>Interval to send keepalive messages</help> diff --git a/src/op_mode/show_nat_translations.py b/src/op_mode/show_nat_translations.py index 3af33b78e..04c20e584 100755 --- a/src/op_mode/show_nat_translations.py +++ b/src/op_mode/show_nat_translations.py @@ -193,8 +193,10 @@ def main(): elif arg.file: process(content(arg.file), arg.stats, arg.proto, arg.pipe, arg.verbose, arg.type) else: - process(run(command(arg.type, arg.proto, arg.ipaddr)), arg.stats, arg.proto, arg.pipe, arg.verbose, arg.type) - + try: + process(run(command(arg.type, arg.proto, arg.ipaddr)), arg.stats, arg.proto, arg.pipe, arg.verbose, arg.type) + except: + pass if __name__ == '__main__': main() |