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

sim: Query the status of SC facility lock

This commit is contained in:
Slava Monich 2016-07-06 19:02:25 +03:00 committed by Denis Kenzior
parent ee98484193
commit 103e8fd42e
1 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/sim.c
View File

@ -2449,58 +2449,50 @@ static void sim_free_state(struct ofono_sim *sim)
sim_free_main_state(sim);
}
static void sim_query_fac_imsilock_cb(const struct ofono_error *error,
ofono_bool_t status,
void *data)
static void sim_set_locked_pin(struct ofono_sim *sim,
enum ofono_sim_password_type type, gboolean locked)
{
struct ofono_sim *sim = data;
DBusConnection *conn = ofono_dbus_get_connection();
const char *path = __ofono_atom_get_path(sim->atom);
char **locked_pins;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_error("Querying Facility Lock for IMSI Lock failed");
if (sim->locked_pins[type] == locked)
return;
}
sim->locked_pins[OFONO_SIM_PASSWORD_PHSIM_PIN] = status;
sim->locked_pins[type] = locked;
locked_pins = get_locked_pins(sim);
ofono_dbus_signal_array_property_changed(conn,
path,
OFONO_SIM_MANAGER_INTERFACE,
"LockedPins", DBUS_TYPE_STRING,
&locked_pins);
ofono_dbus_signal_array_property_changed(ofono_dbus_get_connection(),
__ofono_atom_get_path(sim->atom),
OFONO_SIM_MANAGER_INTERFACE, "LockedPins",
DBUS_TYPE_STRING, &locked_pins);
g_strfreev(locked_pins);
}
static void sim_query_fac_networklock_cb(const struct ofono_error *error,
ofono_bool_t status,
void *data)
static void sim_query_fac_imsilock_cb(const struct ofono_error *error,
ofono_bool_t status, void *data)
{
struct ofono_sim *sim = data;
DBusConnection *conn = ofono_dbus_get_connection();
const char *path = __ofono_atom_get_path(sim->atom);
char **locked_pins;
if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
ofono_error("Querying Facility Lock for Network Lock failed");
if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
return;
}
sim->locked_pins[OFONO_SIM_PASSWORD_PHNET_PIN] = status;
sim_set_locked_pin(data, OFONO_SIM_PASSWORD_PHSIM_PIN, status);
}
locked_pins = get_locked_pins(sim);
static void sim_query_fac_networklock_cb(const struct ofono_error *error,
ofono_bool_t status, void *data)
{
if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
return;
ofono_dbus_signal_array_property_changed(conn,
path,
OFONO_SIM_MANAGER_INTERFACE,
"LockedPins", DBUS_TYPE_STRING,
&locked_pins);
sim_set_locked_pin(data, OFONO_SIM_PASSWORD_PHNET_PIN, status);
}
g_strfreev(locked_pins);
static void sim_query_fac_pinlock_cb(const struct ofono_error *error,
ofono_bool_t status, void *data)
{
if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
return;
sim_set_locked_pin(data, OFONO_SIM_PASSWORD_SIM_PIN, status);
}
void ofono_sim_inserted_notify(struct ofono_sim *sim, ofono_bool_t inserted)
@ -2529,14 +2521,20 @@ void ofono_sim_inserted_notify(struct ofono_sim *sim, ofono_bool_t inserted)
call_state_watches(sim);
if (inserted) {
sim->driver->query_facility_lock(sim,
if (sim->driver->query_facility_lock) {
sim->driver->query_facility_lock(sim,
OFONO_SIM_PASSWORD_PHSIM_PIN,
sim_query_fac_imsilock_cb, sim);
sim->driver->query_facility_lock(sim,
sim->driver->query_facility_lock(sim,
OFONO_SIM_PASSWORD_PHNET_PIN,
sim_query_fac_networklock_cb, sim);
sim->driver->query_facility_lock(sim,
OFONO_SIM_PASSWORD_SIM_PIN,
sim_query_fac_pinlock_cb, sim);
}
sim_initialize(sim);
} else {
sim->pin_type = OFONO_SIM_PASSWORD_NONE;