From 94e0c78826b15c95c40bfa82bbf8bba35dc56961 Mon Sep 17 00:00:00 2001 From: yurtesen Date: Tue, 12 Nov 2019 17:53:51 +0200 Subject: [PATCH] mwan3: Fix json_load fails with some data Sometimes the return value of `ubus -S call network.interface.wan status` cause `json_load` to return `Failed to parse message data` error. To avoid this, the JSON data always should be quoted with double quotes. Signed-off-by: Evren Yurtesen Removed quoatation marks from commit heading Signed-off-by: Florian Eckert --- net/mwan3/Makefile | 4 ++-- net/mwan3/files/usr/sbin/mwan3 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/mwan3/Makefile b/net/mwan3/Makefile index e6d5386162..cf37fc5b17 100644 --- a/net/mwan3/Makefile +++ b/net/mwan3/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mwan3 -PKG_VERSION:=2.8.0 -PKG_RELEASE:=2 +PKG_VERSION:=2.8.1 +PKG_RELEASE:=1 PKG_MAINTAINER:=Florian Eckert PKG_LICENSE:=GPLv2 diff --git a/net/mwan3/files/usr/sbin/mwan3 b/net/mwan3/files/usr/sbin/mwan3 index ef8b851f2d..b5ee29aeae 100755 --- a/net/mwan3/files/usr/sbin/mwan3 +++ b/net/mwan3/files/usr/sbin/mwan3 @@ -63,7 +63,7 @@ ifup() status=$(ubus -S call network.interface.$1 status) [ -n "$status" ] && { - json_load $status + json_load "$status" json_get_vars up l3_device } -- 2.30.2