summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSusnata Sovalin <s.sovalin@samsung.com>2018-10-05 12:17:35 +0530
committerSusnata Sovalin <s.sovalin@samsung.com>2018-10-05 12:17:35 +0530
commit1c35a2839d2346544fe8d34efdedcd35a511a0f4 (patch)
tree03eeebd63ea8fb8567e78829ffc021185e33be5d
parent79de70f960a280d7a2b995feb64ce8b5a19e61e4 (diff)
downloadgeofence-server-tizen_5.0.tar.gz
geofence-server-tizen_5.0.tar.bz2
geofence-server-tizen_5.0.zip
Change-Id: I03339743fb0980b4f1c57290b5b76892ec579cc9 Signed-off-by: Randeep Singh <randeep.s@samsung.com> Signed-off-by: Susnata Sovalin <s.sovalin@samsung.com>
-rw-r--r--geofence-server/src/server.c52
1 files 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;
}