colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iface-modem-location: log old and new 3GPP location ids when updating

Browse Source
This commit is contained in:
Aleksander Morgado
2020-10-10 14:38:24 +02:00
parent 135d484501
commit df9cb4a8f6
1 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/mm-iface-modem-location.c
View File

@@ -400,42 +400,66 @@ mm_iface_modem_location_3gpp_update_lac_tac_ci (MMIfaceModemLocation *self,
gulong tracking_area_code, gulong tracking_area_code,
gulong cell_id) gulong cell_id)
{ {
MmGdbusModemLocation *skeleton; g_autoptr(MmGdbusModemLocationSkeleton) skeleton = NULL;
LocationContext *ctx; LocationContext *ctx;
guint changed = 0;
gulong old_location_area_code;
gulong old_tracking_area_code;
gulong old_cell_id;
ctx = get_location_context (self);
g_object_get (self, g_object_get (self,
MM_IFACE_MODEM_LOCATION_DBUS_SKELETON, &skeleton, MM_IFACE_MODEM_LOCATION_DBUS_SKELETON, &skeleton,
NULL); NULL);
if (!skeleton) if (!skeleton || !(mm_gdbus_modem_location_get_enabled (MM_GDBUS_MODEM_LOCATION (skeleton)) & MM_MODEM_LOCATION_SOURCE_3GPP_LAC_CI))
return; return;
if (mm_gdbus_modem_location_get_enabled (skeleton) & MM_MODEM_LOCATION_SOURCE_3GPP_LAC_CI) { ctx = get_location_context (self);
guint changed = 0; g_assert (ctx->location_3gpp != NULL);
g_assert (ctx->location_3gpp != NULL); old_location_area_code = mm_location_3gpp_get_location_area_code (ctx->location_3gpp);
old_tracking_area_code = mm_location_3gpp_get_tracking_area_code (ctx->location_3gpp);
old_cell_id = mm_location_3gpp_get_cell_id (ctx->location_3gpp);
/* Update LAC if given, and clear TAC unless a TAC is also given */ /* Update LAC if given, and clear TAC unless a TAC is also given */
if (location_area_code) { if (location_area_code) {
changed += mm_location_3gpp_set_location_area_code (ctx->location_3gpp, location_area_code); if (old_location_area_code != location_area_code) {
if (!tracking_area_code) mm_obj_dbg (self, "3GPP location area code updated: '%lX->%lX'", old_location_area_code, location_area_code);
changed += mm_location_3gpp_set_tracking_area_code (ctx->location_3gpp, 0); mm_location_3gpp_set_location_area_code (ctx->location_3gpp, location_area_code);
changed++;
} }
/* Update TAC if given, and clear LAC unless a LAC is also given */ if (!tracking_area_code) {
if (tracking_area_code) { if (old_tracking_area_code != 0) {
changed += mm_location_3gpp_set_tracking_area_code (ctx->location_3gpp, tracking_area_code); mm_obj_dbg (self, "3GPP tracking area code cleared: '%lX->%lX'", old_tracking_area_code, tracking_area_code);
if (!location_area_code) mm_location_3gpp_set_tracking_area_code (ctx->location_3gpp, 0);
changed += mm_location_3gpp_set_location_area_code (ctx->location_3gpp, 0); changed++;
}
}
}
/* Update TAC if given, and clear LAC unless a LAC is also given */
if (tracking_area_code) {
if (old_tracking_area_code != tracking_area_code) {
mm_obj_dbg (self, "3GPP tracking area code updated: '%lX->%lX'", old_tracking_area_code, tracking_area_code);
mm_location_3gpp_set_tracking_area_code (ctx->location_3gpp, tracking_area_code);
changed++;
}
if (!location_area_code) {
if (old_location_area_code != 0) {
mm_obj_dbg (self, "3GPP location area code cleared: '%lX->%lX'", old_location_area_code, location_area_code);
mm_location_3gpp_set_location_area_code (ctx->location_3gpp, 0);
changed++;
}
} }
/* Cell ID only updated if given. It is assumed that if LAC or TAC are given, CID is also given */
if (cell_id)
changed += mm_location_3gpp_set_cell_id (ctx->location_3gpp, cell_id);
if (changed)
notify_3gpp_location_update (self, skeleton, ctx->location_3gpp);
} }
g_object_unref (skeleton); /* Cell ID only updated if given. It is assumed that if LAC or TAC are given, CID is also given */
if (cell_id && (old_cell_id != cell_id)) {
mm_obj_dbg (self, "3GPP cell id updated: '%lX->%lX'", old_cell_id, cell_id);
mm_location_3gpp_set_cell_id (ctx->location_3gpp, cell_id);
changed++;
}
if (changed)
notify_3gpp_location_update (self, MM_GDBUS_MODEM_LOCATION (skeleton), ctx->location_3gpp);
} }
void void