summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjomui <jongmun.woo@samsung.com>2016-12-02 18:02:30 +0900
committerjomui <jongmun.woo@samsung.com>2016-12-02 18:02:50 +0900
commit8de1f3f754920205d8205d307df5c2e63ce55131 (patch)
tree6a41f044777304361912179df4e0f811704fb8b9
parent4dfe998fde1a7dcf47c0d76ab46f73774e525037 (diff)
downloadgeofence-server-8de1f3f754920205d8205d307df5c2e63ce55131.tar.gz
geofence-server-8de1f3f754920205d8205d307df5c2e63ce55131.tar.bz2
geofence-server-8de1f3f754920205d8205d307df5c2e63ce55131.zip
Signed-off-by: jomui <jongmun.woo@samsung.com> Change-Id: Ibebe3807b07bccbb2697935c4392a50966610fa4
-rw-r--r--geofence-server/src/geofence_server.c5
-rw-r--r--geofence-server/src/geofence_server_wifi.c8
2 files changed, 11 insertions, 2 deletions
diff --git a/geofence-server/src/geofence_server.c b/geofence-server/src/geofence_server.c
index 9b33a97..88fbf87 100644
--- a/geofence-server/src/geofence_server.c
+++ b/geofence-server/src/geofence_server.c
@@ -2215,7 +2215,7 @@ static void dbus_start_geofence_cb(gint fence_id, const gchar *app_id, gpointer
} else {
bssidlen = strlen(ap_bssid);
LOGI_GEOFENCE("Connected AP: %s, %d\n", ap_bssid, bssidlen);
- if (g_strcmp0(wifi_info->bssid, ap_bssid) == 0) {
+ if (g_strcmp0(wifi_info->bssid, ap_bssid) == 0) {
status_to_be_emitted = GEOFENCE_FENCE_STATE_IN;
geofence_server->connectedTrackingWifiFenceId = fence_id;
} else {
@@ -2223,6 +2223,9 @@ static void dbus_start_geofence_cb(gint fence_id, const gchar *app_id, gpointer
}
}
+ if (ap_bssid != NULL)
+ free(ap_bssid);
+ ap_bssid = NULL;
}
} else {
LOGI_GEOFENCE("Wifi is not switched on...");
diff --git a/geofence-server/src/geofence_server_wifi.c b/geofence-server/src/geofence_server_wifi.c
index 3217474..13fc92f 100644
--- a/geofence-server/src/geofence_server_wifi.c
+++ b/geofence-server/src/geofence_server_wifi.c
@@ -165,6 +165,9 @@ void wifi_rssi_level_changed(wifi_rssi_level_e rssi_level, void *user_data)
state = GEOFENCE_PROXIMITY_FAR;
emit_wifi_geofence_proximity_changed(geofence_server, geofence_server->connectedTrackingWifiFenceId, state);
}
+ if (bssid != NULL)
+ free(bssid);
+ bssid = NULL;
}
}
@@ -203,7 +206,7 @@ void wifi_device_state_changed(wifi_device_state_e state, void *user_data)
LOGD_GEOFENCE("exit");
}
-void __geofence_check_wifi_matched_bssid(wifi_connection_state_e state, char *bssid, void *user_data)
+void __geofence_check_wifi_matched_bssid(wifi_connection_state_e state, char *bssid, void *user_data)
{
LOGD_GEOFENCE("Comparing the matching bssids");
GeofenceServer *geofence_server = (GeofenceServer *)user_data;
@@ -263,4 +266,7 @@ void wifi_conn_state_changed(wifi_connection_state_e state, wifi_ap_h ap, void *
LOGD_GEOFENCE("Wifi disconnected with [%s].", ap_bssid);
__geofence_check_wifi_matched_bssid(state, ap_bssid, user_data);
}
+ if (ap_bssid != NULL)
+ free(ap_bssid);
+ ap_bssid = NULL;
}