From 9b540745d7ce7b5860de2c4ea9946ffb239e2446 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 5 Jan 2017 22:01:28 +0100
Subject: [PATCH] (tinc) add some options for
 https://github.com/opnsense/plugins/issues/61

---
 .../OPNsense/Tinc/forms/dialogHost.xml        |  6 ++++
 .../OPNsense/Tinc/forms/dialogNetwork.xml     | 20 ++++++++++++
 .../mvc/app/models/OPNsense/Tinc/Tinc.xml     | 31 +++++++++++++++----
 .../scripts/OPNsense/Tinc/lib/objects.py      |  5 ++-
 .../templates/OPNsense/Tinc/tinc_deploy.xml   |  6 +++-
 5 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/forms/dialogHost.xml b/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/forms/dialogHost.xml
index 9e991a432..aedfb2f5a 100644
--- a/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/forms/dialogHost.xml
+++ b/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/forms/dialogHost.xml
@@ -23,6 +23,12 @@
         <type>text</type>
         <help>This machines external address to use</help>
     </field>
+    <field>
+        <id>host.extport</id>
+        <label>Ext. Port</label>
+        <type>text</type>
+        <help>This machines external port to use</help>
+    </field>
     <field>
         <id>host.subnet</id>
         <label>Subnet</label>
diff --git a/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/forms/dialogNetwork.xml b/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/forms/dialogNetwork.xml
index e43e7ffea..99f48f02f 100644
--- a/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/forms/dialogNetwork.xml
+++ b/security/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/forms/dialogNetwork.xml
@@ -17,6 +17,14 @@
         <type>text</type>
         <help>This machines internal address to use and network mask for the whole network</help>
     </field>
+    <field>
+        <id>network.pingtimeout</id>
+        <label>PingTimeout</label>
+        <type>text</type>
+        <help>The number of seconds to wait for a response to pings or to allow meta connections to block.
+          If the other end doesn't respond within this time, the connection is terminated, and the others will be notified of this.
+        </help>
+    </field>
     <field>
       <id>network.cipher</id>
       <label>Cipher</label>
@@ -49,6 +57,18 @@
         <type>text</type>
         <help>This machines external address to use</help>
     </field>
+    <field>
+        <id>network.extport</id>
+        <label>Ext. Port</label>
+        <type>text</type>
+        <help>This machines external port to use</help>
+    </field>
+    <field>
+        <id>network.subnet</id>
+        <label>Subnet</label>
+        <type>text</type>
+        <help>This machines part of the network</help>
+    </field>
     <field>
         <id>network.subnet</id>
         <label>Subnet</label>
diff --git a/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.xml b/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.xml
index 633f34499..466f37b62 100644
--- a/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.xml
+++ b/security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.xml
@@ -21,11 +21,17 @@
                     <mask>/^([0-9a-zA-Z\_]){1,1024}$/u</mask>
                     <ValidationMessage>Please specify a valid hostname.</ValidationMessage>
                 </hostname>
-                <extaddress type="NetworkField">
+                <extaddress type="TextField">
                     <Required>Y</Required>
-                    <WildcardEnabled>N</WildcardEnabled>
-                    <FieldSeparator>,</FieldSeparator>
+                    <mask>/^([0-9a-zA-Z\.,_\-:]){0,1024}$/u</mask>
                 </extaddress>
+                <extport type="IntegerField">
+                    <Required>Y</Required>
+                    <default>655</default>
+                    <MinimumValue>1</MinimumValue>
+                    <MaximumValue>65535</MaximumValue>
+                    <ValidationMessage>Port number must be between 1...65535</ValidationMessage>
+                </extport>
                 <intaddress type="NetworkField">
                     <Required>Y</Required>
                     <WildcardEnabled>N</WildcardEnabled>
@@ -36,6 +42,13 @@
                     <NetMaskRequired>Y</NetMaskRequired>
                     <FieldSeparator>,</FieldSeparator>
                 </subnet>
+                <pingtimeout type="IntegerField">
+                    <Required>Y</Required>
+                    <default>5</default>
+                    <MinimumValue>1</MinimumValue>
+                    <MaximumValue>65535</MaximumValue>
+                    <ValidationMessage>Ping timeout must be between 1...65535</ValidationMessage>
+                </pingtimeout>
                 <privkey type="TextField">
                     <Required>Y</Required>
                 </privkey>
