fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-08 09:30:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

mobile: make modem errors generic

Browse source 
We'll use them eventually for the old CDMA and GSM types too.
This commit is contained in:
Dan Williams 2013-05-29 12:41:36 -05:00
parent 67ef73119e
commit 06499b1e1b
4 changed files with 44 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/modem-manager/nm-modem-broadband.c
View file

@ -62,17 +62,6 @@ enum {
/*****************************************************************************/
#define NM_MODEM_BROADBAND_ERROR (nm_modem_broadband_error_quark ())
static GQuark
nm_modem_broadband_error_quark (void)
{
static GQuark quark = 0;
if (!quark)
quark = g_quark_from_static_string ("nm-modem-broadband-error");
return quark;
}
static NMDeviceStateReason
translate_mm_error (GError *error)
{
@ -186,8 +175,8 @@ connect_ready (MMModemSimple *simple_iface,
ip_method = MM_MODEM_IP_METHOD_DHCP;
break;
default:
error = g_error_new (NM_MODEM_BROADBAND_ERROR,
NM_MODEM_BROADBAND_ERROR_CONNECTION_INVALID,
error = g_error_new (NM_MODEM_ERROR,
NM_MODEM_ERROR_CONNECTION_INVALID,
"invalid IP config");
nm_log_warn (LOGD_MB, "(%s) failed to connect modem: %s",
nm_modem_get_uid (NM_MODEM (self)),
@ -397,8 +386,8 @@ check_connection_compatible (NMModem *_self,
if (!g_str_equal (nm_setting_connection_get_connection_type (s_con),
NM_SETTING_GSM_SETTING_NAME)) {
g_set_error (error,
NM_MODEM_BROADBAND_ERROR,
NM_MODEM_BROADBAND_ERROR_CONNECTION_NOT_GSM,
NM_MODEM_ERROR,
NM_MODEM_ERROR_CONNECTION_NOT_GSM,
"The connection was not a 3GPP connection.");
return FALSE;
}
@ -406,8 +395,8 @@ check_connection_compatible (NMModem *_self,
s_gsm = nm_connection_get_setting_gsm (connection);
if (!s_gsm) {
g_set_error (error,
NM_MODEM_BROADBAND_ERROR,
NM_MODEM_BROADBAND_ERROR_CONNECTION_INVALID,
NM_MODEM_ERROR,
NM_MODEM_ERROR_CONNECTION_INVALID,
"The connection was not a valid 3GPP connection.");
return FALSE;
}
@ -421,8 +410,8 @@ check_connection_compatible (NMModem *_self,
if (!g_str_equal (nm_setting_connection_get_connection_type (s_con),
NM_SETTING_CDMA_SETTING_NAME)) {
g_set_error (error,
NM_MODEM_BROADBAND_ERROR,
NM_MODEM_BROADBAND_ERROR_CONNECTION_NOT_CDMA,
NM_MODEM_ERROR,
NM_MODEM_ERROR_CONNECTION_NOT_CDMA,
"The connection was not a 3GPP2 connection.");
return FALSE;
}
@ -430,8 +419,8 @@ check_connection_compatible (NMModem *_self,
s_cdma = nm_connection_get_setting_cdma (connection);
if (!s_cdma) {
g_set_error (error,
NM_MODEM_BROADBAND_ERROR,
NM_MODEM_BROADBAND_ERROR_CONNECTION_INVALID,
NM_MODEM_ERROR,
NM_MODEM_ERROR_CONNECTION_INVALID,
"The connection was not a valid 3GPP2 connection.");
return FALSE;
}
@ -440,8 +429,8 @@ check_connection_compatible (NMModem *_self,
}
g_set_error (error,
NM_MODEM_BROADBAND_ERROR,
NM_MODEM_BROADBAND_ERROR_CONNECTION_INCOMPATIBLE,
NM_MODEM_ERROR,
NM_MODEM_ERROR_CONNECTION_INCOMPATIBLE,
"Device is not a mobile broadband modem");
return FALSE;
}
@ -521,8 +510,8 @@ complete_connection (NMModem *_self,
}
g_set_error (error,
NM_MODEM_BROADBAND_ERROR,
NM_MODEM_BROADBAND_ERROR_CONNECTION_INCOMPATIBLE,
NM_MODEM_ERROR,
NM_MODEM_ERROR_CONNECTION_INCOMPATIBLE,
"Device is not a mobile broadband modem");
return FALSE;
}
@ -679,8 +668,8 @@ static_stage3_done (NMModemBroadband *self)
/* Fully fail if invalid IP address retrieved */
address_string = mm_bearer_ip_config_get_address (self->priv->ipv4_config);
if (!ip_string_to_network_address (address_string, &address_network)) {
error = g_error_new (NM_MODEM_BROADBAND_ERROR,
NM_MODEM_BROADBAND_ERROR_CONNECTION_INVALID,
error = g_error_new (NM_MODEM_ERROR,
NM_MODEM_ERROR_CONNECTION_INVALID,
"(%s) retrieving IP4 configuration failed: invalid address given '%s'",
nm_modem_get_uid (NM_MODEM (self)),
address_string);

7
src/modem-manager/nm-modem-broadband.h
View file

@ -40,13 +40,6 @@ typedef struct _NMModemBroadband NMModemBroadband;
typedef struct _NMModemBroadbandClass NMModemBroadbandClass;
typedef struct _NMModemBroadbandPrivate NMModemBroadbandPrivate;
typedef enum {
NM_MODEM_BROADBAND_ERROR_CONNECTION_NOT_GSM, /*< nick=ConnectionNotGsm >*/
NM_MODEM_BROADBAND_ERROR_CONNECTION_NOT_CDMA, /*< nick=ConnectionNotCdma >*/
NM_MODEM_BROADBAND_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/
NM_MODEM_BROADBAND_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/
} NMModemBroadbandError;
struct _NMModemBroadband {
NMModem parent;
NMModemBroadbandPrivate *priv;

17
src/modem-manager/nm-modem.c
View file

@ -30,6 +30,7 @@
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "nm-dbus-glib-types.h"
#include "nm-enum-types.h"
G_DEFINE_TYPE (NMModem, nm_modem, G_TYPE_OBJECT)
@ -85,6 +86,18 @@ enum {
static guint signals[LAST_SIGNAL] = { 0 };
/*****************************************************************************/
GQuark
nm_modem_error_quark (void)
{
static GQuark quark = 0;
if (!quark)
quark = g_quark_from_static_string ("nm-modem-error");
return quark;
}
/*****************************************************************************/
/* Get/Set enabled/connected */
@ -918,4 +931,8 @@ nm_modem_class_init (NMModemClass *klass)
G_STRUCT_OFFSET (NMModemClass, auth_result),
NULL, NULL, NULL,
G_TYPE_NONE, 1, G_TYPE_POINTER);
dbus_g_error_domain_register (NM_MODEM_ERROR,
NM_DBUS_INTERFACE_DEVICE_MODEM,
NM_TYPE_MODEM_ERROR);
}

11
src/modem-manager/nm-modem.h
View file

@ -56,6 +56,17 @@ G_BEGIN_DECLS
#define MM_MODEM_IP_METHOD_STATIC 1
#define MM_MODEM_IP_METHOD_DHCP 2
typedef enum {
NM_MODEM_ERROR_CONNECTION_NOT_GSM, /*< nick=ConnectionNotGsm >*/
NM_MODEM_ERROR_CONNECTION_NOT_CDMA, /*< nick=ConnectionNotCdma >*/
NM_MODEM_ERROR_CONNECTION_INVALID, /*< nick=ConnectionInvalid >*/
NM_MODEM_ERROR_CONNECTION_INCOMPATIBLE, /*< nick=ConnectionIncompatible >*/
} NMModemError;
#define NM_MODEM_ERROR (nm_modem_error_quark ())
GQuark nm_modem_error_quark (void);
typedef struct {
GObject parent;
} NMModem;