TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} -ldl)
INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/udhcp_script.non-autoip DESTINATION etc/wifi-direct)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/wifi-direct-server.sh DESTINATION bin)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/p2p_supp.sh DESTINATION sbin)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/ccode.conf DESTINATION etc/wifi-direct)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/wfd-manager.conf DESTINATION /etc/dbus-1/system.d)
-IF(TIZEN_TV)
- IF(TIZEN_WIFI_MODULE_BUNDLE)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/bundle/p2p_supp.conf DESTINATION etc/wifi-direct)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/bundle/p2p_supp.conf DESTINATION /opt/etc)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/bundle/dhcpd.wlan.conf DESTINATION etc/wifi-direct)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/bundle/dhcpd-notify.sh DESTINATION bin)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/bundle/wifi-direct-dhcp.sh DESTINATION bin)
- ELSE(TIZEN_WIFI_MODULE_BUNDLE)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/tv/dhcpd-notify.sh DESTINATION bin)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/tv/p2p_supp.conf DESTINATION etc/wifi-direct)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/tv/p2p_supp.conf DESTINATION /opt/etc)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/tv/dhcpd.p2p.conf DESTINATION etc/wifi-direct)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/tv/wifi-direct-dhcp.sh DESTINATION bin)
- ENDIF(TIZEN_WIFI_MODULE_BUNDLE)
-ELSE(TIZEN_TV)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/dhcpd-notify.sh DESTINATION bin)
- IF(TIZEN_WLAN_BOARD_SPRD)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/TM1/p2p_supp.conf DESTINATION etc/wifi-direct)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/TM1/p2p_supp.conf DESTINATION /opt/etc)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/TM1/dhcpd.p2p.conf DESTINATION etc/wifi-direct)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/TM1/wifi-direct-dhcp.sh DESTINATION bin)
- ELSE(TIZEN_WLAN_BOARD_SPRD)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/p2p_supp.conf DESTINATION etc/wifi-direct)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/p2p_supp.conf DESTINATION /opt/etc)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/dhcpd.p2p.conf DESTINATION etc/wifi-direct)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/wifi-direct-dhcp.sh DESTINATION bin)
- ENDIF(TIZEN_WLAN_BOARD_SPRD)
-ENDIF(TIZEN_TV)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/udhcp_script.non-autoip DESTINATION etc/wifi-direct)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/wifi-direct-server.sh DESTINATION bin)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/p2p_supp.sh DESTINATION sbin)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/ccode.conf DESTINATION etc/wifi-direct)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/dhcpd-notify.sh DESTINATION bin)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/p2p_supp.conf DESTINATION etc/wifi-direct)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/p2p_supp.conf DESTINATION /opt/etc)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/dhcpd.conf DESTINATION etc/wifi-direct)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/wifi-direct-dhcp.sh DESTINATION bin)
IF("${ARCH}" MATCHES "^arm.*|.*86.*")
IF(CTRL_IFACE_DBUS)
+++ /dev/null
-start 192.168.49.20 #default: 192.168.0.20
-end 192.168.49.40 #default: 192.168.0.254
-interface p2p0 #default: wlan0
-max_leases 20 #default: 254
-notify_file /usr/bin/dhcpd-notify.sh
-
-option subnet 255.255.255.0
-option router 192.168.49.1
-option lease 864000 #10 days of seconds
-option broadcast 192.168.49.255
+++ /dev/null
-##### p2p_supplicant configuration file template #####
-update_config=1
-eapol_version=1
-ap_scan=1
+++ /dev/null
-#!/bin/sh
-# Dump DHCP lease data: MAC IP Time
-/usr/bin/dumpleases -f /opt/var/lib/misc/dhcpd.leases | /bin/awk '$1!="Mac" {print $1, $2, $3}' > /tmp/dhcp-client-table
-
-#Update vconf value to notify wifi-direct
-/usr/bin/vconftool set -t int memory/private/wifi_direct_manager/dhcp_ip_lease 1 -f
-#cat /tmp/dhcp-client-table
+++ /dev/null
-#!/bin/sh
-INTERFACE_NAME="wlan0"
-INTERFACE_PREFIX="wlan"
-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=`/usr/sbin/ip link|/bin/grep ^${INTERFACE_NAME}|/usr/bin/cut -d":" -f2`
-#echo "interface is ${INTERFACE_PREFIX}: ${interface}."
-
-start_dhcp_server()
-{
- if [ "X${INTERFACE_NAME}" == "X" ]; then
- echo "interface(${INTERFACE_PREFIX}) is not up"
- return 0
- fi
-
- /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_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}'`
- if [ -z $route ]; then
- route="192.168.49.1"
- fi
- subnet=`/bin/cat /usr/etc/wifi-direct/dhcpd.${INTERFACE_PREFIX}.conf | /bin/grep subnet | /bin/awk '{print $3}'`
-
- if [ -z $subnet ]; then
- subnet="255.255.255.0"
- fi
-
- /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
-}
-
-start_dhcp_client()
-{
- if [ "X${INTERFACE_NAME}" == "X" ]; then
- echo "interface(${INTERFACE_PREFIX}) is not up"
- return 0
- fi
-
- /usr/bin/vconftool set -t string memory/private/wifi_direct_manager/dhcpc_server_ip "0.0.0.0" -f
- /usr/bin/dhcp -i ${INTERFACE_NAME} -s /usr/etc/wifi-direct/udhcp_script.non-autoip &
-}
-
-
-clean_vconfs()
-{
- /usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_ifname "" -f
- /usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_subnet_mask "" -f
- /usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_gateway "" -f
- /usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_local_ip "" -f
- /usr/bin/vconftool set -t string memory/private/wifi_direct_manager/dhcpc_server_ip "0.0.0.0" -f
-}
-
-stop_dhcp()
-{
- /usr/bin/pkill -x dhcp
- /usr/bin/pkill -x dhcpd
- /sbin/ifconfig ${INTERFACE_NAME} 0.0.0.0
-}
-
-is_running()
-{
- program=$1
- run=`/bin/ps -eo comm|/bin/grep ${program}`
- if [ "X${run}" == "X" ]; then
- echo "${program} is not running"
- else
- echo "${program} is already running"
- fi
-}
-
-status_dhcp()
-{
- is_running /usr/bin/dhcp
- is_running /usr/sbin/dhcpd
-}
-
-
-case $1 in
-"server")
-stop_dhcp
-start_dhcp_server
-;;
-"client")
-clean_vconfs
-stop_dhcp
-start_dhcp_client
-;;
-"stop")
-clean_vconfs
-stop_dhcp
-;;
-"status")
-status_dhcp
-;;
-*)
-/bin/echo wifi-direct-dhcp.sh [server] [client] [stop] [status]
-exit 1
-;;
-esac
-
+++ /dev/null
-#!/bin/sh
-# Dump DHCP lease data: MAC IP Time
-/usr/bin/dumpleases | /bin/awk '$1!="Mac" {print $1, $2, $3}' > /tmp/dhcp-client-table
-
-#Update vconf value to notify wifi-direct
-/usr/bin/vconftool set -t int memory/private/wifi_direct_manager/dhcp_ip_lease 1 -f
-#cat /tmp/dhcp-client-table
+++ /dev/null
-start 192.168.49.20 #default: 192.168.0.20
-end 192.168.49.40 #default: 192.168.0.254
-interface p2p-wlan0-0 #default: wlan0
-max_leases 20 #default: 254
-notify_file /usr/bin/dhcpd-notify.sh
-
-option subnet 255.255.255.0
-option router 192.168.49.1
-option lease 864000 #10 days of seconds
-option broadcast 192.168.49.255
+++ /dev/null
-##### p2p_supplicant configuration file template #####
-update_config=1
-eapol_version=1
-ap_scan=1
+++ /dev/null
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
- <policy user="root">
- <allow own="net.wifidirect"/>
- <allow send_destination="net.wifidirect"/>
- </policy>
- <policy context="default">
- <check send_destination="net.wifidirect" send_interface="net.wifidirect" privilege="http://tizen.org/feature/network.wifi.direct" />
- <check send_destination="net.wifidirect" send_interface="net.wifidirect.group" privilege="http://tizen.org/feature/network.wifi.direct" />
- <check send_destination="net.wifidirect" send_interface="net.wifidirect.config" privilege="http://tizen.org/feature/network.wifi.direct" />
- <check send_destination="net.wifidirect" send_interface="net.wifidirect.service" privilege="http://tizen.org/feature/network.wifi.direct.service_discovery" />
- <check send_destination="net.wifidirect" send_interface="net.wifidirect.display" privilege="http://tizen.org/feature/network.wifi.direct.display" />
- </policy>
-</busconfig>
+++ /dev/null
-#!/bin/sh
-INTERFACE_NAME="p2p-wlan0-0"
-INTERFACE_PREFIX="p2p"
-TARGET="REDWOOD"
-DEFAULT_IP="192.168.49.1"
-DEFAULT_NET="192.168.49.1/24"
-DEFAULT_BRD="192.168.49.255"
-
-val=`/bin/uname -a | /bin/grep PQ | /usr/bin/wc -l`
-if [ "${val}" -eq "1" ]; then
- TARGET="PQ"
-fi
-
-val=`/bin/uname -a | /bin/grep U1HD | /usr/bin/wc -l`
-if [ "${val}" -eq "1" ]; then
- INTERFACE_PREFIX="wl0"
- TARGET="U1HD"
-fi
-
-val=`/bin/uname -a | /bin/grep U1SLP | /usr/bin/wc -l`
-if [ "${val}" -eq "1" ]; then
- INTERFACE_PREFIX="wl0"
- TARGET="U1SLP"
-fi
-
-val=`/bin/uname -a | /bin/grep i686 | /usr/bin/wc -l`
-if [ "${val}" -eq "1" ]; then
- INTERFACE_PREFIX="eth"
- TARGET="EMUL"
-fi
-
-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 "Target is ${TARGET} and interface ${INTERFACE_PREFIX}: ${interface}."
-
-start_dhcp_server()
-{
- if [ "X${interface}" == "X" ]; then
- echo "interface(${INTERFACE_PREFIX}) is not up"
- return 0
- fi
-
- /usr/sbin/ip addr add ${DEFAULT_NET} brd ${DEFAULT_BRD} dev ${interface}
- /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}'`
- if [ -z $route ]; then
- route="192.168.49.1"
- fi
- subnet=`/bin/cat /usr/etc/wifi-direct/dhcpd.${INTERFACE_PREFIX}.conf | /bin/grep subnet | /bin/awk '{print $3}'`
-
- if [ -z $subnet ]; then
- 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_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
-}
-
-start_dhcp_client()
-{
- if [ "X${interface}" == "X" ]; then
- echo "interface(${INTERFACE_PREFIX}) is not up"
- return 0
- fi
- /usr/bin/dhcp -i $interface -s /usr/etc/wifi-direct/udhcp_script.non-autoip &
-}
-
-
-stop_dhcp()
-{
- /usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_ifname "" -f
- /usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_subnet_mask "" -f
- /usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_gateway "" -f
- /usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_local_ip "" -f
- /usr/bin/vconftool set -t string memory/private/wifi_direct_manager/dhcpc_server_ip "0.0.0.0" -f
-
- /usr/bin/pkill -x dhcp
- /usr/bin/pkill -x dhcpd
-# /sbin/ifconfig ${interface} 0.0.0.0
-}
-
-is_running()
-{
- program=$1
- run=`/bin/ps -eo comm|/bin/grep ${program}`
- if [ "X${run}" == "X" ]; then
- echo "${program} is not running"
- else
- echo "${program} is already running"
- fi
-}
-
-status_dhcp()
-{
- is_running /usr/bin/dhcp
- is_running /usr/sbin/dhcpd
-}
-
-
-case $1 in
-"server")
-stop_dhcp
-start_dhcp_server
-;;
-"client")
-stop_dhcp
-start_dhcp_client
-;;
-"stop")
-stop_dhcp
-;;
-"status")
-status_dhcp
-;;
-*)
-/bin/echo wifi-direct-dhcp.sh [server] [client] [stop] [status]
-exit 1
-;;
-esac
-
start 192.168.49.20 #default: 192.168.0.20
end 192.168.49.40 #default: 192.168.0.254
-interface wlan0 #default: wlan0
max_leases 20 #default: 254
notify_file /usr/bin/dhcpd-notify.sh
lease_file /opt/var/lib/misc/dhcpd.leases #default: /var/lib/misc/udhcpd.leases
-
##### p2p_supplicant configuration file template #####
-update_config=1
ctrl_interface=/var/run/wpa_supplicant
+update_config=1
eapol_version=1
ap_scan=1
p2p_listen_reg_class=81
p2p_listen_channel=1
p2p_oper_reg_class=81
p2p_oper_channel=1
-device_name=[TV]Tizen
-device_type=7-0050F204-1
-config_methods=keypad virtual_push_button physical_display
-persistent_reconnect=1
-p2p_no_group_iface=1
+device_name=Tizen
+device_type=10-0050F204-5
+config_methods=push_button,keypad,display
+driver_param=use_p2p_group_interface=0
+++ /dev/null
-start 192.168.49.20 #default: 192.168.0.20
-end 192.168.49.40 #default: 192.168.0.254
-interface p2p0 #default: wlan0
-max_leases 20 #default: 254
-notify_file /usr/bin/dhcpd-notify.sh
-lease_file /opt/var/lib/misc/dhcpd.leases #default: /var/lib/misc/udhcpd.leases
-
-option subnet 255.255.255.0
-option router 192.168.49.1
-option lease 864000 #10 days of seconds
-option broadcast 192.168.49.255
+++ /dev/null
-
-##### p2p_supplicant configuration file template #####
-update_config=1
-ctrl_interface=/var/run/wpa_supplicant
-eapol_version=1
-ap_scan=1
-p2p_listen_reg_class=81
-p2p_listen_channel=1
-p2p_oper_reg_class=115
-p2p_oper_channel=48
-device_name=[TV]Tizen
-device_type=7-0050F204-1
-config_methods=keypad virtual_push_button physical_display
-persistent_reconnect=1
-p2p_no_group_iface=1
-p2p_go_ht40=1
+++ /dev/null
-#!/bin/sh
-INTERFACE_NAME="p2p0"
-INTERFACE_PREFIX="p2p"
-TARGET="TIZEN_TV"
-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`
-echo "Target is ${TARGET} and interface ${INTERFACE_PREFIX}: ${interface}."
-
-start_dhcp_server()
-{
- if [ "X${interface}" == "X" ]; then
- echo "interface(${INTERFACE_PREFIX}) is not up"
- return 0
- fi
-
- /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_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}'`
- if [ -z $route ]; then
- route="192.168.49.1"
- fi
- subnet=`/bin/cat /usr/etc/wifi-direct/dhcpd.${INTERFACE_PREFIX}.conf | /bin/grep subnet | /bin/awk '{print $3}'`
-
- if [ -z $subnet ]; then
- 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_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
-}
-
-start_dhcp_client()
-{
- if [ "X${interface}" == "X" ]; then
- echo "interface(${INTERFACE_PREFIX}) is not up"
- return 0
- fi
-
- /usr/bin/vconftool set -t string memory/private/wifi_direct_manager/dhcpc_server_ip "0.0.0.0" -f
- /usr/bin/dhcp -i ${INTERFACE_NAME} -s /usr/etc/wifi-direct/udhcp_script.non-autoip &
-}
-
-
-clean_vconfs()
-{
- /usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_ifname "" -f
- /usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_subnet_mask "" -f
- /usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_gateway "" -f
- /usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_local_ip "" -f
- /usr/bin/vconftool set -t string memory/private/wifi_direct_manager/dhcpc_server_ip "0.0.0.0" -f
-}
-
-stop_dhcp()
-{
- /usr/bin/pkill -x dhcp
- /usr/bin/pkill -x dhcpd
-# /sbin/ifconfig ${interface} 0.0.0.0
-}
-
-is_running()
-{
- program=$1
- run=`/bin/ps -eo comm|/bin/grep ${program}`
- if [ "X${run}" == "X" ]; then
- echo "${program} is not running"
- else
- echo "${program} is already running"
- fi
-}
-
-status_dhcp()
-{
- is_running /usr/bin/dhcp
- is_running /usr/sbin/dhcpd
-}
-
-
-case $1 in
-"server")
-stop_dhcp
-start_dhcp_server
-;;
-"client")
-clean_vconfs
-stop_dhcp
-start_dhcp_client
-;;
-"stop")
-clean_vconfs
-stop_dhcp
-;;
-"status")
-status_dhcp
-;;
-*)
-/bin/echo wifi-direct-dhcp.sh [server] [client] [stop] [status]
-exit 1
-;;
-esac
-
#!/bin/sh
+if [ $2 ]; then
+INTERFACE_NAME="$2"
+else
INTERFACE_NAME="p2p0"
+fi
INTERFACE_PREFIX="p2p"
TARGET="TM1"
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=`/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 "Target is ${TARGET} and interface ${INTERFACE_PREFIX}: ${interface}."
return 0
fi
+ /bin/rm /opt/var/lib/misc/dhcpd.leases
+ /bin/touch /opt/var/lib/misc/dhcpd.leases
/usr/sbin/ip addr add ${DEFAULT_NET} brd ${DEFAULT_BRD} dev ${interface}
- /usr/sbin/dhcpd /usr/etc/wifi-direct/dhcpd.${INTERFACE_PREFIX}.conf -f &
+ /usr/sbin/dhcpd -S -i ${interface} /usr/etc/wifi-direct/dhcpd.conf -f &
- route=`/bin/cat /usr/etc/wifi-direct/dhcpd.${INTERFACE_PREFIX}.conf | /bin/grep router | /bin/awk '{print $3}'`
+ route=`/bin/cat /usr/etc/wifi-direct/dhcpd.conf | /bin/grep router | /bin/awk '{print $3}'`
if [ -z $route ]; then
route="192.168.49.1"
fi
- subnet=`/bin/cat /usr/etc/wifi-direct/dhcpd.${INTERFACE_PREFIX}.conf | /bin/grep subnet | /bin/awk '{print $3}'`
+ subnet=`/bin/cat /usr/etc/wifi-direct/dhcpd.conf | /bin/grep subnet | /bin/awk '{print $3}'`
if [ -z $subnet ]; then
subnet="255.255.255.0"
echo "interface(${INTERFACE_PREFIX}) is not up"
return 0
fi
- /usr/bin/dhcp -i $interface -s /usr/etc/wifi-direct/udhcp_script.non-autoip &
+
+ /usr/bin/vconftool set -t string memory/private/wifi_direct_manager/dhcpc_server_ip "0.0.0.0" -f
+ /usr/bin/dhcp -S -i $interface -s /usr/etc/wifi-direct/udhcp_script.non-autoip &
}
-stop_dhcp()
+clean_vconfs()
{
/usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_ifname "" -f
/usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_subnet_mask "" -f
/usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_gateway "" -f
/usr/bin/vconftool set -t string memory/private/wifi_direct_manager/p2p_local_ip "" -f
/usr/bin/vconftool set -t string memory/private/wifi_direct_manager/dhcpc_server_ip "0.0.0.0" -f
+}
+stop_dhcp()
+{
/usr/bin/pkill -x dhcp
/usr/bin/pkill -x dhcpd
- /sbin/ifconfig ${interface} 0.0.0.0
+ if [ "X${interface}" == "X" ]; then
+ echo "interface(${INTERFACE_PREFIX}) is not up"
+ return 0
+ fi
+ /usr/sbin/ip addr del ${local_ip_net} dev ${interface}
}
is_running()
start_dhcp_server
;;
"client")
+clean_vconfs
stop_dhcp
start_dhcp_client
;;
"stop")
+clean_vconfs
stop_dhcp
;;
"status")
int wfd_util_stop_wifi_direct_popup();
#endif /* TIZEN_FEATURE_DEFAULT_CONNECTION_AGENT */
-int wfd_util_dhcps_start();
+int wfd_util_dhcps_start(char *ifname);
int wfd_util_dhcps_wait_ip_leased(wfd_device_s *peer);
-int wfd_util_dhcps_stop();
-int wfd_util_dhcpc_start(wfd_device_s *peer);
-int wfd_util_dhcpc_stop();
+int wfd_util_dhcps_stop(char *ifname);
+int wfd_util_dhcpc_start(char *ifname, wfd_device_s *peer);
+int wfd_util_dhcpc_stop(char *ifname);
int wfd_util_local_get_ip(char *ifname, unsigned char *ip_addr, int is_IPv6);
int wfd_util_dhcpc_get_server_ip(unsigned char* ip_addr);
#ifdef TIZEN_FEATURE_IP_OVER_EAPOL
Name: wifi-direct-manager
Summary: Wi-Fi Direct manger
-Version: 1.2.140
+Version: 1.2.141
Release: 1
Group: Network & Connectivity/Wireless
License: Apache-2.0
%license LICENSE
%defattr(-,root,root,-)
%{_bindir}/wfd-manager
-/usr/etc/wifi-direct/dhcpd.*.conf
+/usr/etc/wifi-direct/dhcpd.conf
/usr/etc/wifi-direct/udhcp_script.non-autoip
/usr/etc/wifi-direct/p2p_supp.conf
/opt/etc/p2p_supp.conf
manager->group = group;
manager->local->dev_role = group_info->dev_role;
- wfd_util_dhcps_start();
+ wfd_util_dhcps_start(group->ifname);
WDS_LOGD("Role is Group Owner. DHCP Server started");
__WDS_LOG_FUNC_EXIT__;
}
if (group->role == WFD_DEV_ROLE_GO) {
- wfd_util_dhcps_start();
+ wfd_util_dhcps_start(group->ifname);
WDS_LOGD("Role is Group Owner. DHCP Server started");
} else {
if(!peer) {
}
if(peer->ip_type != WFD_IP_TYPE_OVER_EAPOL)
#endif /* TIZEN_FEATURE_IP_OVER_EAPOL */
- wfd_util_dhcpc_start(peer);
+ wfd_util_dhcpc_start(group->ifname, peer);
}
__WDS_LOG_FUNC_EXIT__;
}
manager->group = NULL;
+ wfd_util_ip_unset(group->ifname);
if (group->role == WFD_DEV_ROLE_GO)
- wfd_util_dhcps_stop();
+ wfd_util_dhcps_stop(group->ifname);
else
- wfd_util_dhcpc_stop();
+ wfd_util_dhcpc_stop(group->ifname);
memset(manager->local->ip_addr, 0x0, IPADDR_LEN);
temp = g_list_first(group->members);
return FALSE;
}
-int wfd_util_dhcps_start()
+int wfd_util_dhcps_start(char *ifname)
{
__WDS_LOG_FUNC_ENTER__;
gboolean rv = FALSE;
+ char *const iface = ifname;
const char *path = "/usr/bin/wifi-direct-dhcp.sh";
- char *const args[] = { "/usr/bin/wifi-direct-dhcp.sh", "server", NULL };
+ char *const args[] = { "/usr/bin/wifi-direct-dhcp.sh", "server", iface, NULL };
char *const envs[] = { NULL };
wfd_manager_s *manager = wfd_get_manager();
return 0;
}
-int wfd_util_dhcps_stop()
+int wfd_util_dhcps_stop(char *ifname)
{
__WDS_LOG_FUNC_ENTER__;
gboolean rv = FALSE;
+ char *const iface = ifname;
const char *path = "/usr/bin/wifi-direct-dhcp.sh";
- char *const args[] = { "/usr/bin/wifi-direct-dhcp.sh", "stop", NULL };
+ char *const args[] = { "/usr/bin/wifi-direct-dhcp.sh", "stop", iface, NULL };
char *const envs[] = { NULL };
vconf_ignore_key_changed(VCONFKEY_DHCPS_IP_LEASE, _dhcps_ip_leased_cb);
return 0;
}
-int wfd_util_dhcpc_start(wfd_device_s *peer)
+int wfd_util_dhcpc_start(char *ifname, wfd_device_s *peer)
{
__WDS_LOG_FUNC_ENTER__;
gboolean rv = FALSE;
+ char *const iface = ifname;
const char *path = "/usr/bin/wifi-direct-dhcp.sh";
- char *const args[] = { "/usr/bin/wifi-direct-dhcp.sh", "client", NULL };
+ char *const args[] = { "/usr/bin/wifi-direct-dhcp.sh", "client", iface, NULL };
char *const envs[] = { NULL };
if (!peer) {
return 0;
}
-int wfd_util_dhcpc_stop()
+int wfd_util_dhcpc_stop(char *ifname)
{
__WDS_LOG_FUNC_ENTER__;
gboolean rv = FALSE;
+ char *const iface = ifname;
const char *path = "/usr/bin/wifi-direct-dhcp.sh";
- char *const args[] = { "/usr/bin/wifi-direct-dhcp.sh", "stop", NULL };
+ char *const args[] = { "/usr/bin/wifi-direct-dhcp.sh", "stop", iface, NULL };
char *const envs[] = { NULL };
rv = wfd_util_execute_file(path, args, envs);
projects / platform / core / connectivity / wifi-direct-manager.git / commitdiff