Attention is currently required from: flichtenheld.
Hello flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/450?usp=email
to review the following change.
Change subject: Introduce report_command_status helper function
......................................................................
Introduce report_command_status helper function
Instead of repeating near identical code several times
in manage.c, use a small helper function instead.
Change-Id: I91f739f5cb43386b2ce767cf3603a76e6b93e216
---
M src/openvpn/manage.c
1 file changed, 21 insertions(+), 24 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/50/450/1
diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c
index feb62b2..3cf392a 100644
--- a/src/openvpn/manage.c
+++ b/src/openvpn/manage.c
@@ -284,6 +284,24 @@
#endif
}
+
+/**
+ * Small function to report the success or failure of a command to
+ * the management interface
+ */
+static void
+report_command_status(const bool status, const char *command)
+{
+ if (status)
+ {
+ msg(M_CLIENT, "SUCCESS: %s command succeeded", command);
+ }
+ else
+ {
+ msg(M_CLIENT, "ERROR: %s command failed", command);
+ }
+}
+
static void
man_delete_unix_socket(struct management *man)
{
@@ -974,14 +992,7 @@
NULL,
man->connection.in_extra);
man->connection.in_extra = NULL;
- if (status)
- {
- msg(M_CLIENT, "SUCCESS: client-auth command succeeded");
- }
- else
- {
- msg(M_CLIENT, "ERROR: client-auth command failed");
- }
+ report_command_status(status, "client_auth");
}
else
{
@@ -1260,14 +1271,7 @@
if (man->persist.callback.proxy_cmd)
{
const bool status =
(*man->persist.callback.proxy_cmd)(man->persist.callback.arg, p);
- if (status)
- {
- msg(M_CLIENT, "SUCCESS: proxy command succeeded");
- }
- else
- {
- msg(M_CLIENT, "ERROR: proxy command failed");
- }
+ report_command_status(status, "proxy");
}
else
{
@@ -1281,14 +1285,7 @@
if (man->persist.callback.remote_cmd)
{
const bool status =
(*man->persist.callback.remote_cmd)(man->persist.callback.arg, p);
- if (status)
- {
- msg(M_CLIENT, "SUCCESS: remote command succeeded");
- }
- else
- {
- msg(M_CLIENT, "ERROR: remote command failed");
- }
+ report_command_status(status, "remote");
}
else
{
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/450?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I91f739f5cb43386b2ce767cf3603a76e6b93e216
Gerrit-Change-Number: 450
Gerrit-PatchSet: 1
Gerrit-Owner: plaisthos <arne-open...@rfc2549.org>
Gerrit-Reviewer: flichtenheld <fr...@lichtenheld.com>
Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net>
Gerrit-Attention: flichtenheld <fr...@lichtenheld.com>
Gerrit-MessageType: newchange
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
