[Openvpn-devel,04/17] Minor cleanup in push.c

Message ID 20200810143707.5834-5-arne@rfc2549.org
State Accepted
Headers show
Series
  • OpenVPN refactoring
Related show

Commit Message

Arne Schwabe Aug. 10, 2020, 2:36 p.m.
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
---
 src/openvpn/push.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

Comments

Gert Doering Aug. 10, 2020, 3:11 p.m. | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

"Trivially correct" (still tested, client side is enough to
excercise that code).

Unfortunately, the Whitespace Overlord required re-indentation
of the two lines of context, so I did that.

Your patch has been applied to the master branch.

commit 2fdd332979a69d6064706ba3bb875385333b6720
Author: Arne Schwabe
Date:   Mon Aug 10 16:36:54 2020 +0200

     Minor cleanup in push.c

     Signed-off-by: Arne Schwabe <arne@rfc2549.org>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20200810143707.5834-5-arne@rfc2549.org>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg20678.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/src/openvpn/push.c b/src/openvpn/push.c
index f10021f8..d20b345d 100644
--- a/src/openvpn/push.c
+++ b/src/openvpn/push.c
@@ -330,13 +330,10 @@  incoming_push_message(struct context *c, const struct buffer *buffer)
 {
     struct gc_arena gc = gc_new();
     unsigned int option_types_found = 0;
-    int status;
 
     msg(D_PUSH, "PUSH: Received control message: '%s'", sanitize_control_message(BSTR(buffer), &gc));
 
-    status = process_incoming_push_msg(c,
-                                       buffer,
-                                       c->options.pull,
+    int status = process_incoming_push_msg(c, buffer, c->options.pull,
                                        pull_permission_mask(c),
                                        &option_types_found);
 
@@ -866,7 +863,7 @@  process_incoming_push_msg(struct context *c,
         return process_incoming_push_request(c);
     }
     else if (honor_received_options
-             && buf_string_compare_advance(&buf, "PUSH_REPLY"))
+             && buf_string_compare_advance(&buf, push_reply_cmd))
     {
         return process_incoming_push_reply(c, permission_mask,
                                            option_types_found, &buf);