sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

network: Use sim SPN watch API

This commit is contained in:
Oleg Zhurakivskyy 2012-01-18 13:56:27 +02:00 committed by Denis Kenzior
parent b5d6d835fa
commit 0f79546eaf
1 changed files with 19 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
src/network.c
View File

@ -43,7 +43,6 @@
#define NETWORK_REGISTRATION_FLAG_HOME_SHOW_PLMN 0x1
#define NETWORK_REGISTRATION_FLAG_ROAMING_SHOW_SPN 0x2
#define NETWORK_REGISTRATION_FLAG_READING_PNN 0x4
#define NETWORK_REGISTRATION_FLAG_READING_SPN 0x8
enum network_registration_mode {
NETWORK_REGISTRATION_MODE_AUTO = 0,
@ -84,6 +83,7 @@ struct ofono_netreg {
struct ofono_atom *atom;
unsigned int hfp_watch;
char *spn;
unsigned int spn_watch;
};
struct network_operator_data {
@ -1648,140 +1648,22 @@ static void sim_spn_display_condition_parse(struct ofono_netreg *netreg,
netreg->flags |= NETWORK_REGISTRATION_FLAG_ROAMING_SHOW_SPN;
}
static gboolean sim_spn_parse(const void *data, int length, char **dst)
static void spn_read_cb(const char *spn, const char *dc, void *data)
{
char *spn;
/*
* TS 31.102 says:
*
* the string shall use:
*
* - either the SMS default 7-bit coded alphabet as defined in
* TS 23.038 [5] with bit 8 set to 0. The string shall be left
* justified. Unused bytes shall be set to 'FF'.
*
* - or one of the UCS2 code options defined in the annex of TS
* 31.101 [11].
*
* 31.101 has no such annex though. 51.101 refers to Annex B of
* itself which is not there either. 11.11 contains the same
* paragraph as 51.101 and has an Annex B which we implement.
*/
spn = sim_string_to_utf8(data, length);
if (spn == NULL) {
ofono_error("EFspn read successfully, but couldn't parse");
return FALSE;
}
if (strlen(spn) == 0) {
g_free(spn);
return FALSE;
}
*dst = spn;
return TRUE;
}
static void sim_cphs_spn_short_read_cb(int ok, int length, int record,
const unsigned char *data,
int record_length, void *user_data)
{
struct ofono_netreg *netreg = user_data;
netreg->flags &= ~NETWORK_REGISTRATION_FLAG_READING_SPN;
if (!ok)
return;
if (!sim_spn_parse(data, length, &netreg->spn))
return;
if (netreg->current_operator)
netreg_emit_operator_display_name(netreg);
}
static void sim_cphs_spn_read_cb(int ok, int length, int record,
const unsigned char *data,
int record_length, void *user_data)
{
struct ofono_netreg *netreg = user_data;
if (!ok) {
if (__ofono_sim_cphs_service_available(netreg->sim,
SIM_CPHS_SERVICE_SHORT_SPN))
ofono_sim_read(netreg->sim_context,
SIM_EF_CPHS_SPN_SHORT_FILEID,
OFONO_SIM_FILE_STRUCTURE_TRANSPARENT,
sim_cphs_spn_short_read_cb, netreg);
else
netreg->flags &= ~NETWORK_REGISTRATION_FLAG_READING_SPN;
return;
}
netreg->flags &= ~NETWORK_REGISTRATION_FLAG_READING_SPN;
if (!sim_spn_parse(data, length, &netreg->spn))
return;
if (netreg->current_operator)
netreg_emit_operator_display_name(netreg);
}
static void sim_spn_read_cb(int ok, int length, int record,
const unsigned char *data,
int record_length, void *user_data)
{
struct ofono_netreg *netreg = user_data;
if (!ok) {
ofono_sim_read(netreg->sim_context,
SIM_EF_CPHS_SPN_FILEID,
OFONO_SIM_FILE_STRUCTURE_TRANSPARENT,
sim_cphs_spn_read_cb, netreg);
return;
}
netreg->flags &= ~NETWORK_REGISTRATION_FLAG_READING_SPN;
if (!sim_spn_parse(data + 1, length - 1, &netreg->spn))
return;
sim_spn_display_condition_parse(netreg, data[0]);
if (netreg->current_operator)
netreg_emit_operator_display_name(netreg);
}
static void sim_spn_changed(int id, void *userdata)
{
struct ofono_netreg *netreg = userdata;
gboolean had_spn;
if (netreg->flags & NETWORK_REGISTRATION_FLAG_READING_SPN)
return;
had_spn = netreg->spn != NULL && strlen(netreg->spn) > 0;
netreg->flags &= ~(NETWORK_REGISTRATION_FLAG_HOME_SHOW_PLMN |
NETWORK_REGISTRATION_FLAG_ROAMING_SHOW_SPN);
struct ofono_netreg *netreg = data;
g_free(netreg->spn);
netreg->spn = NULL;
netreg->flags &= ~(NETWORK_REGISTRATION_FLAG_HOME_SHOW_PLMN |
NETWORK_REGISTRATION_FLAG_ROAMING_SHOW_SPN);
/*
* We can't determine whether the property really changed
* without checking the name, before and after. Instead we use a
* simple heuristic, which will not always be correct
*/
if (had_spn && netreg->current_operator)
if (dc)
sim_spn_display_condition_parse(netreg, *dc);
netreg->spn = g_strdup(spn);
if (netreg->current_operator)
netreg_emit_operator_display_name(netreg);
netreg->flags |= NETWORK_REGISTRATION_FLAG_READING_SPN;
ofono_sim_read(netreg->sim_context, SIM_EFSPN_FILEID,
OFONO_SIM_FILE_STRUCTURE_TRANSPARENT,
sim_spn_read_cb, netreg);
}
int ofono_netreg_get_location(struct ofono_netreg *netreg)
@ -1919,6 +1801,12 @@ static void netreg_unregister(struct ofono_atom *atom)
netreg->settings = NULL;
}
if (netreg->spn_watch)
ofono_sim_remove_spn_watch(netreg->sim, &netreg->spn_watch);
g_free(netreg->spn);
netreg->spn = NULL;
if (netreg->sim_context) {
ofono_sim_context_free(netreg->sim_context);
netreg->sim_context = NULL;
@ -1947,7 +1835,6 @@ static void netreg_remove(struct ofono_atom *atom)
sim_eons_free(netreg->eons);
sim_spdi_free(netreg->spdi);
g_free(netreg->spn);
g_free(netreg);
}
@ -2199,25 +2086,8 @@ void ofono_netreg_register(struct ofono_netreg *netreg)
sim_pnn_opl_changed, netreg,
NULL);
netreg->flags |= NETWORK_REGISTRATION_FLAG_READING_SPN;
ofono_sim_read(netreg->sim_context, SIM_EFSPN_FILEID,
OFONO_SIM_FILE_STRUCTURE_TRANSPARENT,
sim_spn_read_cb, netreg);
ofono_sim_add_file_watch(netreg->sim_context, SIM_EFSPN_FILEID,
sim_spn_changed, netreg,
NULL);
ofono_sim_add_file_watch(netreg->sim_context,
SIM_EF_CPHS_SPN_FILEID,
sim_spn_changed, netreg,
NULL);
if (__ofono_sim_cphs_service_available(netreg->sim,
SIM_CPHS_SERVICE_SHORT_SPN))
ofono_sim_add_file_watch(netreg->sim_context,
SIM_EF_CPHS_SPN_SHORT_FILEID,
sim_spn_changed,
netreg, NULL);
ofono_sim_add_spn_watch(netreg->sim, &netreg->spn_watch,
spn_read_cb, netreg, NULL);
if (__ofono_sim_service_available(netreg->sim,
SIM_UST_SERVICE_PROVIDER_DISPLAY_INFO,