STOP=01
USE_PROCD=1
+LLDPDBIN=/usr/sbin/lldpd
LLDPCLI=/usr/sbin/lldpcli
LLDPSOCKET=/var/run/lldpd.socket
LLDPD_CONF=/tmp/lldpd.conf
LLDPD_CONFS_DIR=/tmp/lldpd.d
+LLDPD_RUN=/var/run/lldpd
+LLDPD_RESTART_HASH=${LLDPD_RUN}/lldpd.restart_hash
+
+. "$IPKG_INSTROOT/lib/functions/network.sh"
+
find_release_info()
{
[ -s /etc/os-release ] && . /etc/os-release
[ -z "$PRETTY_NAME" ] && [ -s /etc/openwrt_version ] && \
PRETTY_NAME="$(cat /etc/openwrt_version)"
- echo "${PRETTY_NAME:-Unknown Lede release} @ $(cat /proc/sys/kernel/hostname)"
+ echo "${PRETTY_NAME:-Unknown OpenWrt release} @ $(cat /proc/sys/kernel/hostname)"
+}
+
+get_config_restart_hash() {
+ local var="$1"
+ local _string _hash v
+
+ config_load 'lldpd'
+
+ config_get v 'config' 'lldp_class'; append _string "$v" ","
+ config_get v 'config' 'agentxsocket'; append _string "$v" ","
+ config_get v 'config' 'cid_interface'; append _string "$v" ","
+ config_get v 'config' 'filter'; append _string "$v" ","
+ config_get_bool v 'config' 'readonly_mode'; append _string "$v" ","
+ config_get_bool v 'config' 'enable_lldp' 1; append _string "$v" ","
+ config_get_bool v 'config' 'enable_cdp'; append _string "$v" ","
+ config_get_bool v 'config' 'enable_edp'; append _string "$v" ","
+ config_get_bool v 'config' 'enable_fdp'; append _string "$v" ","
+ config_get_bool v 'config' 'enable_sonmp'; append _string "$v" ","
+
+ _hash=`echo -n "${_string}" | md5sum | awk '{ print \$1 }'`
+ export -n "$var=$_hash"
+}
+
+get_config_cid_ifaces() {
+ local _ifaces
+ config_get _ifaces 'config' 'cid_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
+
+ export -n "${1}=$_ifnames"
}
write_lldpd_conf()
{
- . /lib/functions/network.sh
-
local lldp_description
config_load 'lldpd'
config_get lldp_description 'config' 'lldp_description' "$(find_release_info)"
+ local lldp_hostname
+ config_get lldp_hostname 'config' 'lldp_hostname' "$(cat /proc/sys/kernel/hostname)"
+
local ifaces
config_get ifaces 'config' 'interface'
fi
done
+ local lldp_mgmt_ip
+ config_get lldp_mgmt_ip 'config' 'lldp_mgmt_ip'
+
+ local lldp_syscapabilities
+ config_get lldp_syscapabilities 'config' 'lldp_syscapabilities'
+
# 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"
+ [ -n "$lldp_hostname" ] && echo "configure system hostname" "\"$lldp_hostname\"" >> "$LLDPD_CONF"
+ [ -n "$lldp_mgmt_ip" ] && echo "configure system ip management pattern" "\"$lldp_mgmt_ip\"" >> "$LLDPD_CONF"
+ [ -n "$lldp_syscapabilities" ] && echo "configure system capabilities enabled" "\"$lldp_syscapabilities\"" >> "$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
local lldp_class
local lldp_location
local readonly_mode
+ local agentxsocket
+ local filter
config_load 'lldpd'
config_get_bool enable_cdp 'config' 'enable_cdp' 0
config_get lldp_class 'config' 'lldp_class'
config_get lldp_location 'config' 'lldp_location'
config_get_bool readonly_mode 'config' 'readonly_mode' 0
+ config_get agentxsocket 'config' 'agentxsocket'
+ config_get filter 'config' 'filter' 15
- mkdir -p /var/run/lldp
- chown lldp:lldp /var/run/lldp
+ mkdir -p ${LLDPD_RUN}
+ chown lldp:lldp ${LLDPD_RUN}
# When lldpd starts, it also loads up what we write in this config file
write_lldpd_conf
procd_open_instance
- procd_set_param command /usr/sbin/lldpd
- procd_append_param command -d # don't daemonize, procd will handle that for us
+ procd_set_param command ${LLDPDBIN}
+ procd_append_param command -d
[ $enable_cdp -gt 0 ] && procd_append_param command '-c'
[ $enable_fdp -gt 0 ] && procd_append_param command '-f'
[ $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"
+ [ -n "$agentxsocket" ] && procd_append_param command -x -X "$agentxsocket"
+ [ -n "$filter" ] && procd_append_param command -H "$filter"
+
+ # ChassisID interfaces
+ local ifnames
+ get_config_cid_ifaces ifnames
+ [ -n "$ifnames" ] && procd_append_param command -C "$ifnames"
+
+ # Overwrite default configuration locations processed by lldpcli at start
+ procd_append_param command -O "$LLDPD_CONF"
+
+ local restart_hash
+ get_config_restart_hash restart_hash
+ echo -n "$restart_hash" > $LLDPD_RESTART_HASH
# 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_running() {
- pgrep -x /usr/sbin/lldpd &> /dev/null
+service_triggers() {
+ procd_add_config_trigger "config.change" "lldpd" /etc/init.d/lldpd reload
}
reload_service() {
running || return 1
+
+ local running_hash=""
+ local config_hash=""
+
+ get_config_restart_hash config_hash
+ if [ -f ${LLDPD_RESTART_HASH} ]; then running_hash=`cat $LLDPD_RESTART_HASH`; fi
+
+ if [ "x$running_hash" != "x$config_hash" ]; then
+ # Restart LLDPd
+ # Some parameters can't be configured at runtime
+ restart
+ return 0
+ fi
+
$LLDPCLI -u $LLDPSOCKET &> /dev/null <<-EOF
+ pause
unconfigure lldp custom-tlv
unconfigure system interface pattern
unconfigure system description
+ unconfigure system hostname
+ unconfigure system ip management pattern
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 update &> /dev/null
+ $LLDPCLI -u $LLDPSOCKET &> /dev/null <<-EOF
+ resume
+ update
+ EOF
return 0
}
stop_service() {
- rm -rf /var/run/lldp $LLDPSOCKET
+ rm -rf ${LLDPD_RUN} $LLDPSOCKET 2>/dev/null
}
+
projects / openwrt / staging / robimarko.git / blobdiff