This patch updates link state monitor (lsm) to release 0.131, add sample connections.conf and update lsm.conf and lsm_script
Signed-off-by: Edy Corak i...@loenshotel.de
Index: Makefile =================================================================== --- Makefile (Revision 32449) +++ Makefile (Arbeitskopie) @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lsm -PKG_VERSION:=0.60 -PKG_RELEASE:=3 +PKG_VERSION:=0.131 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://lsm.foobar.fi/download -PKG_MD5SUM:=f4748308c0a1caa98d7e756778954116 +PKG_MD5SUM:=c3ff15f5e0d3988a1a45f35392639d40 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk @@ -48,12 +48,14 @@ $(INSTALL_DIR) $(1)/etc/lsm $(INSTALL_DIR) $(1)/etc/lsm/script.d $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_DATA) ./files/connections.conf $(1)/etc/lsm/connections.conf $(INSTALL_DATA) ./files/lsm.conf $(1)/etc/lsm/lsm.conf $(INSTALL_BIN) ./files/lsm_script $(1)/etc/lsm/script $(INSTALL_BIN) ./files/lsm.init $(1)/etc/init.d/lsm endef define Package/lsm/conffiles +/etc/lsm/connections.conf /etc/lsm/lsm.conf endef Index: files/connections.conf =================================================================== --- files/connections.conf (Revision 0) +++ files/connections.conf (Revision 0) @@ -0,0 +1,13 @@ +connection { + name=Provider1 + checkip=1.1.1.1 + device=pppoe-wan + ttl=2 +} + +connection { + name=Provider2 + checkip=2.2.2.2 + device=eth0.2 + ttl=1 +} Index: files/lsm.conf =================================================================== --- files/lsm.conf (Revision 32449) +++ files/lsm.conf (Arbeitskopie) @@ -1,4 +1,3 @@ - # # (C) 2009 Mika Ilmaranta <ilmis at nullnet.fi> # @@ -12,7 +11,7 @@ #debug=10 #debug=9 debug=8 -reopen_on_enodev=1 +# reopen_on_enodev=1 # # Defaults for the connection entries @@ -21,7 +20,7 @@ name=defaults checkip=127.0.0.1 eventscript=/etc/lsm/script - max_packet_loss=15 + max_packet_loss=20 max_successive_pkts_lost=7 min_packet_loss=5 min_successive_pkts_rcvd=10 Index: files/lsm_script =================================================================== --- files/lsm_script (Revision 32449) +++ files/lsm_script (Arbeitskopie) @@ -1,14 +1,11 @@ #!/bin/sh # -# (C) 2009 Mika Ilmaranta <ilmis at nullnet.fi> +# (C) 2009 Mika Ilmaranta <il...@nullnet.fi> +# (C) 2009 Tom Eastep <teas...@shorewall.net> # # License: GPLv2 # -# -# default event handling script -# - DATE=$(/bin/date) STATE=${1} @@ -25,42 +22,56 @@ CONS_MISS=${12} AVG_RTT=${13} -cat <<EOM | mail -s "LSM: ${NAME} ${STATE}, IP ${CHECKIP}" ${WARN_EMAIL} +if [ -f /usr/share/shorewall-lite/lib.base ]; then + VARDIR=/etc/shorewall-lite/state + STATEDIR=/etc/shorewall-lite +else + VARDIR=/var/lib/shorewall + STATEDIR=/etc/shorewall +fi +[ -f ${STATEDIR}/vardir ] && . ${STATEDIR}/vardir + +cat <<EOM | ssmtp ${WARN_EMAIL} +Subject: "LSM: ${NAME} ${STATE}, DEV ${DEVICE}" + Hi, Your connection ${NAME} has changed it's state to ${STATE} at ${DATE}. Following parameters were passed: + newstate = ${STATE} name = ${NAME} checkip = ${CHECKIP} device = ${DEVICE} warn_email = ${WARN_EMAIL} -Packet statuses: +Packet counters: + replied = ${REPLIED} packets replied waiting = ${WAITING} packets waiting for reply -timeout = ${TIMEOUT} packets that have timeout (= packet loss) +timeout = ${TIMEOUT} packets that have timed out (= packet loss) reply_late = ${REPLY_LATE} packets that received a reply after timeout cons_rcvd = ${CONS_RCVD} consecutively received replies in sequence cons_wait = ${CONS_WAIT} consecutive packets waiting for reply cons_miss = ${CONS_MISS} consecutive packets that have timed out -avg_rtt = ${AVG_RTT} average rtt [usec], calculated from received packets +avg_rtt = ${AVG_RTT} average rtt, notice that waiting and timed out packets have rtt = 0 when calculating this -BR, -Your LSM installation +Your LSM Daemon EOM -cd /etc/lsm/script.d/ -for script in $(ls); do - if [ ! -x $script ]; then - continue - fi - ./$script "$@" -done +if [ ${STATE} = up ]; then + echo 0 > ${VARDIR}/${DEVICE}.status # Uncomment this line if you are running Shorewall 4.4.x or earlier + ${VARDIR}/firewall enable ${DEVICE} +else + echo 1 > ${VARDIR}/${DEVICE}.status # Uncomment this line if you are running Shorewall 4.4.x or earlier + ${VARDIR}/firewall disable ${DEVICE} +fi -exit 0; +/sbin/shorewall-lite show routing > /var/log/lsm +exit 0 + #EOF
_______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
