[Openvpn-devel] Cleanup: get rid of 'dynamic' argument of open_tun_generic()

Message ID 20220807193535.15377-1-gert@greenie.muc.de
State Accepted
Headers show
Series [Openvpn-devel] Cleanup: get rid of 'dynamic' argument of open_tun_generic() | expand

Commit Message

Gert Doering Aug. 7, 2022, 7:35 p.m. UTC
All callers of open_tun_generic() always set dynamic=true - so just
get rid of it.  While at it, move "int i" into the for() loop.

Signed-off-by: Gert Doering <gert@greenie.muc.de>
---
 src/openvpn/tun.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

Comments

Antonio Quartulli Aug. 8, 2022, 9:08 a.m. UTC | #1
Hi,

On 07/08/2022 21:35, Gert Doering wrote:
> All callers of open_tun_generic() always set dynamic=true - so just
> get rid of it.  While at it, move "int i" into the for() loop.
> 
> Signed-off-by: Gert Doering <gert@greenie.muc.de>

Patch does what it says and it is easy to verify that all invocations of 
open_tun_generic() were simply passing "true" as dynamic argument.

> ---
>   src/openvpn/tun.c | 23 +++++++++++------------
>   1 file changed, 11 insertions(+), 12 deletions(-)
> 
> diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c
> index 659bd245..6e7c0197 100644
> --- a/src/openvpn/tun.c
> +++ b/src/openvpn/tun.c
> @@ -1736,7 +1736,7 @@ tun_dco_enabled(struct tuntap *tt)
>   #if !(defined(_WIN32) || defined(TARGET_LINUX))
>   static void
>   open_tun_generic(const char *dev, const char *dev_type, const char *dev_node,
> -                 bool dynamic, struct tuntap *tt)
> +                 struct tuntap *tt)
>   {
>       char tunname[256];
>       char dynamic_name[256];
> @@ -1767,7 +1767,7 @@ open_tun_generic(const char *dev, const char *dev_type, const char *dev_node,
>                * opening /dev/tap and then querying the system about the
>                * actual device name (tap0, tap1, ...) assigned
>                */
> -            if (dynamic && strcmp( dev, "tap" ) == 0)
> +            if (strcmp( dev, "tap" ) == 0)

While at it you could have removed the spaces next to the parenthesis... :)

>               {
>                   struct ifreq ifr;
>                   if ((tt->fd = open( "/dev/tap", O_RDWR)) < 0)
> @@ -1786,10 +1786,9 @@ open_tun_generic(const char *dev, const char *dev_type, const char *dev_node,
>               else
>   #endif
>   
> -            if (dynamic && !tun_name_is_fixed(dev))
> +            if (!tun_name_is_fixed(dev))
>               {
> -                int i;
> -                for (i = 0; i < 256; ++i)
> +                for (int i = 0; i < 256; ++i)
>                   {
>                       openvpn_snprintf(tunname, sizeof(tunname),
>                                        "/dev/%s%d", dev, i);
> @@ -2682,7 +2681,7 @@ void
>   open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tuntap *tt,
>            openvpn_net_ctx_t *ctx)
>   {
> -    open_tun_generic(dev, dev_type, dev_node, true, tt);
> +    open_tun_generic(dev, dev_type, dev_node, tt);
>   
>       /* Enable multicast on the interface */
>       if (tt->fd >= 0)
> @@ -2777,7 +2776,7 @@ void
>   open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tuntap *tt,
>            openvpn_net_ctx_t *ctx)
>   {
> -    open_tun_generic(dev, dev_type, dev_node, true, tt);
> +    open_tun_generic(dev, dev_type, dev_node, tt);
>   
>       if (tt->fd >= 0)
>       {
> @@ -2918,7 +2917,7 @@ void
>   open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tuntap *tt,
>            openvpn_net_ctx_t *ctx)
>   {
> -    open_tun_generic(dev, dev_type, dev_node, true, tt);
> +    open_tun_generic(dev, dev_type, dev_node, tt);
>   
>       if (tt->fd >= 0 && tt->type == DEV_TYPE_TUN)
>       {
> @@ -3047,7 +3046,7 @@ void
>   open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tuntap *tt,
>            openvpn_net_ctx_t *ctx)
>   {
> -    open_tun_generic(dev, dev_type, dev_node, true, tt);
> +    open_tun_generic(dev, dev_type, dev_node, tt);
>   
>       if (tt->fd >= 0)
>       {
> @@ -3300,7 +3299,7 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun
>               {
>                   /* No explicit utun and utun failed, try the generic way) */
>                   msg(M_INFO, "Failed to open utun device. Falling back to /dev/tun device");
> -                open_tun_generic(dev, dev_type, NULL, true, tt);
> +                open_tun_generic(dev, dev_type, NULL, tt);
>               }
>               else
>               {
> @@ -3323,7 +3322,7 @@ open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun
>               dev_node = NULL;
>           }
>   
> -        open_tun_generic(dev, dev_type, dev_node, true, tt);
> +        open_tun_generic(dev, dev_type, dev_node, tt);
>       }
>   }
>   
> @@ -7004,7 +7003,7 @@ void
>   open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tuntap *tt,
>            openvpn_net_ctx_t *ctx)
>   {
> -    open_tun_generic(dev, dev_type, dev_node, true, tt);
> +    open_tun_generic(dev, dev_type, dev_node, tt);
>   }
>   
>   void

other than my nitpick above,

Acked-by: Antonio Quartulli <a@unstable.cc>

Cheers,
Gert Doering Aug. 8, 2022, 10:43 a.m. UTC | #2
Whitespace in "strcmp()" adjusted as instructed :-)

Tested by feeding to the buildbot army, which did not complain.

Patch has been applied to the master branch.

commit 4c31a3ca0660e2693e18430d836957edf6e128ea
Author: Gert Doering
Date:   Sun Aug 7 21:35:35 2022 +0200

     Cleanup: get rid of 'dynamic' argument of open_tun_generic()

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


--
kind regards,

Gert Doering

Patch

diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c
index 659bd245..6e7c0197 100644
--- a/src/openvpn/tun.c
+++ b/src/openvpn/tun.c
@@ -1736,7 +1736,7 @@  tun_dco_enabled(struct tuntap *tt)
 #if !(defined(_WIN32) || defined(TARGET_LINUX))
 static void
 open_tun_generic(const char *dev, const char *dev_type, const char *dev_node,
-                 bool dynamic, struct tuntap *tt)
+                 struct tuntap *tt)
 {
     char tunname[256];
     char dynamic_name[256];
@@ -1767,7 +1767,7 @@  open_tun_generic(const char *dev, const char *dev_type, const char *dev_node,
              * opening /dev/tap and then querying the system about the
              * actual device name (tap0, tap1, ...) assigned
              */
-            if (dynamic && strcmp( dev, "tap" ) == 0)
+            if (strcmp( dev, "tap" ) == 0)
             {
                 struct ifreq ifr;
                 if ((tt->fd = open( "/dev/tap", O_RDWR)) < 0)
@@ -1786,10 +1786,9 @@  open_tun_generic(const char *dev, const char *dev_type, const char *dev_node,
             else
 #endif
 
-            if (dynamic && !tun_name_is_fixed(dev))
+            if (!tun_name_is_fixed(dev))
             {
-                int i;
-                for (i = 0; i < 256; ++i)
+                for (int i = 0; i < 256; ++i)
                 {
                     openvpn_snprintf(tunname, sizeof(tunname),
                                      "/dev/%s%d", dev, i);
@@ -2682,7 +2681,7 @@  void
 open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tuntap *tt,
          openvpn_net_ctx_t *ctx)
 {
-    open_tun_generic(dev, dev_type, dev_node, true, tt);
+    open_tun_generic(dev, dev_type, dev_node, tt);
 
     /* Enable multicast on the interface */
     if (tt->fd >= 0)
@@ -2777,7 +2776,7 @@  void
 open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tuntap *tt,
          openvpn_net_ctx_t *ctx)
 {
-    open_tun_generic(dev, dev_type, dev_node, true, tt);
+    open_tun_generic(dev, dev_type, dev_node, tt);
 
     if (tt->fd >= 0)
     {
@@ -2918,7 +2917,7 @@  void
 open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tuntap *tt,
          openvpn_net_ctx_t *ctx)
 {
-    open_tun_generic(dev, dev_type, dev_node, true, tt);
+    open_tun_generic(dev, dev_type, dev_node, tt);
 
     if (tt->fd >= 0 && tt->type == DEV_TYPE_TUN)
     {
@@ -3047,7 +3046,7 @@  void
 open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tuntap *tt,
          openvpn_net_ctx_t *ctx)
 {
-    open_tun_generic(dev, dev_type, dev_node, true, tt);
+    open_tun_generic(dev, dev_type, dev_node, tt);
 
     if (tt->fd >= 0)
     {
@@ -3300,7 +3299,7 @@  open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun
             {
                 /* No explicit utun and utun failed, try the generic way) */
                 msg(M_INFO, "Failed to open utun device. Falling back to /dev/tun device");
-                open_tun_generic(dev, dev_type, NULL, true, tt);
+                open_tun_generic(dev, dev_type, NULL, tt);
             }
             else
             {
@@ -3323,7 +3322,7 @@  open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tun
             dev_node = NULL;
         }
 
-        open_tun_generic(dev, dev_type, dev_node, true, tt);
+        open_tun_generic(dev, dev_type, dev_node, tt);
     }
 }
 
@@ -7004,7 +7003,7 @@  void
 open_tun(const char *dev, const char *dev_type, const char *dev_node, struct tuntap *tt,
          openvpn_net_ctx_t *ctx)
 {
-    open_tun_generic(dev, dev_type, dev_node, true, tt);
+    open_tun_generic(dev, dev_type, dev_node, tt);
 }
 
 void