diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/ltq-dsl-app/Config.in | 4 | ||||
| -rw-r--r-- | package/ltq-dsl-app/Makefile | 9 | ||||
| -rw-r--r-- | package/ltq-dsl-app/files/dsl_control | 280 | ||||
| -rw-r--r-- | package/ltq-dsl-app/files/dsl_notify.sh | 44 | ||||
| -rw-r--r-- | package/ltq-dsl-app/files/ifx_cpe_control_init.sh | 21 |
5 files changed, 331 insertions, 27 deletions
diff --git a/package/ltq-dsl-app/Config.in b/package/ltq-dsl-app/Config.in index c9a9a9563..728fe65b3 100644 --- a/package/ltq-dsl-app/Config.in +++ b/package/ltq-dsl-app/Config.in @@ -1,5 +1,5 @@ -config LTQ_DSL_ENABLE_CLI - bool "Enable CLI support" +config LTQ_DSL_ENABLE_SOAP + bool "Enable SOAP support" depends on PACKAGE_ltq-dsl-app default n diff --git a/package/ltq-dsl-app/Makefile b/package/ltq-dsl-app/Makefile index 981a6a796..f94f3e0b9 100644 --- a/package/ltq-dsl-app/Makefile +++ b/package/ltq-dsl-app/Makefile @@ -17,7 +17,7 @@ PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources/ PKG_MD5SUM:=ee315306626b68794d3d3636dabfe161 PKG_CONFIG_DEPENDS:=\ - CONFIG_LTQ_DSL_ENABLE_CLI \ + CONFIG_LTQ_DSL_ENABLE_SOAP \ CONFIG_LTQ_DSL_ENABLE_DSL_EVENT_POLLING include $(INCLUDE_DIR)/package.mk @@ -55,6 +55,7 @@ CONFIGURE_ARGS += \ --enable-driver-include="-I$(STAGING_DIR)/usr/include" \ --enable-debug-prints \ --enable-add-appl-cflags="-DMAX_CLI_PIPES=2" \ + --enable-cli-support \ --enable-cmv-scripts \ --enable-debug-tool-interface \ --enable-adsl-led \ @@ -72,9 +73,8 @@ CONFIGURE_ARGS += \ --enable-dsl-pm-line-thresholds \ --enable-dsl-pm-optional-parameters -ifeq ($(CONFIG_LTQ_DSL_ENABLE_CLI),y) +ifeq ($(CONFIG_LTQ_DSL_ENABLE_SOAP),y) CONFIGURE_ARGS += \ - --enable-cli-support \ --enable-soap-support endif @@ -87,10 +87,11 @@ TARGET_CFLAGS += -I$(LINUX_DIR)/include define Package/ltq-dsl-app/install $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/ifx_cpe_control_init.sh $(1)/etc/init.d/ + $(INSTALL_BIN) ./files/dsl_control $(1)/etc/init.d/ $(INSTALL_DIR) $(1)/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dsl_cpe_control $(1)/sbin + $(INSTALL_BIN) ./files/dsl_notify.sh $(1)/sbin endef $(eval $(call BuildPackage,ltq-dsl-app)) diff --git a/package/ltq-dsl-app/files/dsl_control b/package/ltq-dsl-app/files/dsl_control new file mode 100644 index 000000000..df31c39e5 --- /dev/null +++ b/package/ltq-dsl-app/files/dsl_control @@ -0,0 +1,280 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2008 OpenWrt.org +START=99 + +EXTRA_COMMANDS="status lucistat" +EXTRA_HELP=" status Get DSL status information + lucistat Get status information if lua friendly format" + +SERVICE_DAEMONIZE=1 +SERVICE_WRITE_PID=1 + +# +# Basic functions to send CLI commands to the dsl_cpe_control daemon +# +dsl_cmd() { + pkill -0 dsl_cpe_control && ( + echo "$@" > /tmp/pipe/dsl_cpe0_cmd + cat /tmp/pipe/dsl_cpe0_ack + ) +} +dsl_val() { + echo $(expr "$1" : '.*'$2'=\([-\.[:alnum:]]*\).*') +} + +# +# Simple divide by 10 routine to cope with one decimal place +# +dbt() { + local a=$(expr $1 / 10) + local b=$(expr $1 % 10) + echo "${a}.${b}" +} +# +# Take a number and convert to k or meg +# +scale() { + local val=$1 + local a + local b + + if [ "$val" -gt 1000000 ]; then + a=$(expr $val / 1000) + b=$(expr $a % 1000) + a=$(expr $a / 1000) + printf "%d.%03d Mb" ${a} ${b} + elif [ "$val" -gt 1000 ]; then + a=$(expr $val / 1000) + printf "%d Kb" ${a} + else + echo "${val} b" + fi +} + +# +# Read the data rates for both directions +# +data_rates() { + local csg + local dru + local drd + local sdru + local sdrd + + csg=$(dsl_cmd g997csg 0 1) + drd=$(dsl_val "$csg" ActualDataRate) + + csg=$(dsl_cmd g997csg 0 0) + dru=$(dsl_val "$csg" ActualDataRate) + + [ -z "$drd" ] && drd=0 + [ -z "$dru" ] && dru=0 + + sdrd=$(scale $drd) + sdru=$(scale $dru) + + if [ "$action" = "lucistat" ]; then + echo "dsl.data_rate_down=$drd" + echo "dsl.data_rate_up=$dru" + echo "dsl.data_rate_down_s=\"$sdrd\"" + echo "dsl.data_rate_up_s=\"$sdru\"" + else + echo "Data Rate: ${sdrd}/s / ${sdru}/s" + fi +} + +# +# Chipset +# +chipset() { + local vig + local cs + local csv + + vig=$(dsl_cmd vig) + cs=$(dsl_val "$vig" DSL_ChipSetType) + csv=$(dsl_val "$vig" DSL_ChipSetHWVersion) + + if [ "$action" = "lucistat" ]; then + echo "dsl.chipset=\"${cs} ${csv}\"" + else + echo "Chipset: ${cs} ${csv}" + fi +} + +# +# Work out how long the line has been up +# +line_uptime() { + local ccsg + local et + local etr + local d + local h + local m + local s + local rc="" + + ccsg=$(dsl_cmd pmccsg 0 0 0) + et=$(dsl_val "$ccsg" nElapsedTime) + + [ -z "$et" ] && et=0 + + if [ "$action" = "lucistat" ]; then + echo "dsl.line_uptime=${et}" + return + fi + + d=$(expr $et / 86400) + etr=$(expr $et % 86400) + h=$(expr $etr / 3600) + etr=$(expr $etr % 3600) + m=$(expr $etr / 60) + s=$(expr $etr % 60) + + + [ "${d}${h}${m}${s}" -ne 0 ] && rc="${s}s" + [ "${d}${h}${m}" -ne 0 ] && rc="${m}m ${rc}" + [ "${d}${h}" -ne 0 ] && rc="${h}h ${rc}" + [ "${d}" -ne 0 ] && rc="${d}d ${rc}" + + [ -z "$rc" ] && rc="down" + echo "Line Uptime: ${rc}" +} + +# +# Get noise and attenuation figures +# +line_data() { + local lsg + local latnu + local latnd + local snru + local snrd + + lsg=$(dsl_cmd g997lsg 1 1) + latnd=$(dsl_val "$lsg" LATN) + snrd=$(dsl_val "$lsg" SNR) + + lsg=$(dsl_cmd g997lsg 0 1) + latnu=$(dsl_val "$lsg" LATN) + snru=$(dsl_val "$lsg" SNR) + + [ -z "$latnd" ] && latnd=0 + [ -z "$latnu" ] && latnu=0 + [ -z "$snrd" ] && snrd=0 + [ -z "$snru" ] && snru=0 + + latnd=$(dbt $latnd) + latnu=$(dbt $latnu) + snrd=$(dbt $snrd) + snru=$(dbt $snru) + + if [ "$action" = "lucistat" ]; then + echo "dsl.line_attenuation_down=$latnd" + echo "dsl.line_attenuation_up=$latnu" + echo "dsl.noise_margin_down=$snrd" + echo "dsl.noise_margin_up=$snru" + else + echo "Line Attenuation: ${latnd}dB / ${latnu}dB" + echo "Noise Margin: ${snrd}dB / ${snru}dB" + fi +} + +# +# Is the line up? Or what state is it in? +# +line_state() { + local lsg=$(dsl_cmd lsg) + local ls=$(dsl_val "$lsg" nLineState); + local s; + + case "$ls" in + "0x0") s="not initialized" ;; + "0x1") s="exception" ;; + "0x10") s="not updated" ;; + "0xff") s="idle request" ;; + "0x100") s="idle" ;; + "0x1ff") s="silent request" ;; + "0x200") s="silent" ;; + "0x300") s="handshake" ;; + "0x380") s="full_init" ;; + "0x400") s="discovery" ;; + "0x500") s="training" ;; + "0x600") s="analysis" ;; + "0x700") s="exchange" ;; + "0x800") s="showtime_no_sync" ;; + "0x801") s="showtime_tc_sync" ;; + "0x900") s="fastretrain" ;; + "0xa00") s="lowpower_l2" ;; + "0xb00") s="loopdiagnostic active" ;; + "0xb10") s="loopdiagnostic data exchange" ;; + "0xb20") s="loopdiagnostic data request" ;; + "0xc00") s="loopdiagnostic complete" ;; + "0x1000000") s="test" ;; + "0xd00") s="resync" ;; + "0x3c0") s="short init entry" ;; + "") s="not running daemon"; ls="0xfff" ;; + *) s="unknown" ;; + esac + + if [ $action = "lucistat" ]; then + echo "dsl.line_state_num=$ls" + echo "dsl.line_state_detail=\"$s\"" + if [ "$ls" = "0x801" ]; then + echo "dsl.line_state=\"UP\"" + else + echo "dsl.line_state=\"DOWN\"" + fi + else + if [ "$ls" = "0x801" ]; then + echo "Line State: UP [$ls: $s]" + else + echo "Line State: DOWN [$ls: $s]" + fi + fi +} + +# +# Main status routine +# +status() { + chipset + line_state + data_rates + line_data + line_uptime +} + +# +# Luci (lua) compatible version that's easy to parse +# +lucistat() { + echo "local dsl={}" + status + echo "return dsl" +} + +# +# Simple start routine +# +start() { + # start CPE dsl daemon in the background + service_start /sbin/dsl_cpe_control -i \ + -n /sbin/dsl_notify.sh \ + -f /lib/firmware/ModemHWE.bin +} + +# +# For stop we want to simulate the notification call for when +# the line goes down, so that we can stop the ppp link before +# we die. +# +stop() { + DSL_NOTIFICATION_TYPE="DSL_INTERFACE_STATUS" \ + DSL_INTERFACE_STATUS="DOWN" \ + /sbin/dsl_notify.sh + + service_stop /sbin/dsl_cpe_control +} + diff --git a/package/ltq-dsl-app/files/dsl_notify.sh b/package/ltq-dsl-app/files/dsl_notify.sh new file mode 100644 index 000000000..f440450f0 --- /dev/null +++ b/package/ltq-dsl-app/files/dsl_notify.sh @@ -0,0 +1,44 @@ +#!/bin/sh +# +# This script is called by dsl_cpe_control whenever there is a DSL event, +# we only actually care about the DSL_INTERFACE_STATUS events as these +# tell us the line has either come up or gone down. +# +# The rest of the code is basically the same at the atm hotplug code +# + +[ "$DSL_NOTIFICATION_TYPE" = "DSL_INTERFACE_STATUS" ] || exit 0 + +. /etc/functions.sh + +include /lib/network +scan_interfaces + +local found=0 +local ifc +for ifc in $interfaces; do + local up + config_get_bool up "$ifc" up 0 + + local auto + config_get_bool auto "$ifc" auto 1 + + local proto + config_get proto "$ifc" proto + + if [ "$DSL_INTERFACE_STATUS" = "UP" ]; then + if [ "$proto" = "pppoa" ] && [ "$up" != 1 ] && [ "$auto" = 1 ]; then + found=1 + ( sleep 1; ifup "$ifc" ) & + fi + else + if [ "$proto" = "pppoa" ] && [ "$up" = 1 ] && [ "$auto" = 1 ]; then + found=1 + ( sleep 1; ifdown "$ifc" ) & + fi + fi +done + +if [ "$found" != 1 ]; then + logger "Found no matching interface for DSL notification ($DSL_INTERFACE_STATUS)" +fi diff --git a/package/ltq-dsl-app/files/ifx_cpe_control_init.sh b/package/ltq-dsl-app/files/ifx_cpe_control_init.sh deleted file mode 100644 index 91316938c..000000000 --- a/package/ltq-dsl-app/files/ifx_cpe_control_init.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2008 OpenWrt.org -START=99 - -start() { - - # start CPE dsl daemon in the background - /sbin/dsl_cpe_control -i -f /lib/firmware/ModemHWE.bin & - -# PS=`ps` -# echo $PS | grep -q dsl_cpe_control && { -# # workaround for nfs: allow write to pipes for non-root -# while [ ! -e /tmp/pipe/dsl_cpe1_ack ] ; do sleep 1; done -# chmod a+w /tmp/pipe/dsl_* -# } - echo $PS | grep -q dsl_cpe_control || { - echo "Start of dsl_cpe_control failed!!!" - false - } - -} |