From b6c43069b07a763426b62d8f32e81eac807536da Mon Sep 17 00:00:00 2001 From: chanywa Date: Wed, 21 Mar 2018 15:32:12 +0900 Subject: [PATCH 01/16] Fix cmake upgrade issue Change-Id: Iacebdf1e1461e77428a7036b05bc13a46e8d8fc2 --- CMakeLists.txt | 2 +- geofence-server/CMakeLists.txt | 2 +- module/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6600afd..8e226f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS(" -DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" ") MESSAGE(${CMAKE_C_FLAGS}) -MESSAGE(${CMAKE_EXE_LINKER_FLAGS}) +#MESSAGE(${CMAKE_EXE_LINKER_FLAGS}) ADD_SUBDIRECTORY(module) ADD_SUBDIRECTORY(geofence-server) diff --git a/geofence-server/CMakeLists.txt b/geofence-server/CMakeLists.txt index 9f3786d..a64c5f7 100644 --- a/geofence-server/CMakeLists.txt +++ b/geofence-server/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.0) +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) PROJECT(geofence-server) SET(server_pkgs_LDFLAGS "${server_pkgs_LDFLAGS} -ldl") diff --git a/module/CMakeLists.txt b/module/CMakeLists.txt index b13e779..9240749 100644 --- a/module/CMakeLists.txt +++ b/module/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.0) +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) PROJECT(geofence) SET(geofence_module ${PROJECT_NAME}) -- 2.7.4 From 9ce9a5edf2aaaca76f83ad29cffb36f7d5c5ee6b Mon Sep 17 00:00:00 2001 From: Susnata Sovalin Date: Fri, 20 Apr 2018 15:19:04 +0530 Subject: [PATCH 02/16] Dbus/Cynara Policy Fix Change-Id: I907d7960a4f533a97f69cbf63ec8b0e652bf953e Signed-off-by: Susnata Sovalin --- geofence-server/config/geofence-server.conf | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/geofence-server/config/geofence-server.conf b/geofence-server/config/geofence-server.conf index 1effc5b..fb0e8ba 100644 --- a/geofence-server/config/geofence-server.conf +++ b/geofence-server/config/geofence-server.conf @@ -5,23 +5,25 @@ - - - - - + + + + + + + - + privilege="http://tizen.org/privilege/location"/> -- 2.7.4 From 05de360a602e22f231999346dd02b5d3441babc1 Mon Sep 17 00:00:00 2001 From: "Seechan, Kim" Date: Thu, 10 May 2018 17:57:13 +0900 Subject: [PATCH 03/16] Fixes dbus policy to receive alarm message Change-Id: I0e93914ee0a6d99c966f6a4f3b72ac0ac519e9b3 --- geofence-server/config/geofence-server.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/geofence-server/config/geofence-server.conf b/geofence-server/config/geofence-server.conf index fb0e8ba..922ca23 100644 --- a/geofence-server/config/geofence-server.conf +++ b/geofence-server/config/geofence-server.conf @@ -22,6 +22,8 @@ + -- 2.7.4 From fff6ba50d1f40bbf02222eaa847ad386f0c2e95d Mon Sep 17 00:00:00 2001 From: "Seechan, Kim" Date: Thu, 21 Jun 2018 08:49:38 +0900 Subject: [PATCH 04/16] Fix mis-spelled dbus policy Change-Id: Ia05bd843ef1a4356dfff5fd9241c181e034b8258 --- geofence-server/config/geofence-server.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geofence-server/config/geofence-server.conf b/geofence-server/config/geofence-server.conf index 922ca23..d2ab32a 100644 --- a/geofence-server/config/geofence-server.conf +++ b/geofence-server/config/geofence-server.conf @@ -23,7 +23,7 @@ + send_interface="org.tizen.alarm.client" send_member="alarm_expired"/> -- 2.7.4 From 9a062ea1bb9b2ba90e164611fd2d8c19ae4017c7 Mon Sep 17 00:00:00 2001 From: "Seechan, Kim" Date: Thu, 21 Jun 2018 08:50:37 +0900 Subject: [PATCH 05/16] Revert "Fix mis-spelled dbus policy" This reverts commit fff6ba50d1f40bbf02222eaa847ad386f0c2e95d. --- geofence-server/config/geofence-server.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geofence-server/config/geofence-server.conf b/geofence-server/config/geofence-server.conf index d2ab32a..922ca23 100644 --- a/geofence-server/config/geofence-server.conf +++ b/geofence-server/config/geofence-server.conf @@ -23,7 +23,7 @@ + interface="org.tizen.alarm.client" member="alarm_expired"/> -- 2.7.4 From e062947cbf61888bca68951d31b670dbd0966ef8 Mon Sep 17 00:00:00 2001 From: "Seechan, Kim" Date: Thu, 21 Jun 2018 08:49:38 +0900 Subject: [PATCH 06/16] Fix mis-spelled dbus policy Change-Id: Ia05bd843ef1a4356dfff5fd9241c181e034b8258 --- geofence-server/config/geofence-server.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geofence-server/config/geofence-server.conf b/geofence-server/config/geofence-server.conf index 922ca23..d2ab32a 100644 --- a/geofence-server/config/geofence-server.conf +++ b/geofence-server/config/geofence-server.conf @@ -23,7 +23,7 @@ + send_interface="org.tizen.alarm.client" send_member="alarm_expired"/> -- 2.7.4 From 557824777d6eeaf54bbba70b15d20f013a5e1f9b Mon Sep 17 00:00:00 2001 From: Susnata Sovalin Date: Tue, 18 Sep 2018 11:06:40 +0530 Subject: [PATCH 07/16] Fix Coverity issue 1026349 Change-Id: I5a5727c9ce176f233ef3c7cc0ace1d6514b61763 Signed-off-by: Susnata Sovalin --- geofence-server/src/geofence_server.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/geofence-server/src/geofence_server.c b/geofence-server/src/geofence_server.c index e9f60f6..179a497 100644 --- a/geofence-server/src/geofence_server.c +++ b/geofence-server/src/geofence_server.c @@ -238,6 +238,8 @@ void bt_le_scan_result_display_cb(int result, bt_adapter_le_device_scan_result_i } else if (ret == BT_ERROR_REMOTE_DEVICE_NOT_BONDED) { ble_proximity_mode = BLE_INFO_READ; /*Its not bonded*/ } + if (bt_device_info != NULL) + bt_adapter_free_device_info(bt_device_info); } } if (ble_proximity_mode == BLE_INFO_READ) { -- 2.7.4 From 79de70f960a280d7a2b995feb64ce8b5a19e61e4 Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Mon, 1 Oct 2018 11:57:15 +0900 Subject: [PATCH 08/16] Remove unnecessary dbus policy rules For the dbus session bus, default allow rule is applied, and only a certain uid is allowed to use. Thus, rules are only required. Change-Id: I62a2420ac9060634ad3f4390224abb6fad1fd1c2 Signed-off-by: Hyotaek Shim --- geofence-server/config/geofence-server.conf | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/geofence-server/config/geofence-server.conf b/geofence-server/config/geofence-server.conf index d2ab32a..991769e 100644 --- a/geofence-server/config/geofence-server.conf +++ b/geofence-server/config/geofence-server.conf @@ -1,29 +1,7 @@ - - - - - - - - - - - - - - - - - - - - -- 2.7.4 From 1c35a2839d2346544fe8d34efdedcd35a511a0f4 Mon Sep 17 00:00:00 2001 From: Susnata Sovalin Date: Fri, 5 Oct 2018 12:17:35 +0530 Subject: [PATCH 09/16] Resolved geofence ITC issue Change-Id: I03339743fb0980b4f1c57290b5b76892ec579cc9 Signed-off-by: Randeep Singh Signed-off-by: Susnata Sovalin --- geofence-server/src/server.c | 52 +++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/geofence-server/src/server.c b/geofence-server/src/server.c index 66dc4fc..a0c7aae 100644 --- a/geofence-server/src/server.c +++ b/geofence-server/src/server.c @@ -240,38 +240,36 @@ int _geofence_initialize_geofence_server(GeofenceServer *geofence_server) /*initialize to use bluetooth C-API*/ ret = bt_initialize(); if (BT_ERROR_NONE != ret) { - LOGD_GEOFENCE("bt_initialize() failed(%d).", ret); - return -1; - } - - /* register the bluetooth adapter state changed callback*/ - ret = bt_adapter_set_state_changed_cb(__geofence_bt_adapter_state_changed_cb, geofence_server); - if (BT_ERROR_NONE != ret) { - LOGD_GEOFENCE("bt_adapter_set_state_changed_cb() failed(%d).", ret); - bt_deinitialize(); - return -1; + LOGD_GEOFENCE("bt_initialize() failed(%d).Proceeding to wifi", ret); } else { - LOGD_GEOFENCE("bt_adapter_set_state_changed_cb() success.", ret); - } + /* register the bluetooth adapter state changed callback*/ + ret = bt_adapter_set_state_changed_cb(__geofence_bt_adapter_state_changed_cb, geofence_server); + if (BT_ERROR_NONE != ret) { + LOGE_GEOFENCE("bt_adapter_set_state_changed_cb() failed(%d).", ret); + bt_deinitialize(); + return -1; + } else { + LOGD_GEOFENCE("bt_adapter_set_state_changed_cb() success.", ret); + } - /* register the bluetooth device connection state changed callback*/ - ret = bt_device_set_connection_state_changed_cb(__geofence_bt_device_connection_state_changed_cb, geofence_server); - if (BT_ERROR_NONE != ret) { - LOGD_GEOFENCE("bt_device_set_connection_state_changed_cb() failed(%d).", ret); - bt_adapter_unset_state_changed_cb(); - bt_deinitialize(); - return -1; - } else { - LOGD_GEOFENCE("bt_device_set_connection_state_changed_cb() success.", ret); + /* register the bluetooth device connection state changed callback*/ + ret = bt_device_set_connection_state_changed_cb(__geofence_bt_device_connection_state_changed_cb, geofence_server); + if (BT_ERROR_NONE != ret) { + LOGE_GEOFENCE("bt_device_set_connection_state_changed_cb() failed(%d).", ret); + bt_adapter_unset_state_changed_cb(); + bt_deinitialize(); + return -1; + } else { + LOGD_GEOFENCE("bt_device_set_connection_state_changed_cb() success.", ret); + } + /*register for the discovery state change callback*/ + ret = bt_adapter_set_device_discovery_state_changed_cb(__geofence_bt_adapter_device_discovery_state_changed_cb, (void *)geofence_server); + if (BT_ERROR_NONE != ret) + LOGE_GEOFENCE("Failed to set the callback for discovery"); } - /*register for the discovery state change callback*/ - ret = bt_adapter_set_device_discovery_state_changed_cb(__geofence_bt_adapter_device_discovery_state_changed_cb, (void *)geofence_server); - if (BT_ERROR_NONE != ret) - LOGE_GEOFENCE("Failed to set the callback for discovery"); - ret = wifi_manager_initialize(&(geofence_server->wifi_h)); if (WIFI_MANAGER_ERROR_NONE != ret) { - LOGD_GEOFENCE("wifi_manager_initialize() failed(%d).", ret); + LOGE_GEOFENCE("wifi_manager_initialize() failed(%d).", ret); return -1; } -- 2.7.4 From f2bfe46537d02d5cb0c3c47845de5603fa62ee11 Mon Sep 17 00:00:00 2001 From: Susnata Sovalin Date: Wed, 12 Dec 2018 17:17:43 +0530 Subject: [PATCH 10/16] Updating debug logs for format check enforcement Change-Id: I1db1955191f0fb95eba2b0be06860874de1e30b2 Signed-off-by: Susnata Sovalin --- geofence-server/src/geofence_server.c | 2 +- geofence-server/src/geofence_server_db.c | 2 +- geofence-server/src/geofence_server_internal.c | 2 +- geofence-server/src/server.c | 10 +++++----- module/module_geofence_server.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/geofence-server/src/geofence_server.c b/geofence-server/src/geofence_server.c index 179a497..d8cff49 100644 --- a/geofence-server/src/geofence_server.c +++ b/geofence-server/src/geofence_server.c @@ -2222,7 +2222,7 @@ static void dbus_start_geofence_cb(gint fence_id, const gchar *app_id, gpointer } else { rv = wifi_manager_ap_get_bssid(ap_h, &ap_bssid); if (rv != WIFI_MANAGER_ERROR_NONE) { - LOGI_GEOFENCE("Fail to get the bssid: [%d]\n", __convert_wifi_error_to_string(rv)); + LOGI_GEOFENCE("Fail to get the bssid: [%s]\n", __convert_wifi_error_to_string(rv)); } else { bssidlen = strlen(ap_bssid); LOGI_GEOFENCE("Connected AP: %s, %d\n", ap_bssid, bssidlen); diff --git a/geofence-server/src/geofence_server_db.c b/geofence-server/src/geofence_server_db.c index f4c4988..3a6a340 100755 --- a/geofence-server/src/geofence_server_db.c +++ b/geofence-server/src/geofence_server_db.c @@ -820,7 +820,7 @@ int geofence_manager_set_common_info(fence_common_info_s *fence_info, int *fence return FENCE_ERR_PREPARE; } - LOGD_GEOFENCE("place_id[%d], enable[%d], appid[%s] geofence_type[%d] access_type[%d] running_status[%d]", fence_info->place_id, fence_info->enable, fence_info->appid, fence_info->running_status, fence_info->type, fence_info->access_type, fence_info->place_id); + LOGD_GEOFENCE("place_id[%d], enable[%d], appid[%s] geofence_type[%d] access_type[%d] running_status[%d]", fence_info->place_id, fence_info->enable, fence_info->appid, fence_info->type, fence_info->access_type, fence_info->running_status); ret = sqlite3_bind_int(state, ++index, fence_info->place_id); SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state); diff --git a/geofence-server/src/geofence_server_internal.c b/geofence-server/src/geofence_server_internal.c index 51a002e..4282f26 100644 --- a/geofence-server/src/geofence_server_internal.c +++ b/geofence-server/src/geofence_server_internal.c @@ -42,7 +42,7 @@ GeofenceItemData *__get_item_by_fence_id(gint fence_id, GeofenceServer *geofence GList *found_item = NULL; found_item = g_list_find_custom(geofence_server->geofence_list, &fence_id, __find_custom_item_by_fence_id); if (found_item == NULL || found_item->data == NULL) { - LOGD_GEOFENCE("item_data is not found. found_item[%d]", found_item); + LOGE_GEOFENCE("item_data is not found. found_item is NULL\n"); return NULL; } /*Get the item from the list and return it*/ diff --git a/geofence-server/src/server.c b/geofence-server/src/server.c index a0c7aae..b063be9 100644 --- a/geofence-server/src/server.c +++ b/geofence-server/src/server.c @@ -249,7 +249,7 @@ int _geofence_initialize_geofence_server(GeofenceServer *geofence_server) bt_deinitialize(); return -1; } else { - LOGD_GEOFENCE("bt_adapter_set_state_changed_cb() success.", ret); + LOGD_GEOFENCE("bt_adapter_set_state_changed_cb() success %d.", ret); } /* register the bluetooth device connection state changed callback*/ @@ -260,7 +260,7 @@ int _geofence_initialize_geofence_server(GeofenceServer *geofence_server) bt_deinitialize(); return -1; } else { - LOGD_GEOFENCE("bt_device_set_connection_state_changed_cb() success.", ret); + LOGD_GEOFENCE("bt_device_set_connection_state_changed_cb() success %d.", ret); } /*register for the discovery state change callback*/ ret = bt_adapter_set_device_discovery_state_changed_cb(__geofence_bt_adapter_device_discovery_state_changed_cb, (void *)geofence_server); @@ -289,7 +289,7 @@ int _geofence_initialize_geofence_server(GeofenceServer *geofence_server) geofence_server->wifi_h = NULL; return -1; } else { - LOGD_GEOFENCE("wifi_manager_set_connection_state_changed_cb() success.", ret); + LOGD_GEOFENCE("wifi_manager_set_connection_state_changed_cb() success(%d).", ret); } ret = wifi_manager_set_device_state_changed_cb(geofence_server->wifi_h, __geofence_wifi_device_state_changed_cb, geofence_server); @@ -301,7 +301,7 @@ int _geofence_initialize_geofence_server(GeofenceServer *geofence_server) geofence_server->wifi_h = NULL; return -1; } else { - LOGD_GEOFENCE("wifi_manager_set_device_state_changed_cb() success.", ret); + LOGD_GEOFENCE("wifi_manager_set_device_state_changed_cb() success %d.", ret); } ret = wifi_manager_set_rssi_level_changed_cb(geofence_server->wifi_h, __geofence_wifi_rssi_level_changed_cb, geofence_server); @@ -313,7 +313,7 @@ int _geofence_initialize_geofence_server(GeofenceServer *geofence_server) geofence_server->wifi_h = NULL; return -1; } else { - LOGD_GEOFENCE("wifi_manager_set_rssi_level_changed_cb() success.", ret); + LOGD_GEOFENCE("wifi_manager_set_rssi_level_changed_cb() success(%d).", ret); } /*Set the callback for location*/ diff --git a/module/module_geofence_server.c b/module/module_geofence_server.c index ff80d10..a4c9afb 100644 --- a/module/module_geofence_server.c +++ b/module/module_geofence_server.c @@ -381,7 +381,7 @@ EXPORT_API int start_geofence(void *handle, int fence_id) int ret = GEOFENCE_MANAGER_ERROR_NONE; - MOD_LOGD("geofence-server(%x)", geofence_manager); + MOD_LOGD("geofence-server(%p)", (void*)geofence_manager); ret = geo_client_start_geofence(geofence_manager->geofence_client, geofence_manager->app_id, fence_id); if (ret != GEOFENCE_MANAGER_ERROR_NONE) { @@ -395,7 +395,7 @@ EXPORT_API int start_geofence(void *handle, int fence_id) EXPORT_API int stop_geofence(void *handle, int fence_id) { GeofenceManagerData *geofence_manager = (GeofenceManagerData *)handle; - MOD_LOGD("geofence_manager->geofence_cb : %x", geofence_manager->geofence_cb); + MOD_LOGD("geofence_manager->geofence_cb : %p", geofence_manager->geofence_cb); g_return_val_if_fail(geofence_manager, GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER); g_return_val_if_fail(geofence_manager->geofence_client, GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER); -- 2.7.4 From a58db5553ca379480bb85de4cb455262daf6c5a0 Mon Sep 17 00:00:00 2001 From: Avichal Date: Tue, 12 Feb 2019 17:32:29 +0530 Subject: [PATCH 11/16] SVACE FIXS WGIDS: 370880,370928,370929,370931,370932,370933,370934,370936, 370938,370939,370940,370941,370942 Change-Id: I0c54ca2901747b5af8fbd4a25abd24cd847760e8 Signed-off-by: Avichal --- geofence-server/src/geofence_server_db.c | 56 ++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/geofence-server/src/geofence_server_db.c b/geofence-server/src/geofence_server_db.c index 3a6a340..fd1e969 100755 --- a/geofence-server/src/geofence_server_db.c +++ b/geofence-server/src/geofence_server_db.c @@ -67,12 +67,13 @@ static struct { .handle = NULL, }; -#define SQLITE3_RETURN(ret, msg, state) \ +#define SQLITE3_RETURN(ret, msg, state, query) \ if (ret != SQLITE_OK) { \ LOGI_GEOFENCE("sqlite3 Error[%d] : %s", ret, msg); \ sqlite3_reset(state); \ sqlite3_clear_bindings(state); \ sqlite3_finalize(state); \ + sqlite3_free(query); \ return FENCE_ERR_SQLITE_FAIL; \ } @@ -351,6 +352,7 @@ static int __geofence_manager_db_insert_bssid_info(const int fence_id, char *bss } if (count > 0) { LOGI_GEOFENCE("count = %d", count); + sqlite3_free(query); return FENCE_ERR_NONE; } @@ -362,13 +364,13 @@ static int __geofence_manager_db_insert_bssid_info(const int fence_id, char *bss } ret = sqlite3_bind_int(state, ++index, fence_id); - SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state); + SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state, query); ret = sqlite3_bind_text(state, ++index, bssid_info, -1, SQLITE_STATIC); - SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state); + SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state, query); ret = sqlite3_bind_text(state, ++index, ssid, -1, SQLITE_STATIC); - SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state); + SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state, query); ret = sqlite3_step(state); if (ret != SQLITE_DONE) { @@ -420,10 +422,10 @@ static int __geofence_manager_db_insert_wifi_data_info(gpointer data, gpointer u } ret = sqlite3_bind_int(state, ++index, *fence_id); - SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state); + SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state, query); ret = sqlite3_bind_text(state, ++index, wifi_info->bssid, -1, SQLITE_STATIC); - SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state); + SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state, query); ret = sqlite3_step(state); if (ret != SQLITE_DONE) { @@ -772,13 +774,13 @@ int geofence_manager_set_place_info(place_info_s *place_info, int *place_id) LOGD_GEOFENCE("appid[%s] access_type[%d] place_name[%s]", place_info->appid, place_info->access_type, place_info->place_name); ret = sqlite3_bind_int(state, ++index, place_info->access_type); - SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state); + SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state, query); ret = sqlite3_bind_text(state, ++index, place_info->place_name, -1, SQLITE_STATIC); - SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state); + SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state, query); ret = sqlite3_bind_text(state, ++index, place_info->appid, -1, SQLITE_STATIC); - SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state); + SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state, query); ret = sqlite3_step(state); if (ret != SQLITE_DONE) { @@ -823,22 +825,22 @@ int geofence_manager_set_common_info(fence_common_info_s *fence_info, int *fence LOGD_GEOFENCE("place_id[%d], enable[%d], appid[%s] geofence_type[%d] access_type[%d] running_status[%d]", fence_info->place_id, fence_info->enable, fence_info->appid, fence_info->type, fence_info->access_type, fence_info->running_status); ret = sqlite3_bind_int(state, ++index, fence_info->place_id); - SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state); + SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state, query); ret = sqlite3_bind_int(state, ++index, fence_info->enable); - SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state); + SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state, query); ret = sqlite3_bind_text(state, ++index, fence_info->appid, -1, SQLITE_STATIC); - SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state); + SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state, query); ret = sqlite3_bind_int(state, ++index, fence_info->type); - SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state); + SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state, query); ret = sqlite3_bind_int(state, ++index, fence_info->access_type); - SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state); + SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state, query); ret = sqlite3_bind_int(state, ++index, fence_info->running_status); - SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state); + SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state, query); ret = sqlite3_step(state); if (ret != SQLITE_DONE) { @@ -1130,7 +1132,7 @@ int geofence_manager_set_geocoordinate_info(int fence_id, geocoordinate_info_s * } ret = sqlite3_bind_int(state, ++index, fence_id); - SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state); + SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state, query); #ifdef SUPPORT_ENCRYPTION if (password == NULL) @@ -1142,36 +1144,39 @@ int geofence_manager_set_geocoordinate_info(int fence_id, geocoordinate_info_s * ret = sqlite3_bind_text(state, ++index, data_name_lat, -1, SQLITE_STATIC); /*ret = sqlite3_bind_double (state, ++index, geocoordinate_info->latitude);*/ - SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state); + SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state, query); ret = snprintf(data_name_lon, MAX_DATA_NAME, "%lf", geocoordinate_info->longitude); if (ret < 0) { LOGD_GEOFENCE("ERROR: String will be truncated"); + sqlite3_free(query); sqlite3_finalize(state); return FENCE_ERR_STRING_TRUNCATED; } ret = sqlite3_bind_text(state, ++index, data_name_lon, -1, SQLITE_STATIC); /*ret = sqlite3_bind_double (state, ++index, geocoordinate_info->longitude);*/ - SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state); + SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state, query); ret = snprintf(data_name_rad, MAX_DATA_NAME, "%lf", geocoordinate_info->radius); if (ret < 0) { LOGD_GEOFENCE("ERROR: String will be truncated"); + sqlite3_free(query); sqlite3_finalize(state); return FENCE_ERR_STRING_TRUNCATED; } ret = sqlite3_bind_text(state, ++index, data_name_rad, -1, SQLITE_STATIC); /*ret = sqlite3_bind_double (state, ++index, geocoordinate_info->radius);*/ - SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state); + SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state, query); ret = sqlite3_bind_text(state, ++index, geocoordinate_info->address, -1, SQLITE_STATIC); - SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state); + SQLITE3_RETURN(ret, sqlite3_errmsg(db_info_s.handle), state, query); ret = sqlite3_step(state); if (ret != SQLITE_DONE) { LOGI_GEOFENCE("sqlite3_step Error[%d] : %s", ret, sqlite3_errmsg(db_info_s.handle)); + sqlite3_free(query); sqlite3_finalize(state); return FENCE_ERR_SQLITE_FAIL; } @@ -1221,6 +1226,7 @@ int geofence_manager_get_geocoordinate_info(int fence_id, geocoordinate_info_s * *geocoordinate_info = (geocoordinate_info_s *)g_malloc0(sizeof(geocoordinate_info_s)); if (*geocoordinate_info == NULL) { sqlite3_finalize(state); + sqlite3_free(query); } g_return_val_if_fail(*geocoordinate_info, FENCE_ERR_INVALID_PARAMETER); @@ -1320,6 +1326,7 @@ int geofence_manager_get_ap_info(const int fence_id, GList **ap_list) } wifi_info = g_slice_new0(wifi_info_s); if (wifi_info == NULL) { + sqlite3_free(query2); sqlite3_finalize(state); } g_return_val_if_fail(wifi_info, -1); @@ -1368,6 +1375,7 @@ int geofence_manager_get_place_info(int place_id, place_info_s **place_info) } *place_info = (place_info_s *)g_malloc0(sizeof(place_info_s)); if (*place_info == NULL) { + sqlite3_free(query); sqlite3_finalize(state); } g_return_val_if_fail(*place_info, FENCE_ERR_INTERNAL); @@ -1483,6 +1491,7 @@ int geofence_manager_get_bssid_info(const int fence_id, bssid_info_s **bssid_inf } bssid_info_from_db = g_slice_new0(bssid_info_s); if (bssid_info_from_db == NULL) { + sqlite3_free(query2); sqlite3_finalize(state); } g_return_val_if_fail(bssid_info_from_db, -1); @@ -2054,6 +2063,10 @@ int geofence_manager_get_access_type(int fence_id, int place_id, access_type_e * LOGD_GEOFENCE("current fence id is [%d]", fence_id); LOGD_GEOFENCE("current place id is [%d]", place_id); + + if (query == NULL) + return FENCE_ERR_INVALID_PARAMETER; + ret = sqlite3_prepare_v2(db_info_s.handle, query, -1, &state, &tail); if (ret != SQLITE_OK) { LOGI_GEOFENCE("Error: %s", sqlite3_errmsg(db_info_s.handle)); @@ -2543,6 +2556,7 @@ int geofence_manager_get_count_by_params(const char *app_id, geofence_type_e fen if (*count <= 0) { LOGI_GEOFENCE("ERROR: count = %d", *count); sqlite3_finalize(state); + sqlite3_free(query); return FENCE_ERR_COUNT; } else { LOGI_GEOFENCE("count[%d]", *count); @@ -2640,6 +2654,7 @@ int geofence_manager_get_count_of_fences(int *count) if (*count < 0) { LOGI_GEOFENCE("ERROR: count = %d", *count); sqlite3_finalize(state); + sqlite3_free(query); return FENCE_ERR_COUNT; } else { LOGI_GEOFENCE("count[%d]", *count); @@ -2679,6 +2694,7 @@ int geofence_manager_get_place_count_by_placeid(int place_id, int *count) if (*count < 0) { LOGI_GEOFENCE("ERROR: place count = %d", *count); sqlite3_finalize(state); + sqlite3_free(query); return FENCE_ERR_COUNT; } else { LOGI_GEOFENCE("place count[%d]", *count); -- 2.7.4 From 26c5c648bcbd8cfcdb0ec2688cce1b1fc6454150 Mon Sep 17 00:00:00 2001 From: Avichal Date: Mon, 27 May 2019 19:03:04 +0530 Subject: [PATCH 12/16] Repalcing libnet-client API with connection CAPI Change-Id: I06a31652a7e64b66e1c7ee12915465e573c54e32 Signed-off-by: Avichal --- CMakeLists.txt | 2 +- geofence-server/src/geofence_server.c | 11 +++++------ geofence-server/src/geofence_server.h | 4 ++-- geofence-server/src/geofence_server_private.h | 1 - geofence-server/src/server.c | 27 ++++++++++++++------------- geofence-server/src/server.h | 1 + packaging/geofence-server.spec | 2 +- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e226f5..88c85b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ SET(BIN_DIR "${PREFIX}/bin") #Dependencies SET(common_dp "glib-2.0 geofence-dbus dlog gio-2.0 capi-appfw-app-manager") -SET(server_dp "${common_dp} network vconf vconf-internal-keys capi-system-info gthread-2.0 gio-unix-2.0 sqlite3 db-util alarm-service deviced capi-location-manager capi-network-bluetooth capi-network-wifi-manager libcore-context-manager capi-system-device libtzplatform-config") +SET(server_dp "${common_dp} vconf vconf-internal-keys capi-system-info gthread-2.0 gio-unix-2.0 sqlite3 db-util alarm-service deviced capi-network-connection capi-location-manager capi-network-bluetooth capi-network-wifi-manager libcore-context-manager capi-system-device libtzplatform-config") SET(module_dp "${common_dp} gmodule-2.0 capi-geofence-manager") # Set required packages diff --git a/geofence-server/src/geofence_server.c b/geofence-server/src/geofence_server.c index d8cff49..5cb8ea8 100644 --- a/geofence-server/src/geofence_server.c +++ b/geofence-server/src/geofence_server.c @@ -35,7 +35,6 @@ #include "geofence_server_internal.h" #include "geofence_server_bluetooth.h" #include -#include #include #define TIZEN_ENGINEER_MODE @@ -1014,7 +1013,7 @@ void bt_adapter_device_discovery_state_cb(int result, bt_adapter_device_discover #endif } -static void geofence_network_evt_cb(net_event_info_t *event_cb, void *user_data) +static void geofence_network_evt_cb(connection_type_e type, void* user_data) { FUNC_ENTRANCE_SERVER; GeofenceServer *geofence_server = (GeofenceServer *) user_data; @@ -1023,8 +1022,8 @@ static void geofence_network_evt_cb(net_event_info_t *event_cb, void *user_data) int wps_state = 0; int gps_state = 0; - switch (event_cb->Event) { - case NET_EVENT_WIFI_POWER_IND: + switch (type) { + case CONNECTION_TYPE_WIFI: LOGI_GEOFENCE("WIFI ON/OFF indication"); vconf_get_int(VCONFKEY_LOCATION_NETWORK_ENABLED, &wps_state); vconf_get_int(VCONFKEY_LOCATION_ENABLED, &gps_state); @@ -1062,7 +1061,7 @@ static void geofence_network_evt_cb(net_event_info_t *event_cb, void *user_data) LOGE_GEOFENCE("WPS is not supported"); } break; - case NET_EVENT_OPEN_IND: + case CONNECTION_TYPE_CELLULAR: LOGI_GEOFENCE("Mobile internet connected"); vconf_get_int(VCONFKEY_LOCATION_NETWORK_ENABLED, &wps_state); if (__is_support_wps() == true && geofence_server->running_geopoint_cnt > 0 && wps_state == 1 && __isWifiOn() == true && __isDataConnected() == true) { @@ -1076,7 +1075,7 @@ static void geofence_network_evt_cb(net_event_info_t *event_cb, void *user_data) LOGE_GEOFENCE("Fail to start wps positioning. Error[%d]", ret); } break; - case NET_EVENT_CLOSE_IND: + case CONNECTION_TYPE_DISCONNECTED: LOGI_GEOFENCE("Mobile internet disconnected"); if (__is_support_wps() == true && geofence_server->running_geopoint_cnt > 0 && geofence_server->loc_wps_started == true) { /***** Start standalone gps as mobile data is disconnected *****/ diff --git a/geofence-server/src/geofence_server.h b/geofence-server/src/geofence_server.h index 19a3044..7a6d811 100644 --- a/geofence-server/src/geofence_server.h +++ b/geofence-server/src/geofence_server.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "geofence_server_data_types.h" #define PACKAGE_NAME "geofence-server" @@ -89,7 +89,7 @@ typedef void (*geofence_wifi_device_state_changed_cb)(wifi_manager_device_state_ * @Param[in] user_data The user data to be returned * @see None. */ -typedef void (*geofence_network_event_cb)(net_event_info_t *event_cb, void *user_data); +typedef void (*geofence_network_event_cb)(connection_type_e type, void* user_data); /** * @brief BT Discovery status change callback diff --git a/geofence-server/src/geofence_server_private.h b/geofence-server/src/geofence_server_private.h index e34b023..4b05c5b 100644 --- a/geofence-server/src/geofence_server_private.h +++ b/geofence-server/src/geofence_server_private.h @@ -25,7 +25,6 @@ #include #include #include -#include #include "geofence_server_data_types.h" #include "geofence_server.h" #include diff --git a/geofence-server/src/server.c b/geofence-server/src/server.c index b063be9..25ef479 100644 --- a/geofence-server/src/server.c +++ b/geofence-server/src/server.c @@ -46,10 +46,6 @@ #endif /* for scan AP #include */ -#include -#include -#include -#include /* for telephony*/ #if USE_TAPI #include @@ -71,6 +67,7 @@ #endif geofence_callbacks g_fence_update_cb; void *g_fence_user_data; +static connection_h g_connection ; #if USE_TAPI typedef struct { @@ -99,16 +96,16 @@ static void __deinitialize_geofence_data(void) } #endif -static void __geofence_network_evt_cb(net_event_info_t *event_cb, void *user_data) +static void __geofence_network_evt_cb(connection_type_e type, void* user_data) { GeofenceServer *geofence_server = (GeofenceServer *)user_data; g_return_if_fail(geofence_server); - LOGD_GEOFENCE("==CM Event callback==, Event[%d]", event_cb->Event); + LOGD_GEOFENCE("==CM Event callback==, Event[%d]", type); if (g_fence_update_cb.network_evt_cb) { LOGD_GEOFENCE("geofence_network_evt_cb"); - g_fence_update_cb.network_evt_cb(event_cb, user_data); + g_fence_update_cb.network_evt_cb(type, user_data); } } @@ -272,12 +269,14 @@ int _geofence_initialize_geofence_server(GeofenceServer *geofence_server) LOGE_GEOFENCE("wifi_manager_initialize() failed(%d).", ret); return -1; } - - if (net_register_client((net_event_cb_t) __geofence_network_evt_cb, geofence_server) != NET_ERR_NONE) { - LOGD_GEOFENCE("net_register_client() failed"); - return -1; - } else { - LOGD_GEOFENCE("net_register_client() succeeded"); + ret = connection_create(&g_connection); + if(ret == CONNECTION_ERROR_NONE) { + connection_set_type_changed_cb(g_connection, + __geofence_network_evt_cb,geofence_server); + LOGD_GEOFENCE("Create connection() succeeded"); + } + else { + LOGD_GEOFENCE("Create connection failed () failed"); } ret = wifi_manager_set_connection_state_changed_cb(geofence_server->wifi_h, __geofence_wifi_device_connection_state_changed_cb, geofence_server); @@ -373,6 +372,8 @@ int _geofence_deinitialize_geofence_server(GeofenceServer *geofence_server) LOGD_GEOFENCE("GPS unsetting failed\n"); else LOGD_GEOFENCE("GPS unsetting success\n"); + connection_unset_type_changed_cb(g_connection); + connection_destroy(g_connection); #if USE_TAPI __deinitialize_geofence_data(); #endif diff --git a/geofence-server/src/server.h b/geofence-server/src/server.h index 8788c7a..cce4fb2 100644 --- a/geofence-server/src/server.h +++ b/geofence-server/src/server.h @@ -24,6 +24,7 @@ #include "geofence_server.h" #include "geofence_server_private.h" +#include #include #include diff --git a/packaging/geofence-server.spec b/packaging/geofence-server.spec index be86dca..0167bbd 100644 --- a/packaging/geofence-server.spec +++ b/packaging/geofence-server.spec @@ -13,7 +13,6 @@ Requires(post): sqlite Requires(post): lbs-server BuildRequires: cmake BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(network) BuildRequires: pkgconfig(vconf) BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(geofence-dbus) @@ -28,6 +27,7 @@ BuildRequires: pkgconfig(capi-system-info) BuildRequires: pkgconfig(capi-appfw-app-manager) BuildRequires: pkgconfig(capi-location-manager) BuildRequires: pkgconfig(capi-network-wifi-manager) +BuildRequires: pkgconfig(capi-network-connection) BuildRequires: pkgconfig(capi-network-bluetooth) BuildRequires: pkgconfig(libcore-context-manager) BuildRequires: pkgconfig(capi-system-device) -- 2.7.4 From 5555d20032facf65b41ac45c6cac59a5793fc6a2 Mon Sep 17 00:00:00 2001 From: INSUN PYO Date: Fri, 5 Jul 2019 16:39:50 +0900 Subject: [PATCH 13/16] Delete meaningless configuration Change-Id: Ic3e1d96a889d1c4ffd23f7606857864046d8c4fd --- geofence-server/org.tizen.lbs.Providers.GeofenceServer.service.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/geofence-server/org.tizen.lbs.Providers.GeofenceServer.service.in b/geofence-server/org.tizen.lbs.Providers.GeofenceServer.service.in index 3841bc2..05b90aa 100644 --- a/geofence-server/org.tizen.lbs.Providers.GeofenceServer.service.in +++ b/geofence-server/org.tizen.lbs.Providers.GeofenceServer.service.in @@ -1,5 +1,3 @@ [D-BUS Service] Name=org.tizen.lbs.Providers.GeofenceServer Exec=@BIN_DIR@/geofence-server -#User=system -#Group=system -- 2.7.4 From 65bc1642d04b6cbcf7331700460a84ffa78e67b4 Mon Sep 17 00:00:00 2001 From: Abhimanyu Swami Date: Fri, 31 Jan 2020 17:27:12 +0530 Subject: [PATCH 14/16] Fixed svace issues Change-Id: I229479207f3191cbe8d9fff753979b6721a6265b Signed-off-by: Abhimanyu Swami --- geofence-server/src/geofence_server.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/geofence-server/src/geofence_server.c b/geofence-server/src/geofence_server.c index 5cb8ea8..b0268ba 100644 --- a/geofence-server/src/geofence_server.c +++ b/geofence-server/src/geofence_server.c @@ -232,7 +232,7 @@ void bt_le_scan_result_display_cb(int result, bt_adapter_le_device_scan_result_i if (bt_info != NULL) { ret = bt_adapter_get_bonded_device_info(bt_info->bssid, &bt_device_info); if (ret == BT_ERROR_NONE) { - if (bt_device_info->is_connected == false) + if (bt_device_info != NULL && bt_device_info->is_connected == false) ble_proximity_mode = BLE_INFO_READ; } else if (ret == BT_ERROR_REMOTE_DEVICE_NOT_BONDED) { ble_proximity_mode = BLE_INFO_READ; /*Its not bonded*/ @@ -2223,7 +2223,10 @@ static void dbus_start_geofence_cb(gint fence_id, const gchar *app_id, gpointer if (rv != WIFI_MANAGER_ERROR_NONE) { LOGI_GEOFENCE("Fail to get the bssid: [%s]\n", __convert_wifi_error_to_string(rv)); } else { - bssidlen = strlen(ap_bssid); + if(ap_bssid != NULL) + bssidlen = strlen(ap_bssid); + else + bssidlen = 0; LOGI_GEOFENCE("Connected AP: %s, %d\n", ap_bssid, bssidlen); if (g_strcmp0(wifi_info->bssid, ap_bssid) == 0) { status_to_be_emitted = GEOFENCE_FENCE_STATE_IN; -- 2.7.4 From 5d8cc040ccda1fea9871b4588dda0bd6a26756f4 Mon Sep 17 00:00:00 2001 From: Abhimanyu Swami Date: Wed, 19 Feb 2020 18:02:59 +0530 Subject: [PATCH 15/16] Fix Coverity Issues Change-Id: I480aebe50a7b2c6f241050e7a89e38a4f4ec40e0 Signed-off-by: Abhimanyu Swami --- geofence-server/src/geofence_server_bluetooth.c | 2 +- geofence-server/src/geofence_server_db.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/geofence-server/src/geofence_server_bluetooth.c b/geofence-server/src/geofence_server_bluetooth.c index 30dbf51..ac7effb 100644 --- a/geofence-server/src/geofence_server_bluetooth.c +++ b/geofence-server/src/geofence_server_bluetooth.c @@ -130,7 +130,7 @@ static void emit_bt_geofence_inout_changed(GeofenceServer *geofence_server, Geof item_data->client_status = GEOFENCE_CLIENT_STATUS_RUNNING; if (app_id) - free(app_id); + g_free(app_id); } static void __geofence_check_bt_fence_type(gboolean connected, const char *bssid, void *data) diff --git a/geofence-server/src/geofence_server_db.c b/geofence-server/src/geofence_server_db.c index fd1e969..b405bf2 100755 --- a/geofence-server/src/geofence_server_db.c +++ b/geofence-server/src/geofence_server_db.c @@ -194,6 +194,7 @@ static inline int __geofence_manager_db_create_places_table(void) if (sqlite3_exec(db_info_s.handle, ddl, NULL, NULL, &err) != SQLITE_OK) { LOGI_GEOFENCE("Failed to execute the DDL (%s)", err); sqlite3_free(ddl); + sqlite3_free(err); return FENCE_ERR_SQLITE_FAIL; } @@ -214,6 +215,7 @@ static inline int __geofence_manager_db_create_geofence_table(void) if (sqlite3_exec(db_info_s.handle, ddl, NULL, NULL, &err) != SQLITE_OK) { LOGI_GEOFENCE("Failed to execute the DDL (%s)", err); sqlite3_free(ddl); + sqlite3_free(err); return FENCE_ERR_SQLITE_FAIL; } @@ -234,6 +236,7 @@ static inline int __geofence_manager_db_create_geocoordinate_table(void) if (sqlite3_exec(db_info_s.handle, ddl, NULL, NULL, &err) != SQLITE_OK) { LOGI_GEOFENCE("Failed to execute the DDL (%s)", err); sqlite3_free(ddl); + sqlite3_free(err); return FENCE_ERR_SQLITE_FAIL; } @@ -254,6 +257,7 @@ static inline int __geofence_manager_db_create_wifi_data_table(void) if (sqlite3_exec(db_info_s.handle, ddl, NULL, NULL, &err) != SQLITE_OK) { LOGI_GEOFENCE("Failed to execute the DDL (%s)", err); sqlite3_free(ddl); + sqlite3_free(err); return FENCE_ERR_SQLITE_FAIL; } @@ -275,6 +279,7 @@ static inline int __geofence_manager_db_create_bssid_table(void) if (sqlite3_exec(db_info_s.handle, ddl, NULL, NULL, &err) != SQLITE_OK) { LOGI_GEOFENCE("Failed to execute the DDL (%s)", err); sqlite3_free(ddl); + sqlite3_free(err); return FENCE_ERR_SQLITE_FAIL; } -- 2.7.4 From 8d51d48d6b04a1c3d794b1bddf2657f73f445395 Mon Sep 17 00:00:00 2001 From: chakradhar pogiri Date: Wed, 23 Jun 2021 12:37:15 +0530 Subject: [PATCH 16/16] removing dead code Change-Id: I6bd0fd7dec2003f643a9f42f1ff9fdee9ce268a9 --- module/module_geofence_server.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/module/module_geofence_server.c b/module/module_geofence_server.c index a4c9afb..2197801 100644 --- a/module/module_geofence_server.c +++ b/module/module_geofence_server.c @@ -243,10 +243,6 @@ EXPORT_API int get_geofences(void *handle, int place_id, int *fence_amount, int g_return_val_if_fail(fence_ids, GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER); g_return_val_if_fail(params, GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER); - if (!geofence_manager) { - *fence_amount = 0; - return GEOFENCE_MANAGER_ERROR_NONE; - } int index = 0; GVariantIter *iter = NULL; GVariantIter *iter_row = NULL; @@ -309,10 +305,6 @@ EXPORT_API int get_places(void *handle, int *place_amount, int **place_ids, plac g_return_val_if_fail(place_ids, GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER); g_return_val_if_fail(params, GEOFENCE_MANAGER_ERROR_INVALID_PARAMETER); - if (!geofence_manager) { - *place_amount = 0; - return GEOFENCE_MANAGER_ERROR_NONE; - } int index = 0; GVariantIter *iter = NULL; GVariantIter *iter_row = NULL; -- 2.7.4