diff options
| -rw-r--r-- | plugins/Makefile.am | 4 | ||||
| -rw-r--r-- | plugins/samsung/mm-broadband-bearer-samsung.c | 551 | ||||
| -rw-r--r-- | plugins/samsung/mm-broadband-bearer-samsung.h | 61 | ||||
| -rw-r--r-- | plugins/samsung/mm-broadband-modem-samsung.c | 60 |
4 files changed, 3 insertions, 673 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 7485336d..d8c61425 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -255,9 +255,7 @@ libmm_plugin_samsung_la_SOURCES = \ samsung/mm-plugin-samsung.c \ samsung/mm-plugin-samsung.h \ samsung/mm-broadband-modem-samsung.c \ - samsung/mm-broadband-modem-samsung.h \ - samsung/mm-broadband-bearer-samsung.c \ - samsung/mm-broadband-bearer-samsung.h + samsung/mm-broadband-modem-samsung.h libmm_plugin_samsung_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(ICERA_COMMON_COMPILER_FLAGS) libmm_plugin_samsung_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) libmm_plugin_samsung_la_LIBADD = $(ICERA_COMMON_LIBADD_FLAGS) diff --git a/plugins/samsung/mm-broadband-bearer-samsung.c b/plugins/samsung/mm-broadband-bearer-samsung.c deleted file mode 100644 index a03a8110..00000000 --- a/plugins/samsung/mm-broadband-bearer-samsung.c +++ /dev/null @@ -1,551 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details: - * - * Copyright (C) 2012 Google, Inc. - * Copyright (C) 2012 Aleksander Morgado <aleksander@gnu.org> - */ - -#include <config.h> - -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <string.h> -#include <ctype.h> - -#include <ModemManager.h> -#include <libmm-common.h> - -#include "mm-base-modem-at.h" -#include "mm-broadband-bearer-samsung.h" -#include "mm-log.h" -#include "mm-modem-helpers.h" -#include "mm-utils.h" - -G_DEFINE_TYPE (MMBroadbandBearerSamsung, mm_broadband_bearer_samsung, MM_TYPE_BROADBAND_BEARER); - -/*****************************************************************************/ - -typedef struct { - MMBroadbandBearerSamsung *self; - MMBaseModem *modem; - MMAtSerialPort *primary; - GCancellable *cancellable; - GSimpleAsyncResult *result; - - guint cid; - guint timeout_id; -} DialContext; - -typedef struct { - MMBroadbandBearerSamsung *self; - GSimpleAsyncResult *result; - guint timeout_id; -} DisconnectContext; - -struct _MMBroadbandBearerSamsungPrivate { - guint connected_cid; - DialContext *pending_dial; - DisconnectContext *pending_disconnect; -}; - -static DialContext * -dial_context_new (MMBroadbandBearerSamsung *self, - MMBaseModem *modem, - MMAtSerialPort *primary, - GCancellable *cancellable, - guint cid, - GAsyncReadyCallback callback, - gpointer user_data) -{ - DialContext *ctx; - - ctx = g_new0 (DialContext, 1); - ctx->self = g_object_ref (self); - ctx->modem = g_object_ref (modem); - ctx->primary = g_object_ref (primary); - ctx->cancellable = g_object_ref (cancellable); - ctx->result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - dial_context_new); - ctx->cid = cid; - ctx->timeout_id = 0; - return ctx; -} - -static void -dial_context_complete_and_free (DialContext *ctx) -{ - g_simple_async_result_complete (ctx->result); - g_object_unref (ctx->result); - g_object_unref (ctx->cancellable); - g_object_unref (ctx->primary); - g_object_unref (ctx->modem); - g_object_unref (ctx->self); - g_free (ctx); -} - -/* - * "dial" steps: - * %IPDPCFG=<cid>,0,0,"","" - * or %IPDPCFG=<cid>,0,1,"username","password" (may need a retry) - * %IPDPACT=<cid>,0 (optional, generates annoying error message) - * %IPDPACT=<cid>,1 - * wait for unsolicited %IPDPACT=<cid>,1 - */ - -static gboolean -dial_3gpp_finish (MMBroadbandBearer *self, - GAsyncResult *res, - GError **error) -{ - return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error); -} - - -static gboolean -dial_3gpp_timeout (DialContext *ctx) -{ - MMBroadbandBearerSamsung *self = ctx->self; - - g_simple_async_result_set_error (ctx->result, - MM_SERIAL_ERROR, - MM_SERIAL_ERROR_RESPONSE_TIMEOUT, - "Timed out waiting for connection to complete"); - dial_context_complete_and_free (ctx); - self->priv->connected_cid = 0; - self->priv->pending_dial = NULL; - - return FALSE; -} - - -static void -dial_3gpp_done (MMBroadbandBearerSamsung *self, - DialContext *ctx) -{ - - self->priv->connected_cid = self->priv->pending_dial->cid; - - if (ctx->timeout_id) { - g_source_remove (ctx->timeout_id); - ctx->timeout_id = 0; - } - - dial_context_complete_and_free (ctx); - self->priv->pending_dial = NULL; -} - -static void -disconnect_3gpp_done (MMBroadbandBearerSamsung *self, - DisconnectContext *result); - -static void -ipdpact_received (MMAtSerialPort *port, - GMatchInfo *info, - MMBroadbandBearerSamsung *self) -{ - char *str; - int cid, status; - - str = g_match_info_fetch (info, 1); - g_return_if_fail (str != NULL); - cid = atoi (str); - g_free (str); - - if (cid != self->priv->connected_cid) { - mm_warn ("Received %%IPDPACT message for CID other than the current one (%d).", - self->priv->connected_cid); - return; - } - - str = g_match_info_fetch (info, 2); - g_return_if_fail (str != NULL); - status = atoi (str); - g_free (str); - - switch (status) { - case 0: - /* deactivated */ - if (self->priv->pending_disconnect == NULL) { - mm_dbg ("Received spontaneous %%IPDPACT disconnect."); - mm_bearer_report_disconnection (MM_BEARER (self)); - return; - } - disconnect_3gpp_done (self, self->priv->pending_disconnect); - break; - case 1: - /* activated */ - if (self->priv->pending_dial == NULL) { - mm_warn ("Received %%IPDPACT connect while not connecting."); - return; - } - dial_3gpp_done (self, self->priv->pending_dial); - break; - case 2: - /* activating */ - break; - case 3: - /* activation failed */ - break; - default: - mm_warn ("Unknown connect status %d", status); - break; - } -} - -static void -dial_3gpp_wait (MMBaseModem *modem, - GAsyncResult *res, - DialContext *ctx) -{ - GError *error = NULL; - - mm_base_modem_at_command_finish (modem, res, &error); - - if (error) { - g_simple_async_result_take_error (ctx->result, error); - dial_context_complete_and_free (ctx); - return; - } - - /* Set a 60-second connection-failure timeout */ - ctx->timeout_id = g_timeout_add_seconds (60, (GSourceFunc)dial_3gpp_timeout, ctx); -} - -static void -dial_3gpp_activate (MMBaseModem *modem, - GAsyncResult *res, - DialContext *ctx) -{ - gchar *command; - - /* - * Ignore any error here; %IPDPACT=ctx,0 will produce an error 767 - * if the context is not, in fact, connected. This is annoying but - * harmless. - */ - mm_base_modem_at_command_finish (modem, res, NULL); - - command = g_strdup_printf ("%%IPDPACT=%d,1", ctx->cid); - mm_base_modem_at_command ( - ctx->modem, - command, - 60, - FALSE, - (GAsyncReadyCallback)dial_3gpp_wait, - ctx); - g_free (command); - - /* The unsolicited response to %IPDPACT may come before the OK does */ - ctx->self->priv->pending_dial = ctx; - ctx->self->priv->connected_cid = ctx->cid; -} - -static void -dial_3gpp_prepare (MMBaseModem *modem, - GAsyncResult *res, - DialContext *ctx) -{ - gchar *command; - GError *error = NULL; - - mm_base_modem_at_command_finish (modem, res, &error); - - if (error) { - /* TODO(njw): retry up to 3 times with a 1-second delay */ - /* Return an error */ - g_simple_async_result_take_error (ctx->result, error); - dial_context_complete_and_free (ctx); - return; - } - - /* - * Deactivate the context we want to use before we try to activate - * it. This handles the case where ModemManager crashed while - * connected and is now trying to reconnect. (Should some part of - * the core or modem driver have made sure of this already?) - */ - command = g_strdup_printf ("%%IPDPACT=%d,0", ctx->cid); - mm_base_modem_at_command ( - ctx->modem, - command, - 60, - FALSE, - (GAsyncReadyCallback)dial_3gpp_activate, - ctx); - g_free (command); -} - -static void -dial_3gpp (MMBroadbandBearer *self, - MMBaseModem *modem, - MMAtSerialPort *primary, - guint cid, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - DialContext *ctx; - gchar *command; - const gchar *user; - const gchar *password; - - ctx = dial_context_new (MM_BROADBAND_BEARER_SAMSUNG (self), - modem, - primary, - cancellable, - cid, - callback, - user_data); - - user = mm_bearer_properties_get_user (mm_bearer_peek_config (MM_BEARER (ctx->self))); - password = mm_bearer_properties_get_password (mm_bearer_peek_config (MM_BEARER (ctx->self))); - - if (!user && !password) { - command = g_strdup_printf ("%%IPDPCFG=%d,0,0,\"\",\"\"", cid); - } else { - gchar *quoted_user; - gchar *quoted_password; - - quoted_user = mm_at_serial_port_quote_string (user); - quoted_password = mm_at_serial_port_quote_string (password); - command = g_strdup_printf ("%%IPDPCFG=%d,0,1,%s,%s", - cid, quoted_user, quoted_password); - g_free (quoted_user); - g_free (quoted_password); - } - - mm_base_modem_at_command ( - ctx->modem, - command, - 60, - FALSE, - (GAsyncReadyCallback)dial_3gpp_prepare, - ctx); - g_free (command); -} - -static gboolean -disconnect_3gpp_finish (MMBroadbandBearer *self, - GAsyncResult *res, - GError **error) -{ - return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error); -} - -static gboolean -disconnect_3gpp_timeout (DisconnectContext *ctx) -{ - MMBroadbandBearerSamsung *self = ctx->self; - - g_simple_async_result_set_error (ctx->result, - MM_SERIAL_ERROR, - MM_SERIAL_ERROR_RESPONSE_TIMEOUT, - "Timed out waiting for connection to complete"); - g_simple_async_result_complete (ctx->result); - g_object_unref (ctx->result); - - self->priv->pending_disconnect = NULL; - g_free (ctx); - - return FALSE; -} - -static void -disconnect_3gpp_done (MMBroadbandBearerSamsung *self, - DisconnectContext *ctx) -{ - if (ctx->timeout_id) { - g_source_remove (ctx->timeout_id); - ctx->timeout_id = 0; - } - - g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE); - g_simple_async_result_complete (ctx->result); - g_object_unref (ctx->result); - - self->priv->pending_disconnect = NULL; - self->priv->connected_cid = 0; - g_free (ctx); -} - -static void -disconnect_3gpp_ready (MMBaseModem *modem, - GAsyncResult *res, - DisconnectContext *ctx) -{ - GError *error = NULL; - - mm_base_modem_at_command_finish (MM_BASE_MODEM (modem), res, &error); - if (error) { - mm_dbg ("PDP context deactivation failed: %s", error->message); - g_simple_async_result_take_error (ctx->result, error); - g_simple_async_result_complete (ctx->result); - g_object_unref (ctx->result); - - ctx->self->priv->pending_disconnect = NULL; - g_free (ctx); - return; - } - - /* Set a 60-second disconnection-failure timeout */ - ctx->timeout_id = g_timeout_add_seconds (60, (GSourceFunc)disconnect_3gpp_timeout, ctx); -} - -static void -disconnect_3gpp (MMBroadbandBearer *bearer, - MMBroadbandModem *modem, - MMAtSerialPort *primary, - MMAtSerialPort *secondary, - MMPort *data, - guint cid, - GAsyncReadyCallback callback, - gpointer user_data) -{ - MMBroadbandBearerSamsung *self = MM_BROADBAND_BEARER_SAMSUNG (bearer); - gchar *command; - DisconnectContext *ctx; - - ctx = g_new0 (DisconnectContext, 1); - ctx->self = self; - ctx->result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - disconnect_3gpp); - - command = g_strdup_printf ("%%IPDPACT=%d,0", self->priv->connected_cid); - mm_base_modem_at_command ( - MM_BASE_MODEM (modem), - command, - 60, - FALSE, - (GAsyncReadyCallback)disconnect_3gpp_ready, - ctx); - g_free (command); - - self->priv->pending_disconnect = ctx; -} - -static void -set_unsolicited_result_codes (MMBroadbandBearerSamsung *self, - gboolean enable) -{ - MMBroadbandModemSamsung *modem; - MMAtSerialPort *ports[2]; - GRegex *ipdpact_regex; - guint i; - - g_object_get (self, - MM_BEARER_MODEM, &modem, - NULL); - g_assert (modem != NULL); - - ipdpact_regex = g_regex_new ( - "\\r\\n%IPDPACT:\\s*(\\d+),\\s*(\\d+),\\s*(\\d+)\\r\\n", - G_REGEX_RAW | G_REGEX_OPTIMIZE, - 0, - NULL); - - ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (modem)); - ports[1] = mm_base_modem_peek_port_secondary (MM_BASE_MODEM (modem)); - for (i = 0; ports[i] && i < 2; i++) { - mm_at_serial_port_add_unsolicited_msg_handler ( - ports[i], - ipdpact_regex, - enable ? (MMAtSerialUnsolicitedMsgFn) ipdpact_received : NULL, - enable ? self : NULL, - NULL); - } - g_object_unref (modem); - g_regex_unref (ipdpact_regex); -} - -static void -dispose (GObject *object) -{ - MMBroadbandBearerSamsung *self = MM_BROADBAND_BEARER_SAMSUNG (object); - - set_unsolicited_result_codes (self, FALSE); - - G_OBJECT_CLASS (mm_broadband_bearer_samsung_parent_class)->dispose (object); -} - -static void -mm_broadband_bearer_samsung_init (MMBroadbandBearerSamsung *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), - MM_TYPE_BROADBAND_BEARER_SAMSUNG, - MMBroadbandBearerSamsungPrivate); - - /* Set defaults */ - self->priv->connected_cid = 0; - self->priv->pending_dial = NULL; - self->priv->pending_disconnect = NULL; -} - -static void -mm_broadband_bearer_samsung_class_init (MMBroadbandBearerSamsungClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - MMBroadbandBearerClass *broadband_bearer_class = MM_BROADBAND_BEARER_CLASS (klass); - - g_type_class_add_private (object_class, sizeof (MMBroadbandBearerSamsungPrivate)); - - object_class->dispose = dispose; - - broadband_bearer_class->dial_3gpp = dial_3gpp; - broadband_bearer_class->dial_3gpp_finish = dial_3gpp_finish; - broadband_bearer_class->disconnect_3gpp = disconnect_3gpp; - broadband_bearer_class->disconnect_3gpp_finish = disconnect_3gpp_finish; -} - -MMBearer * -mm_broadband_bearer_samsung_new_finish (GAsyncResult *res, - GError **error) -{ - GObject *source; - GObject *bearer; - - source = g_async_result_get_source_object (res); - bearer = g_async_initable_new_finish (G_ASYNC_INITABLE (source), res, error); - g_object_unref (source); - - if (!bearer) - return NULL; - - set_unsolicited_result_codes (MM_BROADBAND_BEARER_SAMSUNG (bearer), TRUE); - - /* Only export valid bearers */ - mm_bearer_export (MM_BEARER (bearer)); - - return MM_BEARER (bearer); -} - -void -mm_broadband_bearer_samsung_new (MMBroadbandModemSamsung *modem, - MMBearerProperties *config, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_async_initable_new_async ( - MM_TYPE_BROADBAND_BEARER_SAMSUNG, - G_PRIORITY_DEFAULT, - cancellable, - callback, - user_data, - MM_BEARER_MODEM, modem, - MM_BEARER_CONFIG, config, - NULL); -} diff --git a/plugins/samsung/mm-broadband-bearer-samsung.h b/plugins/samsung/mm-broadband-bearer-samsung.h deleted file mode 100644 index 048bea01..00000000 --- a/plugins/samsung/mm-broadband-bearer-samsung.h +++ /dev/null @@ -1,61 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details: - * - * Author: Nathan Williams <njw@google.com> - * - * Copyright (C) 2012 Google, Inc. - * Copyright (C) 2012 Aleksander Morgado <aleksander@gnu.org> - */ - -#ifndef MM_BROADBAND_BEARER_SAMSUNG_H -#define MM_BROADBAND_BEARER_SAMSUNG_H - -#include <glib.h> -#include <glib-object.h> - -#include <libmm-common.h> - -#include "mm-broadband-bearer.h" -#include "mm-broadband-modem-samsung.h" - -#define MM_TYPE_BROADBAND_BEARER_SAMSUNG (mm_broadband_bearer_samsung_get_type ()) -#define MM_BROADBAND_BEARER_SAMSUNG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BROADBAND_BEARER_SAMSUNG, MMBroadbandBearerSamsung)) -#define MM_BROADBAND_BEARER_SAMSUNG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_BROADBAND_BEARER_SAMSUNG, MMBroadbandBearerSamsungClass)) -#define MM_IS_BROADBAND_BEARER_SAMSUNG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_BROADBAND_BEARER_SAMSUNG)) -#define MM_IS_BROADBAND_BEARER_SAMSUNG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_BROADBAND_BEARER_SAMSUNG)) -#define MM_BROADBAND_BEARER_SAMSUNG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_BROADBAND_BEARER_SAMSUNG, MMBroadbandBearerSamsungClass)) - -typedef struct _MMBroadbandBearerSamsung MMBroadbandBearerSamsung; -typedef struct _MMBroadbandBearerSamsungClass MMBroadbandBearerSamsungClass; -typedef struct _MMBroadbandBearerSamsungPrivate MMBroadbandBearerSamsungPrivate; - -struct _MMBroadbandBearerSamsung { - MMBroadbandBearer parent; - MMBroadbandBearerSamsungPrivate *priv; -}; - -struct _MMBroadbandBearerSamsungClass { - MMBroadbandBearerClass parent; -}; - -GType mm_broadband_bearer_samsung_get_type (void); - -/* Default 3GPP bearer creation implementation */ -void mm_broadband_bearer_samsung_new (MMBroadbandModemSamsung *modem, - MMBearerProperties *config, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -MMBearer *mm_broadband_bearer_samsung_new_finish (GAsyncResult *res, - GError **error); - -#endif /* MM_BROADBAND_BEARER_SAMSUNG_H */ diff --git a/plugins/samsung/mm-broadband-modem-samsung.c b/plugins/samsung/mm-broadband-modem-samsung.c index 86a800fa..1757b847 100644 --- a/plugins/samsung/mm-broadband-modem-samsung.c +++ b/plugins/samsung/mm-broadband-modem-samsung.c @@ -25,7 +25,6 @@ #include "ModemManager.h" #include "mm-base-modem-at.h" -#include "mm-broadband-bearer-samsung.h" #include "mm-broadband-modem-samsung.h" #include "mm-iface-icera.h" #include "mm-iface-modem.h" @@ -396,61 +395,6 @@ mm_broadband_modem_samsung_new (const gchar *device, NULL); } -static MMBearer * -modem_create_bearer_finish (MMIfaceModem *self, - GAsyncResult *res, - GError **error) -{ - MMBearer *bearer; - - if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) - return NULL; - - bearer = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res)); - - return g_object_ref (bearer); -} - -static void -broadband_bearer_new_ready (GObject *source, - GAsyncResult *res, - GSimpleAsyncResult *simple) -{ - MMBearer *bearer = NULL; - GError *error = NULL; - - bearer = mm_broadband_bearer_samsung_new_finish (res, &error); - if (!bearer) - g_simple_async_result_take_error (simple, error); - else - g_simple_async_result_set_op_res_gpointer (simple, - bearer, - (GDestroyNotify)g_object_unref); - g_simple_async_result_complete (simple); - g_object_unref (simple); -} - -static void -modem_create_bearer (MMIfaceModem *self, - MMBearerProperties *properties, - GAsyncReadyCallback callback, - gpointer user_data) -{ - GSimpleAsyncResult *result; - - /* Set a new ref to the bearer object as result */ - result = g_simple_async_result_new (G_OBJECT (self), - callback, - user_data, - modem_create_bearer); - - mm_broadband_bearer_samsung_new (MM_BROADBAND_MODEM_SAMSUNG (self), - properties, - NULL, /* cancellable */ - (GAsyncReadyCallback)broadband_bearer_new_ready, - result); -} - static MMUnlockRetries * load_unlock_retries_finish (MMIfaceModem *self, GAsyncResult *res, @@ -752,8 +696,6 @@ iface_modem_3gpp_init (MMIfaceModem3gpp *iface) static void iface_modem_init (MMIfaceModem *iface) { - iface->create_bearer = modem_create_bearer; - iface->create_bearer_finish = modem_create_bearer_finish; iface->load_supported_bands = load_supported_bands; iface->load_supported_bands_finish = load_supported_bands_finish; iface->load_current_bands = load_current_bands; @@ -770,6 +712,8 @@ iface_modem_init (MMIfaceModem *iface) iface->set_allowed_modes_finish = mm_iface_icera_modem_set_allowed_modes_finish; iface->load_access_technologies = mm_iface_icera_modem_load_access_technologies; iface->load_access_technologies_finish = mm_iface_icera_modem_load_access_technologies_finish; + iface->create_bearer = mm_iface_icera_modem_create_bearer; + iface->create_bearer_finish = mm_iface_icera_modem_create_bearer_finish; } static void |