colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: get AT command timeout directly from our default operation timeout

Browse Source 
We remove the `--command-timeout' option, as the AT command timeout is now
directly computed from our default DBus timeout (modifiable with `--timeout').
This commit is contained in:
Aleksander Morgado
2012-07-25 10:41:09 +02:00
parent 8b863c5a4b
commit 75d84b7402
1 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
cli/mmcli-modem.c
View File

@@ -51,7 +51,6 @@ static gboolean disable_flag;
static gboolean reset_flag;
static gchar *factory_reset_str;
static gchar *command_str;
static gint command_timeout;
static gboolean list_bearers_flag;
static gchar *create_bearer_str;
static gchar *delete_bearer_str;
@@ -84,10 +83,6 @@ static GOptionEntry entries[] = {
"Send an AT command to the modem",
"[COMMAND]"
},
{ "command-timeout", 0, 0, G_OPTION_ARG_INT, &command_timeout,
"Timeout for AT command",
"[SECONDS]"
},
{ "list-bearers", 0, 0, G_OPTION_ARG_NONE, &list_bearers_flag,
"List packet data bearers available in a given modem",
NULL
@@ -554,6 +549,21 @@ command_ready (MMModem *modem,
mmcli_async_operation_done ();
}
static guint
command_get_timeout (MMModem *modem)
{
gint timeout;
/* If --timeout was given, it should already have been set in the proxy */
timeout = (g_dbus_proxy_get_default_timeout (G_DBUS_PROXY (modem)) / 1000) - 1;
if (timeout <= 0) {
g_printerr ("error: timeout is too short (%d)\n", timeout);
exit (EXIT_FAILURE);
}
return (guint)timeout;
}
static void
list_bearers_process_reply (GList *result,
const GError *error)
@@ -847,10 +857,16 @@ get_modem_ready (GObject *source,
/* Request to send a command to the modem? */
if (command_str) {
g_debug ("Asynchronously sending a command to the modem...");
guint timeout;
timeout = command_get_timeout (ctx->modem);
g_debug ("Asynchronously sending a command to the modem (%u seconds timeout)...",
timeout);
mm_modem_command (ctx->modem,
command_str,
command_timeout ? command_timeout : 30,
timeout,
ctx->cancellable,
(GAsyncReadyCallback)command_ready,
NULL);
@@ -1028,11 +1044,16 @@ mmcli_modem_run_synchronous (GDBusConnection *connection)
/* Request to send a command to the modem? */
if (command_str) {
gchar *result;
guint timeout;
timeout = command_get_timeout (ctx->modem);
g_debug ("Synchronously sending command to modem (%u seconds timeout)...",
timeout);
g_debug ("Synchronously sending command to modem...");
result = mm_modem_command_sync (ctx->modem,
command_str,
command_timeout ? command_timeout : 30,
timeout,
NULL,
&error);
command_process_reply (result, error);