Merge pull request #29 from opentechinstitute/dhcp-timeout

Dhcp timeout tested by areynold
opentechinstitute · Jul 11, 2013 · ef11653 · ef11653
2 parents f120494 + d4b0aaa
commit ef11653
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/openwrt/etc/config/commotiond b/openwrt/etc/config/commotiond
@@ -1,3 +1,5 @@
 config daemon
 
 config node
+	option 'dhcp_timeout' '20'
+
diff --git a/openwrt/lib/netifd/proto/commotion.sh b/openwrt/lib/netifd/proto/commotion.sh
@@ -10,6 +10,7 @@ init_proto "$@"
 
 WIFI_DEVICE=
 TYPE=
+DHCP_TIMEOUT=20
 
 configure_wifi_iface() {
 	local config="$1"
@@ -73,8 +74,9 @@ proto_commotion_setup() {
 
 	if [ "$type" = "plug" ]; then 
 		local dhcp_status
+		local dhcp_timeout="$(uci_get commotiond @node[0] dhcp_timeout "$DHCP_TIMEOUT")"
 		export DHCP_INTERFACE="$config"
-		udhcpc -q -i ${iface} -t 2 -T 5 -n -s /lib/netifd/commotion.dhcp.script
+		udhcpc -q -i ${iface} -t 2 -T "$dhcp_timeout" -n -s /lib/netifd/commotion.dhcp.script
 		dhcp_status=$?
 		export DHCP_INTERFACE=""
 		if [ $dhcp_status -eq 0 ]; then