[wifi-direct-manager]Merge Tizen 2.4 for sync

[platform/core/connectivity/wifi-direct-manager.git] / files / udhcp_script.non-autoip

diff --git a/files/udhcp_script.non-autoip b/files/udhcp_script.non-autoip
index bbab6e2..0163ac6 100644 (file)
--- a/files/udhcp_script.non-autoip
+++ b/files/udhcp_script.non-autoip
@@ -7,10 +7,13 @@
 TEMP_DHCP_FILE="/tmp/udhcpc_dyn.tmp"
 UDHCPC_LOG="/tmp/udhcpc_log"
 
-env > /tmp/test_env
+BRD_ADDR="+"
+NET_ADDR="$ip/24"
 
-[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
-[ -n "$subnet" ] && NETMASK="netmask $subnet"
+/usr/bin/env > /tmp/test_env
+
+[ -n "$subnet" ] && NET_ADDR="$ip/$subnet"
+[ -n "$broadcast" ] && BRD_ADDR="$broadcast"
 
 case "$1" in
        deconfig)
@@ -22,13 +25,13 @@ case "$1" in
                echo "$interface $ip $BROADCAST $NETMASK" >> $UDHCPC_LOG
 #              if [ -n "$router" ] ; then
 #                      echo "deleting routers" >> $UDHCPC_LOG
-#                      while route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
+#                      while /sbin/route del default gw 0.0.0.0 dev $interface 2>/dev/null ; do
 #                              :
 #                      done
 #
 #                      for i in $router ; do
 #                              echo "router $i" >> $UDHCPC_LOG
-#                              route add default gw $i dev $interface
+#                              /sbin/route add default gw $i dev $interface
 #                      done
 #              fi
 
@@ -38,7 +41,7 @@ case "$1" in
                if [ -n $router ]; then
                        for i in $router ; do
 # Take the first router
-                               echo "route $i"
+                               echo "/sbin/route $i"
                                local_gateway=$i
                                break
                        done
@@ -50,12 +53,11 @@ case "$1" in
                        local_gateway="0.0.0.0"
                fi
 
-               vconftool set -t string memory/private/wifi_direct_manager/p2p_ifname ${interface} -f
-               vconftool set -t string memory/private/wifi_direct_manager/p2p_local_ip ${ip} -f
-               vconftool set -t string memory/private/wifi_direct_manager/p2p_subnet_mask ${subnet} -f
-               vconftool set -t string memory/private/wifi_direct_manager/p2p_gateway ${local_gateway} -f
-               vconftool set -t string memory/private/wifi_direct_manager/dhcpc_server_ip ${serverid} -f
-               
+               /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_subnet_mask ${subnet} -f
+               /usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_gateway ${local_gateway} -f
+               /usr/bin/vconftool set -t string memory/private/wifi_direct_manager/dhcpc_server_ip ${serverid} -f
+               /usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_local_ip ${ip} -f
                echo $i >> $TEMP_DHCP_FILE
                ;;
 esac