From: Nishant Chaprana <n.chaprana@samsung.com>
Date: Tue, 16 Feb 2016 12:00:03 +0000 (+0530)
Subject: Using wlan0 in wifi-direct-dhcp.sh when TIZEN_WIFI_MODULE_BUNDLE=1
X-Git-Tag: accepted/tizen/common/20160308.142856~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db0daad3013308c122afb7e7d30dfb235abc987d;p=platform%2Fcore%2Fconnectivity%2Fwifi-direct-manager.git

Using wlan0 in wifi-direct-dhcp.sh when TIZEN_WIFI_MODULE_BUNDLE=1

In odriod board, interface name fetched after using below command is wlan0:
it should be wlan0 for proper functioning of wifi-direct-dhcp.sh
cmd -> interface=`/sbin/ifconfig|/bin/grep ^${INTERFACE_NAME}|/usr/bin/cut -d" " -f1`
result -> wlan0: flags=4099<UP,BROADCAST,MULTICAST>  mtu 1500
Due to this when "wifi-direct-dhcp.sh stop" is called ip is not reset from wlan0 interface.

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

diff --git a/files/bundle/wifi-direct-dhcp.sh b/files/bundle/wifi-direct-dhcp.sh
index b9dd0da..1e36995 100644
--- a/files/bundle/wifi-direct-dhcp.sh
+++ b/files/bundle/wifi-direct-dhcp.sh
@@ -5,14 +5,13 @@ 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}|/usr/bin/cut -d" " -f1`
-#interface=`/sbin/ifconfig|/bin/grep ^${INTERFACE_NAME}|/usr/bin/cut -d":" -f1`
+#interface=`/sbin/ifconfig|/bin/grep ^${INTERFACE_NAME}|/usr/bin/cut -d" " -f1`
 #interface=`/usr/sbin/ip link|/bin/grep ^${INTERFACE_NAME}|/usr/bin/cut -d":" -f2`
-echo "interface is ${INTERFACE_PREFIX}: ${interface}."
+#echo "interface is ${INTERFACE_PREFIX}: ${interface}."
 
 start_dhcp_server()
 {
-	if [ "X${interface}" == "X" ]; then
+	if [ "X${INTERFACE_NAME}" == "X" ]; then
 		echo "interface(${INTERFACE_PREFIX}) is not up"
 		return 0
 	fi
@@ -20,7 +19,7 @@ start_dhcp_server()
 	/bin/rm /var/lib/misc/udhcpd.leases
 	/bin/touch /var/lib/misc/udhcpd.leases
 	/sbin/ifconfig ${INTERFACE_NAME} ${DEFAULT_IP} up
-	/usr/sbin/ip addr add ${DEFAULT_NET} brd ${DEFAULT_BRD} dev ${interface}
+	/usr/sbin/ip addr add ${DEFAULT_NET} brd ${DEFAULT_BRD} dev ${INTERFACE_NAME}
 	/usr/sbin/dhcpd /usr/etc/wifi-direct/dhcpd.${INTERFACE_PREFIX}.conf -f &
 
 	route=`/bin/cat /usr/etc/wifi-direct/dhcpd.${INTERFACE_PREFIX}.conf | /bin/grep router | /bin/awk '{print $3}'`
@@ -33,7 +32,7 @@ start_dhcp_server()
 		subnet="255.255.255.0"
 	fi
 
-	/usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_ifname ${interface} -f
+	/usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_ifname ${INTERFACE_NAME} -f
 	/usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_subnet_mask ${subnet} -f
 	/usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_gateway ${route} -f
 	/usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_local_ip ${DEFAULT_IP} -f
@@ -41,7 +40,7 @@ start_dhcp_server()
 
 start_dhcp_client()
 {
-	if [ "X${interface}" == "X" ]; then
+	if [ "X${INTERFACE_NAME}" == "X" ]; then
 		echo "interface(${INTERFACE_PREFIX}) is not up"
 		return 0
 	fi
@@ -64,7 +63,7 @@ stop_dhcp()
 {
 	/usr/bin/pkill -x dhcp
 	/usr/bin/pkill -x dhcpd
-	/sbin/ifconfig ${interface} 0.0.0.0
+	/sbin/ifconfig ${INTERFACE_NAME} 0.0.0.0
 }
 
 is_running()
diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index 283dd41..d7dae70 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.134
+Version:	1.2.135
 Release:	1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0