diff mbox series

[Openvpn-devel,v2] Get rid of unused 'bool tuntap_buffer' arguments.

Message ID 20230130161730.110021-1-gert@greenie.muc.de
State Rejected
Headers show
Series [Openvpn-devel,v2] Get rid of unused 'bool tuntap_buffer' arguments. | expand

Commit Message

Gert Doering Jan. 30, 2023, 4:17 p.m. UTC 
overlapped_io_init() has a "bool tuntap_buffer" argument which is only
passed onwards to alloc_buf_sock_tun(), which does nothing with it.

Remove from both functions.

While at it, move alloc_buf_sock_tun() from mtu.c to win32.c and make
static.  It's only ever called from win32.c / overlapped_io_init().

v2:
  move alloc_buf_sock_tun() to win32.c

Signed-off-by: Gert Doering <gert@greenie.muc.de>
---
 src/openvpn/mtu.c    | 13 -------------
 src/openvpn/mtu.h    |  7 -------
 src/openvpn/socket.c |  4 ++--
 src/openvpn/tun.c    |  4 ++--
 src/openvpn/win32.c  | 17 ++++++++++++++---
 src/openvpn/win32.h  |  3 +--
 6 files changed, 19 insertions(+), 29 deletions(-)

Comments

Arne Schwabe Jan. 30, 2023, 5:01 p.m. UTC | #1 
Am 30.01.23 um 17:17 schrieb Gert Doering:
> overlapped_io_init() has a "bool tuntap_buffer" argument which is only
> passed onwards to alloc_buf_sock_tun(), which does nothing with it.
> 
> Remove from both functions.
> 
> While at it, move alloc_buf_sock_tun() from mtu.c to win32.c and make
> static.  It's only ever called from win32.c / overlapped_io_init().
> 
> v2:
>    move alloc_buf_sock_tun() to win32.c
> 
Acked-By: Arne Schwabe <arne@rfc2549.org>
Gert Doering Jan. 31, 2023, 5:28 p.m. UTC | #2 
Hi,

On Mon, Jan 30, 2023 at 04:17:30PM +0000, Gert Doering wrote:
> overlapped_io_init() has a "bool tuntap_buffer" argument which is only
> passed onwards to alloc_buf_sock_tun(), which does nothing with it.
> 
> Remove from both functions.
> 
> While at it, move alloc_buf_sock_tun() from mtu.c to win32.c and make
> static.  It's only ever called from win32.c / overlapped_io_init().

NAK this.  

There are more calls in socket.c, in the non-WIN32 code paths, so
v2 breaks Linux compilation (not sure why I overlooked that before).

Need to re-think how I want to clean this up...

gert
diff mbox series

Patch

diff --git a/src/openvpn/mtu.c b/src/openvpn/mtu.c
index 1d9ebe01..4b32daff 100644
--- a/src/openvpn/mtu.c
+++ b/src/openvpn/mtu.c
@@ -39,19 +39,6 @@ 
 
 #include "memdbg.h"
 
-/* allocate a buffer for socket or tun layer */
-void
-alloc_buf_sock_tun(struct buffer *buf,
-                   const struct frame *frame,
-                   const bool tuntap_buffer)
-{
-    /* allocate buffer for overlapped I/O */
-    *buf = alloc_buf(BUF_SIZE(frame));
-    ASSERT(buf_init(buf, frame->buf.headroom));
-    buf->len = frame->buf.payload_size;
-    ASSERT(buf_safe(buf, 0));
-}
-
 unsigned int
 calc_packet_id_size_dc(const struct options *options, const struct key_type *kt)
 {
diff --git a/src/openvpn/mtu.h b/src/openvpn/mtu.h
index 0ff4f7bf..afd4ac53 100644
--- a/src/openvpn/mtu.h
+++ b/src/openvpn/mtu.h
@@ -261,13 +261,6 @@  unsigned int
 calc_packet_id_size_dc(const struct options *options,
                        const struct key_type *kt);
 
-/*
- * allocate a buffer for socket or tun layer
- */
-void alloc_buf_sock_tun(struct buffer *buf,
-                        const struct frame *frame,
-                        const bool tuntap_buffer);
-
 /*
  * EXTENDED_SOCKET_ERROR_CAPABILITY functions -- print extra error info
  * on socket errors, such as PMTU size.  As of 2003.05.11, only works
diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c
index a883ac4a..2c75cb35 100644
--- a/src/openvpn/socket.c
+++ b/src/openvpn/socket.c
@@ -1623,8 +1623,8 @@  static void
 socket_frame_init(const struct frame *frame, struct link_socket *sock)
 {
 #ifdef _WIN32
-    overlapped_io_init(&sock->reads, frame, FALSE, false);
-    overlapped_io_init(&sock->writes, frame, TRUE, false);
+    overlapped_io_init(&sock->reads, frame, FALSE);
+    overlapped_io_init(&sock->writes, frame, TRUE);
     sock->rw_handle.read = sock->reads.overlapped.hEvent;
     sock->rw_handle.write = sock->writes.overlapped.hEvent;
 #endif
diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c
index 01c85f9f..20f80798 100644
--- a/src/openvpn/tun.c
+++ b/src/openvpn/tun.c
@@ -898,8 +898,8 @@  init_tun_post(struct tuntap *tt,
         return;
     }
 
-    overlapped_io_init(&tt->reads, frame, FALSE, true);
-    overlapped_io_init(&tt->writes, frame, TRUE, true);
+    overlapped_io_init(&tt->reads, frame, FALSE);
+    overlapped_io_init(&tt->writes, frame, TRUE);
     tt->adapter_index = TUN_ADAPTER_INDEX_INVALID;
 
     if (tt->windows_driver == WINDOWS_DRIVER_WINTUN)
diff --git a/src/openvpn/win32.c b/src/openvpn/win32.c
index 44176936..9f0c119f 100644
--- a/src/openvpn/win32.c
+++ b/src/openvpn/win32.c
@@ -170,11 +170,22 @@  init_security_attributes_allow_all(struct security_attributes *obj)
     return true;
 }
 
+/* allocate a buffer for socket or tun layer */
+static void
+alloc_buf_sock_tun(struct buffer *buf,
+                   const struct frame *frame)
+{
+    /* allocate buffer for overlapped I/O */
+    *buf = alloc_buf(BUF_SIZE(frame));
+    ASSERT(buf_init(buf, frame->buf.headroom));
+    buf->len = frame->buf.payload_size;
+    ASSERT(buf_safe(buf, 0));
+}
+
 void
 overlapped_io_init(struct overlapped_io *o,
                    const struct frame *frame,
-                   BOOL event_state,
-                   bool tuntap_buffer)  /* if true: tuntap buffer, if false: socket buffer */
+                   BOOL event_state)
 {
     CLEAR(*o);
 
@@ -186,7 +197,7 @@  overlapped_io_init(struct overlapped_io *o,
     }
 
     /* allocate buffer for overlapped I/O */
-    alloc_buf_sock_tun(&o->buf_init, frame, tuntap_buffer);
+    alloc_buf_sock_tun(&o->buf_init, frame);
 }
 
 void
diff --git a/src/openvpn/win32.h b/src/openvpn/win32.h
index a1a45503..72ffb012 100644
--- a/src/openvpn/win32.h
+++ b/src/openvpn/win32.h
@@ -217,8 +217,7 @@  struct overlapped_io {
 
 void overlapped_io_init(struct overlapped_io *o,
                         const struct frame *frame,
-                        BOOL event_state,
-                        bool tuntap_buffer);
+                        BOOL event_state);
 
 void overlapped_io_close(struct overlapped_io *o);