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

core: fix taking over external connection after restart

Browse Source 
When we restart the daemon, it would find the previously present external
connection and assume it. We need to keep it as external.
This commit is contained in:
Thomas Haller
2020-06-09 09:10:53 +02:00
parent 8d6dbd1746
commit 16cff1149a
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/nm-manager.c
View File

@@ -2699,11 +2699,19 @@ get_existing_connection (NMManager *self,
}
if (matched) {
_LOG2I (LOGD_DEVICE, device, "assume: will attempt to assume matching connection '%s' (%s)%s",
nm_settings_connection_get_id (matched),
nm_settings_connection_get_uuid (matched),
assume_state_connection_uuid && nm_streq (assume_state_connection_uuid, nm_settings_connection_get_uuid (matched))
? " (indicated)" : " (guessed)");
if (NM_FLAGS_HAS (nm_settings_connection_get_flags (matched), NM_SETTINGS_CONNECTION_INT_FLAGS_EXTERNAL)) {
_LOG2D (LOGD_DEVICE, device, "assume: take over previous connection '%s' (%s)",
nm_settings_connection_get_id (matched),
nm_settings_connection_get_uuid (matched));
NM_SET_OUT (out_generated, TRUE);
} else {
_LOG2I (LOGD_DEVICE, device, "assume: will attempt to assume matching connection '%s' (%s)%s",
nm_settings_connection_get_id (matched),
nm_settings_connection_get_uuid (matched),
assume_state_connection_uuid && nm_streq (assume_state_connection_uuid, nm_settings_connection_get_uuid (matched))
? " (indicated)" : " (guessed)");
}
nm_device_assume_state_reset (device);
return matched;
}