Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-22 13:02:44 +01:00
Code Releases Activity

client: Modify error handler to return cancelation msg

Browse Source 
This allows to send cancelation error back to iwd, instead of
returning NULL and waiting for iwd to timeout on agent request.
This commit is contained in:
Tim Kourt 2019-10-25 13:32:05 -07:00 committed by Denis Kenzior
parent ceeab83fa8
commit cfdb33f710
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/agent.c
View File

@ -59,7 +59,8 @@ static struct l_dbus_message *agent_reply_canceled(
"Error: %s", text); "Error: %s", text);
} }
static struct l_dbus_message *agent_error(const char *text) static struct l_dbus_message *agent_error(struct l_dbus_message *message,
const char *text)
{ {
display_error(text); display_error(text);
@ -69,7 +70,7 @@ static struct l_dbus_message *agent_error(const char *text)
l_main_quit(); l_main_quit();
} }
return NULL; return agent_reply_canceled(message, text);
} }
static struct l_dbus_message *release_method_call(struct l_dbus *dbus, static struct l_dbus_message *release_method_call(struct l_dbus *dbus,
@ -114,7 +115,7 @@ static struct l_dbus_message *request_passphrase_method_call(
return reply; return reply;
if (command_option_get(COMMAND_OPTION_DONTASK, NULL)) if (command_option_get(COMMAND_OPTION_DONTASK, NULL))
return agent_error("No passphrase is provided as " return agent_error(message, "No passphrase is provided as "
"'--"COMMAND_OPTION_PASSPHRASE"' " "'--"COMMAND_OPTION_PASSPHRASE"' "
"command-line option.\n"); "command-line option.\n");
@ -152,7 +153,7 @@ static struct l_dbus_message *request_private_key_passphrase_method_call(
return reply; return reply;
if (command_option_get(COMMAND_OPTION_DONTASK, NULL)) if (command_option_get(COMMAND_OPTION_DONTASK, NULL))
return agent_error("No passphrase is provided as " return agent_error(message, "No passphrase is provided as "
"'--"COMMAND_OPTION_PASSPHRASE"' " "'--"COMMAND_OPTION_PASSPHRASE"' "
"command-line option.\n"); "command-line option.\n");
@ -211,7 +212,8 @@ static struct l_dbus_message *request_username_and_password_method_call(
return reply; return reply;
if (command_option_get(COMMAND_OPTION_DONTASK, NULL)) if (command_option_get(COMMAND_OPTION_DONTASK, NULL))
return agent_error("No username or password is provided as " return agent_error(message, "No username or password is "
"provided as "
"'--"COMMAND_OPTION_USERNAME"' or " "'--"COMMAND_OPTION_USERNAME"' or "
"'--"COMMAND_OPTION_PASSWORD"' " "'--"COMMAND_OPTION_PASSWORD"' "
"command-line option.\n"); "command-line option.\n");
@ -268,7 +270,7 @@ static struct l_dbus_message *request_user_password_method_call(
return reply; return reply;
if (command_option_get(COMMAND_OPTION_DONTASK, NULL)) if (command_option_get(COMMAND_OPTION_DONTASK, NULL))
return agent_error("No password is provided as " return agent_error(message, "No password is provided as "
"'--"COMMAND_OPTION_PASSWORD"' " "'--"COMMAND_OPTION_PASSWORD"' "
"command-line option.\n"); "command-line option.\n");