From 1335405ccc3aa2d17c791d5f3927d4e46ee34322 Mon Sep 17 00:00:00 2001
From: sverma <saurabh.verma@iopsys.eu>
Date: Fri, 24 Jan 2020 17:15:54 +0530
Subject: [PATCH] obuspa: reduce ubus calls to uspd

 - Reduce number of ubus calls to uspd on obuspa_get
 - Add uci option to enable/disable obuspa
---
 obuspa/Makefile                | 4 ++--
 obuspa/files/etc/config/obuspa | 1 +
 obuspa/files/etc/init.d/obuspa | 7 ++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/obuspa/Makefile b/obuspa/Makefile
index 488029d27..cd58b96ad 100644
--- a/obuspa/Makefile
+++ b/obuspa/Makefile
@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=2.0.0
+PKG_VERSION:=2.0.1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9c7921c8e39acfc31f563bd08220faba1012a834
+PKG_SOURCE_VERSION:=ae498582d76a138fdd7b77d413a9a035d3987403
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 
diff --git a/obuspa/files/etc/config/obuspa b/obuspa/files/etc/config/obuspa
index 34c5c9a29..03edda595 100644
--- a/obuspa/files/etc/config/obuspa
+++ b/obuspa/files/etc/config/obuspa
@@ -3,6 +3,7 @@
 # details, always defined in groups
 
 config obuspa
+	option enable 'true'
 	option cert '/etc/obuspa/rootCA.pem'
 	option interface 'wan'
 	option debug 'false'
diff --git a/obuspa/files/etc/init.d/obuspa b/obuspa/files/etc/init.d/obuspa
index 4c411e324..6512ac7f1 100755
--- a/obuspa/files/etc/init.d/obuspa
+++ b/obuspa/files/etc/init.d/obuspa
@@ -26,6 +26,7 @@ db_set() {
 validate_obuspa_section()
 {
 	uci_validate_section obuspa obuspa "${1}" \
+		'enable:bool:true' \
 		'cert:string:"/etc/obuspa/rootCA.pem"' \
 		'interface:string:wan' \
 		'debug:bool:false'
@@ -163,13 +164,17 @@ configure_connection() {
 }
 
 configure_obuspa() {
-	local cert interface debug
+	local enable cert interface debug
 
 	validate_obuspa_section "${1}" || {
 		log "Validation of section failed"
 		return 1;
 	}
 
+	[ ${enable} -eq 0 ] && \
+		echo "obuspa not enabled" >>/dev/console && \
+		exit
+
 	if [ ${debug} -eq 1 ]; then
 		# Forward stdout of the command to logd
 		procd_set_param stdout 1