[Openvpn-devel] options: drop useless netmask variable

Message ID 20220314131356.11577-1-a@unstable.cc
State Accepted
Headers show
Series
  • [Openvpn-devel] options: drop useless netmask variable
Related show

Commit Message

Antonio Quartulli March 14, 2022, 1:13 p.m.
netmask is simply used to reflect the value of p[2], therefore
it can be dropped and p[2] can directly be used instead.

Reported-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: Antonio Quartulli <a@unstable.cc>
---
 src/openvpn/options.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

Comments

Gert Doering March 17, 2022, 11:38 a.m. | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

Trivial change, obviously correct.  I *did* test-compile this :-) but
did not actually test any iroute stuff (that will come next in the 
"DCO server" testbed).

Your patch has been applied to the master branch.

commit 07be493796250ad680a4a41c26e19c1938bf37ce
Author: Antonio Quartulli
Date:   Mon Mar 14 14:13:56 2022 +0100

     options: drop useless netmask variable

     Signed-off-by: Antonio Quartulli <a@unstable.cc>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20220314131356.11577-1-a@unstable.cc>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg23941.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 7ce0ba61..7d7b8dc1 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -7282,14 +7282,8 @@  add_option(struct options *options,
     }
     else if (streq(p[0], "iroute") && p[1] && !p[3])
     {
-        const char *netmask = NULL;
-
         VERIFY_PERMISSION(OPT_P_INSTANCE);
-        if (p[2])
-        {
-            netmask = p[2];
-        }
-        option_iroute(options, p[1], netmask, msglevel);
+        option_iroute(options, p[1], p[2], msglevel);
     }
     else if (streq(p[0], "iroute-ipv6") && p[1] && !p[2])
     {