diff --git a/net-mgmt/lldpd/Makefile b/net-mgmt/lldpd/Makefile index ae63bd512b..e93fd641c9 100644 --- a/net-mgmt/lldpd/Makefile +++ b/net-mgmt/lldpd/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= lldpd -PLUGIN_VERSION= 1.2 +PLUGIN_VERSION= 1.3 PLUGIN_COMMENT= LLDP allows you to know exactly on which port is a server PLUGIN_DEPENDS= lldpd PLUGIN_MAINTAINER= m.muenz@gmail.com diff --git a/net-mgmt/lldpd/pkg-descr b/net-mgmt/lldpd/pkg-descr index 652ec7c97f..956ce8d962 100644 --- a/net-mgmt/lldpd/pkg-descr +++ b/net-mgmt/lldpd/pkg-descr @@ -6,6 +6,10 @@ to adjacent network devices. Plugin Changelog ================ +1.3 + +* Ability to disable LLDP-MED + 1.2 * Add AgentX integration support (contributed by TotalGriffLock) diff --git a/net-mgmt/lldpd/src/opnsense/mvc/app/controllers/OPNsense/Lldpd/forms/general.xml b/net-mgmt/lldpd/src/opnsense/mvc/app/controllers/OPNsense/Lldpd/forms/general.xml index 48da1c1d5f..13ddbf76f5 100644 --- a/net-mgmt/lldpd/src/opnsense/mvc/app/controllers/OPNsense/Lldpd/forms/general.xml +++ b/net-mgmt/lldpd/src/opnsense/mvc/app/controllers/OPNsense/Lldpd/forms/general.xml @@ -35,6 +35,12 @@ checkbox This will enable AgentX support, which can then be queried via SNMP. + + general.lldpmed + + checkbox + This will enable LLDP-MED. + general.interface diff --git a/net-mgmt/lldpd/src/opnsense/mvc/app/models/OPNsense/Lldpd/General.xml b/net-mgmt/lldpd/src/opnsense/mvc/app/models/OPNsense/Lldpd/General.xml index 1385c882b1..2b8373d02e 100644 --- a/net-mgmt/lldpd/src/opnsense/mvc/app/models/OPNsense/Lldpd/General.xml +++ b/net-mgmt/lldpd/src/opnsense/mvc/app/models/OPNsense/Lldpd/General.xml @@ -1,7 +1,7 @@ //OPNsense/lldpd/general Lldpd configuration - 1.0.1 + 1.0.2 0 @@ -27,6 +27,10 @@ 0 Y + + 0 + Y + N diff --git a/net-mgmt/lldpd/src/opnsense/service/templates/OPNsense/Lldpd/lldpd b/net-mgmt/lldpd/src/opnsense/service/templates/OPNsense/Lldpd/lldpd index 4e627eb957..0eaf572c4f 100644 --- a/net-mgmt/lldpd/src/opnsense/service/templates/OPNsense/Lldpd/lldpd +++ b/net-mgmt/lldpd/src/opnsense/service/templates/OPNsense/Lldpd/lldpd @@ -1,6 +1,6 @@ {% if helpers.exists('OPNsense.lldpd.general.enabled') and OPNsense.lldpd.general.enabled == '1' %} lldpd_enable="YES" -lldpd_flags="{% if helpers.exists('OPNsense.lldpd.general.cdp') and OPNsense.lldpd.general.cdp == '1' %}-c{% endif %}{% if helpers.exists('OPNsense.lldpd.general.fdp') and OPNsense.lldpd.general.fdp == '1' %} -f{% endif %}{% if helpers.exists('OPNsense.lldpd.general.edp') and OPNsense.lldpd.general.edp == '1' %} -e{% endif %}{% if helpers.exists('OPNsense.lldpd.general.sonmp') and OPNsense.lldpd.general.sonmp == '1' %} -s{% endif %}{% if helpers.exists('OPNsense.lldpd.general.agentx') and OPNsense.lldpd.general.agentx == '1' %} -x{% endif %}{% if helpers.exists('OPNsense.lldpd.general.interface') and OPNsense.lldpd.general.interface != '' %} -I {{ OPNsense.lldpd.general.interface }}{% endif %} -M 4" +lldpd_flags="{% if helpers.exists('OPNsense.lldpd.general.cdp') and OPNsense.lldpd.general.cdp == '1' %}-c{% endif %}{% if helpers.exists('OPNsense.lldpd.general.fdp') and OPNsense.lldpd.general.fdp == '1' %} -f{% endif %}{% if helpers.exists('OPNsense.lldpd.general.edp') and OPNsense.lldpd.general.edp == '1' %} -e{% endif %}{% if helpers.exists('OPNsense.lldpd.general.sonmp') and OPNsense.lldpd.general.sonmp == '1' %} -s{% endif %}{% if helpers.exists('OPNsense.lldpd.general.agentx') and OPNsense.lldpd.general.agentx == '1' %} -x{% endif %}{% if helpers.exists('OPNsense.lldpd.general.interface') and OPNsense.lldpd.general.interface != '' %} -I {{ OPNsense.lldpd.general.interface }}{% endif %}{% if helpers.exists('OPNsense.lldpd.general.lldpmed') and OPNsense.lldpd.general.lldpmed == '1' %} -M 4{% endif %} {% else %} lldpd_enable="NO" {% endif %}