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

network: Refactor sim_spn_read_cb() 

Refactor sim_spn_read_cb() for CPHS SPN, short-SPN inclusion
This commit is contained in:
Oleg Zhurakivskyy 2011-12-02 13:10:30 +02:00 committed by Denis Kenzior
parent 58fc48c6c4
commit a67bc1a4b0
1 changed files with 50 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/network.c
View File

@ -1656,19 +1656,31 @@ static void sim_spdi_read_cb(int ok, int length, int record,
} }
} }
static void sim_spn_read_cb(int ok, int length, int record, static void ofono_netreg_operator_display_name_notify(
const unsigned char *data, struct ofono_netreg *netreg)
int record_length, void *user_data) {
const char *operator = get_operator_display_name(netreg);
ofono_dbus_signal_property_changed(ofono_dbus_get_connection(),
__ofono_atom_get_path(netreg->atom),
OFONO_NETWORK_REGISTRATION_INTERFACE,
"Name", DBUS_TYPE_STRING, &operator);
}
static void sim_spn_display_condition_parse(struct ofono_netreg *netreg,
guint8 dcbyte)
{
if (dcbyte & SIM_EFSPN_DC_HOME_PLMN_BIT)
netreg->flags |= NETWORK_REGISTRATION_FLAG_HOME_SHOW_PLMN;
if (!(dcbyte & SIM_EFSPN_DC_ROAMING_SPN_BIT))
netreg->flags |= NETWORK_REGISTRATION_FLAG_ROAMING_SHOW_SPN;
}
static gboolean sim_spn_parse(const void *data, int length, char **dst)
{ {
struct ofono_netreg *netreg = user_data;
unsigned char dcbyte;
char *spn; char *spn;
if (!ok)
return;
dcbyte = data[0];
/* /*
* TS 31.102 says: * TS 31.102 says:
* *
@ -1685,40 +1697,42 @@ static void sim_spn_read_cb(int ok, int length, int record,
* itself which is not there either. 11.11 contains the same * itself which is not there either. 11.11 contains the same
* paragraph as 51.101 and has an Annex B which we implement. * paragraph as 51.101 and has an Annex B which we implement.
*/ */
spn = sim_string_to_utf8(data + 1, length - 1); spn = sim_string_to_utf8(data, length);
if (spn == NULL) { if (spn == NULL || strlen(spn) == 0) {
ofono_error("EFspn read successfully, but couldn't parse"); if (spn == NULL)
return; ofono_error("EFspn read successfully, "
} "but couldn't parse");
if (strlen(spn) == 0) {
g_free(spn); g_free(spn);
return; return FALSE;
} }
netreg->spname = spn; *dst = spn;
return TRUE;
}
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;
unsigned char dcbyte;
if (!ok)
return;
dcbyte = data[0];
if (!sim_spn_parse(data + 1, length - 1, &netreg->spname))
return;
ofono_sim_read(netreg->sim_context, SIM_EFSPDI_FILEID, ofono_sim_read(netreg->sim_context, SIM_EFSPDI_FILEID,
OFONO_SIM_FILE_STRUCTURE_TRANSPARENT, OFONO_SIM_FILE_STRUCTURE_TRANSPARENT,
sim_spdi_read_cb, netreg); sim_spdi_read_cb, netreg);
if (dcbyte & SIM_EFSPN_DC_HOME_PLMN_BIT) sim_spn_display_condition_parse(netreg, dcbyte);
netreg->flags |= NETWORK_REGISTRATION_FLAG_HOME_SHOW_PLMN;
if (!(dcbyte & SIM_EFSPN_DC_ROAMING_SPN_BIT)) if (netreg->current_operator)
netreg->flags |= NETWORK_REGISTRATION_FLAG_ROAMING_SHOW_SPN; ofono_netreg_operator_display_name_notify(netreg);
if (netreg->current_operator) {
DBusConnection *conn = ofono_dbus_get_connection();
const char *path = __ofono_atom_get_path(netreg->atom);
const char *operator;
operator = get_operator_display_name(netreg);
ofono_dbus_signal_property_changed(conn, path,
OFONO_NETWORK_REGISTRATION_INTERFACE,
"Name", DBUS_TYPE_STRING,
&operator);
}
} }
int ofono_netreg_get_location(struct ofono_netreg *netreg) int ofono_netreg_get_location(struct ofono_netreg *netreg)