diff --git a/net/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/forms/dialogNetwork.xml b/net/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/forms/dialogNetwork.xml
index 96ef25ca1..026fdb993 100644
--- a/net/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/forms/dialogNetwork.xml
+++ b/net/tinc/src/opnsense/mvc/app/controllers/OPNsense/Tinc/forms/dialogNetwork.xml
@@ -17,6 +17,12 @@
text
This machines internal address to use and network mask for the whole network
+
+ network.debuglevel
+
+ dropdown
+ set debug output for this tinc network.
+
header
diff --git a/net/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.xml b/net/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.xml
index 35afc7346..5cc67df01 100644
--- a/net/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.xml
+++ b/net/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.xml
@@ -46,6 +46,19 @@
1
Y
+
+ Y
+ ip
+
+ [0] start/stop, serious errors
+ [1] +all connections
+ [2] +script status
+ [3] +all requests
+ [4] +meta socket
+ [5] +network traffic
+
+ debug level needs to be between 0 (default) and 5 (highest)
+
diff --git a/net/tinc/src/opnsense/scripts/OPNsense/Tinc/lib/objects.py b/net/tinc/src/opnsense/scripts/OPNsense/Tinc/lib/objects.py
index 0aa68fb4e..d35c6c83e 100644
--- a/net/tinc/src/opnsense/scripts/OPNsense/Tinc/lib/objects.py
+++ b/net/tinc/src/opnsense/scripts/OPNsense/Tinc/lib/objects.py
@@ -60,6 +60,7 @@ class Network(NetwConfObject):
self._payload['id'] = None
self._payload['privkey'] = None
self._payload['intaddress'] = None
+ self._payload['debuglevel'] = 'd0'
self._hosts = list()
def get_id(self):
@@ -68,6 +69,12 @@ class Network(NetwConfObject):
def get_local_address(self):
return self._payload['intaddress']
+ def get_debuglevel(self):
+ if len(self._payload['debuglevel']) > 1:
+ return self._payload['debuglevel'][1]
+ else:
+ return '0'
+
def set_hosts(self, hosts):
for host in hosts:
hostObj = Host()
diff --git a/net/tinc/src/opnsense/scripts/OPNsense/Tinc/tincd.py b/net/tinc/src/opnsense/scripts/OPNsense/Tinc/tincd.py
index 6015719fa..2e584f53b 100755
--- a/net/tinc/src/opnsense/scripts/OPNsense/Tinc/tincd.py
+++ b/net/tinc/src/opnsense/scripts/OPNsense/Tinc/tincd.py
@@ -98,4 +98,4 @@ if len(sys.argv) > 1:
subprocess.call(['/usr/local/sbin/tincd','-n',instance.split('/')[-1], '-k'])
elif sys.argv[1] == 'start':
for netwrk in deploy('/usr/local/etc/tinc_deploy.xml'):
- subprocess.call(['/usr/local/sbin/tincd','-n',netwrk.get_network(), '-R'])
+ subprocess.call(['/usr/local/sbin/tincd','-n',netwrk.get_network(), '-R', '-d', netwrk.get_debuglevel()])
diff --git a/net/tinc/src/opnsense/service/templates/OPNsense/Tinc/tinc_deploy.xml b/net/tinc/src/opnsense/service/templates/OPNsense/Tinc/tinc_deploy.xml
index 04751a509..f51b424d6 100644
--- a/net/tinc/src/opnsense/service/templates/OPNsense/Tinc/tinc_deploy.xml
+++ b/net/tinc/src/opnsense/service/templates/OPNsense/Tinc/tinc_deploy.xml
@@ -9,6 +9,7 @@
{{network.intaddress}}
{{network.intaddress}}
+ {{network.debuglevel}}
{{network.hostname}}