Remove TIZEN_FEATURE_SERVICE_DISCOVERY build flag

Description: Remove this flag and manage it at run time.
But we leave service discovery event handling code on
wpasupplicant plugin working. When wfd-manager gets that
event from supplicant, wfd-manager'll parse it but it doesn't
raise a event to applications using Wi-Fi Direct CAPI.

Change-Id: I39100918e473982fdb321128102b3cc66dbc4b8c
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e8ed00..8def770 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,9 +36,6 @@ ENDIF(TIZEN_TETHERING_ENABLE)
 IF(TIZEN_FEATURE_DEFAULT_CONNECTION_AGENT)
        ADD_DEFINITIONS(-DTIZEN_FEATURE_DEFAULT_CONNECTION_AGENT)
 ENDIF(TIZEN_FEATURE_DEFAULT_CONNECTION_AGENT)
-IF(TIZEN_FEATURE_SERVICE_DISCOVERY)
-       ADD_DEFINITIONS(-DTIZEN_FEATURE_SERVICE_DISCOVERY)
-ENDIF(TIZEN_FEATURE_SERVICE_DISCOVERY)
 IF(TIZEN_FEATURE_IP_OVER_EAPOL)
        ADD_DEFINITIONS(-DTIZEN_FEATURE_IP_OVER_EAPOL)
 ENDIF(TIZEN_FEATURE_IP_OVER_EAPOL)
