lldpd: freeze execution of lldpd during reload

[openwrt/openwrt.git] / package / network / services / lldpd / files / lldpd.init

diff --git a/package/network/services/lldpd/files/lldpd.init b/package/network/services/lldpd/files/lldpd.init
index b2eea70fd3577ccce092a7df24b929bf281a726c..4e9efcae0de0e445baf6f43966f90675484d3ea7 100644 (file)
--- a/package/network/services/lldpd/files/lldpd.init
+++ b/package/network/services/lldpd/files/lldpd.init
@@ -1,29 +1,62 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2008-2012 OpenWrt.org
+# Copyright (C) 2008-2015 OpenWrt.org
 
 START=90
+STOP=01
 
-SERVICE_USE_PID=1
+USE_PROCD=1
+LLDPCLI=/usr/sbin/lldpcli
+LLDPSOCKET=/var/run/lldpd.socket
+LLDPD_CONF=/tmp/lldpd.conf
+LLDPD_CONFS_DIR=/tmp/lldpd.d
 
 find_release_info()
 {
-       [ -s /etc/openwrt_release ] && . /etc/openwrt_release
-       [ -z "$DISTRIB_DESCRIPTION" ] && [ -s /etc/openwrt_version ] && \
-               DISTRIB_DESCRIPTION="$(cat /etc/openwrt_version)"
+       [ -s /etc/os-release ] && . /etc/os-release
+       [ -z "$PRETTY_NAME" ] && [ -s /etc/openwrt_version ] && \
+               PRETTY_NAME="$(cat /etc/openwrt_version)"
 
-       echo "${DISTRIB_DESCRIPTION:-Unknown OpenWrt release} @ $(cat /proc/sys/kernel/hostname)"
+       echo "${PRETTY_NAME:-Unknown Lede release} @ $(cat /proc/sys/kernel/hostname)"
 }
 
-start() {
+write_lldpd_conf()
+{
        . /lib/functions/network.sh
 
+       local lldp_description
+
+       config_load 'lldpd'
+       config_get lldp_description 'config' 'lldp_description' "$(find_release_info)"
+
+       local ifaces
+       config_get ifaces 'config' 'interface'
+
+       local iface ifnames=""
+       for iface in $ifaces; do
+               local ifname=""
+               if network_get_device ifname "$iface" || [ -e "/sys/class/net/$iface" ]; then
+                       append ifnames "${ifname:-$iface}" ","
+               fi
+       done
+
+       # Clear out the config file first
+       echo -n > "$LLDPD_CONF"
+       [ -n "$ifnames" ] && echo "configure system interface pattern" "$ifnames" >> "$LLDPD_CONF"
+       [ -n "$lldp_description" ] && echo "configure system description" "\"$lldp_description\"" >> "$LLDPD_CONF"
+
+       # Since lldpd's sysconfdir is /tmp, we'll symlink /etc/lldpd.d to /tmp/$LLDPD_CONFS_DIR
+       [ -e $LLDPD_CONFS_DIR ] || ln -s /etc/lldpd.d $LLDPD_CONFS_DIR
+}
+
+start_service() {
+
        local enable_cdp
        local enable_fdp
        local enable_sonmp
        local enable_edp
        local lldp_class
        local lldp_location
-       local lldp_description
+       local readonly_mode
 
        config_load 'lldpd'
        config_get_bool enable_cdp 'config' 'enable_cdp' 0
@@ -32,38 +65,57 @@ start() {
        config_get_bool enable_edp 'config' 'enable_edp' 0
        config_get lldp_class 'config' 'lldp_class'
        config_get lldp_location 'config' 'lldp_location'
-       config_get lldp_description 'config' 'lldp_description' "$(find_release_info)"
+       config_get_bool readonly_mode 'config' 'readonly_mode' 0
 
-       local ifaces
-       config_get ifaces 'config' 'interface'
+       mkdir -p /var/run/lldp
+       chown lldp:lldp /var/run/lldp
 
-       local iface
-       for iface in $ifaces; do
-               local ifname=""
-               if network_get_device ifname "$iface" || [ -e "/sys/class/net/$iface" ]; then
-                       append args "-I ${ifname:-$iface}"
-               fi
-       done
+       # When lldpd starts, it also loads up what we write in this config file
+       write_lldpd_conf
 
-       [ $enable_cdp -gt 0 ] && append args '-c'
-       [ $enable_fdp -gt 0 ] && append args '-f'
-       [ $enable_sonmp -gt 0 ] && append args '-s'
-       [ $enable_edp -gt 0 ] && append args '-e'
+       procd_open_instance
+       procd_set_param command /usr/sbin/lldpd
+       procd_append_param command -d # don't daemonize, procd will handle that for us
 
-       mkdir -p /var/run/lldp
-       chown lldp:lldp /var/run/lldp
+       [ $enable_cdp -gt 0 ] && procd_append_param command '-c'
+       [ $enable_fdp -gt 0 ] && procd_append_param command '-f'
+       [ $enable_sonmp -gt 0 ] && procd_append_param command '-s'
+       [ $enable_edp -gt 0 ] && procd_append_param command '-e'
+       [ $readonly_mode -gt 0 ] && procd_append_param command '-r'
+       [ -n "$lldp_class" ] && procd_append_param command -M "$lldp_class"
+
+       # set auto respawn behavior
+       procd_set_param respawn
+       procd_append_param respawn 3600
+       procd_append_param respawn 5
+       procd_append_param respawn -1
+       procd_close_instance
+}
 
-       service_start /usr/sbin/lldpd $args \
-               ${lldp_class:+ -M $lldp_class} \
-               ${lldp_description:+ -S "$lldp_description"}
+service_running() {
+       pgrep -x /usr/sbin/lldpd &> /dev/null
+}
 
-       [ -n "$lldp_location" ] && {
-               sleep 1
-               /usr/sbin/lldpctl -L "$lldp_location" > /dev/null 2>&1
-       }
+reload_service() {
+       running || return 1
+       $LLDPCLI -u $LLDPSOCKET &> /dev/null <<-EOF
+               pause
+               unconfigure lldp custom-tlv
+               unconfigure system interface pattern
+               unconfigure system description
+       EOF
+       # Rewrite lldpd.conf
+       # If something changed it should be included by the lldpcli call
+       write_lldpd_conf
+       $LLDPCLI -u $LLDPSOCKET -c $LLDPD_CONF -c $LLDPD_CONFS_DIR &> /dev/null
+       # Broadcast update over the wire
+       $LLDPCLI -u $LLDPSOCKET &> /dev/null <<-EOF
+               resume
+               update
+       EOF
+       return 0
 }
 
-stop() {
-       service_stop /usr/sbin/lldpd
-       rm -f /var/run/lldpd.socket /var/run/lldpd.pid
+stop_service() {
+       rm -rf /var/run/lldp $LLDPSOCKET
 }