Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1384?usp=email
to review the following change.
Change subject: multi-socket: remove duplicated/dead code
......................................................................
multi-socket: remove duplicated/dead code
Removed the event_ctl() for ENABLE_ASYNC_PUSH
in io_wait_dowork() since that function is
not executed by servers anymore.
Removed a duplicated code in multi_io_process_io()
for new incoming TCP connections since the same
thing is done couple lines above.
Change-Id: Id1457f8432b4f0a69108b91ca12f2cbd0818f90d
Signed-off-by: Gianmarco De Gregori <[email protected]>
---
M src/openvpn/forward.c
M src/openvpn/multi_io.c
2 files changed, 2 insertions(+), 23 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/84/1384/1
diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c
index d57cbe0..ccb8404 100644
--- a/src/openvpn/forward.c
+++ b/src/openvpn/forward.c
@@ -2214,9 +2214,7 @@
static uintptr_t management_shift =
MANAGEMENT_SHIFT; /* depends on MANAGEMENT_READ and MANAGEMENT_WRITE */
#endif
-#ifdef ENABLE_ASYNC_PUSH
- static uintptr_t file_shift = FILE_SHIFT;
-#endif
+
#if defined(TARGET_LINUX) || defined(TARGET_FREEBSD)
static uintptr_t dco_shift = DCO_SHIFT; /* Event from DCO linux kernel
module */
#endif
@@ -2242,14 +2240,6 @@
}
#endif
-#ifdef ENABLE_ASYNC_PUSH
- /* arm inotify watcher */
- if (c->options.mode == MODE_SERVER)
- {
- event_ctl(c->c2.event_set, c->c2.inotify_fd, EVENT_READ, (void
*)file_shift);
- }
-#endif
-
/*
* Possible scenarios:
* (1) tcp/udp port has data available to read
diff --git a/src/openvpn/multi_io.c b/src/openvpn/multi_io.c
index 6e31687..fe72456 100644
--- a/src/openvpn/multi_io.c
+++ b/src/openvpn/multi_io.c
@@ -500,18 +500,7 @@
multi_io_action(m, NULL, TA_TUN_READ, false);
}
}
- /* new incoming TCP client attempting to connect? */
- else if (e->arg == MULTI_IO_SOCKET)
- {
- struct multi_instance *mi;
- ASSERT(m->top.c2.link_sockets[0]);
- socket_reset_listen_persistent(m->top.c2.link_sockets[0]);
- mi = multi_create_instance_tcp(m,
m->top.c2.link_sockets[0]);
- if (mi)
- {
- multi_io_action(m, mi, TA_INITIAL, false);
- }
- }
+
#if defined(ENABLE_DCO)
/* incoming data on DCO? */
else if (e->arg == MULTI_IO_DCO)
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1384?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Id1457f8432b4f0a69108b91ca12f2cbd0818f90d
Gerrit-Change-Number: 1384
Gerrit-PatchSet: 1
Gerrit-Owner: its_Giaan <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
