--- plugins/phonesim.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/plugins/phonesim.c b/plugins/phonesim.c index d2faf42..14dae47 100644 --- a/plugins/phonesim.c +++ b/plugins/phonesim.c @@ -237,6 +237,30 @@ static void cfun_set_on_cb(gboolean ok, GAtResult *result, gpointer user_data) ofono_modem_set_powered(modem, ok); } +static gboolean phonesim_reset(void *user_data) +{ + struct ofono_modem *modem = user_data; + struct phonesim_data *data = ofono_modem_get_data(modem); + + g_at_chat_unref(data->chat); + data->chat = NULL; + + if (data->mux) { + g_at_mux_shutdown(data->mux); + g_at_mux_unref(data->mux); + data->mux = NULL; + } + + ofono_modem_reset(modem); + + return FALSE; +} + +static void crst_notify(GAtResult *result, gpointer user_data) +{ + g_idle_add(phonesim_reset, user_data); +} + static void phonesim_disconnected(gpointer user_data) { struct ofono_modem *modem = user_data; @@ -389,6 +413,9 @@ static int phonesim_enable(struct ofono_modem *modem) g_at_chat_send(data->chat, "AT+CSCS=\"GSM\"", none_prefix, NULL, NULL, NULL); + g_at_chat_register(data->chat, "+CRST:", + crst_notify, FALSE, modem, NULL); + return 0; } -- 1.7.3.2

Setting Lockdown to TRUE means power down the modem and hold a lock that only permits the lock's owner power up the modem back. When released it restores the last state of the modem before holding the lock. --- doc/modem-api.txt | 10 +++++ src/modem.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 0 deletions(-) diff --git a/doc/modem-api.txt b/doc/modem-api.txt index b92e53c..7189245 100644 --- a/doc/modem-api.txt +++ b/doc/modem-api.txt @@ -37,6 +37,16 @@ Properties boolean Powered [readwrite] Boolean representing the rf state of the modem. Online is false in flight mode. + boolean Lockdown [readwrite] + + Boolean representing the lock state of the modem. + Setting it to true, makes the calling application hold + the modem lock and power it down. Setting to false + makes the it restore the modem state before the + lockdown and release the modem lock. Only the + application that holds the lock can power up the modem. + If the the application exits Lockdown is set to false. + boolean Emergency [readonly, optional, experimental] Boolean representing the emergency mode of the diff --git a/src/modem.c b/src/modem.c index 1828a3b..0ad488d 100644 --- a/src/modem.c +++ b/src/modem.c @@ -71,6 +71,9 @@ struct ofono_modem { ofono_bool_t powered; ofono_bool_t powered_pending; ofono_bool_t get_online; + ofono_bool_t lockdown; + char *lock_owner; + guint lock_watch; guint timeout; ofono_bool_t online; struct ofono_watchlist *online_watches; @@ -579,6 +582,9 @@ void __ofono_modem_append_properties(struct ofono_modem *modem, ofono_dbus_dict_append(dict, "Powered", DBUS_TYPE_BOOLEAN, &modem->powered); + ofono_dbus_dict_append(dict, "Lockdown", DBUS_TYPE_BOOLEAN, + &modem->lockdown); + devinfo_atom = __ofono_modem_find_atom(modem, OFONO_ATOM_TYPE_DEVINFO); /* We cheat a little here and don't check the registered status */ @@ -713,6 +719,22 @@ static gboolean set_powered_timeout(gpointer user) return FALSE; } +static void lockdown_disconnect(DBusConnection *conn, void *user_data) +{ + struct ofono_modem *modem = user_data; + + DBG(""); + + g_free(modem->lock_owner); + + modem->lockdown = FALSE; + + ofono_dbus_signal_property_changed(conn, modem->path, + OFONO_MODEM_INTERFACE, + "Lockdown", DBUS_TYPE_BOOLEAN, + &modem->lockdown); +} + static DBusMessage *modem_set_property(DBusConnection *conn, DBusMessage *msg, void *data) { @@ -755,6 +777,9 @@ static DBusMessage *modem_set_property(DBusConnection *conn, if (modem->powered == powered) return dbus_message_new_method_return(msg); + if (modem->lockdown) + return __ofono_error_access_denied(msg); + err = set_powered(modem, powered); if (err < 0) { if (err != -EINPROGRESS) @@ -786,6 +811,81 @@ static DBusMessage *modem_set_property(DBusConnection *conn, return NULL; } + if (g_str_equal(name, "Lockdown")) { + ofono_bool_t lockdown, powered; + const char *caller; + int err; + + if (dbus_message_iter_get_arg_type(&var) != DBUS_TYPE_BOOLEAN) + return __ofono_error_invalid_args(msg); + + dbus_message_iter_get_basic(&var, &lockdown); + + if (modem->pending != NULL) + return __ofono_error_busy(msg); + + if (modem->lockdown == lockdown) + return dbus_message_new_method_return(msg); + + if (modem->powered != modem->powered_pending) + return __ofono_error_not_available(msg); + + caller = dbus_message_get_sender(msg); + + if (lockdown) { + modem->lock_owner = g_strdup(caller); + + modem->lock_watch = g_dbus_add_service_watch(conn, + modem->lock_owner, NULL, + lockdown_disconnect, modem, NULL); + + if (modem->lock_watch == 0) { + g_free(modem->lock_owner); + return __ofono_error_failed(msg); + } + + powered = FALSE; + + } else { + if (g_strcmp0(caller, modem->lock_owner)) + return __ofono_error_access_denied(msg); + + g_free(modem->lock_owner); + g_dbus_remove_watch(conn, modem->lock_watch); + modem->lock_watch = 0; + } + + modem->lockdown = lockdown; + + g_dbus_send_reply(conn, msg, DBUS_TYPE_INVALID); + + ofono_dbus_signal_property_changed(conn, modem->path, + OFONO_MODEM_INTERFACE, + "Lockdown", DBUS_TYPE_BOOLEAN, + &lockdown); + + if (!modem->lockdown) + return NULL; + + err = set_powered(modem, powered); + if (err < 0) { + if (err != -EINPROGRESS) + return __ofono_error_failed(msg); + + modem->pending = dbus_message_ref(msg); + modem->timeout = g_timeout_add_seconds(20, + set_powered_timeout, modem); + return NULL; + } + + ofono_dbus_signal_property_changed(conn, modem->path, + OFONO_MODEM_INTERFACE, + "Powered", DBUS_TYPE_BOOLEAN, + &powered); + + return NULL; + } + return __ofono_error_invalid_args(msg); } @@ -1588,6 +1688,11 @@ static void modem_unregister(struct ofono_modem *modem) modem->interface_update = 0; } + if (modem->lock_watch) { + g_dbus_remove_watch(conn, modem->lock_watch); + modem->lock_watch = 0; + } + g_dbus_unregister_interface(conn, modem->path, OFONO_MODEM_INTERFACE); if (modem->driver && modem->driver->remove) -- 1.7.3.2

Hi Gustavo, Fair enough... But what about the error case? Regards, -Denis