From add80b4fa85fc816de09f6ce74f9525be22bba17 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Mon, 3 Dec 2018 21:54:57 +0100
Subject: [PATCH] net-mgmt/net-snmp: add l3 visibility (#1039)

(cherry picked from commit 435aee386ae13dfc6f6c009894e4a9d54aaae41c)
---
 net-mgmt/net-snmp/Makefile                                  | 2 +-
 .../mvc/app/controllers/OPNsense/Netsnmp/forms/general.xml  | 6 ++++++
 .../opnsense/mvc/app/models/OPNsense/Netsnmp/General.xml    | 6 +++++-
 .../opnsense/service/templates/OPNsense/Netsnmp/snmpd.conf  | 3 +++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index 8b6970711..efce494b6 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		net-snmp
-PLUGIN_VERSION=		1.2
+PLUGIN_VERSION=		1.3
 PLUGIN_COMMENT=		Net-SNMP is a daemon for the SNMP protocol
 PLUGIN_DEPENDS=		net-snmp
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net-mgmt/net-snmp/src/opnsense/mvc/app/controllers/OPNsense/Netsnmp/forms/general.xml b/net-mgmt/net-snmp/src/opnsense/mvc/app/controllers/OPNsense/Netsnmp/forms/general.xml
index b50f93bfa..bfeabc7fa 100644
--- a/net-mgmt/net-snmp/src/opnsense/mvc/app/controllers/OPNsense/Netsnmp/forms/general.xml
+++ b/net-mgmt/net-snmp/src/opnsense/mvc/app/controllers/OPNsense/Netsnmp/forms/general.xml
@@ -23,6 +23,12 @@
         <type>text</type>
         <help>Set the contact address to use.</help>
     </field>
+    <field>
+        <id>general.l3visibility</id>
+        <label>Layer 3 Visibility</label>
+        <type>checkbox</type>
+        <help>Make this device visible as Layer 3 enabled.</help>
+    </field>
     <field>
         <id>general.listen</id>
         <label>Listen IPs</label>
diff --git a/net-mgmt/net-snmp/src/opnsense/mvc/app/models/OPNsense/Netsnmp/General.xml b/net-mgmt/net-snmp/src/opnsense/mvc/app/models/OPNsense/Netsnmp/General.xml
index 348b15095..adf2dc4a6 100644
--- a/net-mgmt/net-snmp/src/opnsense/mvc/app/models/OPNsense/Netsnmp/General.xml
+++ b/net-mgmt/net-snmp/src/opnsense/mvc/app/models/OPNsense/Netsnmp/General.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/netsnmp/general</mount>
     <description>Netsnmp configuration</description>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -19,6 +19,10 @@
             <default></default>
             <Required>N</Required>
         </syscontact>
+        <l3visibility type="BooleanField">
+            <default>0</default>
+            <Required>Y</Required>
+        </l3visibility>
         <listen type="NetworkField">
             <FieldSeparator>,</FieldSeparator>
             <Required>N</Required>
diff --git a/net-mgmt/net-snmp/src/opnsense/service/templates/OPNsense/Netsnmp/snmpd.conf b/net-mgmt/net-snmp/src/opnsense/service/templates/OPNsense/Netsnmp/snmpd.conf
index 0857c081f..d216bd3a5 100644
--- a/net-mgmt/net-snmp/src/opnsense/service/templates/OPNsense/Netsnmp/snmpd.conf
+++ b/net-mgmt/net-snmp/src/opnsense/service/templates/OPNsense/Netsnmp/snmpd.conf
@@ -35,5 +35,8 @@ sysLocation {{ OPNsense.netsnmp.general.syslocation }}
 sysContact {{ OPNsense.netsnmp.general.syscontact }}
 {% endif %}
 
+{% if helpers.exists('OPNsense.netsnmp.general.l3visibility') and OPNsense.netsnmp.general.l3visibility == '1' %}
+sysServices 76
+{% endif %}
 
 {% endif %}