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

[platform/core/connectivity/wifi-direct-manager.git] / include / wifi-direct-util.h

diff --git a/include/wifi-direct-util.h b/include/wifi-direct-util.h
old mode 100644 (file)
new mode 100755 (executable)
index d5dc4db..d8fd124
--- a/include/wifi-direct-util.h
+++ b/include/wifi-direct-util.h
@@ -27,18 +27,33 @@
 
 #ifndef __WIFI_DIRECT_UTIL_H__
 #define __WIFI_DIRECT_UTIL_H__
-
+#if 0
+#if !defined TIZEN_TV
 #define DEFAULT_MAC_FILE_PATH "/opt/etc/.mac.info"
+#else
+#define DEFAULT_MAC_FILE_PATH "/sys/class/net/p2p0/address"
+#endif
+#endif
+#define DEFAULT_MAC_FILE_PATH "/sys/class/net/wlan0/address"
 #define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
 #define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"
 #define IP2STR(a) (a)[0], (a)[1], (a)[2], (a)[3]
 #define IPSTR "%d.%d.%d.%d"
+#define ZEROIP "0.0.0.0"
+#define MAC2SECSTR(a) (a)[0], (a)[4], (a)[5]
+#define MACSECSTR "%02x:%02x:%02x"
+#define IP2SECSTR(a) (a)[0], (a)[3]
+#define IPSECSTR "%d..%d"
 
 #define VCONFKEY_DHCPS_IP_LEASE "memory/private/wifi_direct_manager/dhcp_ip_lease"
 #define VCONFKEY_DHCPC_SERVER_IP "memory/private/wifi_direct_manager/dhcpc_server_ip"
+#define VCONFKEY_LOCAL_IP "memory/private/wifi_direct_manager/p2p_local_ip"
 #define DHCP_DUMP_FILE "/tmp/dhcp-client-table"
+#define COUNTRY_CODE_FILE "/usr/etc/wifi-direct/ccode.conf"
 #define MAX_DHCP_DUMP_SIZE 64    // Single lease format: [99:66:dd:00:11:aa 192.168.16.20 00:00:60]
 
+#define SOCK_FD_MIN 3
+
 #ifdef USE_DLOG
 #include <dlog.h>
 
@@ -52,8 +67,11 @@
 #define WDS_LOGE(format, args...) LOGE(format, ##args)
 #define WDS_LOGF(format, args...) LOGF(format, ##args)
 
-#define __WDS_LOG_FUNC_ENTER__ LOGV("Enter")
-#define __WDS_LOG_FUNC_EXIT__ LOGV("Quit")
+#define __WDS_LOG_FUNC_ENTER__ LOGD("Enter")
+#define __WDS_LOG_FUNC_EXIT__ LOGD("Quit")
+
+#define WDS_SECLOGI(format, args...) SECURE_LOG(LOG_INFO, LOG_TAG, format, ##args)
+#define WDS_SECLOGD(format, args...) SECURE_LOG(LOG_DEBUG, LOG_TAG, format, ##args)
 
 #else /* USE_DLOG */
 
@@ -67,16 +85,29 @@
 #define __WDS_LOG_FUNC_ENTER__
 #define __WDS_LOG_FUNC_EXIT__
 
+#define WDS_SECLOGI(format, args...)
+#define WDS_SECLOGD(format, args...)
+
 #endif /* USE_DLOG */
 
+#if !(__GNUC__ <= 4 && __GNUC_MINOR__ < 8)
+int wfd_util_get_current_time(unsigned long *cur_time);
+#endif
+gboolean wfd_util_execute_file(const char *file_path,  char *const args[], char *const envs[]);
 int wfd_util_freq_to_channel(int freq);
+int wfd_util_channel_to_freq(int channel);
 int wfd_util_get_phone_name(char *phone_name);
 void wfd_util_set_dev_name_notification();
 void wfd_util_unset_dev_name_notification();
+int wfd_util_set_country();
+
 int wfd_util_check_wifi_state();
 int wfd_util_check_mobile_ap_state();
 int wfd_util_wifi_direct_activatable();
+#if 0
 int wfd_util_get_wifi_direct_state();
+unsigned int wfd_util_static_ip_convert_order(unsigned int net_ip);
+#endif
 int wfd_util_set_wifi_direct_state(int state);
 int wfd_util_get_local_dev_mac(unsigned char *dev_mac);
 int wfd_util_start_wifi_direct_popup();
@@ -87,5 +118,6 @@ int wfd_util_dhcpc_start(wfd_device_s *peer);
 int wfd_util_dhcpc_stop();
 int wfd_util_dhcpc_get_ip(char *ifname, unsigned char *ip_addr, int is_IPv6);
 int wfd_util_dhcpc_get_server_ip(unsigned char* ip_addr);
+int wfd_util_get_local_ip(unsigned char* ip_addr);
 
 #endif /* __WIFI_DIRECT_UTIL_H__ */