fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-21 11:10:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

wwan, bluetooth: drop support for ModemManager 0.7

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=732176
This commit is contained in:
Dan Winship 2014-06-26 12:53:33 -04:00
commit baab3cc641
9 changed files with 98 additions and 1712 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Makefile.am
View file

@ -5,13 +5,17 @@ include $(GLIB_MAKEFILE)
SUBDIRS = \
. \
devices/adsl \
devices/wwan \
devices/bluetooth \
devices/wifi \
dhcp-manager \
ppp-manager \
settings/plugins
if WITH_MODEM_MANAGER_1
SUBDIRS += \
devices/wwan \
devices/bluetooth
endif
if WITH_WIMAX
SUBDIRS += devices/wimax
endif

20
src/devices/bluetooth/nm-device-bt.c
View file

@ -47,8 +47,7 @@
#include "nm-bt-enum-types.h"
#include "nm-utils.h"
#define MM_OLD_DBUS_SERVICE "org.freedesktop.ModemManager"
#define MM_NEW_DBUS_SERVICE "org.freedesktop.ModemManager1"
#define MM_DBUS_SERVICE "org.freedesktop.ModemManager1"
G_DEFINE_TYPE (NMDeviceBt, nm_device_bt, NM_TYPE_DEVICE)
@ -674,11 +673,6 @@ component_added (NMDevice *device, GObject *component)
g_signal_connect (modem, NM_MODEM_STATE_CHANGED, G_CALLBACK (modem_state_cb), self);
g_signal_connect (modem, NM_MODEM_REMOVED, G_CALLBACK (modem_removed_cb), self);
/* In the old ModemManager the data port is known from the very beginning;
* while in the new ModemManager the data port is set afterwards when the bearer gets
* created */
if (modem_data_port)
nm_device_set_ip_iface (NM_DEVICE (self), modem_data_port);
g_signal_connect (modem, "notify::" NM_MODEM_DATA_PORT, G_CALLBACK (data_port_changed_cb), self);
/* Kick off the modem connection */
@ -1038,11 +1032,7 @@ mm_name_owner_changed (NMDBusManager *dbus_mgr,
gboolean new_owner_good;
/* Can't handle the signal if its not from the modem service */
if ( strcmp (MM_OLD_DBUS_SERVICE, name) != 0
#if WITH_MODEM_MANAGER_1
&& strcmp (MM_NEW_DBUS_SERVICE, name) != 0
#endif
)
if (strcmp (MM_DBUS_SERVICE, name) != 0)
return;
old_owner_good = (old_owner && strlen (old_owner));
@ -1096,11 +1086,7 @@ nm_device_bt_init (NMDeviceBt *self)
self);
/* Initial check to see if ModemManager is running */
mm_running = nm_dbus_manager_name_has_owner (priv->dbus_mgr, MM_OLD_DBUS_SERVICE);
#if WITH_MODEM_MANAGER_1
if (!mm_running)
mm_running = nm_dbus_manager_name_has_owner (priv->dbus_mgr, MM_NEW_DBUS_SERVICE);
#endif
mm_running = nm_dbus_manager_name_has_owner (priv->dbus_mgr, MM_DBUS_SERVICE);
set_mm_running (self, mm_running);
}

11
src/devices/wwan/Makefile.am
View file

@ -33,9 +33,8 @@ nm_modem_enum_types_sources = $(srcdir)/nm-modem.h
BUILT_SOURCES += $(GLIB_GENERATED)
libnm_wwan_la_SOURCES = \
nm-modem-old.c \
nm-modem-old.h \
nm-modem-old-types.h \
nm-modem-broadband.c \
nm-modem-broadband.h \
nm-modem-manager.c \
nm-modem-manager.h \
nm-modem.c \
@ -43,12 +42,6 @@ libnm_wwan_la_SOURCES = \
\
$(GLIB_GENERATED)
if WITH_MODEM_MANAGER_1
libnm_wwan_la_SOURCES += \
nm-modem-broadband.c \
nm-modem-broadband.h
endif
WWAN_SYMBOL_VIS_FILE=$(srcdir)/wwan-exports.ver
libnm_wwan_la_LDFLAGS = \

45
src/devices/wwan/README
View file

