[PATCH 1/2] lldpd: Enable support for cisco discovery protocol

[PATCH 1/2] lldpd: Enable support for cisco discovery protocol

[Stefan Schantl]

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
 src/initscripts/system/lldpd | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/initscripts/system/lldpd b/src/initscripts/system/lldpd
index 128115dbb..42b0cb9d7 100755
--- a/src/initscripts/system/lldpd
+++ b/src/initscripts/system/lldpd
@@ -22,6 +22,8 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
+LLDPDARGS=""
+
 # Read the configuration
 readhash CONFIG "/var/ipfire/lldp/settings"
 
@@ -34,6 +36,9 @@ generate_config() {
 	return 0
 }
 
+# Enable support for Cisco Discovery Protocol (CDP)
+LLDPDARGS+="-c"
+
 case "${1}" in
 	start)
 		# Do nothing if the service is not enabled
@@ -49,7 +54,7 @@ case "${1}" in
 		fi
 
 		boot_mesg "Starting Link-Layer Discovery Protocol Daemon..."
-		loadproc /usr/sbin/lldpd
+		loadproc /usr/sbin/lldpd ${LLDPDARGS}
 		;;
 
 	stop)
-- 
2.47.3

[PATCH 2/2] lldpd: Set green address as management address

[Stefan Schantl]

At default the first available IP address (which heavily depends on your
and your ISP assigned addresses) will be used as management address.

This patch changes this behaviour to set the address of the green zone
as management address and broadcast it.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
 src/initscripts/system/lldpd | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/initscripts/system/lldpd b/src/initscripts/system/lldpd
index 42b0cb9d7..9b2cbcaf4 100755
--- a/src/initscripts/system/lldpd
+++ b/src/initscripts/system/lldpd
@@ -27,6 +27,9 @@ LLDPDARGS=""
 # Read the configuration
 readhash CONFIG "/var/ipfire/lldp/settings"
 
+# Read-in network settings
+eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
+
 generate_config() {
 	# Set the description (if given)
 	if [ -n "${CONFIG["DESCRIPTION"]}" ]; then
@@ -53,6 +56,11 @@ case "${1}" in
 			exit 1
 		fi
 
+		# Set green address as management address if there is one.
+		if [ -n ${GREEN_ADDRESS} ]; then
+			LLDPDARGS+=" -m ${GREEN_ADDRESS}"
+		fi
+
 		boot_mesg "Starting Link-Layer Discovery Protocol Daemon..."
 		loadproc /usr/sbin/lldpd ${LLDPDARGS}
 		;;
-- 
2.47.3