From 1f882d464eb8667b69ae98fde64294796c49b28d Mon Sep 17 00:00:00 2001 From: jomui Date: Wed, 19 Apr 2017 17:13:58 +0900 Subject: [PATCH 01/16] fixed SVACE issue Signed-off-by: jomui Change-Id: I33162edf1b1ebc0af25b19f47d83f7bdbaaf515c --- geofence-server/src/geofence_server.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/geofence-server/src/geofence_server.c b/geofence-server/src/geofence_server.c index de56328..68d45ea 100644 --- a/geofence-server/src/geofence_server.c +++ b/geofence-server/src/geofence_server.c @@ -243,11 +243,15 @@ void bt_le_scan_result_display_cb(int result, bt_adapter_le_device_scan_result_i } if (ble_proximity_mode == BLE_INFO_READ) { geofence_manager_get_ble_info_from_geofence(fence_id, &ble_info); - LOGI_GEOFENCE("Ble info read from DB: %s", ble_info); - if (__check_for_match(ble_info, info->remote_address)) { - LOGI_GEOFENCE("Matched for ble address: %s for the fence: %d", info->remote_address, fence_id); - emit_proximity_using_ble(geofence_server, fence_id, GEOFENCE_PROXIMITY_IMMEDIATE); + if (ble_info != NULL) { + LOGI_GEOFENCE("Ble info read from DB: %s", ble_info); + if (__check_for_match(ble_info, info->remote_address)) { + LOGI_GEOFENCE("Matched for ble address: %s for the fence: %d", info->remote_address, fence_id); + emit_proximity_using_ble(geofence_server, fence_id, GEOFENCE_PROXIMITY_IMMEDIATE); + } + g_free(ble_info); } + ble_info = NULL; } tracking_list = g_list_next(tracking_list); } -- 2.7.4 From 0ff77eaf834a7350588f9567bc85d11fd88024bd Mon Sep 17 00:00:00 2001 From: jomui Date: Tue, 30 May 2017 21:50:19 +0900 Subject: [PATCH 02/16] fix for alarm issue in GPS fence Signed-off-by: jomui Change-Id: I51cafb40141b935d00a26f546e0930279f3e7f3b --- geofence-server/config/geofence-server.conf | 1 - geofence-server/src/geofence_server.c | 2 +- packaging/geofence-server.spec | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/geofence-server/config/geofence-server.conf b/geofence-server/config/geofence-server.conf index 88b47b3..1effc5b 100644 --- a/geofence-server/config/geofence-server.conf +++ b/geofence-server/config/geofence-server.conf @@ -19,7 +19,6 @@ - diff --git a/geofence-server/src/geofence_server.c b/geofence-server/src/geofence_server.c index 68d45ea..2d17c64 100644 --- a/geofence-server/src/geofence_server.c +++ b/geofence-server/src/geofence_server.c @@ -517,7 +517,7 @@ static int __start_wps_positioning(GeofenceServer *geofence_server, location_pos return FENCE_ERR_UNKNOWN; } if (geofence_server->wps_timeout_alarm_id == -1) - geofence_server->wps_timeout_alarm_id = _geofence_add_alarm(WPS_TIMEOUT, __wps_timeout_cb, geofence_server); + geofence_server->wps_timeout_alarm_id = _geofence_add_alarm(WPS_TIMEOUT, __wps_timeout_cb, geofence_server); geofence_server->loc_wps_started = TRUE; } else { diff --git a/packaging/geofence-server.spec b/packaging/geofence-server.spec index 72309b8..be86dca 100644 --- a/packaging/geofence-server.spec +++ b/packaging/geofence-server.spec @@ -1,6 +1,6 @@ Name: geofence-server Summary: Geofence Server for Tizen -Version: 0.4.6 +Version: 0.4.7 Release: 1 Group: Location/Service License: Apache-2.0 -- 2.7.4 From df3c5ec7d555cf4eeddfcf62ee2dce09f9a245c2 Mon Sep 17 00:00:00 2001 From: Sangdok Mo Date: Mon, 24 Jul 2017 11:05:31 +0900 Subject: [PATCH 03/16] changed AUTHORS Change-Id: Ifa9f3810da91b5be9f75ac94cccb1953d7a03595 Signed-off-by: Sangdok Mo --- AUTHORS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index ce0e4ee..3d8b966 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,6 @@ Jongmun Woo -Young-Ae Kang Kyoungjun Sung +Seechan Kim +Young-Ae Kang Karthik Paulraj VENKATAKOTIVIJAYALAKSHMINARAYA -- 2.7.4 From 7f9fda3707c5d5f49a8d89541b251b7b0ad747bd Mon Sep 17 00:00:00 2001 From: jomui Date: Mon, 24 Jul 2017 13:54:43 +0900 Subject: [PATCH 04/16] fix for no AppId Signed-off-by: jomui Change-Id: I5edafd2e2e8a4f9d7c4d36eb24227c6f1a284801 --- geofence-server/CMakeLists.txt | 2 +- geofence-server/src/geofence_server.c | 10 +++++----- module/module_geofence_server.c | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/geofence-server/CMakeLists.txt b/geofence-server/CMakeLists.txt index 6d66d70..9f3786d 100644 --- a/geofence-server/CMakeLists.txt +++ b/geofence-server/CMakeLists.txt @@ -1,5 +1,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.0) -PROJECT(geofence-server) +PROJECT(geofence-server) SET(server_pkgs_LDFLAGS "${server_pkgs_LDFLAGS} -ldl") SET(SERVER_EXTRA_CFLAGS "${SERVER_EXTRA_CFLAGS} -D_GNU_SOURCE") diff --git a/geofence-server/src/geofence_server.c b/geofence-server/src/geofence_server.c index 2d17c64..2ecba0a 100644 --- a/geofence-server/src/geofence_server.c +++ b/geofence-server/src/geofence_server.c @@ -412,7 +412,7 @@ static void __check_inout_by_gps(double latitude, double longitude, int fence_id geofence_fence_state_e status = GEOFENCE_FENCE_STATE_OUT; geocoordinate_info_s *geocoordinate_info = (geocoordinate_info_s *)item_data->priv; /* get_current_position/ check_fence_in/out for geoPoint */ - location_manager_get_distance(latitude, longitude, geocoordinate_info->latitude, geocoordinate_info->longitude, &distance); + location_manager_get_distance(latitude, longitude, geocoordinate_info->latitude, geocoordinate_info->longitude, &distance); if (distance >= geocoordinate_info->radius) { LOGD_GEOFENCE("FENCE_OUT : based on distance. Distance[%f] for fence id: %d at (%f, %f)", distance, fence_id, latitude, longitude); @@ -2164,7 +2164,7 @@ static void dbus_start_geofence_cb(gint fence_id, const gchar *app_id, gpointer } else if (adapter_state == BT_ADAPTER_ENABLED) { bt_device_info_s *bt_device_info = NULL; if (bt_info != NULL) { - ret = bt_adapter_get_bonded_device_info(bt_info->bssid, &bt_device_info); + ret = bt_adapter_get_bonded_device_info(bt_info->bssid, &bt_device_info); if (ret != BT_ERROR_NONE) { LOGE_GEOFENCE("Fail to get the bonded device info/ Not bonded with any device. Error[%d]", ret); /*NEED TO BE DECIDED WHETHER TO REQUEST FOR A SCAN HERE OR JUST EMIT OUT AS STATUS*/ @@ -2172,7 +2172,7 @@ static void dbus_start_geofence_cb(gint fence_id, const gchar *app_id, gpointer status_to_be_emitted = GEOFENCE_FENCE_STATE_OUT; } else { if (bt_device_info == NULL) { - LOGI_GEOFENCE("bt_adapter_get_bonded_device_info [%s] failed.", bt_info->bssid); + LOGI_GEOFENCE("bt_adapter_get_bonded_device_info [%s] failed.", bt_info->bssid); status_to_be_emitted = GEOFENCE_FENCE_STATE_OUT; } else { if (bt_device_info->is_bonded == TRUE && bt_device_info->is_connected == TRUE) { @@ -2468,18 +2468,18 @@ static GVariant *dbus_get_geofences_cb(int place_id, const gchar *app_id, int *f if ((place_info != NULL) && (place_info->access_type == ACCESS_TYPE_PRIVATE)) { if (g_strcmp0(app_id, place_info->appid) != 0) { LOGI_GEOFENCE("Not authorized to access this private place[%d]", place_id); - g_free(place_info); /* Send ZERO data gvariant*/ *errorCode = GEOFENCE_SERVER_ERROR_PLACE_ACCESS_DENIED; *fenceCnt = fence_cnt; g_variant_builder_init(&b, G_VARIANT_TYPE("aa{sv}")); + g_free(place_info); return g_variant_builder_end(&b); } - g_free(place_info); } ret = geofence_manager_get_fence_list_from_db(&count, &fence_list, place_id); } LOGI_GEOFENCE("count = %d", count); + g_free(place_info); if (ret != FENCE_ERR_NONE) { LOGI_GEOFENCE("get list failed"); diff --git a/module/module_geofence_server.c b/module/module_geofence_server.c index 0a1cc92..ff80d10 100644 --- a/module/module_geofence_server.c +++ b/module/module_geofence_server.c @@ -491,7 +491,8 @@ static void __get_caller_app_id(void *handle) pid = getpid(); ret = app_manager_get_app_id(pid, &app_id); if (ret != APP_MANAGER_ERROR_NONE) { - MOD_LOGE("Fail to get app_id from module_geofence_server. Err[%d]", ret); + MOD_LOGE("No app_id. Set app_id to RequestbyFramework"); + geofence_manager->app_id = g_strdup("RequestbyFramework"); } else { MOD_LOGD("app_id: %s", app_id); geofence_manager->app_id = app_id; -- 2.7.4 From 865ec0d97dabca8dad27ce537abdc02b91d2fd84 Mon Sep 17 00:00:00 2001 From: jomui Date: Wed, 26 Jul 2017 17:29:40 +0900 Subject: [PATCH 05/16] remove unused code Signed-off-by: jomui Change-Id: Id89b89b27671e11f88a1f8ba5a90626af1571c32 --- geofence-server/src/geofence_server.c | 1 - 1 file changed, 1 deletion(-) diff --git a/geofence-server/src/geofence_server.c b/geofence-server/src/geofence_server.c index 2ecba0a..367b872 100644 --- a/geofence-server/src/geofence_server.c +++ b/geofence-server/src/geofence_server.c @@ -1122,7 +1122,6 @@ static int __gps_alarm_cb(alarm_id_t alarm_id, void *user_data) if (geofence_server->gps_alarm_id != -1) { /*LOGI_GEOFENCE("GPS interval timer removed. ID[%d]", geofence_server->gps_alarm_id);*/ geofence_server->gps_alarm_id = _geofence_remove_alarm(geofence_server->gps_alarm_id); - geofence_server->gps_alarm_id = -1; } if (geofence_server->loc_gps_started_by_wps == true) { ret = __start_gps_positioning(geofence_server, __geofence_gps_position_changed_cb); -- 2.7.4 From 80204ea329810010b54b81c66aa288897acb4f26 Mon Sep 17 00:00:00 2001 From: jomui Date: Thu, 24 Aug 2017 10:18:24 +0900 Subject: [PATCH 06/16] remove unused code about deprecated display APIs Signed-off-by: jomui Change-Id: Id4af70a4cda643579cdeb0c5232c91b997e5797a --- geofence-server/src/geofence_server.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/geofence-server/src/geofence_server.c b/geofence-server/src/geofence_server.c index 367b872..e9f60f6 100644 --- a/geofence-server/src/geofence_server.c +++ b/geofence-server/src/geofence_server.c @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -1149,7 +1148,6 @@ static int __wps_timeout_cb(alarm_id_t alarm_id, void *user_data) /*Stop the wps for sometime when there is no fix*/ __stop_wps_positioning(geofence_server); geofence_server->wps_alarm_id = _geofence_add_alarm(10, __wps_alarm_cb, geofence_server); - /*display_unlock_state(LCD_OFF, PM_RESET_TIMER);*/ return 0; } -- 2.7.4 From 5eac3a8c72205b0c1f9cced96559eeb3765a571c Mon Sep 17 00:00:00 2001 From: Susnata Date: Mon, 12 Mar 2018 05:13:11 -0400 Subject: [PATCH 07/16] Fixed svace issues of geofence-server db Change-Id: Ibbe226a6700c41d291b7e7d8195ca73c1e3e1137 Signed-off-by: Susnata --- geofence-server/src/geofence_server_db.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/geofence-server/src/geofence_server_db.c b/geofence-server/src/geofence_server_db.c index 8c85238..f4c4988 100755 --- a/geofence-server/src/geofence_server_db.c +++ b/geofence-server/src/geofence_server_db.c @@ -1147,6 +1147,7 @@ int geofence_manager_set_geocoordinate_info(int fence_id, geocoordinate_info_s * ret = snprintf(data_name_lon, MAX_DATA_NAME, "%lf", geocoordinate_info->longitude); if (ret < 0) { LOGD_GEOFENCE("ERROR: String will be truncated"); + sqlite3_finalize(state); return FENCE_ERR_STRING_TRUNCATED; } @@ -1157,6 +1158,7 @@ int geofence_manager_set_geocoordinate_info(int fence_id, geocoordinate_info_s * ret = snprintf(data_name_rad, MAX_DATA_NAME, "%lf", geocoordinate_info->radius); if (ret < 0) { LOGD_GEOFENCE("ERROR: String will be truncated"); + sqlite3_finalize(state); return FENCE_ERR_STRING_TRUNCATED; } @@ -1217,6 +1219,9 @@ 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); + } g_return_val_if_fail(*geocoordinate_info, FENCE_ERR_INVALID_PARAMETER); #ifdef SUPPORT_ENCRYPTION @@ -1314,6 +1319,9 @@ int geofence_manager_get_ap_info(const int fence_id, GList **ap_list) break; } wifi_info = g_slice_new0(wifi_info_s); + if (wifi_info == NULL) { + sqlite3_finalize(state); + } g_return_val_if_fail(wifi_info, -1); if (wifi_info) { bssid = (const char *) sqlite3_column_text(state, 1); @@ -1359,6 +1367,9 @@ int geofence_manager_get_place_info(int place_id, place_info_s **place_info) return FENCE_ERR_SQLITE_FAIL; } *place_info = (place_info_s *)g_malloc0(sizeof(place_info_s)); + if (*place_info == NULL) { + sqlite3_finalize(state); + } g_return_val_if_fail(*place_info, FENCE_ERR_INTERNAL); data_name = (char *)sqlite3_column_text(state, ++index); @@ -1471,6 +1482,9 @@ int geofence_manager_get_bssid_info(const int fence_id, bssid_info_s **bssid_inf break; } bssid_info_from_db = g_slice_new0(bssid_info_s); + if (bssid_info_from_db == NULL) { + sqlite3_finalize(state); + } g_return_val_if_fail(bssid_info_from_db, -1); if (bssid_info_from_db) { bssid = (const char *)sqlite3_column_text(state, 1); @@ -2411,6 +2425,7 @@ int geofence_manager_reset(void) return FENCE_ERR_SQLITE_FAIL; } sqlite3_reset(state); + sqlite3_finalize(state); sqlite3_free(query_two); char *query_three = sqlite3_mprintf("UPDATE sqlite_sequence SET seq = 0 where name = %Q;", menu_table[FENCE_MAIN_TABLE]); @@ -2527,6 +2542,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); return FENCE_ERR_COUNT; } else { LOGI_GEOFENCE("count[%d]", *count); @@ -2623,6 +2639,7 @@ int geofence_manager_get_count_of_fences(int *count) if (*count < 0) { LOGI_GEOFENCE("ERROR: count = %d", *count); + sqlite3_finalize(state); return FENCE_ERR_COUNT; } else { LOGI_GEOFENCE("count[%d]", *count); @@ -2661,6 +2678,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); return FENCE_ERR_COUNT; } else { LOGI_GEOFENCE("place count[%d]", *count); -- 2.7.4 From b6c43069b07a763426b62d8f32e81eac807536da Mon Sep 17 00:00:00 2001 From: chanywa Date: Wed, 21 Mar 2018 15:32:12 +0900 Subject: [PATCH 08/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 09/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 10/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 11/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 12/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 13/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 14/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 15/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 16/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