fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 01:47:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device/wwan: merge branch 'afaure/protect-self-variable'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/303
This commit is contained in:
Thomas Haller 2019-10-23 15:27:24 +02:00
commit e346bdc550
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/devices/wwan/nm-modem-broadband.c
View file

@ -341,16 +341,26 @@ connect_ready (MMModemSimple *simple_iface,
GAsyncResult *res,
NMModemBroadband *self)
{
ConnectContext *ctx = self->_priv.ctx;
ConnectContext *ctx;
GError *error = NULL;
NMModemIPMethod ip4_method = NM_MODEM_IP_METHOD_UNKNOWN;
NMModemIPMethod ip6_method = NM_MODEM_IP_METHOD_UNKNOWN;
MMBearer *bearer;
self->_priv.bearer = mm_modem_simple_connect_finish (simple_iface, res, &error);
bearer = mm_modem_simple_connect_finish (simple_iface, res, &error);
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
g_error_free (error);
return;
}
ctx = self->_priv.ctx;
if (!ctx)
return;
self->_priv.bearer = bearer;
if (!self->_priv.bearer) {
if (g_error_matches (error, MM_MOBILE_EQUIPMENT_ERROR, MM_MOBILE_EQUIPMENT_ERROR_SIM_PIN) ||
(g_error_matches (error, MM_CORE_ERROR, MM_CORE_ERROR_UNAUTHORIZED) &&
@ -619,7 +629,7 @@ connect_context_step (NMModemBroadband *self)
mm_modem_simple_connect (self->_priv.simple_iface,
ctx->connect_properties,
NULL,
ctx->cancellable,
(GAsyncReadyCallback) connect_ready,
self);
break;