From 15a18454bbfb164dc35c403314349e4869e23ace Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Thu, 6 Feb 2020 22:53:57 +0100
Subject: [PATCH] net-mgmt/net-snmp: allow to call opnsense-version via snmp
 (#1684)

---
 net-mgmt/net-snmp/Makefile                                | 2 +-
 net-mgmt/net-snmp/pkg-descr                               | 8 ++++++++
 .../app/controllers/OPNsense/Netsnmp/forms/general.xml    | 6 ++++++
 .../opnsense/mvc/app/models/OPNsense/Netsnmp/General.xml  | 8 ++++++--
 .../service/templates/OPNsense/Netsnmp/snmpd.conf         | 4 ++++
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index efce494b6..bd26747fa 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		net-snmp
-PLUGIN_VERSION=		1.3
+PLUGIN_VERSION=		1.4
 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/pkg-descr b/net-mgmt/net-snmp/pkg-descr
index da22f4203..c2f08d0ba 100644
--- a/net-mgmt/net-snmp/pkg-descr
+++ b/net-mgmt/net-snmp/pkg-descr
@@ -6,3 +6,11 @@ Net-SNMP is a suite of applications used to implement
 SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6.
 
 WWW: http://www.net-snmp.org
+
+
+Plugin Changelog
+----------------
+
+1.4
+
+* Include installed version number in extended OID
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 bfeabc7fa..93c370f17 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
@@ -29,6 +29,12 @@
         <type>checkbox</type>
         <help>Make this device visible as Layer 3 enabled.</help>
     </field>
+    <field>
+        <id>general.versionoid</id>
+        <label>Display Verion in OID</label>
+        <type>checkbox</type>
+        <help>This let you fetch the current installed version via .1.3.6.1.4.1.8072.1.3.2.3.1.2.7.118.101.114.115.105.111.110</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 adf2dc4a6..ca6ac99c7 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.1</version>
+    <version>1.0.3</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -22,7 +22,11 @@
         <l3visibility type="BooleanField">
             <default>0</default>
             <Required>Y</Required>
-        </l3visibility>
+        </l3visibility>        
+        <versionoid type="BooleanField">
+            <default>0</default>
+            <Required>Y</Required>
+        </versionoid>
         <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 d216bd3a5..1afbeaad8 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
@@ -39,4 +39,8 @@ sysContact {{ OPNsense.netsnmp.general.syscontact }}
 sysServices 76
 {% endif %}
 
+{% if helpers.exists('OPNsense.netsnmp.general.versionoid') and OPNsense.netsnmp.general.versionoid == '1' %}
+extend    version   /usr/local/sbin/opnsense-version
+{% endif %}
+
 {% endif %}