diff mbox series

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

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

Commit Message

Gert Doering Jan. 30, 2023, 2:41 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.

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

Patch

diff --git a/src/openvpn/mtu.c b/src/openvpn/mtu.c
index 1d9ebe01..748a1cf1 100644
--- a/src/openvpn/mtu.c
+++ b/src/openvpn/mtu.c
@@ -42,8 +42,7 @@ 
 /* allocate a buffer for socket or tun layer */
 void
 alloc_buf_sock_tun(struct buffer *buf,
-                   const struct frame *frame,
-                   const bool tuntap_buffer)
+                   const struct frame *frame)
 {
     /* allocate buffer for overlapped I/O */
     *buf = alloc_buf(BUF_SIZE(frame));
diff --git a/src/openvpn/mtu.h b/src/openvpn/mtu.h
index 0ff4f7bf..65236508 100644
--- a/src/openvpn/mtu.h
+++ b/src/openvpn/mtu.h
@@ -265,8 +265,7 @@  calc_packet_id_size_dc(const struct options *options,
  * allocate a buffer for socket or tun layer
  */
 void alloc_buf_sock_tun(struct buffer *buf,
-                        const struct frame *frame,
-                        const bool tuntap_buffer);
+                        const struct frame *frame);
 
 /*
  * EXTENDED_SOCKET_ERROR_CAPABILITY functions -- print extra error info
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..8cdfec0e 100644
--- a/src/openvpn/win32.c
+++ b/src/openvpn/win32.c
@@ -173,8 +173,7 @@  init_security_attributes_allow_all(struct security_attributes *obj)
 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 +185,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);