@ -1,45 +0,0 @@
ModemManager integration is organized as follows:
Common source
********************************************************************************
* nm-modem.[h|c]:
Defines the basic `NMModem' object. The core NetworkManager implementation
will use this interface exclusively, regardless of the real final type of
the modem object.
* nm-modem-manager.[h|c]:
Defines the `NMModemManager' object, which takes care of listening to
signals from the DBus interface notifying about added or removed modems.
It also takes care of creating proper `NMModem' objects from the
information retrieved from the DBus interface.
ModemManager 0.7 integration
********************************************************************************
* nm-modem-broadband.[h|c]:
Defines the `NMModemBroadband' object, which is a subclass of `NMModem'.
This object handles both 3GPP and 3GPP2 modems exposed in the new
`ModemManager1' interface.
ModemManager 0.4/0.5/0.6 integration
********************************************************************************
* nm-modem-old-types.h:
Defines helper types to use with the (old) ModemManager DBus API.
* nm-modem-old.[h|c]:
Defines the `NMModemGeneric' object. All modem objects based on the old
ModemManager interface are subclasses of this one.
* nm-modem-gsm.[h|c]:
Defines the `NMModemGsm' object, which is a subclass of `NMModemGeneric'.
This object handles 3GPP-specific (GSM, UMTS, HSPA, LTE) modems.
* nm-modem-cdma.[h|c]:
Defines the `NMModemCdma' object, which is a subclass of `NMModemGeneric'.
This object handles 3GPP2-specific modems (CDMA, EV-DO).

4
src/devices/wwan/nm-device-modem.c
View file

@ -24,16 +24,12 @@
#include "nm-device-modem.h"
#include "nm-modem.h"
#include "nm-modem-old.h"
#include "nm-device-private.h"
#include "nm-rfkill-manager.h"
#include "nm-logging.h"
#include "nm-dbus-manager.h"
#include "nm-settings-connection.h"
#if WITH_MODEM_MANAGER_1
#include "nm-modem-broadband.h"
#endif
G_DEFINE_TYPE (NMDeviceModem, nm_device_modem, NM_TYPE_DEVICE)

460
src/devices/wwan/nm-modem-manager.c
View file

