From 30d72f16834eeb9dbc96e68907e1579ed5ce4824 Mon Sep 17 00:00:00 2001
From: vdutta <v.dutta@iopsys.eu>
Date: Tue, 24 Dec 2019 13:01:41 +0530
Subject: [PATCH] ieee1905: Added configure Discovery timer uci option

---
 ieee1905/Makefile                  | 2 +-
 ieee1905/files/etc/config/ieee1905 | 3 ++-
 ieee1905/files/etc/init.d/ieee1905 | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ieee1905/Makefile b/ieee1905/Makefile
index 01f58357d..dde289c2c 100644
--- a/ieee1905/Makefile
+++ b/ieee1905/Makefile
@@ -8,7 +8,7 @@ PKG_NAME:=ieee1905
 PKG_VERSION:=1.1.2
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=dfc91ea4420ae34a10af7ad3a021a3496b84d565
+PKG_SOURCE_VERSION:=9b6b93b7cd03ef8ecf4948b019ff98652b005acc
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 
diff --git a/ieee1905/files/etc/config/ieee1905 b/ieee1905/files/etc/config/ieee1905
index 9fdb281f0..3ebde45fa 100644
--- a/ieee1905/files/etc/config/ieee1905
+++ b/ieee1905/files/etc/config/ieee1905
@@ -6,10 +6,11 @@ config meshcomms 'global'
         option enabled '1'
         option basemacint 'wan'
         option mapall true
-#        option registrar 'rai0'
+#        option registrar 'wl0'
         option debug_level  2
         option port  8888
         option cmdu_event false
+        option discovery_timer 300
 
 #config al-iface
 #        option enabled '1'
diff --git a/ieee1905/files/etc/init.d/ieee1905 b/ieee1905/files/etc/init.d/ieee1905
index 1511c2bb3..5abea753b 100644
--- a/ieee1905/files/etc/init.d/ieee1905
+++ b/ieee1905/files/etc/init.d/ieee1905
@@ -18,7 +18,8 @@ validate_global_section()
 		'mapall:bool:true' \
 		'debug_level:uinteger:5' \
 		'port:port:8888' \
-		'cmdu_event:bool:true'
+		'cmdu_event:bool:true' \
+		'discovery_timer:uinteger:60'
 }
 
 validate_ieee1905_section()
@@ -109,7 +110,7 @@ configure_interface()
 
 configure_meshcomms()
 {
-	local enabled almac basemacint mapall debug_level port l3device basemac intf registrar cmdu_event
+	local enabled almac basemacint mapall debug_level port l3device basemac intf registrar cmdu_event discovery_timer
 
 	validate_global_section global || {
 		echo "Validation of global section failed"
@@ -149,6 +150,7 @@ configure_meshcomms()
 	json_add_int debug_level ${debug_level}
 	json_add_int port ${port}
 	json_add_int cmdu_event ${cmdu_event}
+	json_add_int discovery_timer ${discovery_timer}
 	json_close_object
 
 	json_dump >${MESH_CONF}