From: Nishant Chaprana <n.chaprana@samsung.com>
Date: Fri, 27 May 2016 13:37:59 +0000 (+0530)
Subject: [wifi-direct-manager] Use @SBIN_DIR@/ifconfig when @SBIN_DIR@/ip is unavailable.
X-Git-Tag: accepted/tizen/common/20160602.140304~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=109bd092968e79c78da908150f066de0d5356b03;p=platform%2Fcore%2Fconnectivity%2Fwifi-direct-manager.git

[wifi-direct-manager] Use @SBIN_DIR@/ifconfig when @SBIN_DIR@/ip is unavailable.

This patch uses  @SBIN_DIR@/ifconfig when @SBIN_DIR@/ip is not available.
because when @SBIN_DIR@/ip is missing then TV GO will fail to start dhcpd.

Change-Id: I7565e7a770aa3c58070d605f094dd68518589b19
Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>
---

diff --git a/files/wifi-direct-dhcp.sh.in b/files/wifi-direct-dhcp.sh.in
index 65e6fec..a850130 100644
--- a/files/wifi-direct-dhcp.sh.in
+++ b/files/wifi-direct-dhcp.sh.in
@@ -10,9 +10,11 @@ DEFAULT_IP="192.168.49.1"
 DEFAULT_NET="192.168.49.1/24"
 DEFAULT_BRD="192.168.49.255"
 
-#interface=`/sbin/ifconfig|/bin/grep ^${INTERFACE_NAME}|@BIN_DIR@/cut -d" " -f1`
-interface=`/sbin/ifconfig|/bin/grep ^${INTERFACE_NAME}|@BIN_DIR@/cut -d":" -f1`
-#interface=`@SBIN_DIR@/ip link|/bin/grep ^${INTERFACE_NAME}|@BIN_DIR@/cut -d":" -f2`
+if [ ! -f @SBIN_DIR@/ip ]; then
+	interface=`@SBIN_DIR@/ifconfig|/bin/grep ^${INTERFACE_NAME}|@BIN_DIR@/cut -d":" -f1`
+else
+	interface=`@SBIN_DIR@/ip link|/bin/grep ^${INTERFACE_NAME}|@BIN_DIR@/cut -d":" -f2`
+fi
 echo "Target is ${TARGET} and interface ${INTERFACE_PREFIX}: ${interface}."
 
 start_dhcp_server()
@@ -24,7 +26,11 @@ start_dhcp_server()
 
 	/bin/rm /@TZ_SYS_VAR@/lib/misc/dhcpd.leases
 	/bin/touch @TZ_SYS_VAR@/lib/misc/dhcpd.leases
-	@SBIN_DIR@/ip addr add ${DEFAULT_NET} brd ${DEFAULT_BRD} dev ${interface}
+	if [ ! -f @SBIN_DIR@/ip ]; then
+		@SBIN_DIR@/ifconfig ${interface} ${DEFAULT_IP} up
+	else
+		@SBIN_DIR@/ip addr add ${DEFAULT_NET} brd ${DEFAULT_BRD} dev ${interface}
+	fi
 	@SBIN_DIR@/dhcpd -S -i ${interface} @TZ_SYS_RO_ETC@/wifi-direct/dhcpd.conf -f &
 
 	route=`/bin/cat @TZ_SYS_RO_ETC@/wifi-direct/dhcpd.conf | /bin/grep router | /bin/awk '{print $3}'`
diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index 57e62b5..5d8f6d2 100755
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -1,6 +1,6 @@
 Name:		wifi-direct-manager
 Summary:	Wi-Fi Direct manger
-Version:	1.2.163
+Version:	1.2.164
 Release:	1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0