[OpenWrt-Devel] [PATCH] lantiq: bugfix luci lantiq_dsl status

[Florian Eckert]

Signed-off-by: Florian Eckert <Eckert.Florian at googlemail.com>
Signed-off-by: Helge Mader <hmader at tdt.de>
Reported-by: Jo-Philipp Wich <jow at openwrt.org>

---

Basically the problem is that the current "lucistatus" code emits
invalid Lua code by providing no value for some  parameters if dsl
is not in showtime mode.

 .../lantiq/base-files/lib/functions/lantiq_dsl.sh  | 50 +++++++++++-----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh b/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh
index 8f1d0c2..46f3a17 100755
--- a/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh
+++ b/target/linux/lantiq/base-files/lib/functions/lantiq_dsl.sh
@@ -268,14 +268,14 @@ xtse() {
 	xtse_s="${xtse1}, ${xtse2}, ${xtse3}, ${xtse4}, ${xtse5}, ${xtse6}, ${xtse7}, ${xtse8}"
 
 	if [ "$action" = "lucistat" ]; then
-		echo "dsl.xtse1=$xtse1"
-		echo "dsl.xtse2=$xtse2"
-		echo "dsl.xtse3=$xtse3"
-		echo "dsl.xtse4=$xtse4"
-		echo "dsl.xtse5=$xtse5"
-		echo "dsl.xtse6=$xtse6"
-		echo "dsl.xtse7=$xtse7"
-		echo "dsl.xtse8=$xtse8"
+		echo "dsl.xtse1=${xtse1:-nil}"
+		echo "dsl.xtse2=${xtse2:-nil}"
+		echo "dsl.xtse3=${xtse3:-nil}"
+		echo "dsl.xtse4=${xtse4:-nil}"
+		echo "dsl.xtse5=${xtse5:-nil}"
+		echo "dsl.xtse6=${xtse6:-nil}"
+		echo "dsl.xtse7=${xtse7:-nil}"
+		echo "dsl.xtse8=${xtse8:-nil}"
 		echo "dsl.xtse_s=\"$xtse_s\""
 		echo "dsl.annex_s=\"${annex_s}\""
 		echo "dsl.line_mode_s=\"${line_mode_s}\""
@@ -304,7 +304,7 @@ power_mode() {
 	esac
 
 	if [ "$action" = "lucistat" ]; then
-		echo "dsl.power_mode_num=$pm"
+		echo "dsl.power_mode_num=${pm:-nil}"
 		echo "dsl.power_mode_s=\"$s\""
 	else
 		echo "Power Management Mode:                    $s"
@@ -414,22 +414,22 @@ errors() {
 	fecn=$(dsl_val "$ccsg" nFEC)
 
 	if [ "$action" = "lucistat" ]; then
-		echo "dsl.errors_fec_near=$fecn"
-		echo "dsl.errors_fec_far=$fecf"
-		echo "dsl.errors_es_near=$esn"
-		echo "dsl.errors_es_far=$esf"
-		echo "dsl.errors_ses_near=$sesn"
-		echo "dsl.errors_ses_far=$sesf"
-		echo "dsl.errors_loss_near=$lossn"
-		echo "dsl.errors_loss_far=$lossf"
-		echo "dsl.errors_uas_near=$uasn"
-		echo "dsl.errors_uas_far=$uasf"
-		echo "dsl.errors_hec_near=$hecn"
-		echo "dsl.errors_hec_far=$hecf"
-		echo "dsl.errors_crc_p_near=$crc_pn"
-		echo "dsl.errors_crc_p_far=$crc_pf"
-		echo "dsl.errors_crcp_p_near=$crcp_pn"
-		echo "dsl.errors_crcp_p_far=$crcp_pf"
+		echo "dsl.errors_fec_near=${fecn:-nil}"
+		echo "dsl.errors_fec_far=${fecf:-nil}"
+		echo "dsl.errors_es_near=${esn:-nil}"
+		echo "dsl.errors_es_far=${esf:-nil}"
+		echo "dsl.errors_ses_near=${sesn:-nil}"
+		echo "dsl.errors_ses_far=${sesf:-nil}"
+		echo "dsl.errors_loss_near=${lossn:-nil}"
+		echo "dsl.errors_loss_far=${lossf:-nil}"
+		echo "dsl.errors_uas_near=${uasn:-nil}"
+		echo "dsl.errors_uas_far=${uasf:-nil}"
+		echo "dsl.errors_hec_near=${hecn:-nil}"
+		echo "dsl.errors_hec_far=${hecf:-nil}"
+		echo "dsl.errors_crc_p_near=${crc_pn:-nil}"
+		echo "dsl.errors_crc_p_far=${crc_pf:-nil}"
+		echo "dsl.errors_crcp_p_near=${crcp_pn:-nil}"
+		echo "dsl.errors_crcp_p_far=${crcp_pf:-nil}"
 	else
 		echo "Forward Error Correction Seconds (FECS):  Near: ${fecn} / Far: ${fecf}"
 		echo "Errored seconds (ES):                     Near: ${esn} / Far: ${esf}"
-- 
2.1.4
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel