fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-28 11:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

vpn: avoid calling call_plugin_disconnect() without proxy

Browse source 
Got an assertion due to priv-proxy unset.
  NMDevice:
    - _platform_link_cb_idle()
     - nm_device_unrealize() [NMDeviceTun]
      - nm_device_state_changed()
       - _set_state_full()
         NMVpnConnection:
           - _set_vpn_state()
            - call_plugin_disconnect()

It seam to me, that can only happen if the NMVpnConnection never
completed on_proxy_acquired() and is still in preparing state when
being disconnected.

Avoid that be checking whether we have a proxy.

https://bugzilla.redhat.com/show_bug.cgi?id=1442064
(cherry picked from commit bc1d1c9df4)
This commit is contained in:
Thomas Haller 2017-04-13 17:28:22 +02:00
parent 9029dabb87
commit e6b1a31106
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/vpn/nm-vpn-connection.c
View file

@ -646,7 +646,8 @@ _set_vpn_state (NMVpnConnection *self,
}
/* Tear down and clean up the connection */
call_plugin_disconnect (self);
if (priv->proxy)
call_plugin_disconnect (self);
vpn_cleanup (self, parent_dev);
/* fall through */
default: