diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-26 13:00:07 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-26 13:00:07 +0200 |
| commit | 28f13c09ecf6433385d9b7a8cff5be825d74c9c8 (patch) | |
| tree | d3529febb689258b8535f1c02ec88a344b7d00b6 /cli/mmcli-modem-location.c | |
| parent | d10780dcf573749137710c376edf52086e2b4500 (diff) | |
mmcli: abort certain operations if modem is unlocked
Do not try to perform feature/capability specific actions if we're still
unlocked, as the modem didn't yet export the feature/capability specific
interface.
The only interfaces expected while modem is unlocked are the Modem and Simple
interfaces, as well as the SIM interface in the SIM object, of course.
Diffstat (limited to 'cli/mmcli-modem-location.c')
| -rw-r--r-- | cli/mmcli-modem-location.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/cli/mmcli-modem-location.c b/cli/mmcli-modem-location.c index 49afd0ac..22e7aa1a 100644 --- a/cli/mmcli-modem-location.c +++ b/cli/mmcli-modem-location.c @@ -120,11 +120,17 @@ context_free (Context *ctx) static void ensure_modem_location (void) { - if (ctx->modem_location) - return; + if (mm_modem_get_unlock_required (mm_object_peek_modem (ctx->object)) != MM_MODEM_LOCK_NONE) { + g_printerr ("error: modem not unlocked yet\n"); + exit (EXIT_FAILURE); + } + + if (!ctx->modem_location) { + g_printerr ("error: modem has no location capabilities\n"); + exit (EXIT_FAILURE); + } - g_printerr ("error: modem has no location capabilities\n"); - exit (EXIT_FAILURE); + /* Success */ } void |