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

agent-manager: pass agent-manager to maybe_remove_agent_on_error() and don't lookup by name

Browse Source 
Don't access the singleton getter here. Pass the agent-manager argument
instead to maybe_remove_agent_on_error().

Also, don't lookup the agent by name. We already know, whether the agent
is still tracked or not. Look at agent->agent_lst.
This commit is contained in:
Thomas Haller
2019-12-23 11:25:51 +01:00
parent d4a821d53e
commit 821efd87d8
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/settings/nm-agent-manager.c
View File

@@ -266,13 +266,17 @@ _agent_remove_by_owner (NMAgentManager *self, const char *owner)
/* Call this *after* calling request_next_agent() */
static void
maybe_remove_agent_on_error (NMSecretAgent *agent,
maybe_remove_agent_on_error (NMAgentManager *self,
NMSecretAgent *agent,
GError *error)
{
if ( g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CLOSED)
|| g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_DISCONNECTED)
|| g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_NAME_HAS_NO_OWNER))
_agent_remove_by_owner (nm_agent_manager_get (), nm_secret_agent_get_dbus_owner (agent));
if ( !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CLOSED)
&& !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_DISCONNECTED)
&& !g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_NAME_HAS_NO_OWNER))
return;
if (!c_list_is_empty (&agent->agent_lst))
_agent_remove (self, agent);
}
/*****************************************************************************/
@@ -872,7 +876,7 @@ _con_get_request_done (NMSecretAgent *agent,
/* Try the next agent */
request_next_agent (req);
maybe_remove_agent_on_error (agent, error);
maybe_remove_agent_on_error (self, agent, error);
}
return;
}
@@ -1246,7 +1250,7 @@ _con_save_request_done (NMSecretAgent *agent,
LOG_REQ_ARG (req), error->message);
/* Try the next agent */
request_next_agent (req);
maybe_remove_agent_on_error (agent, error);
maybe_remove_agent_on_error (self, agent, error);
return;
}
@@ -1337,7 +1341,7 @@ _con_del_request_done (NMSecretAgent *agent,
/* Tell the next agent to delete secrets */
request_next_agent (req);
if (error)
maybe_remove_agent_on_error (agent, error);
maybe_remove_agent_on_error (self, agent, error);
}
static void