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

modem-manager: avoid assertion when exposed modem has no 3GPP/3GPP2 capabilities

Browse Source 
If, for any reason, MM exposes a modem object without 3GPP or 3GPP2
capabilities, just return an error instead of assert()-ing.
This commit is contained in:
Aleksander Morgado
2012-12-19 08:28:17 +01:00
committed by Dan Williams
parent 94d6074e26
commit 6c16796119
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/modem-manager/nm-modem-broadband.c
View File

@@ -351,8 +351,11 @@ act_stage1_prepare (NMModem *_self,
self->priv->connect_properties = create_gsm_connect_properties (connection); self->priv->connect_properties = create_gsm_connect_properties (connection);
else if (MODEM_CAPS_3GPP2 (caps)) else if (MODEM_CAPS_3GPP2 (caps))
self->priv->connect_properties = create_cdma_connect_properties (connection); self->priv->connect_properties = create_cdma_connect_properties (connection);
else else {
g_assert_not_reached (); nm_log_warn (LOGD_MB, "(%s) not a mobile broadband modem",
nm_modem_get_uid (NM_MODEM (self)));
return NM_ACT_STAGE_RETURN_FAILURE;
}
if (!self->priv->simple_iface) if (!self->priv->simple_iface)
self->priv->simple_iface = mm_object_get_modem_simple (self->priv->modem_object); self->priv->simple_iface = mm_object_get_modem_simple (self->priv->modem_object);
@@ -473,7 +476,11 @@ check_connection_compatible (NMModem *_self,
return TRUE; return TRUE;
} }
g_assert_not_reached (); g_set_error (error,
NM_MODEM_BROADBAND_ERROR,
NM_MODEM_BROADBAND_ERROR_CONNECTION_INCOMPATIBLE,
"Device is not a mobile broadband modem");
return FALSE;
} }
/*****************************************************************************/ /*****************************************************************************/
@@ -550,7 +557,11 @@ complete_connection (NMModem *_self,
return TRUE; return TRUE;
} }
g_assert_not_reached (); g_set_error (error,
NM_MODEM_BROADBAND_ERROR,
NM_MODEM_BROADBAND_ERROR_CONNECTION_INCOMPATIBLE,
"Device is not a mobile broadband modem");
return FALSE;
} }
/*****************************************************************************/ /*****************************************************************************/