@@ -86,10 +99,16 @@
                     <mask>/^([0-9a-zA-Z\_]){1,1024}$/u</mask>
                     <ValidationMessage>Please specify a valid hostname.</ValidationMessage>
                 </hostname>
-                <extaddress type="NetworkField">
+                <extport type="IntegerField">
                     <Required>Y</Required>
-                    <WildcardEnabled>N</WildcardEnabled>
-                    <FieldSeparator>,</FieldSeparator>
+                    <default>655</default>
+                    <MinimumValue>1</MinimumValue>
+                    <MaximumValue>65535</MaximumValue>
+                    <ValidationMessage>Port number must be between 1...65535</ValidationMessage>
+                </extport>
+                <extaddress type="TextField">
+                    <Required>Y</Required>
+                    <mask>/^([0-9a-zA-Z\.,_\-:]){0,1024}$/u</mask>
                 </extaddress>
                 <subnet type="NetworkField">
                     <Required>Y</Required>
diff --git a/security/tinc/src/opnsense/scripts/OPNsense/Tinc/lib/objects.py b/security/tinc/src/opnsense/scripts/OPNsense/Tinc/lib/objects.py
index 299f00911..55c6e34d6 100644
--- a/security/tinc/src/opnsense/scripts/OPNsense/Tinc/lib/objects.py
+++ b/security/tinc/src/opnsense/scripts/OPNsense/Tinc/lib/objects.py
@@ -31,6 +31,7 @@ class NetwConfObject(object):
         self._payload['hostname'] = None
         self._payload['network'] = None
         self._payload['address'] = None
+        self._payload['port'] = None
 
     def is_valid(self):
         for key in self._payload:
@@ -85,6 +86,8 @@ class Network(NetwConfObject):
     def config_text(self):
         result = list()
         result.append('AddressFamily=any')
+        result.append('Port=%(port)s' % self._payload)
+        result.append('PingTimeout=%(pingtimeout)s' % self._payload)
         for host in self._hosts:
             if host.connect_to_this_host():
                 result.append('ConnectTo = %s' % (host.get_hostname(),))
@@ -122,7 +125,7 @@ class Host(NetwConfObject):
 
     def config_text(self):
         result = list()
-        result.append('Address=%(address)s'%self._payload)
+        result.append('Address=%(address)s %(port)s'%self._payload)
         result.append('Subnet=%(subnet)s'%self._payload)
         result.append('Cipher=%(cipher)s'%self._payload)
         result.append('Digest=sha256')
diff --git a/security/tinc/src/opnsense/service/templates/OPNsense/Tinc/tinc_deploy.xml b/security/tinc/src/opnsense/service/templates/OPNsense/Tinc/tinc_deploy.xml
index d2a1a1050..0d7687207 100644
--- a/security/tinc/src/opnsense/service/templates/OPNsense/Tinc/tinc_deploy.xml
+++ b/security/tinc/src/opnsense/service/templates/OPNsense/Tinc/tinc_deploy.xml
@@ -9,12 +9,15 @@
         <intaddress>{{network.intaddress}}</intaddress>
         <privkey><![CDATA[{{network.privkey}}]]></privkey>
         <address>{{network.intaddress}}</address>
+        <port>{{network.extport}}</port>
         <debuglevel>{{network.debuglevel}}</debuglevel>
+        <pingtimeout>{{network.pingtimeout}}</pingtimeout>
         <hosts>
             <host>
                 <hostname>{{network.hostname}}</hostname>
                 <network>{{network.name}}</network>
                 <address>{{network.extaddress}}</address>
+                <port>{{network.extport}}</port>
                 <subnet>{{network.subnet}}</subnet>
                 <pubkey><![CDATA[{{network.pubkey}}]]></pubkey>
                 <cipher>{{network.cipher}}</cipher>
@@ -26,6 +29,7 @@
                 <hostname>{{host.hostname}}</hostname>
                 <network>{{network.name}}</network>
                 <address>{{host.extaddress}}</address>
+                <port>{{network.extport}}</port>
                 <subnet>{{host.subnet}}</subnet>
                 <pubkey><![CDATA[{{host.pubkey}}]]></pubkey>
                 <cipher>{{host.cipher}}</cipher>
@@ -38,4 +42,4 @@
 {%     endif %}
 {%   endfor %}
 {% endif %}
-</networks>
\ No newline at end of file
+</networks>