Attention is currently required from: Arne Schwabe.
Hello Arne Schwabe,
I'd like you to do a code review.
Please visit
https://gerrit.openvpn.net/c/openvpn/+/2133?usp=email
to review the following change.
Change subject: multi: use multi_io_delete_event() and drop
multi_tcp_delete_event()
......................................................................
multi: use multi_io_delete_event() and drop multi_tcp_delete_event()
cbb0440e ("multiproto: move generic event handling code in dedicated
files") added multi_io_delete_event() as a copy of
multi_tcp_delete_event() but kept the old function and its only
caller. Switch management_delete_event() to the new one and remove the
old copy.
Change-Id: Iba1db32cd130d092e34a31159f14d3aa37db96f2
Signed-off-by: Razvan Cojocaru <[email protected]>
---
M src/openvpn/mtcp.c
M src/openvpn/mtcp.h
M src/openvpn/multi.c
3 files changed, 1 insertion(+), 12 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/33/2133/1
diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c
index 2d0af06..62d059e 100644
--- a/src/openvpn/mtcp.c
+++ b/src/openvpn/mtcp.c
@@ -95,15 +95,6 @@
}
void
-multi_tcp_delete_event(struct multi_io *multi_io, event_t event)
-{
- if (multi_io && multi_io->es)
- {
- event_del(multi_io->es, event);
- }
-}
-
-void
multi_tcp_dereference_instance(struct multi_io *multi_io, struct
multi_instance *mi)
{
const struct link_socket *sock = mi->context.c2.link_sockets[0];
diff --git a/src/openvpn/mtcp.h b/src/openvpn/mtcp.h
index 47c6308..b4ec1f9 100644
--- a/src/openvpn/mtcp.h
+++ b/src/openvpn/mtcp.h
@@ -43,6 +43,4 @@
struct multi_instance *multi_create_instance_tcp(struct multi_context *m,
struct link_socket *sock);
-void multi_tcp_delete_event(struct multi_io *multi_io, event_t event);
-
#endif /* ifndef MTCP_H */
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 3f514d6..741b3d1 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -4025,7 +4025,7 @@
struct multi_context *m = (struct multi_context *)arg;
if (m->multi_io)
{
- multi_tcp_delete_event(m->multi_io, event);
+ multi_io_delete_event(m->multi_io, event);
}
}
--
To view, visit https://gerrit.openvpn.net/c/openvpn/+/2133?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iba1db32cd130d092e34a31159f14d3aa37db96f2
Gerrit-Change-Number: 2133
Gerrit-PatchSet: 1
Gerrit-Owner: Răzvan Cojocaru <[email protected]>
Gerrit-Reviewer: Arne Schwabe <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: Arne Schwabe <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