@ -20,42 +20,28 @@
* Copyright (C) 2009 Canonical Ltd.
*/
#include <string.h>
#include "config.h"
#include <string.h>
#include <libmm-glib.h>
#include "nm-modem-manager.h"
#include "nm-logging.h"
#include "nm-modem.h"
#include "nm-modem-old.h"
#include "nm-dbus-manager.h"
#include "nm-modem-old-types.h"
#include "nm-dbus-glib-types.h"
#if WITH_MODEM_MANAGER_1
#include <libmm-glib.h>
#include "nm-modem-broadband.h"
#endif
#define MODEM_POKE_INTERVAL 120
G_DEFINE_TYPE (NMModemManager, nm_modem_manager, G_TYPE_OBJECT)
struct _NMModemManagerPrivate {
/* ModemManager < 0.7 */
NMDBusManager *dbus_mgr;
DBusGProxy *proxy;
guint poke_id;
#if WITH_MODEM_MANAGER_1
/* ModemManager >= 0.7 */
GDBusConnection *dbus_connection;
MMManager *modem_manager_1;
guint modem_manager_1_launch_id;
gboolean old_modem_manager_found;
gboolean new_modem_manager_found;
guint modem_manager_1_name_owner_changed_id;
guint modem_manager_1_object_added_id;
guint modem_manager_1_object_removed_id;
#endif
MMManager *modem_manager;
guint mm_launch_id;
guint mm_name_owner_changed_id;
guint mm_object_added_id;
guint mm_object_removed_id;
/* Common */
GHashTable *modems;
@ -85,191 +71,6 @@ handle_new_modem (NMModemManager *self, NMModem *modem)
g_signal_emit (self, signals[MODEM_ADDED], 0, modem);
}
/************************************************************************/
/* Support for ModemManager < 0.7 */
static void
clear_modem_manager_support (NMModemManager *self)
{
if (self->priv->poke_id) {
g_source_remove (self->priv->poke_id);
self->priv->poke_id = 0;
}
if (self->priv->proxy) {
g_object_unref (self->priv->proxy);
self->priv->proxy = NULL;
}
}
static void
create_modem (NMModemManager *self, const char *path)
{
DBusGProxy *proxy;
GError *error = NULL;
NMModem *modem = NULL;
GHashTable *properties;
if (g_hash_table_lookup (self->priv->modems, path)) {
nm_log_warn (LOGD_MB, "modem with path %s already exists, ignoring", path);
return;
}
proxy = dbus_g_proxy_new_for_name (nm_dbus_manager_get_connection (self->priv->dbus_mgr),
MM_OLD_DBUS_SERVICE,
path,
DBUS_INTERFACE_PROPERTIES);
g_assert (proxy);
if (dbus_g_proxy_call_with_timeout (proxy, "GetAll", 15000, &error,
G_TYPE_STRING, MM_OLD_DBUS_INTERFACE_MODEM,
G_TYPE_INVALID,
DBUS_TYPE_G_MAP_OF_VARIANT, &properties,
G_TYPE_INVALID)) {
/* Success, create the modem */
modem = nm_modem_old_new (path, properties, &error);
if (modem)
handle_new_modem (self, modem);
else {
nm_log_warn (LOGD_MB, "failed to create modem: %s",
error ? error->message : "(unknown)");
}
g_hash_table_destroy (properties);
} else {
nm_log_warn (LOGD_MB, "could not get modem properties: %s %s",
error ? dbus_g_error_get_name (error) : "(none)",
error ? error->message : "(unknown)");
}
g_object_unref (proxy);
g_clear_error (&error);
}
static void
modem_added (DBusGProxy *proxy, const char *path, gpointer user_data)
{
create_modem (NM_MODEM_MANAGER (user_data), path);
}
static void
modem_removed (DBusGProxy *proxy, const char *path, gpointer user_data)
{
NMModemManager *self = NM_MODEM_MANAGER (user_data);
NMModem *modem;
modem = (NMModem *) g_hash_table_lookup (self->priv->modems, path);
if (modem) {
nm_modem_emit_removed (modem);
g_hash_table_remove (self->priv->modems, path);
}
}
static void
mm_poke_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
{
GPtrArray *modems;
int i;
if (dbus_g_proxy_end_call (proxy, call, NULL,
DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH, &modems,
G_TYPE_INVALID)) {
/* Don't care about the returned value, just free it */
for (i = 0; i < modems->len; i++)
g_free ((char *) g_ptr_array_index (modems, i));
g_ptr_array_free (modems, TRUE);
}
g_object_unref (proxy);
}
static gboolean
poke_modem_cb (gpointer user_data)
{
NMModemManager *self = NM_MODEM_MANAGER (user_data);
DBusGConnection *g_connection;
DBusGProxy *proxy;
g_connection = nm_dbus_manager_get_connection (self->priv->dbus_mgr);
proxy = dbus_g_proxy_new_for_name (g_connection,
MM_OLD_DBUS_SERVICE,
MM_OLD_DBUS_PATH,
MM_OLD_DBUS_INTERFACE);
nm_log_dbg (LOGD_MB, "Requesting to (re)launch modem-manager...");
dbus_g_proxy_begin_call_with_timeout (proxy,
"EnumerateDevices",
mm_poke_cb,
NULL,
NULL,
5000,
G_TYPE_INVALID);
return TRUE;
}
static void
enumerate_devices_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer data)
{
NMModemManager *manager = NM_MODEM_MANAGER (data);
GPtrArray *modems;
GError *error = NULL;
if (!dbus_g_proxy_end_call (proxy, call_id, &error,
dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &modems,
G_TYPE_INVALID)) {
nm_log_warn (LOGD_MB, "could not get modem list: %s", error->message);
g_error_free (error);
} else {
int i;
for (i = 0; i < modems->len; i++) {
char *path = (char *) g_ptr_array_index (modems, i);
create_modem (manager, path);
g_free (path);
}
g_ptr_array_free (modems, TRUE);
}
}
#if WITH_MODEM_MANAGER_1
static void clear_modem_manager_1_support (NMModemManager *self);
#endif
static void
modem_manager_appeared (NMModemManager *self, gboolean enumerate_devices)
{
if (self->priv->poke_id) {
g_source_remove (self->priv->poke_id);
self->priv->poke_id = 0;
}
nm_log_info (LOGD_MB, "modem-manager is now available");
#if WITH_MODEM_MANAGER_1
self->priv->old_modem_manager_found = TRUE;
if (self->priv->new_modem_manager_found)
nm_log_warn (LOGD_MB, "Both the old and the new ModemManager were found");
else
clear_modem_manager_1_support (self);
#endif
self->priv->proxy = dbus_g_proxy_new_for_name (nm_dbus_manager_get_connection (self->priv->dbus_mgr),
MM_OLD_DBUS_SERVICE, MM_OLD_DBUS_PATH, MM_OLD_DBUS_INTERFACE);
dbus_g_proxy_add_signal (self->priv->proxy, "DeviceAdded", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
dbus_g_proxy_connect_signal (self->priv->proxy, "DeviceAdded",
G_CALLBACK (modem_added), self,
NULL);
dbus_g_proxy_add_signal (self->priv->proxy, "DeviceRemoved", DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
dbus_g_proxy_connect_signal (self->priv->proxy, "DeviceRemoved",
G_CALLBACK (modem_removed), self,
NULL);
if (enumerate_devices)
dbus_g_proxy_begin_call (self->priv->proxy, "EnumerateDevices", enumerate_devices_done, self, NULL, G_TYPE_INVALID);
}
static gboolean
remove_one_modem (gpointer key, gpointer value, gpointer user_data)
{
@ -278,95 +79,36 @@ remove_one_modem (gpointer key, gpointer value, gpointer user_data)
}
static void
modem_manager_disappeared (NMModemManager *self)
modem_manager_clear_signals (NMModemManager *self)
{
g_hash_table_foreach_remove (self->priv->modems, remove_one_modem, self);
if (self->priv->proxy) {
g_object_unref (self->priv->proxy);
self->priv->proxy = NULL;
}
/* Try to activate the modem-manager */
nm_log_dbg (LOGD_MB, "trying to start the modem manager...");
poke_modem_cb (self);
self->priv->poke_id = g_timeout_add_seconds (MODEM_POKE_INTERVAL, poke_modem_cb, self);
}
static void
nm_modem_manager_name_owner_changed (NMDBusManager *dbus_mgr,
const char *name,
const char *old_owner,
const char *new_owner,
gpointer user_data)
{
gboolean old_owner_good;
gboolean new_owner_good;
/* Can't handle the signal if its not from the modem service */
if (strcmp (MM_OLD_DBUS_SERVICE, name) != 0)
if (!self->priv->modem_manager)
return;
old_owner_good = (old_owner && strlen (old_owner));
new_owner_good = (new_owner && strlen (new_owner));
if (!old_owner_good && new_owner_good) {
modem_manager_appeared (NM_MODEM_MANAGER (user_data), FALSE);
} else if (old_owner_good && !new_owner_good) {
nm_log_info (LOGD_MB, "the modem manager disappeared");
modem_manager_disappeared (NM_MODEM_MANAGER (user_data));
}
}
/************************************************************************/
/* Support for ModemManager >= 0.7 */
#if WITH_MODEM_MANAGER_1
static void
modem_manager_1_clear_signals (NMModemManager *self)
{
if (!self->priv->modem_manager_1)
return;
if (self->priv->modem_manager_1_name_owner_changed_id) {
if (g_signal_handler_is_connected (self->priv->modem_manager_1,
self->priv->modem_manager_1_name_owner_changed_id))
g_signal_handler_disconnect (self->priv->modem_manager_1,
self->priv->modem_manager_1_name_owner_changed_id);
self->priv->modem_manager_1_name_owner_changed_id = 0;
if (self->priv->mm_name_owner_changed_id) {
if (g_signal_handler_is_connected (self->priv->modem_manager,
self->priv->mm_name_owner_changed_id))
g_signal_handler_disconnect (self->priv->modem_manager,
self->priv->mm_name_owner_changed_id);
self->priv->mm_name_owner_changed_id = 0;
}
if (self->priv->modem_manager_1_object_added_id) {
if (g_signal_handler_is_connected (self->priv->modem_manager_1,
self->priv->modem_manager_1_object_added_id))
g_signal_handler_disconnect (self->priv->modem_manager_1,
self->priv->modem_manager_1_object_added_id);
self->priv->modem_manager_1_object_added_id = 0;
if (self->priv->mm_object_added_id) {
if (g_signal_handler_is_connected (self->priv->modem_manager,
self->priv->mm_object_added_id))
g_signal_handler_disconnect (self->priv->modem_manager,
self->priv->mm_object_added_id);
self->priv->mm_object_added_id = 0;
}
if (self->priv->modem_manager_1_object_removed_id) {
if (g_signal_handler_is_connected (self->priv->modem_manager_1,
self->priv->modem_manager_1_object_removed_id))
g_signal_handler_disconnect (self->priv->modem_manager_1,
self->priv->modem_manager_1_object_removed_id);
self->priv->modem_manager_1_object_removed_id = 0;
if (self->priv->mm_object_removed_id) {
if (g_signal_handler_is_connected (self->priv->modem_manager,
self->priv->mm_object_removed_id))
g_signal_handler_disconnect (self->priv->modem_manager,
self->priv->mm_object_removed_id);
self->priv->mm_object_removed_id = 0;
}
}
static void
clear_modem_manager_1_support (NMModemManager *self)
{
if (self->priv->modem_manager_1_launch_id) {
g_source_remove (self->priv->modem_manager_1_launch_id);
self->priv->modem_manager_1_launch_id = 0;
}
modem_manager_1_clear_signals (self);
g_clear_object (&self->priv->modem_manager_1);
g_clear_object (&self->priv->dbus_connection);
}
static void
modem_object_added (MMManager *modem_manager,
MMObject *modem_object,
@ -426,49 +168,43 @@ modem_object_removed (MMManager *manager,
}
static void
modem_manager_1_available (NMModemManager *self)
modem_manager_available (NMModemManager *self)
{
GList *modems, *l;
nm_log_info (LOGD_MB, "ModemManager available in the bus");
self->priv->new_modem_manager_found = TRUE;
if (self->priv->old_modem_manager_found)
nm_log_warn (LOGD_MB, "Both the old and the new ModemManager were found");
else
clear_modem_manager_support (self);
/* Update initial modems list */
modems = g_dbus_object_manager_get_objects (G_DBUS_OBJECT_MANAGER (self->priv->modem_manager_1));
for (l = modems; l; l = g_list_next (l))
modem_object_added (self->priv->modem_manager_1, MM_OBJECT (l->data), self);
g_list_free_full (modems, (GDestroyNotify) g_object_unref);
modems = g_dbus_object_manager_get_objects (G_DBUS_OBJECT_MANAGER (self->priv->modem_manager));
for (l = modems; l; l = g_list_next (l))
modem_object_added (self->priv->modem_manager, MM_OBJECT (l->data), self);
g_list_free_full (modems, (GDestroyNotify) g_object_unref);
}
static void schedule_modem_manager_1_relaunch (NMModemManager *self,
guint n_seconds);
static void ensure_client (NMModemManager *self);
static void schedule_modem_manager_relaunch (NMModemManager *self,
guint n_seconds);
static void ensure_client (NMModemManager *self);
static void
modem_manager_1_name_owner_changed (MMManager *modem_manager_1,
GParamSpec *pspec,
NMModemManager *self)
modem_manager_name_owner_changed (MMManager *modem_manager,
GParamSpec *pspec,
NMModemManager *self)
{
gchar *name_owner;
/* Quit poking, if any */
if (self->priv->modem_manager_1_launch_id) {
g_source_remove (self->priv->modem_manager_1_launch_id);
self->priv->modem_manager_1_launch_id = 0;
if (self->priv->mm_launch_id) {
g_source_remove (self->priv->mm_launch_id);
self->priv->mm_launch_id = 0;
}
name_owner = g_dbus_object_manager_client_get_name_owner (G_DBUS_OBJECT_MANAGER_CLIENT (modem_manager_1));
name_owner = g_dbus_object_manager_client_get_name_owner (G_DBUS_OBJECT_MANAGER_CLIENT (modem_manager));
if (!name_owner) {
nm_log_info (LOGD_MB, "ModemManager disappeared from bus");
#if !HAVE_SYSTEMD
/* If not managed by systemd, schedule relaunch */
schedule_modem_manager_1_relaunch (self, 0);
schedule_modem_manager_relaunch (self, 0);
#endif
return;
@ -481,21 +217,21 @@ modem_manager_1_name_owner_changed (MMManager *modem_manager_1,
* nor 'object-removed' if it was created while there was no ModemManager in
* the bus. This hack avoids this issue until we get a GIO with the fix
* included... */
modem_manager_1_clear_signals (self);
g_clear_object (&self->priv->modem_manager_1);
modem_manager_clear_signals (self);
g_clear_object (&self->priv->modem_manager);
ensure_client (self);
/* Whenever GDBusObjectManagerClient is fixed, we can just do the following:
* modem_manager_1_available (self);
* modem_manager_available (self);
*/
}
#if !HAVE_SYSTEMD
static void
modem_manager_1_poke_cb (GDBusConnection *connection,
GAsyncResult *res,
NMModemManager *self)
modem_manager_poke_cb (GDBusConnection *connection,
GAsyncResult *res,
NMModemManager *self)
{
GError *error = NULL;
GVariant *result;
@ -514,7 +250,7 @@ modem_manager_1_poke_cb (GDBusConnection *connection,
g_error_free (error);
/* Setup timeout to relaunch */
schedule_modem_manager_1_relaunch (self, MODEM_POKE_INTERVAL);
schedule_modem_manager_relaunch (self, MODEM_POKE_INTERVAL);
} else
g_variant_unref (result);
@ -523,7 +259,7 @@ modem_manager_1_poke_cb (GDBusConnection *connection,
}
static void
modem_manager_1_poke (NMModemManager *self)
modem_manager_poke (NMModemManager *self)
{
/* If there is no current owner right away, ensure we poke to get one */
g_dbus_connection_call (self->priv->dbus_connection,
@ -536,28 +272,28 @@ modem_manager_1_poke (NMModemManager *self)
G_DBUS_CALL_FLAGS_NONE,
-1,
NULL, /* cancellable */
(GAsyncReadyCallback)modem_manager_1_poke_cb, /* callback */
(GAsyncReadyCallback)modem_manager_poke_cb, /* callback */
g_object_ref (self)); /* user_data */
}
#endif /* HAVE_SYSTEMD */
static void
modem_manager_1_check_name_owner (NMModemManager *self)
modem_manager_check_name_owner (NMModemManager *self)
{
gchar *name_owner;
name_owner = g_dbus_object_manager_client_get_name_owner (G_DBUS_OBJECT_MANAGER_CLIENT (self->priv->modem_manager_1));
name_owner = g_dbus_object_manager_client_get_name_owner (G_DBUS_OBJECT_MANAGER_CLIENT (self->priv->modem_manager));
if (name_owner) {
/* Available! */
modem_manager_1_available (self);
modem_manager_available (self);
g_free (name_owner);
return;
}
#if !HAVE_SYSTEMD
/* If the lifecycle is not managed by systemd, poke */
modem_manager_1_poke (self);
modem_manager_poke (self);
#endif
}
@ -570,38 +306,35 @@ manager_new_ready (GObject *source,
GError *error = NULL;
g_assert (!self->priv->modem_manager_1);
self->priv->modem_manager_1 = mm_manager_new_finish (res, &error);
if (!self->priv->modem_manager_1) {
g_assert (!self->priv->modem_manager);
self->priv->modem_manager = mm_manager_new_finish (res, &error);
if (!self->priv->modem_manager) {
/* We're not really supposed to get any error here. If we do get one,
* though, just re-schedule the MMManager creation after some time.
* During this period, name-owner changes won't be followed. */
nm_log_warn (LOGD_MB, "error creating ModemManager client: %s", error->message);
g_error_free (error);
/* Setup timeout to relaunch */
schedule_modem_manager_1_relaunch (self, MODEM_POKE_INTERVAL);
} else if (self->priv->old_modem_manager_found) {
/* If we found the old MM, abort */
clear_modem_manager_1_support (self);
schedule_modem_manager_relaunch (self, MODEM_POKE_INTERVAL);
} else {
/* Setup signals in the GDBusObjectManagerClient */
self->priv->modem_manager_1_name_owner_changed_id =
g_signal_connect (self->priv->modem_manager_1,
self->priv->mm_name_owner_changed_id =
g_signal_connect (self->priv->modem_manager,
"notify::name-owner",
G_CALLBACK (modem_manager_1_name_owner_changed),
G_CALLBACK (modem_manager_name_owner_changed),
self);
self->priv->modem_manager_1_object_added_id =
g_signal_connect (self->priv->modem_manager_1,
self->priv->mm_object_added_id =
g_signal_connect (self->priv->modem_manager,
"object-added",
G_CALLBACK (modem_object_added),
self);
self->priv->modem_manager_1_object_removed_id =
g_signal_connect (self->priv->modem_manager_1,
self->priv->mm_object_removed_id =
g_signal_connect (self->priv->modem_manager,
"object-removed",
G_CALLBACK (modem_object_removed),
self);
modem_manager_1_check_name_owner (self);
modem_manager_check_name_owner (self);
}
/* Balance refcount */
@ -616,7 +349,7 @@ ensure_client (NMModemManager *self)
/* Create the GDBusObjectManagerClient. We do not request to autostart, as
* we don't really want the MMManager creation to fail. We can always poke
* later on if we want to request the autostart */
if (!self->priv->modem_manager_1) {
if (!self->priv->modem_manager) {
mm_manager_new (self->priv->dbus_connection,
G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_DO_NOT_AUTO_START,
NULL,
@ -626,7 +359,7 @@ ensure_client (NMModemManager *self)
}
/* If already available, recheck name owner! */
modem_manager_1_check_name_owner (self);
modem_manager_check_name_owner (self);
}
static void
@ -643,10 +376,7 @@ bus_get_ready (GObject *source,
nm_log_warn (LOGD_CORE, "error getting bus connection: %s", error->message);
g_error_free (error);
/* Setup timeout to relaunch */
schedule_modem_manager_1_relaunch (self, MODEM_POKE_INTERVAL);
} else if (self->priv->old_modem_manager_found) {
/* If we found the old MM, abort */
clear_modem_manager_1_support (self);
schedule_modem_manager_relaunch (self, MODEM_POKE_INTERVAL);
} else {
/* Got the bus, ensure client */
ensure_client (self);
@ -660,7 +390,7 @@ static gboolean
ensure_bus (NMModemManager *self)
{
/* Clear launch ID */
self->priv->modem_manager_1_launch_id = 0;
self->priv->mm_launch_id = 0;
if (!self->priv->dbus_connection)
g_bus_get (G_BUS_TYPE_SYSTEM,
@ -675,20 +405,18 @@ ensure_bus (NMModemManager *self)
}
static void
schedule_modem_manager_1_relaunch (NMModemManager *self,
guint n_seconds)
schedule_modem_manager_relaunch (NMModemManager *self,
guint n_seconds)
{
/* No need to pass an extra reference to self; timeout/idle will be
* cancelled if the object gets disposed. */
if (n_seconds)
self->priv->modem_manager_1_launch_id = g_timeout_add_seconds (n_seconds, (GSourceFunc)ensure_bus, self);
self->priv->mm_launch_id = g_timeout_add_seconds (n_seconds, (GSourceFunc)ensure_bus, self);
else
self->priv->modem_manager_1_launch_id = g_idle_add ((GSourceFunc)ensure_bus, self);
self->priv->mm_launch_id = g_idle_add ((GSourceFunc)ensure_bus, self);
}
#endif /* WITH_MODEM_MANAGER_1 */
/************************************************************************/
static void
@ -698,20 +426,7 @@ nm_modem_manager_init (NMModemManager *self)
self->priv->modems = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
/* ModemManager < 0.7 */
self->priv->dbus_mgr = nm_dbus_manager_get ();
g_signal_connect (self->priv->dbus_mgr, NM_DBUS_MANAGER_NAME_OWNER_CHANGED,
G_CALLBACK (nm_modem_manager_name_owner_changed),
self);
if (nm_dbus_manager_name_has_owner (self->priv->dbus_mgr, MM_OLD_DBUS_SERVICE))
modem_manager_appeared (self, TRUE);
else
modem_manager_disappeared (self);
#if WITH_MODEM_MANAGER_1
/* ModemManager >= 0.7 */
schedule_modem_manager_1_relaunch (self, 0);
#endif
schedule_modem_manager_relaunch (self, 0);
}
static void
@ -719,21 +434,20 @@ dispose (GObject *object)
{
NMModemManager *self = NM_MODEM_MANAGER (object);
/* ModemManager < 0.7 */
clear_modem_manager_support (self);
if (self->priv->mm_launch_id) {
g_source_remove (self->priv->mm_launch_id);
self->priv->mm_launch_id = 0;
}
#if WITH_MODEM_MANAGER_1
/* ModemManager >= 0.7 */
clear_modem_manager_1_support (self);
#endif
modem_manager_clear_signals (self);
g_clear_object (&self->priv->modem_manager);
g_clear_object (&self->priv->dbus_connection);
if (self->priv->modems) {
g_hash_table_foreach_remove (self->priv->modems, remove_one_modem, object);
g_hash_table_destroy (self->priv->modems);
}
self->priv->dbus_mgr = NULL;
/* Chain up to the parent class */
G_OBJECT_CLASS (nm_modem_manager_parent_class)->dispose (object);
}

70
src/devices/wwan/nm-modem-old-types.h
View file

@ -1,70 +0,0 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* NetworkManager -- Network link manager
*
* 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.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright (C) 2009 Novell, Inc.
*/
#ifndef NM_MODEM_OLD_TYPES_H
#define NM_MODEM_OLD_TYPES_H
#define MM_OLD_DBUS_SERVICE "org.freedesktop.ModemManager"
#define MM_OLD_DBUS_PATH "/org/freedesktop/ModemManager"
#define MM_OLD_DBUS_INTERFACE "org.freedesktop.ModemManager"
#define MM_OLD_DBUS_INTERFACE_MODEM "org.freedesktop.ModemManager.Modem"
#define MM_OLD_DBUS_INTERFACE_MODEM_SIMPLE "org.freedesktop.ModemManager.Modem.Simple"
#define MM_OLD_DBUS_INTERFACE_MODEM_CDMA "org.freedesktop.ModemManager.Modem.Cdma"
#define MM_OLD_DBUS_INTERFACE_MODEM_GSM_CARD "org.freedesktop.ModemManager.Modem.Gsm.Card"
#define MM_OLD_DBUS_INTERFACE_MODEM_GSM_NETWORK "org.freedesktop.ModemManager.Modem.Gsm.Network"
#define MM_OLD_MODEM_TYPE_UNKNOWN 0
#define MM_OLD_MODEM_TYPE_GSM 1
#define MM_OLD_MODEM_TYPE_CDMA 2
/* Errors */
#define MM_OLD_MODEM_CONNECT_ERROR_NO_CARRIER MM_OLD_DBUS_INTERFACE_MODEM ".NoCarrier"
#define MM_OLD_MODEM_CONNECT_ERROR_NO_DIALTONE MM_OLD_DBUS_INTERFACE_MODEM ".NoDialtone"
#define MM_OLD_MODEM_CONNECT_ERROR_BUSY MM_OLD_DBUS_INTERFACE_MODEM ".Busy"
#define MM_OLD_MODEM_CONNECT_ERROR_NO_ANSWER MM_OLD_DBUS_INTERFACE_MODEM ".NoAnswer"
#define MM_OLD_MODEM_ERROR "org.freedesktop.ModemManager.Modem.Gsm"
#define MM_OLD_MODEM_ERROR_NETWORK_NOT_ALLOWED MM_OLD_MODEM_ERROR ".NetworkNotAllowed"
#define MM_OLD_MODEM_ERROR_NETWORK_TIMEOUT MM_OLD_MODEM_ERROR ".NetworkTimeout"
#define MM_OLD_MODEM_ERROR_NO_NETWORK MM_OLD_MODEM_ERROR ".NoNetwork"
#define MM_OLD_MODEM_ERROR_SIM_NOT_INSERTED MM_OLD_MODEM_ERROR ".SimNotInserted"
#define MM_OLD_MODEM_ERROR_SIM_PIN MM_OLD_MODEM_ERROR ".SimPinRequired"
#define MM_OLD_MODEM_ERROR_SIM_PUK MM_OLD_MODEM_ERROR ".SimPukRequired"
#define MM_OLD_MODEM_ERROR_SIM_WRONG MM_OLD_MODEM_ERROR ".SimWrong"
#define MM_OLD_MODEM_ERROR_WRONG_PASSWORD MM_OLD_MODEM_ERROR ".IncorrectPassword"
typedef enum {
MM_OLD_MODEM_STATE_UNKNOWN = 0,
MM_OLD_MODEM_STATE_DISABLED = 10,
MM_OLD_MODEM_STATE_DISABLING = 20,
MM_OLD_MODEM_STATE_ENABLING = 30,
MM_OLD_MODEM_STATE_ENABLED = 40,
MM_OLD_MODEM_STATE_SEARCHING = 50,
MM_OLD_MODEM_STATE_REGISTERED = 60,
MM_OLD_MODEM_STATE_DISCONNECTING = 70,
MM_OLD_MODEM_STATE_CONNECTING = 80,
MM_OLD_MODEM_STATE_CONNECTED = 90,
MM_OLD_MODEM_STATE_LAST = MM_OLD_MODEM_STATE_CONNECTED
} MMOldModemState;
#endif /* NM_MODEM_OLD_TYPES_H */

1139
src/devices/wwan/nm-modem-old.c
View file

File diff suppressed because it is too large Load diff

53
src/devices/wwan/nm-modem-old.h
View file

@ -1,53 +0,0 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* NetworkManager -- Network link manager
*
* 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.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright (C) 2009 - 2011 Red Hat, Inc.
* Copyright (C) 2009 Novell, Inc.
*/
#ifndef NM_MODEM_OLD_H
#define NM_MODEM_OLD_H
#include <dbus/dbus-glib.h>
#include <glib-object.h>
#include "nm-modem.h"
#include "nm-modem-old-types.h"
G_BEGIN_DECLS
#define NM_TYPE_MODEM_OLD (nm_modem_old_get_type ())
#define NM_MODEM_OLD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MODEM_OLD, NMModemOld))
#define NM_MODEM_OLD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_MODEM_OLD, NMModemOldClass))
#define NM_IS_MODEM_OLD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_MODEM_OLD))
#define NM_IS_MODEM_OLD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_MODEM_OLD))
#define NM_MODEM_OLD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_MODEM_OLD, NMModemOldClass))
typedef struct {
NMModem parent;
} NMModemOld;
typedef struct {
NMModemClass parent;
} NMModemOldClass;
GType nm_modem_old_get_type (void);
NMModem *nm_modem_old_new (const char *path, GHashTable *properties, GError **error);
G_END_DECLS
#endif /* NM_MODEM_OLD_H */