@@ -82,6 +79,7 @@ SET(SRCS
        ${CMAKE_SOURCE_DIR}/src/wifi-direct-group.c
        ${CMAKE_SOURCE_DIR}/src/wifi-direct-session.c
        ${CMAKE_SOURCE_DIR}/src/wifi-direct-event.c
+       ${CMAKE_SOURCE_DIR}/src/wifi-direct-service.c
        ${CMAKE_SOURCE_DIR}/src/wifi-direct-util.c
        ${CMAKE_SOURCE_DIR}/src/wifi-direct-dbus.c
        ${CMAKE_SOURCE_DIR}/src/wifi-direct-error.c
@@ -89,10 +87,6 @@ SET(SRCS
        ${CMAKE_SOURCE_DIR}/oem/wifi-direct-oem.c
        )
 
-IF(TIZEN_FEATURE_SERVICE_DISCOVERY)
-       SET(SRCS ${SRCS} ${CMAKE_SOURCE_DIR}/src/wifi-direct-service.c)
-ENDIF(TIZEN_FEATURE_SERVICE_DISCOVERY)
-
 IF(TIZEN_FEATURE_ASP)
        SET(SRCS ${SRCS} ${CMAKE_SOURCE_DIR}/src/wifi-direct-asp.c)
 ENDIF(TIZEN_FEATURE_ASP)

diff --git a/include/wifi-direct-manager.h b/include/wifi-direct-manager.h
index d92b1fa..ac00867 100644 (file)
--- a/include/wifi-direct-manager.h
+++ b/include/wifi-direct-manager.h
@@ -158,10 +158,8 @@ typedef struct {
 
        wfd_display_s display;
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
        GList *services;
        unsigned int service_count;
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
        unsigned char ip_addr[IPADDR_LEN];
 

diff --git a/oem/wifi-direct-oem.c b/oem/wifi-direct-oem.c
index d10682f..b689486 100644 (file)
--- a/oem/wifi-direct-oem.c
+++ b/oem/wifi-direct-oem.c
@@ -341,7 +341,6 @@ int wfd_oem_set_persistent_reconnect(wfd_oem_ops_s *ops, unsigned char *bssid, i
        return ops->set_persistent_reconnect(bssid, reconnect);
 }
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
 int wfd_oem_start_service_discovery(wfd_oem_ops_s *ops, unsigned char *peer_addr, int service_type)
 {
        if (!ops || !ops->start_service_discovery)
@@ -389,7 +388,6 @@ int wfd_oem_serv_disc_stop(wfd_oem_ops_s *ops, int handle)
 
        return ops->serv_disc_stop(handle);
 }
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
 int wfd_oem_miracast_init(wfd_oem_ops_s *ops, int enable)
 {

diff --git a/oem/wifi-direct-oem.h b/oem/wifi-direct-oem.h
index b41f934..b328b74 100644 (file)
--- a/oem/wifi-direct-oem.h
+++ b/oem/wifi-direct-oem.h
@@ -138,10 +138,8 @@ typedef enum {
 
        WFD_OEM_EVENT_TERMINATING,      /* 23 */
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
        WFD_OEM_EVENT_SERV_DISC_RESP,
        WFD_OEM_EVENT_SERV_DISC_STARTED,
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
        WFD_OEM_EVENT_GROUP_FORMATION_FAILURE,
        WFD_OEM_EVENT_INVITATION_ACCEPTED,
@@ -276,7 +274,6 @@ typedef struct {
 #endif /* TIZEN_FEATURE_IP_OVER_EAPOL */
 } wfd_oem_group_data_s;
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
 typedef enum {
        WFD_OEM_SERV_STATUS_SUCCESS,
        WFD_OEM_SERV_STATUS_FAIL,
@@ -293,7 +290,6 @@ typedef struct {
        unsigned char data[OEM_MACADDR_LEN];
        unsigned char value[20];
 } wfd_oem_service_data_s;
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
 typedef struct {
        int event_id;
@@ -415,7 +411,6 @@ typedef enum {
        WFD_OEM_CONFIG_ATTR_LIMIT = WFD_OEM_CONFIG_ATTR_NUM_MAX_STA,
 } wfd_oem_conf_attr_e;
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
 typedef enum {
        WFD_OEM_SERVICE_TYPE_ALL,
        WFD_OEM_SERVICE_TYPE_BONJOUR,
@@ -462,7 +457,6 @@ typedef struct {
                } vendor;
        } data;
 } wfd_oem_new_service_s;
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
 #define WFD_OEM_STR_PROTO_WPA "WPA"
 #define WFD_OEM_STR_PROTO_RSN "RSN"
@@ -600,10 +594,8 @@ typedef struct {
 
        void (*terminating_cb) (wfd_oem_event_s *event);
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
        void (*serv_disc_resp_cb) (wfd_oem_event_s *event);
        void (*serv_disc_started_cb) (wfd_oem_event_s *event);
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
        void (*group_formation_failure_cb) (wfd_oem_event_s *event);
        void (*invitation_accepted_cb) (wfd_oem_event_s *event);
@@ -659,7 +651,6 @@ typedef struct {
        int (*remove_persistent_group) (char *ssid, unsigned char *bssid);
        int (*set_persistent_reconnect) (unsigned char *bssid, int reconnect);
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
        int (*start_service_discovery) (unsigned char mac_addr[6], int service_type);
        int (*cancel_service_discovery) (unsigned char mac_addr[6], int service_type);
 
@@ -667,7 +658,6 @@ typedef struct {
        int (*serv_del) (wfd_oem_new_service_s *service);
        int (*serv_disc_start) (wfd_oem_new_service_s *service);
        int (*serv_disc_stop) (int handle);
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
        int (*miracast_init) (int enable);
        int (*set_display) (wfd_oem_display_s *wifi_display);
@@ -734,7 +724,6 @@ int wfd_oem_get_persistent_groups(wfd_oem_ops_s *ops, wfd_oem_persistent_group_s
 int wfd_oem_remove_persistent_group(wfd_oem_ops_s *ops, char *ssid, unsigned char *bssid);
 int wfd_oem_set_persistent_reconnect(wfd_oem_ops_s *ops, unsigned char *bssid, int reconnect);
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
 int wfd_oem_start_service_discovery(wfd_oem_ops_s *ops, unsigned char *peer_addr, int service_type);
 int wfd_oem_cancel_service_discovery(wfd_oem_ops_s *ops, unsigned char *peer_addr, int service_type);
 
@@ -742,7 +731,6 @@ int wfd_oem_serv_add(wfd_oem_ops_s *ops, wfd_oem_new_service_s *service);
 int wfd_oem_serv_del(wfd_oem_ops_s *ops, wfd_oem_new_service_s *service);
 int wfd_oem_serv_disc_start(wfd_oem_ops_s *ops, wfd_oem_new_service_s *service);
 int wfd_oem_serv_disc_stop(wfd_oem_ops_s *ops, int handle);
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
 int wfd_oem_miracast_init(wfd_oem_ops_s *ops, int enable);
 int wfd_oem_set_display(wfd_oem_ops_s *ops, wfd_oem_display_s *wifi_display);

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index 96d89b7..f267d7a 100644 (file)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -8,7 +8,7 @@
 
 Name:          wifi-direct-manager
 Summary:       Wi-Fi Direct manger
-Version:       1.2.230
+Version:       1.2.231
 Release:       1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0
@@ -214,7 +214,6 @@ cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
        -DTIZEN_TETHERING_ENABLE=0 \
 %endif
        -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
-       -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \
        -DTIZEN_FEATURE_DEFAULT_CONNECTION_AGENT=1 \
        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
        -DTIZEN_DEBUG_DBUS_VALUE=1 \
@@ -244,7 +243,6 @@ cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
 %endif
        -DTIZEN_WLAN_BOARD_SPRD=1 \
        -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
-       -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \
        -DTIZEN_FEATURE_DEFAULT_CONNECTION_AGENT=1 \
        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
        -DTIZEN_DEBUG_DBUS_VALUE=1 \
@@ -277,7 +275,6 @@ cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
        -DTIZEN_TETHERING_ENABLE=0 \
 %endif
        -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
-       -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \
        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
        -DTIZEN_DEBUG_DBUS_VALUE=1 \
        -DTIZEN_PROFILE_COMMON=1 \
@@ -307,7 +304,6 @@ cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
        -DTIZEN_TETHERING_ENABLE=0 \
 %endif
        -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
-       -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \
        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
        -DTIZEN_DEBUG_DBUS_VALUE=1 \
        -DTIZEN_PROFILE_TV=1 \
@@ -336,7 +332,6 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
        -DTIZEN_TETHERING_ENABLE=0 \
 %endif
        -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
-       -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \
        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
        -DTIZEN_DEBUG_DBUS_VALUE=1 \
        -DTIZEN_PROFILE_COMMON=1 \

diff --git a/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h b/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
index a949984..2386d34 100644 (file)
--- a/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
+++ b/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
@@ -122,7 +122,6 @@
 
 #define WS_DEVTYPE_LEN 8
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
 #define SERV_DISC_REQ_ALL "02000001"
 #define SERV_DISC_REQ_BONJOUR "02000101"
 #define SERV_DISC_REQ_UPNP "02000201"
@@ -140,7 +139,6 @@
 #define WS_UDP_PTR_HEX "\xc0\x1e"
 #define WS_PTR_TYPE_HEX "\x00\x0c\x01"
 #define WS_TXT_TYPE_HEX "\x00\x10\x01"
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
 /* Config Method bitmap */
 #define WS_CONFIG_METHOD_DISPLAY 0x0008
@@ -425,13 +423,11 @@ int ws_get_persistent_groups(wfd_oem_persistent_group_s **groups, int *group_cou
 int ws_remove_persistent_group(char *ssid, unsigned char *bssid);
 int ws_set_persistent_reconnect(unsigned char *bssid, int reconnect);
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
 int ws_start_service_discovery(unsigned char *mac_addr, int service_type);
 int ws_cancel_service_discovery(unsigned char *mac_addr, int service_type);
 
 int ws_serv_add(wfd_oem_new_service_s *service);
 int ws_serv_del(wfd_oem_new_service_s *service);
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
 int ws_miracast_init(int enable);
 int ws_set_display(wfd_oem_display_s *wifi_display);

diff --git a/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c b/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
index e65588b..0066bab 100644 (file)
--- a/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
+++ b/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
@@ -118,13 +118,11 @@ static wfd_oem_ops_s supplicant_ops = {
        .remove_persistent_group = ws_remove_persistent_group,
        .set_persistent_reconnect = ws_set_persistent_reconnect,
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
        .start_service_discovery = ws_start_service_discovery,
        .cancel_service_discovery = ws_cancel_service_discovery,
 
        .serv_add = ws_serv_add,
        .serv_del = ws_serv_del,
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
        .miracast_init = ws_miracast_init,
        .set_display = ws_set_display,
@@ -154,9 +152,7 @@ static ws_dbus_plugin_data_s *g_pd;
 static int is_peer_joined_notified = 0;
 static int is_peer_disconnected_notified = 0;
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
 static GList *service_list;
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 static GList *seek_list;
 
 static int __ws_txt_to_mac(unsigned char *txt, unsigned char *mac)
@@ -257,7 +253,6 @@ static int __ws_hex_str_to_bin(const char *hex, unsigned char *buf, size_t len)
        return 0;
 }
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
 static int __ws_byte_to_hex(char *buf, int buf_size, unsigned char *data, int data_len)
 {
        int i;
@@ -419,7 +414,6 @@ static int __ws_segment_to_service(char *segment, wfd_oem_new_service_s **servic
 
        return 0;
 }
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
 static void __ws_path_to_addr(char *peer_path,
                unsigned char *dev_addr, GVariant *parameter)
@@ -1329,7 +1323,6 @@ void __ws_extract_gonegsuccess_details(const char *key, GVariant *value, void *u
        return;
 }
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
 void __ws_extract_peer_service(wfd_oem_event_s *data, unsigned char *service_hex, int tlvs_len)
 {
        GList *services = NULL;
@@ -1412,7 +1405,6 @@ void __ws_extract_servicediscoveryresponse_details(const char *key, GVariant *va
 
        __WDP_LOG_FUNC_EXIT__;
 }
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
 #if defined(TIZEN_FEATURE_ASP)
 static void __ws_extract_serviceaspresponse_details(const char *key, GVariant *value, void *user_data)
@@ -2944,7 +2936,6 @@ static void _ws_process_group_finished(GDBusConnection *connection,
        __WDP_LOG_FUNC_EXIT__;
 }
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
 static void _ws_process_service_discovery_response(GDBusConnection *connection,
                const gchar *sender, const gchar *object_path, const gchar *interface,
                const gchar *signal, GVariant *parameters, gpointer user_data)
@@ -2984,7 +2975,6 @@ static void _ws_process_service_discovery_response(GDBusConnection *connection,
 
        __WDP_LOG_FUNC_EXIT__;
 }
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
 #if defined(TIZEN_FEATURE_ASP)
 static void _ws_process_service_asp_response(GDBusConnection *connection,
@@ -3423,14 +3413,12 @@ static struct {
                "GroupFinished",
                _ws_process_group_finished
        },
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
        {
                0,
                SUPPLICANT_P2PDEVICE,
                "ServiceDiscoveryResponse",
                _ws_process_service_discovery_response
        },
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 #if defined(TIZEN_FEATURE_ASP)
        {
                0,
@@ -6080,7 +6068,6 @@ int ws_set_persistent_reconnect(unsigned char *bssid, int reconnect)
        return res;
 }
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
 static int __ws_compress_query(char *compressed, char *query, int qtype)
 {
        char *token = NULL;
@@ -6598,7 +6585,6 @@ int ws_serv_del(wfd_oem_new_service_s *service)
        __WDP_LOG_FUNC_EXIT__;
        return 0;
 }
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
 int _ws_disable_display()
 {

diff --git a/plugin/wpasupplicant/emul/include/wfd-plugin-wpasupplicant.h b/plugin/wpasupplicant/emul/include/wfd-plugin-wpasupplicant.h
index be0b3e3..18bba3c 100644 (file)
--- a/plugin/wpasupplicant/emul/include/wfd-plugin-wpasupplicant.h
+++ b/plugin/wpasupplicant/emul/include/wfd-plugin-wpasupplicant.h
@@ -104,13 +104,11 @@ int ws_get_persistent_groups(wfd_oem_persistent_group_s **groups, int *group_cou
 int ws_remove_persistent_group(char *ssid, unsigned char *bssid);
 int ws_set_persistent_reconnect(unsigned char *bssid, int reconnect);
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
 int ws_start_service_discovery(unsigned char *mac_addr, int service_type);
 int ws_cancel_service_discovery(unsigned char *mac_addr, int service_type);
 
 int ws_serv_add(wfd_oem_new_service_s *service);
 int ws_serv_del(wfd_oem_new_service_s *service);
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
 int ws_miracast_init(int enable);
 int ws_set_display(wfd_oem_display_s *wifi_display);

diff --git a/plugin/wpasupplicant/emul/wfd-plugin-wpasupplicant-emul.c b/plugin/wpasupplicant/emul/wfd-plugin-wpasupplicant-emul.c
index a7f3edb..957f6a5 100644 (file)
--- a/plugin/wpasupplicant/emul/wfd-plugin-wpasupplicant-emul.c
+++ b/plugin/wpasupplicant/emul/wfd-plugin-wpasupplicant-emul.c
@@ -56,13 +56,11 @@ static wfd_oem_ops_s supplicant_ops = {
        .remove_persistent_group = ws_remove_persistent_group,
        .set_persistent_reconnect = ws_set_persistent_reconnect,
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
        .start_service_discovery = ws_start_service_discovery,
        .cancel_service_discovery = ws_cancel_service_discovery,
 
        .serv_add = ws_serv_add,
        .serv_del = ws_serv_del,
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
        .miracast_init = ws_miracast_init,
        .set_display = ws_set_display,
@@ -396,8 +394,6 @@ int ws_set_persistent_reconnect(unsigned char *bssid, int reconnect)
        return -1;
 }
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
-
 int ws_start_service_discovery(unsigned char *mac_addr, int service_type)
 {
        __WDP_LOG_FUNC_ENTER__;
@@ -429,7 +425,6 @@ int ws_serv_del(wfd_oem_new_service_s *service)
        __WDP_LOG_FUNC_EXIT__;
        return -1;
 }
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
 int ws_miracast_init(int enable)
 {

diff --git a/src/wifi-direct-event.c b/src/wifi-direct-event.c
index 2a15fbd..9264af2 100644 (file)
--- a/src/wifi-direct-event.c
+++ b/src/wifi-direct-event.c
@@ -1432,7 +1432,6 @@ void wfd_event_invitation_accepted(wfd_oem_event_s *event)
        __WDS_LOG_FUNC_EXIT__;
 }
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
 void wfd_event_serv_disc_resp(wfd_oem_event_s *event)
 {
        __WDS_LOG_FUNC_ENTER__;
@@ -1442,6 +1441,11 @@ void wfd_event_serv_disc_resp(wfd_oem_event_s *event)
        char response_data[256] = {0, };
        char peer_mac_address[MACSTR_LEN+1] = {0, };
 
+       if (!manager->is_service_discovery_supported) {
+               WDS_LOGD("service discovery not supported");
+               return;
+       }
+
        wfd_update_peer_time(manager, event->dev_addr);
 
        if (event->edata_type == WFD_OEM_EDATA_TYPE_NEW_SERVICE) {
@@ -1507,7 +1511,6 @@ void wfd_event_serv_disc_started(wfd_oem_event_s *event)
        __WDS_LOG_FUNC_EXIT__;
        return;
 }
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
 
 #if defined(TIZEN_FEATURE_ASP)
@@ -1788,10 +1791,8 @@ void wfd_event_init(wfd_oem_event_cbs_s *event_cbs)
 
        event_cbs->terminating_cb = wfd_event_terminating;
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
        event_cbs->serv_disc_resp_cb = wfd_event_serv_disc_resp;
        event_cbs->serv_disc_started_cb = wfd_event_serv_disc_started;
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
        event_cbs->group_formation_failure_cb = wfd_event_group_formation_failure;
        event_cbs->invitation_accepted_cb = wfd_event_invitation_accepted;

diff --git a/src/wifi-direct-iface.c b/src/wifi-direct-iface.c
index 052d1d2..c775d15 100644 (file)
--- a/src/wifi-direct-iface.c
+++ b/src/wifi-direct-iface.c
@@ -41,9 +41,7 @@
 #include "wifi-direct-group.h"
 #include "wifi-direct-state.h"
 #include <vconf.h>
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
 #include "wifi-direct-service.h"
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 #ifdef TIZEN_FEATURE_ASP
 #include "wifi-direct-asp.h"
 #endif /* TIZEN_FEATURE_ASP */
@@ -352,7 +350,6 @@ const gchar wfd_manager_introspection_xml[] = {
                                "<arg type='i' name='error_code' direction='out'/>"
                        "</method>"
                "</interface>"
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
                "<interface name='net.wifidirect.service'>"
                        "<method name='StartDiscovery'>"
                                "<arg type='i' name='service_type' direction='in'/>"
@@ -384,7 +381,6 @@ const gchar wfd_manager_introspection_xml[] = {
                        "<signal name='DiscoveryFinished'>"
                        "</signal>"
                "</interface>"
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
                "<interface name='net.wifidirect.display'>"
                        "<method name='Init'>"
                                "<arg type='i' name='error_code' direction='out'/>"
@@ -635,11 +631,12 @@ static void __wfd_manager_manage_iface_handler(const gchar *method_name,
                        g_variant_builder_add(&builder_peer, "{sv}",
                                        "Channel",
                                        g_variant_new_uint16(peers[i].channel));
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
-                       g_variant_builder_add(&builder_peer, "{sv}",
-                                       "Services",
-                                       g_variant_new_uint16(peers[i].services));
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
+
+                       if (manager->is_service_discovery_supported) {
+                               g_variant_builder_add(&builder_peer, "{sv}",
+                                               "Services",
+                                               g_variant_new_uint16(peers[i].services));
+                       }
                        g_variant_builder_add(&builder_peer, "{sv}",
                                        "IsGroupOwner",
                                        g_variant_new_boolean(peers[i].is_group_owner));
@@ -936,11 +933,11 @@ static void __wfd_manager_manage_iface_handler(const gchar *method_name,
                        g_variant_builder_add(&builder_peer, "{sv}",
                                        "Channel",
                                        g_variant_new_uint16(peers[i].channel));
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
-                       g_variant_builder_add(&builder_peer, "{sv}",
-                                       "Services",
-                                       g_variant_new_uint16(peers[i].services));
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
+                       if (manager->is_service_discovery_supported) {
+                               g_variant_builder_add(&builder_peer, "{sv}",
+                                               "Services",
+                                               g_variant_new_uint16(peers[i].services));
+                       }
                        g_variant_builder_add(&builder_peer, "{sv}",
                                        "Category",
                                        g_variant_new_uint16(peers[i].category));
@@ -1085,11 +1082,11 @@ static void __wfd_manager_manage_iface_handler(const gchar *method_name,
                g_variant_builder_add(builder_peer, "{sv}",
                                "Channel",
                                g_variant_new_uint16(peer->channel));
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
-               g_variant_builder_add(builder_peer, "{sv}",
-                               "Services",
-                               g_variant_new_uint16(peer->services));
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
+               if (manager->is_service_discovery_supported) {
+                       g_variant_builder_add(builder_peer, "{sv}",
+                                       "Services",
+                                       g_variant_new_uint16(peer->services));
+               }
                g_variant_builder_add(builder_peer, "{sv}",
                                "IsGroupOwner",
                                g_variant_new_boolean(peer->is_group_owner));
@@ -2000,7 +1997,6 @@ failed:
        return;
 }
 
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
 static void __wfd_manager_service_iface_handler(const gchar *method_name,
                                               GVariant    *parameters,
                                               GDBusMethodInvocation *invocation)
@@ -2016,6 +2012,12 @@ static void __wfd_manager_service_iface_handler(const gchar *method_name,
                int service_type;
                unsigned char mac_addr[MACADDR_LEN] = {0, };
 
+               if (!manager->is_service_discovery_supported) {
+                       WDS_LOGE("Wi-Fi Direct service discovery is not supported.");
+                       ret = WIFI_DIRECT_ERROR_NOT_SUPPORTED;
+                       goto failed;
+               }
+
                if (manager->state < WIFI_DIRECT_STATE_ACTIVATED) {
                        WDS_LOGE("Wi-Fi Direct is not activated.");
                        ret = WIFI_DIRECT_ERROR_NOT_PERMITTED;
@@ -2050,6 +2052,12 @@ static void __wfd_manager_service_iface_handler(const gchar *method_name,
                int service_type;
                unsigned char mac_addr[MACADDR_LEN] = {0, };
 
+               if (!manager->is_service_discovery_supported) {
+                       WDS_LOGE("Wi-Fi Direct service discovery is not supported.");
+                       ret = WIFI_DIRECT_ERROR_NOT_SUPPORTED;
+                       goto failed;
+               }
+
                if (manager->state < WIFI_DIRECT_STATE_ACTIVATED) {
                        WDS_LOGE("Wi-Fi Direct is not activated.");
                        ret = WIFI_DIRECT_ERROR_NOT_PERMITTED;
@@ -2081,6 +2089,12 @@ static void __wfd_manager_service_iface_handler(const gchar *method_name,
                int service_id = 0;
                const char *info_str = NULL;
 
+               if (!manager->is_service_discovery_supported) {
+                       WDS_LOGE("Wi-Fi Direct service discovery is not supported.");
+                       ret = WIFI_DIRECT_ERROR_NOT_SUPPORTED;
+                       goto failed;
+               }
+
                if (manager->state < WIFI_DIRECT_STATE_ACTIVATED) {
                        WDS_LOGE("Wi-Fi Direct is not activated.");
                        ret = WIFI_DIRECT_ERROR_NOT_PERMITTED;
@@ -2104,6 +2118,12 @@ static void __wfd_manager_service_iface_handler(const gchar *method_name,
        } else if (!g_strcmp0(method_name, "Deregister")) {
                int service_id = 0;
 
+               if (!manager->is_service_discovery_supported) {
+                       WDS_LOGE("Wi-Fi Direct service discovery is not supported.");
+                       ret = WIFI_DIRECT_ERROR_NOT_SUPPORTED;
+                       goto failed;
+               }
+
                if (manager->state < WIFI_DIRECT_STATE_ACTIVATED) {
                        WDS_LOGE("Wi-Fi Direct is not activated.");
                        ret = WIFI_DIRECT_ERROR_NOT_PERMITTED;
@@ -2140,7 +2160,6 @@ failed:
        g_clear_error(&err);
        return;
 }
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
 static void __wfd_manager_display_iface_handler(const gchar *method_name,
                                               GVariant    *parameters,
@@ -2961,13 +2980,11 @@ static struct {
                WFD_MANAGER_CONFIG_INTERFACE,
                __wfd_manager_config_iface_handler
        },
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
        {
                0,
                WFD_MANAGER_SERVICE_INTERFACE,
                __wfd_manager_service_iface_handler
        },
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
        {
                0,
                WFD_MANAGER_DISPLAY_INTERFACE,

diff --git a/src/wifi-direct-manager.c b/src/wifi-direct-manager.c
index 268af1f..cd51c4f 100644 (file)
--- a/src/wifi-direct-manager.c
+++ b/src/wifi-direct-manager.c
@@ -203,10 +203,8 @@ static int _wfd_local_init_device(wfd_manager_s *manager)
 
        local->config_methods = WFD_WPS_MODE_PBC | WFD_WPS_MODE_DISPLAY | WFD_WPS_MODE_KEYPAD;
        local->wps_mode = WFD_WPS_MODE_PBC;
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
        local->services = NULL;
        local->service_count = 0;
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
        /* TODO: initialize other local device datas */
        manager->local = local;
 
@@ -1279,9 +1277,7 @@ int wfd_manager_get_peer_info(wfd_manager_s *manager, unsigned char *addr, wfd_d
        memcpy(peer_info->mac_address, peer_dev->dev_addr, MACADDR_LEN);
        memcpy(peer_info->intf_address, peer_dev->intf_addr, MACADDR_LEN);
        peer_info->channel = peer_dev->channel;
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
        peer_info->services = 0;
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
        peer_info->is_group_owner = peer_dev->dev_role == WFD_DEV_ROLE_GO;
        peer_info->is_persistent_go = peer_dev->group_flags & WFD_OEM_GROUP_FLAG_PERSISTENT_GROUP;
        peer_info->is_connected = peer_dev->dev_role == WFD_DEV_ROLE_GC;
@@ -1365,9 +1361,7 @@ int wfd_manager_get_peers(wfd_manager_s *manager, wfd_discovery_entry_s **peers_
                memcpy(peers[count].mac_address, peer->dev_addr, MACADDR_LEN);
                memcpy(peers[count].intf_address, peer->intf_addr, MACADDR_LEN);
                peers[count].channel = peer->channel;
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
                peers[count].services = 0;
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
                peers[count].is_group_owner = peer->dev_role == WFD_DEV_ROLE_GO;
                peers[count].is_persistent_go = peer->group_flags & WFD_OEM_GROUP_FLAG_PERSISTENT_GROUP;
                peers[count].is_connected = peer->dev_role == WFD_DEV_ROLE_GC;
@@ -1443,9 +1437,7 @@ int wfd_manager_get_connected_peers(wfd_manager_s *manager, wfd_connected_peer_i
                        peers[count].subcategory = peer->sec_dev_type;
                        peers[count].channel = peer->channel;
                        peers[count].is_p2p = peer->is_p2p;
-#ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
                        peers[count].services = 0;
-#endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
                        if (manager->is_wifi_display_supported)
                                if (peer->display.availability && peer->display.port)