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

huawei: explicitly check for the ^NDISDUP command support

Browse Source 
Don't assume that all modems exporting a 'net' port will support ^NDISDUP.
This commit is contained in:
Aleksander Morgado
2012-12-27 10:17:20 +01:00
parent 696403e50a
commit 2499f5760b
1 changed files with 87 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
plugins/huawei/mm-broadband-modem-huawei.c
View File

@@ -14,6 +14,7 @@
* Copyright (C) 2009 - 2012 Red Hat, Inc. * Copyright (C) 2009 - 2012 Red Hat, Inc.
* Copyright (C) 2011 - 2012 Google Inc. * Copyright (C) 2011 - 2012 Google Inc.
* Copyright (C) 2012 Huawei Technologies Co., Ltd * Copyright (C) 2012 Huawei Technologies Co., Ltd
* Copyright (C) 2012 Aleksander Morgado <aleksander@gnu.org>
*/ */
#include <config.h> #include <config.h>
@@ -1242,6 +1243,22 @@ modem_3gpp_disable_unsolicited_events (MMIfaceModem3gpp *self,
/*****************************************************************************/ /*****************************************************************************/
/* Create Bearer (Modem interface) */ /* Create Bearer (Modem interface) */
typedef struct {
MMBroadbandModemHuawei *self;
GSimpleAsyncResult *result;
MMBearerProperties *properties;
} CreateBearerContext;
static void
create_bearer_context_complete_and_free (CreateBearerContext *ctx)
{
g_simple_async_result_complete (ctx->result);
g_object_unref (ctx->result);
g_object_unref (ctx->self);
g_object_unref (ctx->properties);
g_slice_free (CreateBearerContext, ctx);
}
static MMBearer * static MMBearer *
huawei_modem_create_bearer_finish (MMIfaceModem *self, huawei_modem_create_bearer_finish (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
@@ -1260,23 +1277,56 @@ huawei_modem_create_bearer_finish (MMIfaceModem *self,
static void static void
broadband_bearer_huawei_new_ready (GObject *source, broadband_bearer_huawei_new_ready (GObject *source,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) CreateBearerContext *ctx)
{ {
MMBearer *bearer; MMBearer *bearer;
GError *error = NULL; GError *error = NULL;
bearer = ((GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (res), "huawei-bearer"))) ? bearer = mm_broadband_bearer_huawei_new_finish (res, &error);
mm_broadband_bearer_huawei_new_finish (res, &error) :
mm_broadband_bearer_new_finish (res, &error));
if (!bearer) if (!bearer)
g_simple_async_result_take_error (simple, error); g_simple_async_result_take_error (ctx->result, error);
else else
g_simple_async_result_set_op_res_gpointer (simple, g_simple_async_result_set_op_res_gpointer (ctx->result, bearer, (GDestroyNotify)g_object_unref);
bearer, create_bearer_context_complete_and_free (ctx);
(GDestroyNotify)g_object_unref); }
g_simple_async_result_complete (simple);
g_object_unref (simple); static void
broadband_bearer_new_ready (GObject *source,
GAsyncResult *res,
CreateBearerContext *ctx)
{
MMBearer *bearer;
GError *error = NULL;
bearer = mm_broadband_bearer_new_finish (res, &error);
if (!bearer)
g_simple_async_result_take_error (ctx->result, error);
else
g_simple_async_result_set_op_res_gpointer (ctx->result, bearer, (GDestroyNotify)g_object_unref);
create_bearer_context_complete_and_free (ctx);
}
static void
ndisdup_check_ready (MMIfaceModem *self,
GAsyncResult *res,
CreateBearerContext *ctx)
{
if (!mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, NULL)) {
mm_dbg ("^NDISDUP not supported, creating default bearer...");
mm_broadband_bearer_new (MM_BROADBAND_MODEM(self),
ctx->properties,
NULL, /* cancellable */
(GAsyncReadyCallback)broadband_bearer_new_ready,
ctx);
return;
}
mm_dbg ("^NDISDUP supported, creating huawei bearer...");
mm_broadband_bearer_huawei_new (MM_BROADBAND_MODEM_HUAWEI (self),
ctx->properties,
NULL, /* cancellable */
(GAsyncReadyCallback)broadband_bearer_huawei_new_ready,
ctx);
} }
static void static void
@@ -1285,31 +1335,34 @@ huawei_modem_create_bearer (MMIfaceModem *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result; CreateBearerContext *ctx;
MMPort *data_port;
data_port = mm_base_modem_peek_best_data_port (MM_BASE_MODEM (self)); ctx = g_slice_new0 (CreateBearerContext);
result = g_simple_async_result_new (G_OBJECT (self), ctx->self = g_object_ref (self);
callback, ctx->properties = g_object_ref (properties);
user_data, ctx->result = g_simple_async_result_new (G_OBJECT (self),
huawei_modem_create_bearer); callback,
user_data,
huawei_modem_create_bearer);
if (mm_port_get_port_type (data_port) == MM_PORT_TYPE_NET) { if (mm_port_get_port_type (mm_base_modem_peek_best_data_port (MM_BASE_MODEM (self))) == MM_PORT_TYPE_NET) {
mm_dbg ("Creating huawei bearer..."); /* If we get a data port, check for NDISDUP support */
g_object_set_data (G_OBJECT (result), "huawei-bearer", GUINT_TO_POINTER (TRUE)); mm_dbg ("Checking ^NDISDUP support...");
mm_broadband_bearer_huawei_new (MM_BROADBAND_MODEM_HUAWEI (self), mm_base_modem_at_command (MM_BASE_MODEM(self),
properties, "^NDISDUP?",
NULL, /* cancellable */ 3,
(GAsyncReadyCallback)broadband_bearer_huawei_new_ready, FALSE,
result); (GAsyncReadyCallback)ndisdup_check_ready,
} else { ctx);
mm_dbg ("Creating default bearer..."); return;
mm_broadband_bearer_new (MM_BROADBAND_MODEM(self), }
properties,
NULL, /* cancellable */ mm_dbg ("Creating default bearer...");
(GAsyncReadyCallback)broadband_bearer_huawei_new_ready, mm_broadband_bearer_new (MM_BROADBAND_MODEM(self),
result); properties,
} NULL, /* cancellable */
(GAsyncReadyCallback)broadband_bearer_new_ready,
ctx);
} }