diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-03-08 12:22:01 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-03-16 18:27:33 +0100 |
| commit | bed2fa1bec3af102c60a3871d0f86a546b7c2a0c (patch) | |
| tree | 4185fe6c2fc11424a2d94afde19e0aba57c6e514 /src/nm-dispatcher.c | |
| parent | fa015f2aab960bc4cf2da79a85b99d2cdb36e7bd (diff) | |
| download | NetworkManager-bed2fa1bec3af102c60a3871d0f86a546b7c2a0c.tar.gz | |
core: track external activations types in the active-connection
We need a distinction between external activations and assuming
connections. The former shall have the meaning of devices that are
*not* managed by NetworkManager, the latter are configurations that
are gracefully taken over after restart (but fully managed).
Express that in the activation-type of the active connection.
Also, no longer use the settings NM_SETTINGS_CONNECTION_FLAGS_VOLATILE
flag to determine whether an assumed connection is "external". These
concepts are entirely orthogonal (although in pratice, external
activations are in-memory and flagged as volatile, but the inverse
is not necessarily true).
Also change match_connection_filter() to consider all connections.
Later, we only call nm_utils_match_connection() for the connection
we want to assume -- which will be a regular settings connection,
not a generated one.
Diffstat (limited to 'src/nm-dispatcher.c')
| -rw-r--r-- | src/nm-dispatcher.c | 49 |
1 files changed, 34 insertions, 15 deletions
diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c index 4fa4ce6aba..1bb26e1c45 100644 --- a/src/nm-dispatcher.c +++ b/src/nm-dispatcher.c @@ -478,9 +478,10 @@ dispatcher_idle_cb (gpointer user_data) static gboolean _dispatcher_call (NMDispatcherAction action, gboolean blocking, + NMDevice *device, NMSettingsConnection *settings_connection, NMConnection *applied_connection, - NMDevice *device, + gboolean activation_type_external, NMConnectivityState connectivity_state, const char *vpn_iface, NMProxyConfig *vpn_proxy_config, @@ -575,7 +576,7 @@ _dispatcher_call (NMDispatcherAction action, NMD_CONNECTION_PROPS_FILENAME, g_variant_new_string (filename)); } - if (nm_settings_connection_get_volatile (settings_connection)) { + if (activation_type_external) { g_variant_builder_add (&connection_props, "{sv}", NMD_CONNECTION_PROPS_EXTERNAL, g_variant_new_boolean (TRUE)); @@ -711,8 +712,10 @@ nm_dispatcher_call_hostname (NMDispatcherFunc callback, gpointer user_data, guint *out_call_id) { - return _dispatcher_call (NM_DISPATCHER_ACTION_HOSTNAME, FALSE, NULL, NULL, NULL, - NM_CONNECTIVITY_UNKNOWN, NULL, NULL, NULL, NULL, + return _dispatcher_call (NM_DISPATCHER_ACTION_HOSTNAME, FALSE, + NULL, NULL, NULL, FALSE, + NM_CONNECTIVITY_UNKNOWN, + NULL, NULL, NULL, NULL, callback, user_data, out_call_id); } @@ -748,10 +751,12 @@ nm_dispatcher_call_device (NMDispatcherAction action, } nm_assert (NM_IN_SET (nm_active_connection_get_device (NM_ACTIVE_CONNECTION (act_request)), NULL, device)); return _dispatcher_call (action, FALSE, + device, nm_act_request_get_settings_connection (act_request), nm_act_request_get_applied_connection (act_request), - device, - NM_CONNECTIVITY_UNKNOWN, NULL, NULL, NULL, NULL, + nm_active_connection_get_activation_type (NM_ACTIVE_CONNECTION (act_request)) == NM_ACTIVATION_TYPE_EXTERNAL, + NM_CONNECTIVITY_UNKNOWN, + NULL, NULL, NULL, NULL, callback, user_data, out_call_id); } @@ -780,10 +785,12 @@ nm_dispatcher_call_device_sync (NMDispatcherAction action, } nm_assert (NM_IN_SET (nm_active_connection_get_device (NM_ACTIVE_CONNECTION (act_request)), NULL, device)); return _dispatcher_call (action, TRUE, + device, nm_act_request_get_settings_connection (act_request), nm_act_request_get_applied_connection (act_request), - device, - NM_CONNECTIVITY_UNKNOWN, NULL, NULL, NULL, NULL, + nm_active_connection_get_activation_type (NM_ACTIVE_CONNECTION (act_request)) == NM_ACTIVATION_TYPE_EXTERNAL, + NM_CONNECTIVITY_UNKNOWN, + NULL, NULL, NULL, NULL, NULL, NULL, NULL); } @@ -820,9 +827,14 @@ nm_dispatcher_call_vpn (NMDispatcherAction action, gpointer user_data, guint *out_call_id) { - return _dispatcher_call (action, FALSE, settings_connection, applied_connection, - parent_device, NM_CONNECTIVITY_UNKNOWN, vpn_iface, vpn_proxy_config, - vpn_ip4_config, vpn_ip6_config, callback, user_data, out_call_id); + return _dispatcher_call (action, FALSE, + parent_device, + settings_connection, + applied_connection, + FALSE, + NM_CONNECTIVITY_UNKNOWN, + vpn_iface, vpn_proxy_config, vpn_ip4_config, vpn_ip6_config, + callback, user_data, out_call_id); } /** @@ -851,9 +863,14 @@ nm_dispatcher_call_vpn_sync (NMDispatcherAction action, NMIP4Config *vpn_ip4_config, NMIP6Config *vpn_ip6_config) { - return _dispatcher_call (action, TRUE, settings_connection, applied_connection, - parent_device, NM_CONNECTIVITY_UNKNOWN, vpn_iface, vpn_proxy_config, - vpn_ip4_config, vpn_ip6_config, NULL, NULL, NULL); + return _dispatcher_call (action, TRUE, + parent_device, + settings_connection, + applied_connection, + FALSE, + NM_CONNECTIVITY_UNKNOWN, + vpn_iface, vpn_proxy_config, vpn_ip4_config, vpn_ip6_config, + NULL, NULL, NULL); } /** @@ -874,7 +891,9 @@ nm_dispatcher_call_connectivity (NMConnectivityState connectivity_state, gpointer user_data, guint *out_call_id) { - return _dispatcher_call (NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE, FALSE, NULL, NULL, NULL, connectivity_state, + return _dispatcher_call (NM_DISPATCHER_ACTION_CONNECTIVITY_CHANGE, FALSE, + NULL, NULL, NULL, FALSE, + connectivity_state, NULL, NULL, NULL, NULL, callback, user_data, out_call_id); } |
