obuspa: Fix wan interface variable

bbf/Makefile

@@ -9,7 +9,7 @@ PKG_VERSION:=1.0-2019-09-06
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9574e5dc0b3e4407672e1a3a920c811d27f2bc60
+PKG_SOURCE_VERSION:=8421b281fe0246ba9afad22418641c35a9b4f748
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -39,7 +39,7 @@ endef
 TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBBBFDM_VENDOR_PREFIX)\\\"
 
 TARGET_CFLAGS += \
-	-D_GNU_SOURCE -D_AADJ
+	-D_GNU_SOURCE -D_AADJ -DDM_USE_LIBUBUS
 
 ifeq ($(CONFIG_BBF_TR181),y)
 CONFIGURE_ARGS += \

obuspa/files/etc/init.d/obuspa

@@ -4,6 +4,7 @@ START=99
 USE_PROCD=1
 
 PROG=/usr/sbin/obuspa
+l3device=""
 
 CTRL_PATH="Device.LocalAgent.Controller.1."
 MTP_PATH="Device.LocalAgent.MTP.1."
@@ -15,7 +16,7 @@ log() {
 
 db_set() {
 	log "DBSET param|${1}| value|${2}|"
-	${PROG} -c dbset ${1} ${2}
+	USP_BOARD_IFNAME=${l3device} ${PROG} -c dbset ${1} ${2}
 }
 
 validate_controller_section()
@@ -85,9 +86,16 @@ db_init() {
 	config_foreach configure_connection connection
 }
 start_service() {
+	# Get wan L3 interface
+	json_load "$(ubus call network.interface.wan status)"
+	json_get_var l3device l3_device
 	db_init
-
 	procd_open_instance
+	procd_set_param env USP_BOARD_IFNAME=${l3device}
+	# Forward stdout of the command to logd
+	# procd_set_param stdout 1
+	# Same for stderr
+	# procd_set_param stderr 1
 	procd_set_param command ${PROG}
 	procd_append_param command -p -v 4
 	procd_set_param respawn