From: Pekka Pessi <Pekka.Pessi(a)nokia.com&gt; Enable or disable Fixed Dialing Numbers feature on SIM card. If enabled, calls can be dialled or SMSs sent only to numbers listed on special FDN phonebook on the SIM card. --- include/sim.h | 3 ++ src/sim.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/include/sim.h b/include/sim.h index d3e564c..4639671 100644 --- a/include/sim.h +++ b/include/sim.h @@ -157,6 +157,9 @@ struct ofono_sim_driver { void (*query_locked)(struct ofono_sim *sim, enum ofono_sim_password_type type, ofono_sim_locked_cb_t cb, void *data); + void (*enable_fdn)(struct ofono_sim *sim, + int enable, const char *passwd, + ofono_sim_lock_unlock_cb_t cb, void *data); }; int ofono_sim_driver_register(const struct ofono_sim_driver *d); diff --git a/src/sim.c b/src/sim.c index bac77e0..7af4565 100644 --- a/src/sim.c +++ b/src/sim.c @@ -626,6 +626,61 @@ static DBusMessage *sim_unlock_pin(DBusConnection *conn, DBusMessage *msg, return sim_lock_or_unlock(sim, 0, conn, msg); } +static void sim_fdn_cb(const struct ofono_error *error, void *data) +{ + struct ofono_sim *sim = data; + DBusMessage *reply; + + if (error->type == OFONO_ERROR_TYPE_NO_ERROR) + reply = dbus_message_new_method_return(sim->pending); + else + reply = __ofono_error_failed(sim->pending); + + __ofono_dbus_pending_reply(&sim->pending, reply); +} + +static DBusMessage *sim_fdn(struct ofono_sim *sim, int enable, + DBusConnection *conn, DBusMessage *msg) +{ + const char *pin; + + if (!sim->driver->enable_fdn) + return __ofono_error_not_implemented(msg); + + if (sim->pending) + return __ofono_error_busy(msg); + + if (dbus_message_get_args(msg, NULL, + DBUS_TYPE_STRING, &pin, + DBUS_TYPE_INVALID) == FALSE) + return __ofono_error_invalid_args(msg); + + if (!is_valid_pin(pin, PIN_TYPE_PIN)) + return __ofono_error_invalid_format(msg); + + sim->pending = dbus_message_ref(msg); + + sim->driver->enable_fdn(sim, enable, pin, sim_fdn_cb, sim); + + return NULL; +} + +static DBusMessage *sim_enable_fdn(DBusConnection *conn, DBusMessage *msg, + void *data) +{ + struct ofono_sim *sim = data; + + return sim_fdn(sim, 1, conn, msg); +} + +static DBusMessage *sim_disable_fdn(DBusConnection *conn, DBusMessage *msg, + void *data) +{ + struct ofono_sim *sim = data; + + return sim_fdn(sim, 0, conn, msg); +} + static void sim_change_pin_cb(const struct ofono_error *error, void *data) { struct ofono_sim *sim = data; @@ -787,6 +842,10 @@ static GDBusMethodTable sim_methods[] = { G_DBUS_METHOD_FLAG_ASYNC }, { "UnlockPin", "ss", "", sim_unlock_pin, G_DBUS_METHOD_FLAG_ASYNC }, + { "EnableFDN", "s", "", sim_enable_fdn, + G_DBUS_METHOD_FLAG_ASYNC }, + { "DisableFDN", "s", "", sim_disable_fdn, + G_DBUS_METHOD_FLAG_ASYNC }, { } }; -- 1.7.0.4

From: Pekka Pessi <Pekka.Pessi(a)nokia.com&gt; --- test/disable-fdn | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) create mode 100755 test/disable-fdn diff --git a/test/disable-fdn b/test/disable-fdn new file mode 100755 index 0000000..61b731d --- /dev/null +++ b/test/disable-fdn @@ -0,0 +1,31 @@ +#!/usr/bin/python + +import dbus +import sys + +bus = dbus.SystemBus() + +def default_modem(): + manager = bus.get_object('org.ofono', '/') + properties = manager.GetProperties(dbus_interface = 'org.ofono.Manager') + modems = properties["Modems"] + if not modems: + sys.stderr.write("No modems available\n") + sys.exit(1) + return modems[0] + +if len(sys.argv) == 3: + path, pin = sys.argv[1:] +elif len(sys.argv) == 2: + path, pin = default_modem(), sys.argv[1] +else: + print "%s [PATH] pin2" % (sys.argv[0]) + sys.exit(0) + +print "Disable FDN for modem %s..." % (path,) + +modem = bus.get_object('org.ofono', path) + +simmanager = dbus.Interface(modem, 'org.ofono.SimManager') + +simmanager.DisableFDN(pin) -- 1.7.0.4