From: "its_Giaan (Code Review)" Date: Mon, 23 Sep 2024 13:41:27 +0000 References: Reply-To: gianmarco@...2726..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <7e6bdc87ccf6158a14ea7846576078ea49cba822-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="q8UkSwkReAo="; charset=UTF-8 Subject: [Openvpn-devel] [XL] Change in openvpn[master]: multiproto: move generic event handling code in dedicated files List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld Cc: openvpn-devel --q8UkSwkReAo= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, plaisthos. Hello plaisthos, flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/763?usp=3Demail to review the following change. Change subject: multiproto: move generic event handling code in dedicated f= iles ...................................................................... multiproto: move generic event handling code in dedicated files Introduced multi_io.h and multi_io.c files to centralize all codes related to multiple protocols. Renamed the struct mtcp to struct multi_protocol since it encompasses the event_set used by the parent context in server mode. Several methods have also been renamed and moved to fit the multiproto structure: - multi_tcp_init() -> multi_protocol_init(); - multi_tcp_free() -> multi_protocol_free(); - multi_tcp_wait() -> multi_protocol_io_wait(); and so forth. Change-Id: I1e5a84969988e4f027a18658d4ab268c13fbf929 Signed-off-by: Gianmarco De Gregori --- M CMakeLists.txt M src/openvpn/Makefile.am M src/openvpn/forward.h M src/openvpn/mtcp.c M src/openvpn/mtcp.h M src/openvpn/multi.c M src/openvpn/multi.h A src/openvpn/multi_io.c A src/openvpn/multi_io.h M src/openvpn/socket.c 10 files changed, 740 insertions(+), 621 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/63/763/1 diff --git a/CMakeLists.txt b/CMakeLists.txt index ad620fa..38df4ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -455,6 +455,8 @@ src/openvpn/mudp.h src/openvpn/multi.c src/openvpn/multi.h + src/openvpn/multi_io.h + src/openvpn/multi_io.c src/openvpn/ntlm.c src/openvpn/ntlm.h src/openvpn/occ.c diff --git a/src/openvpn/Makefile.am b/src/openvpn/Makefile.am index 3784a98..d9cb599 100644 --- a/src/openvpn/Makefile.am +++ b/src/openvpn/Makefile.am @@ -92,6 +92,7 @@ mtu.c mtu.h \ mudp.c mudp.h \ multi.c multi.h \ + multi_io.c multi_io.h \ networking_freebsd.c \ networking_iproute2.c networking_iproute2.h \ networking_sitnl.c networking_sitnl.h \ diff --git a/src/openvpn/forward.h b/src/openvpn/forward.h index 6840b1a..3acbdd0 100644 --- a/src/openvpn/forward.h +++ b/src/openvpn/forward.h @@ -50,6 +50,7 @@ #include "openvpn.h" #include "occ.h" #include "ping.h" +#include "multi_io.h" #define IOW_TO_TUN (1<<0) #define IOW_TO_LINK (1<<1) diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c index 9243b7f..29706d0 100644 --- a/src/openvpn/mtcp.c +++ b/src/openvpn/mtcp.c @@ -29,6 +29,8 @@ #include "multi.h" #include "forward.h" +#include "mtcp.h" +#include "multi_io.h" #include "memdbg.h" @@ -36,31 +38,6 @@ #include #endif -/* - * TCP States - */ -#define TA_UNDEF 0 -#define TA_SOCKET_READ 1 -#define TA_SOCKET_READ_RESIDUAL 2 -#define TA_SOCKET_WRITE 3 -#define TA_SOCKET_WRITE_READY 4 -#define TA_SOCKET_WRITE_DEFERRED 5 -#define TA_TUN_READ 6 -#define TA_TUN_WRITE 7 -#define TA_INITIAL 8 -#define TA_TIMEOUT 9 -#define TA_TUN_WRITE_TIMEOUT 10 - -/* - * Special tags passed to event.[ch] functions - */ -#define MTCP_SOCKET ((void *)1) -#define MTCP_TUN ((void *)2) -#define MTCP_SIG ((void *)3) /* Only on Windows */ -#define MTCP_MANAGEMENT ((void *)4) -#define MTCP_FILE_CLOSE_WRITE ((void *)5) -#define MTCP_DCO ((void *)6) - struct ta_iow_flags { unsigned int flags; @@ -69,52 +46,7 @@ unsigned int sock; }; -#ifdef ENABLE_DEBUG -static const char * -pract(int action) -{ - switch (action) - { - case TA_UNDEF: - return "TA_UNDEF"; - - case TA_SOCKET_READ: - return "TA_SOCKET_READ"; - - case TA_SOCKET_READ_RESIDUAL: - return "TA_SOCKET_READ_RESIDUAL"; - - case TA_SOCKET_WRITE: - return "TA_SOCKET_WRITE"; - - case TA_SOCKET_WRITE_READY: - return "TA_SOCKET_WRITE_READY"; - - case TA_SOCKET_WRITE_DEFERRED: - return "TA_SOCKET_WRITE_DEFERRED"; - - case TA_TUN_READ: - return "TA_TUN_READ"; - - case TA_TUN_WRITE: - return "TA_TUN_WRITE"; - - case TA_INITIAL: - return "TA_INITIAL"; - - case TA_TIMEOUT: - return "TA_TIMEOUT"; - - case TA_TUN_WRITE_TIMEOUT: - return "TA_TUN_WRITE_TIMEOUT"; - - default: - return "?"; - } -} -#endif /* ENABLE_DEBUG */ - -static struct multi_instance * +struct multi_instance * multi_create_instance_tcp(struct multi_context *m, struct link_socket *ls) { struct gc_arena gc =3D gc_new(); @@ -194,126 +126,42 @@ mbuf_free(mi->tcp_link_out_deferred); } -struct multi_tcp * -multi_tcp_init(int maxevents, int *maxclients) -{ - struct multi_tcp *mtcp; - const int extra_events =3D BASE_N_EVENTS; - - ASSERT(maxevents >=3D 1); - ASSERT(maxclients); - - ALLOC_OBJ_CLEAR(mtcp, struct multi_tcp); - mtcp->maxevents =3D maxevents + extra_events; - mtcp->es =3D event_set_init(&mtcp->maxevents, 0); - wait_signal(mtcp->es, MTCP_SIG); - ALLOC_ARRAY(mtcp->esr, struct event_set_return, mtcp->maxevents); - *maxclients =3D max_int(min_int(mtcp->maxevents - extra_events, *maxcl= ients), 1); - msg(D_MULTI_LOW, "MULTI: TCP INIT maxclients=3D%d maxevents=3D%d", *ma= xclients, mtcp->maxevents); - return mtcp; -} - void -multi_tcp_delete_event(struct multi_tcp *mtcp, event_t event) +multi_tcp_delete_event(struct multi_protocol *multi_io, event_t event) { - if (mtcp && mtcp->es) + if (multi_io && multi_io->es) { - event_del(mtcp->es, event); + event_del(multi_io->es, event); } } void -multi_tcp_free(struct multi_tcp *mtcp) -{ - if (mtcp) - { - event_free(mtcp->es); - free(mtcp->esr); - free(mtcp); - } -} - -void -multi_tcp_dereference_instance(struct multi_tcp *mtcp, struct multi_instan= ce *mi) +multi_tcp_dereference_instance(struct multi_protocol *multi_io, struct mul= ti_instance *mi) { struct link_socket *ls =3D mi->context.c2.link_sockets[0]; if (ls && mi->socket_set_called) { - event_del(mtcp->es, socket_event_handle(ls)); + event_del(multi_io->es, socket_event_handle(ls)); mi->socket_set_called =3D false; } - mtcp->n_esr =3D 0; + multi_io->n_esr =3D 0; } -static inline void +void multi_tcp_set_global_rw_flags(struct multi_context *m, struct multi_instan= ce *mi) { if (mi) { mi->socket_set_called =3D true; socket_set(mi->context.c2.link_sockets[0], - m->mtcp->es, + m->multi_io->es, mbuf_defined(mi->tcp_link_out_deferred) ? EVENT_WRITE := EVENT_READ, &mi->ev_arg, &mi->tcp_rwflags); } } -static inline int -multi_tcp_wait(const struct context *c, - struct multi_tcp *mtcp) -{ - int status, i; - - for (i =3D 0; i < c->c1.link_sockets_num; i++) - { - socket_set_listen_persistent(c->c2.link_sockets[i], mtcp->es, - &c->c2.link_sockets[i]->ev_arg); - } - -#ifdef _WIN32 - if (tuntap_is_wintun(c->c1.tuntap)) - { - if (!tuntap_ring_empty(c->c1.tuntap)) - { - /* there is data in wintun ring buffer, read it immediately */ - mtcp->esr[0].arg =3D MTCP_TUN; - mtcp->esr[0].rwflags =3D EVENT_READ; - mtcp->n_esr =3D 1; - return 1; - } - persistent =3D NULL; - } -#endif - - tun_set(c->c1.tuntap, mtcp->es, EVENT_READ, MTCP_TUN, &mtcp->tun_rwfla= gs); -#if defined(TARGET_LINUX) || defined(TARGET_FREEBSD) - dco_event_set(&c->c1.tuntap->dco, mtcp->es, MTCP_DCO); -#endif - -#ifdef ENABLE_MANAGEMENT - if (management) - { - management_socket_set(management, mtcp->es, MTCP_MANAGEMENT, &mtcp= ->management_persist_flags); - } -#endif - -#ifdef ENABLE_ASYNC_PUSH - /* arm inotify watcher */ - event_ctl(mtcp->es, c->c2.inotify_fd, EVENT_READ, MTCP_FILE_CLOSE_WRIT= E); -#endif - - status =3D event_wait(mtcp->es, &c->c2.timeval, mtcp->esr, mtcp->maxev= ents); - update_time(); - mtcp->n_esr =3D 0; - if (status > 0) - { - mtcp->n_esr =3D status; - } - return status; -} - -static inline struct context * +struct context * multi_tcp_context(struct multi_context *m, struct multi_instance *mi) { if (mi) @@ -326,7 +174,7 @@ } } -static bool +bool multi_tcp_process_outgoing_link_ready(struct multi_context *m, struct mult= i_instance *mi, const unsigned int mpp_flags) { struct mbuf_item item; @@ -350,7 +198,7 @@ return ret; } -static bool +bool multi_tcp_process_outgoing_link(struct multi_context *m, bool defer, const= unsigned int mpp_flags) { struct multi_instance *mi =3D multi_process_outgoing_link_pre(m); @@ -394,429 +242,6 @@ return ret; } -static int -multi_tcp_wait_lite(struct multi_context *m, struct multi_instance *mi, co= nst int action, bool *tun_input_pending) -{ - struct context *c =3D multi_tcp_context(m, mi); - unsigned int looking_for =3D 0; - - dmsg(D_MULTI_DEBUG, "MULTI TCP: multi_tcp_wait_lite a=3D%s mi=3D" ptr_= format, - pract(action), - (ptr_type)mi); - - tv_clear(&c->c2.timeval); /* ZERO-TIMEOUT */ - - switch (action) - { - case TA_TUN_READ: - looking_for =3D TUN_READ; - tun_input_pending =3D NULL; - io_wait(c, IOW_READ_TUN); - break; - - case TA_SOCKET_READ: - looking_for =3D SOCKET_READ; - tun_input_pending =3D NULL; - io_wait(c, IOW_READ_LINK); - break; - - case TA_TUN_WRITE: - looking_for =3D TUN_WRITE; - tun_input_pending =3D NULL; - c->c2.timeval.tv_sec =3D 1; /* For some reason, the Linux 2.2 = TUN/TAP driver hits this timeout */ - perf_push(PERF_PROC_OUT_TUN_MTCP); - io_wait(c, IOW_TO_TUN); - perf_pop(); - break; - - case TA_SOCKET_WRITE: - looking_for =3D SOCKET_WRITE; - io_wait(c, IOW_TO_LINK|IOW_READ_TUN_FORCE); - break; - - default: - msg(M_FATAL, "MULTI TCP: multi_tcp_wait_lite, unhandled action= =3D%d", action); - } - - if (tun_input_pending && (c->c2.event_set_status & TUN_READ)) - { - *tun_input_pending =3D true; - } - - if (c->c2.event_set_status & looking_for) - { - return action; - } - else - { - switch (action) - { - /* TCP socket output buffer is full */ - case TA_SOCKET_WRITE: - return TA_SOCKET_WRITE_DEFERRED; - - /* TUN device timed out on accepting write */ - case TA_TUN_WRITE: - return TA_TUN_WRITE_TIMEOUT; - } - - return TA_UNDEF; - } -} - -static struct multi_instance * -multi_tcp_dispatch(struct multi_context *m, struct multi_instance *mi, con= st int action) -{ - const unsigned int mpp_flags =3D MPP_PRE_SELECT|MPP_RECORD_TOUCH; - struct multi_instance *touched =3D mi; - m->mpp_touched =3D &touched; - - dmsg(D_MULTI_DEBUG, "MULTI TCP: multi_tcp_dispatch a=3D%s mi=3D" ptr_f= ormat, - pract(action), - (ptr_type)mi); - - switch (action) - { - case TA_TUN_READ: - read_incoming_tun(&m->top); - if (!IS_SIG(&m->top)) - { - multi_process_incoming_tun(m, mpp_flags); - } - break; - - case TA_SOCKET_READ: - case TA_SOCKET_READ_RESIDUAL: - ASSERT(mi); - ASSERT(mi->context.c2.link_sockets); - ASSERT(mi->context.c2.link_sockets[0]); - set_prefix(mi); - read_incoming_link(&mi->context, mi->context.c2.link_sockets[0= ]); - clear_prefix(); - if (!IS_SIG(&mi->context)) - { - multi_process_incoming_link(m, mi, mpp_flags, - mi->context.c2.link_sockets[0]= ); - if (!IS_SIG(&mi->context)) - { - stream_buf_read_setup(mi->context.c2.link_sockets[0]); - } - } - break; - - case TA_TIMEOUT: - multi_process_timeout(m, mpp_flags); - break; - - case TA_TUN_WRITE: - multi_process_outgoing_tun(m, mpp_flags); - break; - - case TA_TUN_WRITE_TIMEOUT: - multi_process_drop_outgoing_tun(m, mpp_flags); - break; - - case TA_SOCKET_WRITE_READY: - ASSERT(mi); - multi_tcp_process_outgoing_link_ready(m, mi, mpp_flags); - break; - - case TA_SOCKET_WRITE: - multi_tcp_process_outgoing_link(m, false, mpp_flags); - break; - - case TA_SOCKET_WRITE_DEFERRED: - multi_tcp_process_outgoing_link(m, true, mpp_flags); - break; - - case TA_INITIAL: - ASSERT(mi); - multi_tcp_set_global_rw_flags(m, mi); - multi_process_post(m, mi, mpp_flags); - break; - - default: - msg(M_FATAL, "MULTI TCP: multi_tcp_dispatch, unhandled action= =3D%d", action); - } - - m->mpp_touched =3D NULL; - return touched; -} - -static int -multi_tcp_post(struct multi_context *m, struct multi_instance *mi, const i= nt action) -{ - struct context *c =3D multi_tcp_context(m, mi); - int newaction =3D TA_UNDEF; - -#define MTP_NONE 0 -#define MTP_TUN_OUT (1<<0) -#define MTP_LINK_OUT (1<<1) - unsigned int flags =3D MTP_NONE; - - if (TUN_OUT(c)) - { - flags |=3D MTP_TUN_OUT; - } - if (LINK_OUT(c)) - { - flags |=3D MTP_LINK_OUT; - } - - switch (flags) - { - case MTP_TUN_OUT|MTP_LINK_OUT: - case MTP_TUN_OUT: - newaction =3D TA_TUN_WRITE; - break; - - case MTP_LINK_OUT: - newaction =3D TA_SOCKET_WRITE; - break; - - case MTP_NONE: - if (mi && sockets_read_residual(c)) - { - newaction =3D TA_SOCKET_READ_RESIDUAL; - } - else - { - multi_tcp_set_global_rw_flags(m, mi); - } - break; - - default: - { - struct gc_arena gc =3D gc_new(); - msg(M_FATAL, "MULTI TCP: multi_tcp_post bad state, mi=3D%s fla= gs=3D%d", - multi_instance_string(mi, false, &gc), - flags); - gc_free(&gc); - break; - } - } - - dmsg(D_MULTI_DEBUG, "MULTI TCP: multi_tcp_post %s -> %s", - pract(action), - pract(newaction)); - - return newaction; -} - -static void -multi_tcp_action(struct multi_context *m, struct multi_instance *mi, int a= ction, bool poll) -{ - bool tun_input_pending =3D false; - - do - { - dmsg(D_MULTI_DEBUG, "MULTI TCP: multi_tcp_action a=3D%s p=3D%d", - pract(action), - poll); - - /* - * If TA_SOCKET_READ_RESIDUAL, it means we still have pending - * input packets which were read by a prior TCP recv. - * - * Otherwise do a "lite" wait, which means we wait with 0 timeout - * on I/O events only related to the current instance, not - * the big list of events. - * - * On our first pass, poll will be false because we already know - * that input is available, and to call io_wait would be redundant. - */ - if (poll && action !=3D TA_SOCKET_READ_RESIDUAL) - { - const int orig_action =3D action; - action =3D multi_tcp_wait_lite(m, mi, action, &tun_input_pendi= ng); - if (action =3D=3D TA_UNDEF) - { - msg(M_FATAL, "MULTI TCP: I/O wait required blocking in mul= ti_tcp_action, action=3D%d", orig_action); - } - } - - /* - * Dispatch the action - */ - struct multi_instance *touched =3D multi_tcp_dispatch(m, mi, actio= n); - - /* - * Signal received or TCP connection - * reset by peer? - */ - if (touched && IS_SIG(&touched->context)) - { - if (mi =3D=3D touched) - { - mi =3D NULL; - } - multi_close_instance_on_signal(m, touched); - } - - - /* - * If dispatch produced any pending output - * for a particular instance, point to - * that instance. - */ - if (m->pending) - { - mi =3D m->pending; - } - - /* - * Based on the effects of the action, - * such as generating pending output, - * possibly transition to a new action state. - */ - action =3D multi_tcp_post(m, mi, action); - - /* - * If we are finished processing the original action, - * check if we have any TUN input. If so, transition - * our action state to processing this input. - */ - if (tun_input_pending && action =3D=3D TA_UNDEF) - { - action =3D TA_TUN_READ; - mi =3D NULL; - tun_input_pending =3D false; - poll =3D false; - } - else - { - poll =3D true; - } - - } while (action !=3D TA_UNDEF); -} - -static void -multi_tcp_process_io(struct multi_context *m) -{ - struct multi_tcp *mtcp =3D m->mtcp; - int i; - - for (i =3D 0; i < mtcp->n_esr; ++i) - { - struct event_set_return *e =3D &mtcp->esr[i]; - struct event_arg *ev_arg =3D (struct event_arg *)e->arg; - - /* incoming data for instance or listening socket? */ - if (e->arg >=3D MULTI_N) - { - switch (ev_arg->type) - { - struct multi_instance *mi; - - /* react to event on child instance */ - case EVENT_ARG_MULTI_INSTANCE: - if (!ev_arg->u.mi) - { - msg(D_MULTI_ERRORS, "MULTI: mtcp_proc_io: null min= stance"); - break; - } - - mi =3D ev_arg->u.mi; - if (e->rwflags & EVENT_WRITE) - { - multi_tcp_action(m, mi, TA_SOCKET_WRITE_READY, fal= se); - } - else if (e->rwflags & EVENT_READ) - { - multi_tcp_action(m, mi, TA_SOCKET_READ, false); - } - break; - - /* new incoming TCP client attempting to connect? */ - case EVENT_ARG_LINK_SOCKET: - if (!ev_arg->u.ls) - { - msg(D_MULTI_ERRORS, "MULTI: mtcp_proc_io: null soc= ket"); - break; - } - - socket_reset_listen_persistent(ev_arg->u.ls); - mi =3D multi_create_instance_tcp(m, ev_arg->u.ls); - if (mi) - { - multi_tcp_action(m, mi, TA_INITIAL, false); - } - break; - } - } - else - { -#ifdef ENABLE_MANAGEMENT - if (e->arg =3D=3D MTCP_MANAGEMENT) - { - ASSERT(management); - management_io(management); - } - else -#endif - /* incoming data on TUN? */ - if (e->arg =3D=3D MTCP_TUN) - { - if (e->rwflags & EVENT_WRITE) - { - multi_tcp_action(m, NULL, TA_TUN_WRITE, false); - } - else if (e->rwflags & EVENT_READ) - { - multi_tcp_action(m, NULL, TA_TUN_READ, false); - } - } - /* new incoming TCP client attempting to connect? */ - else if (e->arg =3D=3D MTCP_SOCKET) - { - struct multi_instance *mi; - ASSERT(m->top.c2.link_sockets[0]); - socket_reset_listen_persistent(m->top.c2.link_sockets[0]); - mi =3D multi_create_instance_tcp(m, m->top.c2.link_sockets= [0]); - if (mi) - { - multi_tcp_action(m, mi, TA_INITIAL, false); - } - } -#if defined(ENABLE_DCO) && (defined(TARGET_LINUX) || defined(TARGET_FREEBS= D)) - /* incoming data on DCO? */ - else if (e->arg =3D=3D MTCP_DCO) - { - multi_process_incoming_dco(m); - } -#endif - /* signal received? */ - else if (e->arg =3D=3D MTCP_SIG) - { - get_signal(&m->top.sig->signal_received); - } -#ifdef ENABLE_ASYNC_PUSH - else if (e->arg =3D=3D MTCP_FILE_CLOSE_WRITE) - { - multi_process_file_closed(m, MPP_PRE_SELECT | MPP_RECORD_T= OUCH); - } -#endif - } - if (IS_SIG(&m->top)) - { - break; - } - } - mtcp->n_esr =3D 0; - - /* - * Process queued mbuf packets destined for TCP socket - */ - { - struct multi_instance *mi; - while (!IS_SIG(&m->top) && (mi =3D mbuf_peek(m->mbuf)) !=3D NULL) - { - multi_tcp_action(m, mi, TA_SOCKET_WRITE, true); - } - } -} - /* * Top level event loop for single-threaded operation. * TCP mode. @@ -864,7 +289,7 @@ /* wait on tun/socket list */ multi_get_timeout(&multi, &multi.top.c2.timeval); - status =3D multi_tcp_wait(&multi.top, multi.mtcp); + status =3D multi_protocol_io_wait(&multi); MULTI_CHECK_SIG(&multi); /* check on status of coarse timers */ @@ -874,12 +299,12 @@ if (status > 0) { /* process the I/O which triggered select */ - multi_tcp_process_io(&multi); + multi_protocol_process_io(&multi); MULTI_CHECK_SIG(&multi); } else if (status =3D=3D 0) { - multi_tcp_action(&multi, NULL, TA_TIMEOUT, false); + multi_protocol_action(&multi, NULL, TA_TIMEOUT, false); } perf_pop(); diff --git a/src/openvpn/mtcp.h b/src/openvpn/mtcp.h index 886d2cc..e48481a 100644 --- a/src/openvpn/mtcp.h +++ b/src/openvpn/mtcp.h @@ -30,34 +30,25 @@ #include "event.h" -/* - * Extra state info needed for TCP mode - */ -struct multi_tcp -{ - struct event_set *es; - struct event_set_return *esr; - int n_esr; - int maxevents; - unsigned int tun_rwflags; -#ifdef ENABLE_MANAGEMENT - unsigned int management_persist_flags; -#endif -}; - struct multi_instance; struct context; -struct multi_tcp *multi_tcp_init(int maxevents, int *maxclients); - -void multi_tcp_free(struct multi_tcp *mtcp); - -void multi_tcp_dereference_instance(struct multi_tcp *mtcp, struct multi_i= nstance *mi); +void multi_tcp_dereference_instance(struct multi_protocol *multi_io, struc= t multi_instance *mi); bool multi_tcp_instance_specific_init(struct multi_context *m, struct mult= i_instance *mi); void multi_tcp_instance_specific_free(struct multi_instance *mi); +struct context *multi_tcp_context(struct multi_context *m, struct multi_in= stance *mi); + +void multi_tcp_set_global_rw_flags(struct multi_context *m, struct multi_i= nstance *mi); + +bool multi_tcp_process_outgoing_link(struct multi_context *m, bool defer, = const unsigned int mpp_flags); + +bool multi_tcp_process_outgoing_link_ready(struct multi_context *m, struct= multi_instance *mi, const unsigned int mpp_flags); + +struct multi_instance *multi_create_instance_tcp(struct multi_context *m, = struct link_socket *ls); + void multi_tcp_link_out_deferred(struct multi_context *m, struct multi_ins= tance *mi); @@ -71,6 +62,6 @@ void tunnel_server_tcp(struct context *top); -void multi_tcp_delete_event(struct multi_tcp *mtcp, event_t event); +void multi_tcp_delete_event(struct multi_protocol *multi_io, event_t event= ); #endif /* ifndef MTCP_H */ diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index e7d742b..d7b4e3b 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -440,7 +440,7 @@ */ if (tcp_mode) { - m->mtcp =3D multi_tcp_init(t->options.max_clients, &m->max_clients= ); + m->multi_io =3D multi_protocol_init(t->options.max_clients, &m->ma= x_clients); } m->tcp_queue_limit =3D t->options.tcp_queue_limit; @@ -665,9 +665,9 @@ mi->did_iroutes =3D false; } - if (m->mtcp) + if (m->multi_io) { - multi_tcp_dereference_instance(m->mtcp, mi); + multi_tcp_dereference_instance(m->multi_io, mi); } mbuf_dereference_instance(m->mbuf, mi); @@ -745,7 +745,7 @@ initial_rate_limit_free(m->initial_rate_limiter); multi_reap_free(m->reaper); mroute_helper_free(m->route_helper); - multi_tcp_free(m->mtcp); + multi_protocol_free(m->multi_io); } } @@ -3978,9 +3978,9 @@ management_delete_event(void *arg, event_t event) { struct multi_context *m =3D (struct multi_context *) arg; - if (m->mtcp) + if (m->multi_io) { - multi_tcp_delete_event(m->mtcp, event); + multi_tcp_delete_event(m->multi_io, event); } } diff --git a/src/openvpn/multi.h b/src/openvpn/multi.h index e2e5ef6..a25aeda 100644 --- a/src/openvpn/multi.h +++ b/src/openvpn/multi.h @@ -37,6 +37,7 @@ #include "pool.h" #include "mudp.h" #include "mtcp.h" +#include "multi_io.h" #include "perf.h" #include "vlan.h" #include "reflect_filter.h" @@ -169,8 +170,8 @@ struct mbuf_set *mbuf; /**< Set of buffers for passing data * channel packets between VPN tunnel * instances. */ - struct multi_tcp *mtcp; /**< State specific to OpenVPN using TCP - * as external transport. */ + struct multi_protocol *multi_io; /**< State specific to OpenVPN us= ing TCP + * as external transport. */ struct ifconfig_pool *ifconfig_pool; struct frequency_limit *new_connection_limiter; struct initial_packet_rate_limit *initial_rate_limiter; diff --git a/src/openvpn/multi_io.c b/src/openvpn/multi_io.c new file mode 100644 index 0000000..57ed10e --- /dev/null +++ b/src/openvpn/multi_io.c @@ -0,0 +1,619 @@ +/* + * OpenVPN -- An application to securely tunnel IP networks + * over a single TCP/UDP port, with support for SSL/TLS-based + * session authentication and key exchange, + * packet encryption, packet authentication, and + * packet compression. + * + * Copyright (C) 2002-2023 OpenVPN Inc + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "syshead.h" + +#include "memdbg.h" + +#include "multi.h" +#include "forward.h" +#include "multi_io.h" + +#ifdef HAVE_SYS_INOTIFY_H +#include +#endif + +/* + * Special tags passed to event.[ch] functions + */ +#define MULTI_IO_SOCKET ((void *)1) +#define MULTI_IO_TUN ((void *)2) +#define MULTI_IO_SIG ((void *)3) /* Only on Windows */ +#define MULTI_IO_MANAGEMENT ((void *)4) +#define MULTI_IO_FILE_CLOSE_WRITE ((void *)5) +#define MULTI_IO_DCO ((void *)6) + +struct ta_iow_flags +{ + unsigned int flags; + unsigned int ret; + unsigned int tun; + unsigned int sock; +}; + +#ifdef ENABLE_DEBUG +static const char * +pract(int action) +{ + switch (action) + { + case TA_UNDEF: + return "TA_UNDEF"; + + case TA_SOCKET_READ: + return "TA_SOCKET_READ"; + + case TA_SOCKET_READ_RESIDUAL: + return "TA_SOCKET_READ_RESIDUAL"; + + case TA_SOCKET_WRITE: + return "TA_SOCKET_WRITE"; + + case TA_SOCKET_WRITE_READY: + return "TA_SOCKET_WRITE_READY"; + + case TA_SOCKET_WRITE_DEFERRED: + return "TA_SOCKET_WRITE_DEFERRED"; + + case TA_TUN_READ: + return "TA_TUN_READ"; + + case TA_TUN_WRITE: + return "TA_TUN_WRITE"; + + case TA_INITIAL: + return "TA_INITIAL"; + + case TA_TIMEOUT: + return "TA_TIMEOUT"; + + case TA_TUN_WRITE_TIMEOUT: + return "TA_TUN_WRITE_TIMEOUT"; + + default: + return "?"; + } +} +#endif /* ENABLE_DEBUG */ + +struct multi_protocol * +multi_protocol_init(int maxevents, int *maxclients) +{ + struct multi_protocol *multi_io; + const int extra_events =3D BASE_N_EVENTS; + + ASSERT(maxevents >=3D 1); + ASSERT(maxclients); + + ALLOC_OBJ_CLEAR(multi_io, struct multi_protocol); + multi_io->maxevents =3D maxevents + extra_events; + multi_io->es =3D event_set_init(&multi_io->maxevents, 0); + wait_signal(multi_io->es, MULTI_IO_SIG); + ALLOC_ARRAY(multi_io->esr, struct event_set_return, multi_io->maxevent= s); + *maxclients =3D max_int(min_int(multi_io->maxevents - extra_events, *m= axclients), 1); + msg(D_MULTI_LOW, "MULTI: TCP INIT maxclients=3D%d maxevents=3D%d", *ma= xclients, multi_io->maxevents); + return multi_io; +} + +void +multi_protocol_free(struct multi_protocol *multi_io) +{ + if (multi_io) + { + event_free(multi_io->es); + free(multi_io->esr); + free(multi_io); + } +} + +int +multi_protocol_io_wait(struct multi_context *m) +{ + int status, i; + unsigned int *persistent =3D &m->multi_io->tun_rwflags; + + for (i =3D 0; i < m->top.c1.link_sockets_num; i++) + { + socket_set_listen_persistent(m->top.c2.link_sockets[i], m->multi_i= o->es, + &m->top.c2.link_sockets[i]->ev_arg); + } + +#ifdef _WIN32 + if (tuntap_is_wintun(m->top.c1.tuntap)) + { + if (!tuntap_ring_empty(m->top.c1.tuntap)) + { + /* there is data in wintun ring buffer, read it immediately */ + m->multi_io->esr[0].arg =3D MULTI_IO_TUN; + m->multi_io->esr[0].rwflags =3D EVENT_READ; + m->multi_io->n_esr =3D 1; + return 1; + } + persistent =3D NULL; + } +#endif + tun_set(m->top.c1.tuntap, m->multi_io->es, EVENT_READ, MULTI_IO_TUN, p= ersistent); +#if defined(TARGET_LINUX) || defined(TARGET_FREEBSD) + dco_event_set(&m->top.c1.tuntap->dco, m->multi_io->es, MULTI_IO_DCO); +#endif + +#ifdef ENABLE_MANAGEMENT + if (management) + { + management_socket_set(management, m->multi_io->es, MULTI_IO_MANAGE= MENT, &m->multi_io->management_persist_flags); + } +#endif + +#ifdef ENABLE_ASYNC_PUSH + /* arm inotify watcher */ + event_ctl(m->multi_io->es, m->top.c2.inotify_fd, EVENT_READ, MULTI_IO_= FILE_CLOSE_WRITE); +#endif + + status =3D event_wait(m->multi_io->es, &m->top.c2.timeval, m->multi_io= ->esr, m->multi_io->maxevents); + update_time(); + m->multi_io->n_esr =3D 0; + if (status > 0) + { + m->multi_io->n_esr =3D status; + } + return status; +} + +static int +multi_protocol_wait_lite(struct multi_context *m, struct multi_instance *m= i, const int action, bool *tun_input_pending) +{ + struct context *c =3D multi_tcp_context(m, mi); + unsigned int looking_for =3D 0; + + dmsg(D_MULTI_DEBUG, "MULTI PROTOCOL: multi_protocol_wait_lite a=3D%s m= i=3D" ptr_format, + pract(action), + (ptr_type)mi); + + tv_clear(&c->c2.timeval); /* ZERO-TIMEOUT */ + + switch (action) + { + case TA_TUN_READ: + looking_for =3D TUN_READ; + tun_input_pending =3D NULL; + io_wait(c, IOW_READ_TUN); + break; + + case TA_SOCKET_READ: + looking_for =3D SOCKET_READ; + tun_input_pending =3D NULL; + io_wait(c, IOW_READ_LINK); + break; + + case TA_TUN_WRITE: + looking_for =3D TUN_WRITE; + tun_input_pending =3D NULL; + c->c2.timeval.tv_sec =3D 1; /* For some reason, the Linux 2.2 = TUN/TAP driver hits this timeout */ + perf_push(PERF_PROC_OUT_TUN_MTCP); + io_wait(c, IOW_TO_TUN); + perf_pop(); + break; + + case TA_SOCKET_WRITE: + looking_for =3D SOCKET_WRITE; + io_wait(c, IOW_TO_LINK|IOW_READ_TUN_FORCE); + break; + + default: + msg(M_FATAL, "MULTI PROTOCOL: multi_protocol_wait_lite, unhand= led action=3D%d", action); + } + + if (tun_input_pending && (c->c2.event_set_status & TUN_READ)) + { + *tun_input_pending =3D true; + } + + if (c->c2.event_set_status & looking_for) + { + return action; + } + else + { + switch (action) + { + /* MULTI PROTOCOL socket output buffer is full */ + case TA_SOCKET_WRITE: + return TA_SOCKET_WRITE_DEFERRED; + + /* TUN device timed out on accepting write */ + case TA_TUN_WRITE: + return TA_TUN_WRITE_TIMEOUT; + } + + return TA_UNDEF; + } +} + +static struct multi_instance * +multi_protocol_dispatch(struct multi_context *m, struct multi_instance *mi= , const int action) +{ + const unsigned int mpp_flags =3D MPP_PRE_SELECT|MPP_RECORD_TOUCH; + struct multi_instance *touched =3D mi; + m->mpp_touched =3D &touched; + + dmsg(D_MULTI_DEBUG, "MULTI PROTOCOL: multi_protocol_dispatch a=3D%s mi= =3D" ptr_format, + pract(action), + (ptr_type)mi); + + switch (action) + { + case TA_TUN_READ: + read_incoming_tun(&m->top); + if (!IS_SIG(&m->top)) + { + multi_process_incoming_tun(m, mpp_flags); + } + break; + + case TA_SOCKET_READ: + case TA_SOCKET_READ_RESIDUAL: + ASSERT(mi); + ASSERT(mi->context.c2.link_sockets); + ASSERT(mi->context.c2.link_sockets[0]); + set_prefix(mi); + read_incoming_link(&mi->context, mi->context.c2.link_sockets[0= ]); + clear_prefix(); + if (!IS_SIG(&mi->context)) + { + multi_process_incoming_link(m, mi, mpp_flags, + mi->context.c2.link_sockets[0]= ); + if (!IS_SIG(&mi->context)) + { + stream_buf_read_setup(mi->context.c2.link_sockets[0]); + } + } + break; + + case TA_TIMEOUT: + multi_process_timeout(m, mpp_flags); + break; + + case TA_TUN_WRITE: + multi_process_outgoing_tun(m, mpp_flags); + break; + + case TA_TUN_WRITE_TIMEOUT: + multi_process_drop_outgoing_tun(m, mpp_flags); + break; + + case TA_SOCKET_WRITE_READY: + ASSERT(mi); + multi_tcp_process_outgoing_link_ready(m, mi, mpp_flags); + break; + + case TA_SOCKET_WRITE: + multi_tcp_process_outgoing_link(m, false, mpp_flags); + break; + + case TA_SOCKET_WRITE_DEFERRED: + multi_tcp_process_outgoing_link(m, true, mpp_flags); + break; + + case TA_INITIAL: + ASSERT(mi); + multi_tcp_set_global_rw_flags(m, mi); + multi_process_post(m, mi, mpp_flags); + break; + + default: + msg(M_FATAL, "MULTI PROTOCOL: multi_protocol_dispatch, unhandl= ed action=3D%d", action); + } + + m->mpp_touched =3D NULL; + return touched; +} + +static int +multi_protocol_post(struct multi_context *m, struct multi_instance *mi, co= nst int action) +{ + struct context *c =3D multi_tcp_context(m, mi); + int newaction =3D TA_UNDEF; + +#define MTP_NONE 0 +#define MTP_TUN_OUT (1<<0) +#define MTP_LINK_OUT (1<<1) + unsigned int flags =3D MTP_NONE; + + if (TUN_OUT(c)) + { + flags |=3D MTP_TUN_OUT; + } + if (LINK_OUT(c)) + { + flags |=3D MTP_LINK_OUT; + } + + switch (flags) + { + case MTP_TUN_OUT|MTP_LINK_OUT: + case MTP_TUN_OUT: + newaction =3D TA_TUN_WRITE; + break; + + case MTP_LINK_OUT: + newaction =3D TA_SOCKET_WRITE; + break; + + case MTP_NONE: + if (mi && sockets_read_residual(c)) + { + newaction =3D TA_SOCKET_READ_RESIDUAL; + } + else + { + multi_tcp_set_global_rw_flags(m, mi); + } + break; + + default: + { + struct gc_arena gc =3D gc_new(); + msg(M_FATAL, "MULTI PROTOCOL: multi_protocol_post bad state, m= i=3D%s flags=3D%d", + multi_instance_string(mi, false, &gc), + flags); + gc_free(&gc); + break; + } + } + + dmsg(D_MULTI_DEBUG, "MULTI PROTOCOL: multi_protocol_post %s -> %s", + pract(action), + pract(newaction)); + + return newaction; +} + +void +multi_protocol_process_io(struct multi_context *m) +{ + struct multi_protocol *multi_io =3D m->multi_io; + int i; + + for (i =3D 0; i < multi_io->n_esr; ++i) + { + struct event_set_return *e =3D &multi_io->esr[i]; + struct event_arg *ev_arg =3D (struct event_arg *)e->arg; + + /* incoming data for instance or listening socket? */ + if (e->arg >=3D MULTI_N) + { + switch (ev_arg->type) + { + struct multi_instance *mi; + + /* react to event on child instance */ + case EVENT_ARG_MULTI_INSTANCE: + if (!ev_arg->u.mi) + { + msg(D_MULTI_ERRORS, "MULTI PROTOCOL: multi_proto_p= roc_io: null minstance"); + break; + } + + mi =3D ev_arg->u.mi; + if (e->rwflags & EVENT_WRITE) + { + multi_protocol_action(m, mi, TA_SOCKET_WRITE_READY= , false); + } + else if (e->rwflags & EVENT_READ) + { + multi_protocol_action(m, mi, TA_SOCKET_READ, false= ); + } + break; + + /* new incoming TCP client attempting to connect? */ + case EVENT_ARG_LINK_SOCKET: + if (!ev_arg->u.ls) + { + msg(D_MULTI_ERRORS, "MULTI PROTOCOL: multi_proto_p= roc_io: null socket"); + break; + } + + if (!proto_is_dgram(ev_arg->u.ls->info.proto)) + { + socket_reset_listen_persistent(ev_arg->u.ls); + mi =3D multi_create_instance_tcp(m, ev_arg->u.ls); + if (mi) + { + multi_protocol_action(m, mi, TA_INITIAL, false= ); + } + break; + } + } + } + else + { +#ifdef ENABLE_MANAGEMENT + if (e->arg =3D=3D MULTI_IO_MANAGEMENT) + { + ASSERT(management); + management_io(management); + } + else +#endif + /* incoming data on TUN? */ + if (e->arg =3D=3D MULTI_IO_TUN) + { + if (e->rwflags & EVENT_WRITE) + { + multi_protocol_action(m, NULL, TA_TUN_WRITE, false); + } + else if (e->rwflags & EVENT_READ) + { + multi_protocol_action(m, NULL, TA_TUN_READ, false); + } + } + /* new incoming TCP client attempting to connect? */ + else if (e->arg =3D=3D 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 =3D multi_create_instance_tcp(m, m->top.c2.link_sockets= [0]); + if (mi) + { + multi_protocol_action(m, mi, TA_INITIAL, false); + } + } +#if defined(ENABLE_DCO) && (defined(TARGET_LINUX) || defined(TARGET_FREEBS= D)) + /* incoming data on DCO? */ + else if (e->arg =3D=3D MULTI_IO_DCO) + { + multi_process_incoming_dco(m); + } +#endif + /* signal received? */ + else if (e->arg =3D=3D MULTI_IO_SIG) + { + get_signal(&m->top.sig->signal_received); + } +#ifdef ENABLE_ASYNC_PUSH + else if (e->arg =3D=3D MULTI_IO_FILE_CLOSE_WRITE) + { + multi_process_file_closed(m, MPP_PRE_SELECT | MPP_RECORD_T= OUCH); + } +#endif + } + if (IS_SIG(&m->top)) + { + break; + } + } + multi_io->n_esr =3D 0; + + /* + * Process queued mbuf packets destined for TCP socket + */ + { + struct multi_instance *mi; + while (!IS_SIG(&m->top) && (mi =3D mbuf_peek(m->mbuf)) !=3D NULL) + { + multi_protocol_action(m, mi, TA_SOCKET_WRITE, true); + } + } +} + +void +multi_protocol_action(struct multi_context *m, struct multi_instance *mi, = int action, bool poll) +{ + bool tun_input_pending =3D false; + + do + { + dmsg(D_MULTI_DEBUG, "MULTI PROTOCOL: multi_protocol_action a=3D%s = p=3D%d", + pract(action), + poll); + + /* + * If TA_SOCKET_READ_RESIDUAL, it means we still have pending + * input packets which were read by a prior recv. + * + * Otherwise do a "lite" wait, which means we wait with 0 timeout + * on I/O events only related to the current instance, not + * the big list of events. + * + * On our first pass, poll will be false because we already know + * that input is available, and to call io_wait would be redundant. + */ + if (poll && action !=3D TA_SOCKET_READ_RESIDUAL) + { + const int orig_action =3D action; + action =3D multi_protocol_wait_lite(m, mi, action, &tun_input_= pending); + if (action =3D=3D TA_UNDEF) + { + msg(M_FATAL, "MULTI PROTOCOL: I/O wait required blocking i= n multi_protocol_action, action=3D%d", orig_action); + } + } + + /* + * Dispatch the action + */ + struct multi_instance *touched =3D multi_protocol_dispatch(m, mi, = action); + + /* + * Signal received or connection + * reset by peer? + */ + if (touched && IS_SIG(&touched->context)) + { + if (mi =3D=3D touched) + { + mi =3D NULL; + } + multi_close_instance_on_signal(m, touched); + } + + + /* + * If dispatch produced any pending output + * for a particular instance, point to + * that instance. + */ + if (m->pending) + { + mi =3D m->pending; + } + + /* + * Based on the effects of the action, + * such as generating pending output, + * possibly transition to a new action state. + */ + action =3D multi_protocol_post(m, mi, action); + + /* + * If we are finished processing the original action, + * check if we have any TUN input. If so, transition + * our action state to processing this input. + */ + if (tun_input_pending && action =3D=3D TA_UNDEF) + { + action =3D TA_TUN_READ; + mi =3D NULL; + tun_input_pending =3D false; + poll =3D false; + } + else + { + poll =3D true; + } + + } while (action !=3D TA_UNDEF); +} + +void +multi_protocol_delete_event(struct multi_protocol *multi_io, event_t event) +{ + if (multi_io && multi_io->es) + { + event_del(multi_io->es, event); + } +} diff --git a/src/openvpn/multi_io.h b/src/openvpn/multi_io.h new file mode 100644 index 0000000..07fc935 --- /dev/null +++ b/src/openvpn/multi_io.h @@ -0,0 +1,77 @@ +/* + * OpenVPN -- An application to securely tunnel IP networks + * over a single TCP/UDP port, with support for SSL/TLS-based + * session authentication and key exchange, + * packet encryption, packet authentication, and + * packet compression. + * + * Copyright (C) 2002-2023 OpenVPN Inc + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +/* + * Multi-protocol specific code for --mode server + */ + +#ifndef MULTI_IO_H +#define MULTI_IO_H + +#include "event.h" + +/* + * I/O processing States + */ + +#define TA_UNDEF 0 +#define TA_SOCKET_READ 1 +#define TA_SOCKET_READ_RESIDUAL 2 +#define TA_SOCKET_WRITE 3 +#define TA_SOCKET_WRITE_READY 4 +#define TA_SOCKET_WRITE_DEFERRED 5 +#define TA_TUN_READ 6 +#define TA_TUN_WRITE 7 +#define TA_INITIAL 8 +#define TA_TIMEOUT 9 +#define TA_TUN_WRITE_TIMEOUT 10 + +/* + * Extra state info needed for Multi-protocol + */ +struct multi_protocol +{ + struct event_set *es; + struct event_set_return *esr; + int n_esr; + int maxevents; + unsigned int tun_rwflags; + unsigned int udp_flags; +#ifdef ENABLE_MANAGEMENT + unsigned int management_persist_flags; +#endif +}; + +struct multi_protocol *multi_protocol_init(int maxevents, int *maxclients); + +void multi_protocol_free(struct multi_protocol *multi_io); + +int multi_protocol_io_wait(struct multi_context *m); + +void multi_protocol_process_io(struct multi_context *m); + +void multi_protocol_action(struct multi_context *m, struct multi_instance = *mi, int action, bool poll); + +void multi_protocol_delete_event(struct multi_protocol *multi_io, event_t = event); + +#endif /* ifndef MULTI_IO_H */ diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index f152071..5c7186e 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -1123,7 +1123,9 @@ /* force binding IPv6-only if an address was specified * an it is a IPv6 */ if (sock->local_host && ai_family =3D=3D AF_INET6) + { v6only =3D true; + } socket_bind(sock->sd, sock->info.lsa->bind_local, ai_family, "TCP/UDP", v6only); -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/763?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I1e5a84969988e4f027a18658d4ab268c13fbf929 Gerrit-Change-Number: 763 Gerrit-PatchSet: 1 Gerrit-Owner: its_Giaan Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --q8UkSwkReAo= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos.

its_Giaan would like plaisthos and flichtenheld to review this change.

Vi= ew Change

multiproto: move generic event handling code in dedicated fil=
es

Introduced multi_io.h and multi_io.c files to centralize
= all codes related to multiple protocols.

Renamed the struct m= tcp to struct multi_protocol since it
encompasses the event_set used= by the parent context in server mode.

Several methods have also= been renamed and moved to fit the
multiproto structure:

= - multi_tcp_init() -> multi_protocol_init();
- multi_tcp_free() -= > multi_protocol_free();
- multi_tcp_wait() -> multi_protocol_= io_wait();
and so forth.

Change-Id: I1e5a84969988e4f027a18658= d4ab268c13fbf929
Signed-off-by: Gianmarco De Gregori <gianmarco@...1664...= 26...>
---
M CMakeLists.txt
M src/openvpn/Makefile.am
M src/= openvpn/forward.h
M src/openvpn/mtcp.c
M src/openvpn/mtcp.h
M src/= openvpn/multi.c
M src/openvpn/multi.h
A src/openvpn/multi_io.c
A s= rc/openvpn/multi_io.h
M src/openvpn/socket.c
10 files changed, 740 in= sertions(+), 621 deletions(-)

git pull ssh://gerrit.openvpn.net:2=
9418/openvpn refs/changes/63/763/1
diff --git a/CMakeLists.txt b/CM=
akeLists.txt
index ad620fa..38df4ef 100644
= --- a/CMakeLists.txt
+++ b/CMakeLists.txt
@= @ -455,6 +455,8 @@
src/openvpn/mudp.h
= src/openvpn/multi.c
src/openvpn/multi.h+ src/openvpn/multi_io.h
+ src/openvpn/multi_= io.c
src/openvpn/ntlm.c
src/openv= pn/ntlm.h
src/openvpn/occ.c
diff --git= a/src/openvpn/Makefile.am b/src/openvpn/Makefile.am
index = 3784a98..d9cb599 100644
--- a/src/openvpn/Makefile.am
+++ b/src/openvpn/Makefile.am
@@ -92,6 +92,7 @@<= /span>
mtu.c mtu.h \
mudp.c mudp.h \ multi.c multi.h \
+ multi_io.c multi_io.h \
networking_freebsd.c \
networking_iproute2.c networking_iproute2.h \
networking_sitnl.c networking_sitnl.h \

diff --git a/s= rc/openvpn/forward.h b/src/openvpn/forward.h
index 6840b1a.= .3acbdd0 100644
--- a/src/openvpn/forward.h
+++ b/src/openvpn/forward.h

@@ -50,6 +50,7 @@
#include "openvpn.h"

#include "occ.h&q= uot;
#include "ping.h"
+#include "multi_io.h"

#define IOW_TO_TUN (1<<0)
#define IOW_TO_LINK (1<<1)
diff --git a/= src/openvpn/mtcp.c b/src/openvpn/mtcp.c
index 9243b7f..2970= 6d0 100644
--- a/src/openvpn/mtcp.c
+++ b/s= rc/openvpn/mtcp.c
@@ -29,6 +29,8 @@

#include "multi.h"
#include "fo= rward.h"
+#inclu= de "mtcp.h"
+#include "multi_io.h"

#inclu= de "memdbg.h"

@@ -36,31 +38,6 @= @
#include <sys/inotify.h>
#endif

-/*

- * TCP States
= - */
-#define TA_UNDEF 0
-#define TA_SOCKET_READ 1
-#define TA_SOCKET_READ_R= ESIDUAL 2
-#define TA_= SOCKET_WRITE 3
-#define TA_SOCKET_WRITE_READY 4
-#define TA_SOCKET_WRITE_DEFERRED 5
-#define TA_TUN_READ 6
-#define TA_TUN_WRITE 7=
-#define TA_INITIAL = 8
-#define = TA_TIMEOUT 9
-#define TA_TUN_WRITE_TIMEOUT 10
-
-/*=
- * Special tags passe= d to event.[ch] functions
- */
-#define MTCP_S= OCKET ((void *)1)
= -#define MTCP_TUN ((void *)2)
-#define MTCP_SIG ((void *)3) /* Only on Windows */<= /span>
-#define MTCP_MANAGEMEN= T ((void *)4)
-#define = MTCP_FILE_CLOSE_WRITE ((void *)5)
-#define MTCP_DCO ((void *)6)
-
struct ta_iow_flags
<= span> {

unsigned int flags;
@@ -69,52 = +46,7 @@
unsigned int sock;
};=

-#ifdef ENA= BLE_DEBUG
-static const= char *
-pract(int acti= on)
-{
- switch (action)
- {
- case TA_UNDEF:
- return "TA_UNDEF";
-
- case TA_SOCKET_READ:
- return "TA_SOCKET_READ";
-
- case TA_SOCKET_READ_RESIDUAL:- return "TA_SO= CKET_READ_RESIDUAL";
-
- case TA_S= OCKET_WRITE:
- = return "TA_SOCKET_WRITE";
-
- = case TA_SOCKET_WRITE_READY:
- return "TA_SOCKET_WRITE_READY";
<= span style=3D"color: hsl(0, 100%, 40%);">-

- case TA_SOCKET_WRITE_DEFERRED:
- return "TA_SOCKET_WR= ITE_DEFERRED";
-
- case TA_TUN_REA= D:
- return = "TA_TUN_READ";
- case TA_TU= N_WRITE:
- r= eturn "TA_TUN_WRITE";
-
- cas= e TA_INITIAL:
- = return "TA_INITIAL";
-
- = case TA_TIMEOUT:
- = return "TA_TIMEOUT";
-
- = case TA_TUN_WRITE_TIMEOUT:
- return "TA_TUN_WRITE_TIMEOUT";
-

- default:
- return "?";
- }
-}
-#endif /* E= NABLE_DEBUG */
-=
-static struct multi_instance= *
+struct multi_inst= ance *
multi_create_instance_tcp(struct multi_context *m, = struct link_socket *ls)
{
struct gc_a= rena gc =3D gc_new();
@@ -194,126 +126,42 @@
mbuf_free(mi->tcp_link_out_deferred);
}
-struct multi= _tcp *
-multi_tcp_init(= int maxevents, int *maxclients)
-{
- struct= multi_tcp *mtcp;
- = const int extra_events =3D BASE_N_EVENTS;
-
- = ASSERT(maxevents >=3D 1);
- ASSERT(maxclients);
-
- ALLOC= _OBJ_CLEAR(mtcp, struct multi_tcp);
- mtcp->maxevents =3D maxevents + extra_events;- mtcp->es =3D event_set_= init(&mtcp->maxevents, 0);
- wait_signal(mtcp->es, MTCP_SIG);
- ALLOC_ARRAY(mtcp->esr, struct event_= set_return, mtcp->maxevents);
- *maxclients =3D max_int(min_int(mtcp->maxevents - extra_e= vents, *maxclients), 1);
- return mtcp;
-}
-
void
-mul= ti_tcp_delete_event(struct multi_tcp *mtcp, event_t event)
+multi_tcp_delete_event(struct multi_= protocol *multi_io, event_t event)
{
- if (mtcp && mtcp->es)=
+ if (multi_io &&= ; multi_io->es)
{
- event_del(mtcp->es, event);
+ event_del(multi_io->es, e= vent);
}
}
void
-multi_tc= p_free(struct multi_tcp *mtcp)
-{
- if (mtc= p)
- {
- event_free(mtcp->es);

- free(mtcp->es= r);
- free(mtcp)= ;
- }
-}
-
-vo= id
-multi_tcp_dereferen= ce_instance(struct multi_tcp *mtcp, struct multi_instance *mi)
+multi_tcp_dereference_instance(s= truct multi_protocol *multi_io, struct multi_instance *mi)
= {
struct link_socket *ls =3D mi->context.c2.link_s= ockets[0];
if (ls && mi->socket_set_called)=
{
- event_del(mtcp->es, socket_event_handle(ls));
+ event_del(multi_io->es, s= ocket_event_handle(ls));
mi->socket_set_called = =3D false;
}
- mtcp->n_esr =3D 0;
+ multi_io->n_esr =3D 0;
}
-static inlin= e void
+void multi_tcp_set_global_rw_flags(struct multi_context *m, struct mult= i_instance *mi)
{
if (mi)
<= span> {
mi->socket_set_called =3D true;
socket_set(mi->context.c2.link_sockets[0],<= br>- m->mtcp= ->es,
+ = m->multi_io->es,
mbuf_def= ined(mi->tcp_link_out_deferred) ? EVENT_WRITE : EVENT_READ,
&mi->ev_arg,

= &mi->tcp_rwflags);
}
}


-static= inline int
-multi_tcp_= wait(const struct context *c,
- struct multi_tcp *mtcp)
-{
- int status, i;
-
- for (i =3D 0; i= < c->c1.link_sockets_num; i++)
- {
-= socket_set_listen_persistent(c->c2.link_sockets[i], mtcp->es,=
- = &c->c2.link_sockets[i]->ev_arg);
- }
-
-= #ifdef _WIN32
- if (= tuntap_is_wintun(c->c1.tuntap))
- {
- = if (!tuntap_ring_empty(c->c1.tuntap))
- {
- /* there is data in wintun ring buffer, read it imm= ediately */
- = mtcp->esr[0].arg =3D MTCP_TUN;
- mtcp->esr[0].rwflags =3D EVENT_READ;- mtcp->n_esr =3D = 1;
- return = 1;
- }- persistent =3D NULL;
- }
-#endif
-
- = tun_set(c->c1.tuntap, mtcp->es, EVENT_READ, MTCP_TUN, &mtcp-&g= t;tun_rwflags);
-#if de= fined(TARGET_LINUX) || defined(TARGET_FREEBSD)
- dco_event_set(&c->c1.tuntap->dco, mt= cp->es, MTCP_DCO);
-= #endif
-
-#ifdef ENABLE_MANAGEMENT

<= span style=3D"color: hsl(0, 100%, 40%);">- if (management)
- {
- management_socket_set(management, mtcp->= es, MTCP_MANAGEMENT, &mtcp->management_persist_flags);
- }
-#endif
-
-#ifdef ENABL= E_ASYNC_PUSH
- /* ar= m inotify watcher */
- = event_ctl(mtcp->es, c->c2.inotify_fd, EVENT_READ, MTCP_FILE_CLOSE_= WRITE);
-#endif<= br>-
- status =3D event_wait(mtcp->es, &c->= c2.timeval, mtcp->esr, mtcp->maxevents);
- update_time();
- mtcp->n_esr =3D 0;
- if (status > 0)
- {
- mtcp->n_esr =3D status;
- }
- return status;
-}
-
-static inline struct context *

+struct context * multi_tcp_context(struct multi_context *m, struct multi_instance *= mi)
{
if (mi)
@@ -326= ,7 +174,7 @@
}
}

-static bool
+bool

multi_tcp_= process_outgoing_link_ready(struct multi_context *m, struct multi_instance = *mi, const unsigned int mpp_flags)
{
= struct mbuf_item item;
@@ -350,7 +198,7 @@
= return ret;
}

-static bool
+bool
multi_tcp_process_outgoing_li= nk(struct multi_context *m, bool defer, const unsigned int mpp_flags)
{
struct multi_instance *mi =3D multi_proc= ess_outgoing_link_pre(m);
@@ -394,429 +242,6 @@
<= span> return ret;

}

-static int
-multi_tcp_wait_lite(struct multi_context *m, stru= ct multi_instance *mi, const int action, bool *tun_input_pending)-{
- struct context *c =3D multi_tcp_context(m, mi);=
- unsigned int look= ing_for =3D 0;
-=
- dmsg(D_MULTI_DEBUG, &quo= t;MULTI TCP: multi_tcp_wait_lite a=3D%s mi=3D" ptr_format,
<= span style=3D"color: hsl(0, 100%, 40%);">- pract(action),- (ptr_type)mi);<= br>-
- tv_clear(&c->c2.timeval); /* ZERO-TIMEO= UT */
-
- switch (action)
- {
- case TA_TUN_READ:
- looking_for =3D TUN_READ;
- tun_input_pending =3D N= ULL;
- io_wa= it(c, IOW_READ_TUN);
- = break;
-

- case TA_SOCKET_RE= AD:
- lookin= g_for =3D SOCKET_READ;
= - tun_input_pending =3D NULL;
- io_wait(c, IOW_READ_LINK);
- break;
-
- case TA_TUN_WRITE:
- looking_for =3D TUN_WRITE;
- tun_input_pending =3D NULL;
- c->c2.ti= meval.tv_sec =3D 1; /* For some reason, the Linux 2.2 TUN/TAP driver hits t= his timeout */
- = perf_push(PERF_PROC_OUT_TUN_MTCP);
- io_wait(c, IOW_TO_TUN);
- perf_pop();
- break;
-
- case TA_SOCKET_WRITE:
- looking_for =3D SOCKET_WRITE;
- io_wait(c, IOW_TO_LINK|I= OW_READ_TUN_FORCE);

- = break;
-
- default:- msg(M_FATAL, "= MULTI TCP: multi_tcp_wait_lite, unhandled action=3D%d", action);

- }
-
- if (tun_input_pending && (c->c2.event_set_status = & TUN_READ))
- {=
- *tun_input_pe= nding =3D true;
- }<= /span>
-
- if (c->c2.event_set_status & loo= king_for)
- {=
- return action;
- }
- else
- {
- {
- = /* TCP socket output buffer is full */
- case TA_SOCKET_WRITE:
- return TA_SOCKET_WRITE_DE= FERRED;
-
- /* TUN device timed out= on accepting write */

= - case TA_TUN_WRITE:
- return TA_TUN_WRITE_TIMEOUT;
- }
-
-= return TA_UNDEF;
-}
<= span style=3D"color: hsl(0, 100%, 40%);">-

-static struct multi_instance *
-multi_tcp_dispatch(struct multi_context *m,= struct multi_instance *mi, const int action)
-{
- const unsigned int mpp_flags =3D MPP_PRE_SELECT|MPP_RECORD_TOUCH;
- struct multi_instan= ce *touched =3D mi;
- = m->mpp_touched =3D &touched;
-
- d= msg(D_MULTI_DEBUG, "MULTI TCP: multi_tcp_dispatch a=3D%s mi=3D" p= tr_format,
- pr= act(action),
- = (ptr_type)mi);
-=
- switch (action)- {
- case TA_TUN_READ:
- read_incoming_tun(&m->t= op);
- if (!= IS_SIG(&m->top))
- {
- = multi_process_incoming_tun(m, mpp_flags);
- }
- break;
-
-= case TA_SOCKET_READ:
- case TA_SOCKET_READ_RESIDUAL:
- ASSERT(mi);
- ASSERT(mi->context.c2.link_sockets)= ;
- ASSERT(m= i->context.c2.link_sockets[0]);
- set_prefix(mi);
- read_incoming_link(&mi->context, mi-&= gt;context.c2.link_sockets[0]);
- clear_prefix();
- if (!IS_SIG(&mi->context))
- {

- multi_process_incoming_link= (m, mi, mpp_flags,
- = mi->context.c2.link_sockets[0])= ;
- if (= !IS_SIG(&mi->context))
- {
- stream_buf_read_setup(mi->context.c2.link_socket= s[0]);
- = }
- }
- break;-
- case TA_TIMEOUT:
- multi_process_timeout(m, mpp_flags);=
- break;
-
- case TA_TUN_WRITE:
- multi_process_outgoing_tun= (m, mpp_flags);
- = break;
-- case TA_TUN_WRITE_TIME= OUT:
- multi= _process_drop_outgoing_tun(m, mpp_flags);
- break;
-
- = case TA_SOCKET_WRITE_READY:
- ASSERT(mi);
- multi_tcp_process_outgoing_link_ready(m, mi, mpp_fl= ags);
- brea= k;
-
- case TA_SOCKET_WRITE:
= - multi_tcp_process_ou= tgoing_link(m, false, mpp_flags);
- break;
-
- case= TA_SOCKET_WRITE_DEFERRED:
- multi_tcp_process_outgoing_link(m, true, mpp_flags);
- break;-
- case TA_INITIAL:
- ASSERT(mi);
- multi_tcp_set_global_rw_flags(m, m= i);
- multi_= process_post(m, mi, mpp_flags);
- break;
-
- defaul= t:
- msg(M_F= ATAL, "MULTI TCP: multi_tcp_dispatch, unhandled action=3D%d", act= ion);
- }
= -
- m->mpp_touched =3D NULL;
- return touched;
-}
-
-static in= t
-multi_tcp_post(struc= t multi_context *m, struct multi_instance *mi, const int action)
= -{
- struct context *c =3D multi_tcp_context(m, mi);<= /span>
- int newaction =3D = TA_UNDEF;
-
<= span style=3D"color: hsl(0, 100%, 40%);">-#define MTP_NONE 0
=
-#define MTP_TUN_OUT (1&= lt;<0)
-#define MTP_= LINK_OUT (1<<1)
- unsigned int flags =3D MTP_NONE;
-
- = if (TUN_OUT(c))
- = {
- flags |=3D M= TP_TUN_OUT;
- }
- if (LINK_OUT(c))
- {
- flags |=3D MTP_LINK_OUT;
= - }
-
- switch (flags)
- case = MTP_TUN_OUT|MTP_LINK_OUT:
- case MTP_TUN_OUT:
- newaction =3D TA_TUN_WRITE;
- break;
-
- case MTP_LINK_OUT:
- newaction =3D TA_SOCKET_WRITE;
- break;
-
- case MTP_NONE:
- if (mi && sockets_read_residual(c))
- {

- newaction =3D TA_SOCKET_REA= D_RESIDUAL;
- = }
- else
- {- multi_tcp_set_g= lobal_rw_flags(m, mi);
= - }
- = break;
-- default:
- {

- struct gc_arena gc =3D gc_new();
- msg(M_FATAL, = "MULTI TCP: multi_tcp_post bad state, mi=3D%s flags=3D%d",=
- multi_instan= ce_string(mi, false, &gc),
- flags);
- gc_free(&gc);
- break;
- }
- }
-
<= span style=3D"color: hsl(0, 100%, 40%);">- dmsg(D_MULTI_DEBUG, "MUL= TI TCP: multi_tcp_post %s -> %s",

- pract(action),
- pract(newaction));
-
- return newaction;
-}
-
-static void

-multi_tcp_action(struct multi_context *m, s= truct multi_instance *mi, int action, bool poll)
-{
- bool tun_input_pending =3D false;
-
- do
- {<= br>- dmsg(D_MULTI_DEBUG, &= quot;MULTI TCP: multi_tcp_action a=3D%s p=3D%d",
- pract(action),
- poll);

-
- /*
- * If TA_SOCKET_READ_RESIDUAL, it means we still have pending
- * input packet= s which were read by a prior TCP recv.
- *
- * Otherwise do a "lite" wait, which means we wait = with 0 timeout
- = * on I/O events only related to the current instance, not
- * the big list of events.
- *
- * On our first pass, poll = will be false because we already know

- * that input is available, and to call io_wait wou= ld be redundant.
- = */
- if (pol= l && action !=3D TA_SOCKET_READ_RESIDUAL)
- {
- const int orig_action =3D action;
- action =3D multi_tcp_wa= it_lite(m, mi, action, &tun_input_pending);

- if (action =3D=3D TA_UNDEF)- {
- msg(M_FATAL, "MULT= I TCP: I/O wait required blocking in multi_tcp_action, action=3D%d", o= rig_action);
- = }
- }<= br>-
- /*
- * Dispatch the action
- */
- struct multi_instance *touched =3D multi_tcp_dispatch(= m, mi, action);
-
- /*
- * Signal received or TCP conn= ection
- * rese= t by peer?
- */=
- if (touched &= amp;& IS_SIG(&touched->context))
- {
- if (mi =3D=3D touched)
- {
- mi =3D NULL;
- }
- multi_close_instance_on_signal(m, touched);
- }
-
-
- = /*
- * If dis= patch produced any pending output
- * for a particular instance, point to
- * that instance.
- */

- if (m->pending)
- {
- mi =3D m->pending;
- }
-
- /*
- = * Based on the effects of the action,
- * such as generating pending output,
<= span style=3D"color: hsl(0, 100%, 40%);">- * possibly transition to= a new action state.

- = */
- act= ion =3D multi_tcp_post(m, mi, action);
-
- = /*
- * If w= e are finished processing the original action,
- * check if we have any TUN input. If so,= transition
- *= our action state to processing this input.
- */
- if (tun_input_pending && action =3D=3D TA_UNDEF= )
- {
= - action =3D TA_TUN_RE= AD;
- mi =3D= NULL;
- tun= _input_pending =3D false;
- poll =3D false;
- }
- = else
- {
- poll =3D tr= ue;
- }-
- } while (action !=3D TA_UNDEF);
-}

-
-sta= tic void
-multi_tcp_pro= cess_io(struct multi_context *m)
-{
- struc= t multi_tcp *mtcp =3D m->mtcp;
- int i;
= -
- for (i =3D 0; i = < mtcp->n_esr; ++i)
- {
- stru= ct event_set_return *e =3D &mtcp->esr[i];
- struct event_arg *ev_arg =3D (struct eve= nt_arg *)e->arg;
-
- /* incoming dat= a for instance or listening socket? */
- if (e->arg >=3D MULTI_N)
- {
- switch (ev_arg->type)
- {
- struct multi_instance *mi;
-
- /* react to event on child ins= tance */
- = case EVENT_ARG_MULTI_INSTANCE:
- if (!ev_arg->u.mi)
- {
- msg(D_MULTI_ERRORS,= "MULTI: mtcp_proc_io: null minstance");
- break;
- }

-

- mi =3D ev_arg->u.mi;
- if (e->rwflag= s & EVENT_WRITE)

- = {
- = multi_tcp_action(m, mi, TA_SOCKET_WRITE_READY, false= );
- = }
- = else if (e->rwflags & EVENT_READ)
- {
- multi_tcp_action(m, mi, TA_SOCK= ET_READ, false);
- = }
- = break;
-=
- /* ne= w incoming TCP client attempting to connect? */
- case EVENT_ARG_LINK_SOCKET:
- if (!ev= _arg->u.ls)
- = {
- = msg(D_MULTI_ERRORS, "MULTI: mtcp_proc_io: null socket= ");
- = break;
- = }
-
- socke= t_reset_listen_persistent(ev_arg->u.ls);
- mi =3D multi_create_instance_tcp(= m, ev_arg->u.ls);
- = if (mi)
- {
- multi_tcp_action(m, mi, TA_INITIAL, false);
- }
- brea= k;
- }
- }
- else
- {
-#ifdef ENABLE_MANAGEMENT
- if (e->arg =3D=3D MTCP_MANAGEMENT)<= br>- {
- ASSERT(management);
- managem= ent_io(management);
- = }
- = else
-#endif- /* incoming data o= n TUN? */
- = if (e->arg =3D=3D MTCP_TUN)
- {
= - if (e->rwflags & EVENT_WRITE)
- {
- multi_tcp_action(m, NULL, T= A_TUN_WRITE, false);
- = }
- = else if (e->rwflags & EVENT_READ)
- {
- multi_tcp_action(m, NULL, T= A_TUN_READ, false);
- = }
- = }
- /*= new incoming TCP client attempting to connect? */
- else if (e->arg =3D=3D MTCP_SOC= KET)
- {
- struct mu= lti_instance *mi;
- = ASSERT(m->top.c2.link_sockets[0]);
- socket_reset_listen_persistent(= m->top.c2.link_sockets[0]);
- mi =3D multi_create_instance_tcp(m, m->top.c2.l= ink_sockets[0]);
- = if (mi)
- = {
- = multi_tcp_action(m, mi, TA_INITIAL, false);
- }
- }
-#if defined(ENABLE_DCO) && (defined(TARGET_= LINUX) || defined(TARGET_FREEBSD))
- /* incoming data on DCO? */
- else if (e->arg =3D=3D MTCP_= DCO)
- {
- multi_pro= cess_incoming_dco(m);
-= }
-#endif
- /* signal r= eceived? */
- = else if (e->arg =3D=3D MTCP_SIG)
- {
- get_signal(&m->top.sig->signal_received);=
- }<= br>-#ifdef ENABLE_ASYNC_PUSH
- else if (e->= ;arg =3D=3D MTCP_FILE_CLOSE_WRITE)
- {
- multi_process_file_closed(m, MPP_PRE_SELECT | MPP_RECO= RD_TOUCH);
- = }
-#endif
- }

- if (IS_SIG(&m->top))
= - {
- break;
- }
- }
= - mtcp->n_esr =3D 0;
-
- /*- * Process queued mbuf pack= ets destined for TCP socket
- */
- {
- struct multi_ins= tance *mi;
- whi= le (!IS_SIG(&m->top) && (mi =3D mbuf_peek(m->mbuf)) !=3D = NULL)
- {=
- multi_tcp_action= (m, mi, TA_SOCKET_WRITE, true);
- }
- = }
-}
-
/*
= * Top level event loop for single-threaded operation.
* = TCP mode.
@@ -864,7 +289,7 @@

<= span> /* wait on tun/socket list */

multi_= get_timeout(&multi, &multi.top.c2.timeval);
- status =3D multi_tcp_wait(&mult= i.top, multi.mtcp);
+= status =3D multi_protocol_io_wait(&multi);
= MULTI_CHECK_SIG(&multi);

= /* check on status of coarse timers */
@@ -874,12 +299,12= @@
if (status > 0)
{<= /span>
/* process the I/O which triggered select */
- multi_tcp_p= rocess_io(&multi);
- multi_tcp_action(&= amp;multi, NULL, TA_TIMEOUT, false);
+ multi_protocol_action(&multi, NULL, TA_TIM= EOUT, false);
}

= perf_pop();
diff --git a/src/openvpn/mtcp.h b/src/= openvpn/mtcp.h
index 886d2cc..e48481a 100644
--- a/src/openvpn/mtcp.h

+++ b/src/openvpn/mtcp.h<= br>@@ -30,34 +30,25 @@

#include &q= uot;event.h"

-/*
- * Ex= tra state info needed for TCP mode
- */
-struc= t multi_tcp
-{- struct event_set *es;
- struct event_set_retur= n *esr;
- int n_esr;=
- int maxevents;
- unsigned int tun_rwf= lags;
-#ifdef ENABLE_MA= NAGEMENT
- unsigned = int management_persist_flags;
-#endif
-};
-
struct m= ulti_instance;
struct context;
-struct multi_tcp *multi_tcp_ini= t(int maxevents, int *maxclients);
-
-void mul= ti_tcp_free(struct multi_tcp *mtcp);
-
-void m= ulti_tcp_dereference_instance(struct multi_tcp *mtcp, struct multi_instance= *mi);
+void multi_tc= p_dereference_instance(struct multi_protocol *multi_io, struct multi_instan= ce *mi);

bool multi_tcp_instance_specifi= c_init(struct multi_context *m, struct multi_instance *mi);

void multi_tcp_instance_specific_free(struct multi_inst= ance *mi);

+struct context *multi_tcp_context(struct multi_context *m, struct = multi_instance *mi);
= +
+void multi_tcp_set= _global_rw_flags(struct multi_context *m, struct multi_instance *mi);

+
+bool multi_tcp_process_outgoing_link(struct = multi_context *m, bool defer, const unsigned int mpp_flags);
+

+bool multi_tcp_process_outgoing_link_ready(struct mul= ti_context *m, struct multi_instance *mi, const unsigned int mpp_flags);
+
+struct multi_instance *multi_create_insta= nce_tcp(struct multi_context *m, struct link_socket *ls);
+
void multi_tcp_link= _out_deferred(struct multi_context *m, struct multi_instance *mi);

@@ -71,6 +62,6 @@
void tunnel_server_tcp(struct context *top);


-void multi_t= cp_delete_event(struct multi_tcp *mtcp, event_t event);
+void multi_tcp_delete_event(struct mult= i_protocol *multi_io, event_t event);

#e= ndif /* ifndef MTCP_H */
diff --git a/src/openvpn/multi.c b= /src/openvpn/multi.c
index e7d742b..d7b4e3b 100644--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c=
@@ -440,7 +440,7 @@
*/
if (tcp_mode)

{
- m->mtcp =3D multi_tcp_init(t->options.= max_clients, &m->max_clients);
+ m->multi_io =3D multi_protocol_init(t->opti= ons.max_clients, &m->max_clients);
}
= m->tcp_queue_limit =3D t->options.tcp_queue_limit;<= br>
@@ -665,9 +665,9 @@
= mi->did_iroutes =3D false;
}
=
- if (m->mtc= p)
+ if (m->= ;multi_io)
{
- multi_tcp_dereference_instance(m->mtcp, mi);=
+ multi_t= cp_dereference_instance(m->multi_io, mi);
}

mbuf_dereference_instance(m->mbu= f, mi);
@@ -745,7 +745,7 @@
initia= l_rate_limit_free(m->initial_rate_limiter);
mul= ti_reap_free(m->reaper);
mroute_helper_free(m-&= gt;route_helper);
- = multi_tcp_free(m->mtcp);
+ multi_protocol_free(m->multi_io);
= }
}

@@ -3978,9 +3978,= 9 @@
management_delete_event(void *arg, event_t event)
{
struct multi_context *m =3D (struct mu= lti_context *) arg;
- = if (m->mtcp)
+ = if (m->multi_io)
{
- multi_tcp_delete_event(m->mtcp, event);
+ multi_tcp_del= ete_event(m->multi_io, event);
}
}=

diff --git a/src/openvpn/multi.h b/src/o= penvpn/multi.h
index e2e5ef6..a25aeda 100644
--- a/src/openvpn/multi.h

+++ b/src/openvpn/multi.h
@@ -37,6 +37,7 @@
#include "pool.h"
#include "mudp.h"
#include "= ;mtcp.h"
+#inclu= de "multi_io.h"
#include "perf.h"
#include "vlan.h"
#include "re= flect_filter.h"
@@ -169,8 +170,8 @@
= struct mbuf_set *mbuf; /**< Set of buffers for passing data
* channel packets between V= PN tunnel
* instances. = */
- struct multi_tc= p *mtcp; /**< State specific to OpenVPN using TCP
- * as = external transport. */
+ = * as external transport. */
= struct ifconfig_pool *ifconfig_pool;
struct= frequency_limit *new_connection_limiter;
struct initi= al_packet_rate_limit *initial_rate_limiter;
diff --git a/sr= c/openvpn/multi_io.c b/src/openvpn/multi_io.c
new file mode= 100644
index 0000000..57ed10e
--- /dev/nul= l
+++ b/src/openvpn/multi_io.c
@@ -0,0 +1,6= 19 @@
+/*
<= span style=3D"color: hsl(120, 100%, 40%);">+ * OpenVPN -- An application t= o securely tunnel IP networks

+ * over a single TCP/UDP port, with support for SSL/T= LS-based
+ * = session authentication and key exchange,
+ * packet encryption, packet authentic= ation, and
+ * = packet compression.
+ *
+ * Copyrig= ht (C) 2002-2023 OpenVPN Inc <sales@...515...>
+ *
+ * This program is free software; you can redistribute it= and/or modify
+ * i= t under the terms of the GNU General Public License version 2
+ * as published by the Free Soft= ware Foundation.

+ *<= /span>
+ * This program is = distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the = implied warranty of
+= * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU General Public Licens= e for more details.
+= *
+ * You should ha= ve received a copy of the GNU General Public License along
+ * with this program; if not, write= to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1= 301 USA.
+ */<= br>+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif

+
+#include "syshead.h"
+
+= #include "memdbg.h"
+
+#include = "multi.h"
+= #include "forward.h"
+#include "multi_io.h"
+
+#ifdef HAVE_SYS_INOTIFY_H
+#include <sys/inotify.h>
+#endif
+
+/*+ * Special tags passed to ev= ent.[ch] functions
+ = */
+#define MULTI_IO_= SOCKET ((void *)1)
+#define MULTI_IO_TUN ((void *)2)
+#define MULTI_IO_SIG ((void *)3) /* Only o= n Windows */
+#define= MULTI_IO_MANAGEMENT ((void *)4)
+#define MULTI_IO_FILE_CLOSE_WRITE ((void *)5)
+#define MULTI_IO_DCO ((void *= )6)
+
+struct ta_iow_flags

+{

+ unsigned int flags;
+ unsigned int ret;
+ unsigned int tun;
+ unsigned int sock;
+};
+
+#i= fdef ENABLE_DEBUG
+st= atic const char *
+pr= act(int action)
+{
+ switch (action)
+ {
+ case TA_UNDEF:
+ return "TA_UNDEF= ";

+
<= span style=3D"color: hsl(120, 100%, 40%);">+ case TA_SOCKET_READ:
+ return &qu= ot;TA_SOCKET_READ";
+
+ case T= A_SOCKET_READ_RESIDUAL:
+ return "TA_SOCKET_READ_RESIDUAL";
+

+ case TA_SOCKET_WRITE:
+ return "TA_SOCKET_WRITE&quo= t;;
+
+ case TA_SOCKET_WRITE_READY:=

+ return = "TA_SOCKET_WRITE_READY";
+
+ = case TA_SOCKET_WRITE_DEFERRED:
+ return "TA_SOCKET_WRITE_DEFERRED";
+
+ case TA_TUN_READ:
+ return "TA_TUN_REA= D";

+
= + case TA_TUN_WRITE:
+ return &quo= t;TA_TUN_WRITE";
+
+ case TA_I= NITIAL:
+ = return "TA_INITIAL";
+
+ = case TA_TIMEOUT:
+ = return "TA_TIMEOUT";
+
= + case TA_TUN_WRITE_TIMEOUT:
+ return "TA_TUN_WRITE_TIMEOUT";=
+
+ default:
+ return "?";
+ }

+}
+#endif /* ENABLE_DEBUG */
+
+stru= ct multi_protocol *
+= multi_protocol_init(int maxevents, int *maxclients)
+{
+ struct multi_protocol *multi_io;
+ const int extra_events =3D BASE_N_EVE= NTS;
+
+ ASSERT(maxevents >=3D 1);
+ ASSERT(maxclients= );
+
+ ALLOC_OBJ_CLEAR(multi_io, struct= multi_protocol);
+ = multi_io->maxevents =3D maxevents + extra_events;
+ multi_io->es =3D event_set_init(&= amp;multi_io->maxevents, 0);
+ wait_signal(multi_io->es, MULTI_IO_SIG);
+ ALLOC_ARRAY(multi_io->esr, s= truct event_set_return, multi_io->maxevents);

+ *maxclients =3D max_int(min_int(multi_io-&= gt;maxevents - extra_events, *maxclients), 1);
+ msg(D_MULTI_LOW, "MULTI: TCP INIT maxcl= ients=3D%d maxevents=3D%d", *maxclients, multi_io->maxevents);
+ return multi_io;
+}
+
+void
+= multi_protocol_free(struct multi_protocol *multi_io)
+{
+ if (multi_io)
+ {
+= event_free(multi_io->es);
+ free(multi_io->esr);
+ free(multi_io);
+ }
+}
+
+int
+multi_protocol_io_wait(struct mul= ti_context *m)

+{
+ int status, i;
+ unsigned int *persis= tent =3D &m->multi_io->tun_rwflags;
+
+ for (i =3D 0; i < m->top.c1.link_sockets_num; i++)<= br>+ {
+ socket_set_listen_persistent(m-&g= t;top.c2.link_sockets[i], m->multi_io->es,
+ &m-&g= t;top.c2.link_sockets[i]->ev_arg);
+ }
+
+#ifdef _WIN32
+ if (tuntap_is_win= tun(m->top.c1.tuntap))
+ {
+ = if (!tuntap_ring_empty(m->top.c1.tuntap))
+ {
+ /* there is data in wintun ring buffer, read it = immediately */
+ = m->multi_io->esr[0].arg =3D MULTI_IO_TUN;
+ m->multi_io->esr[0].rw= flags =3D EVENT_READ;
+ m->multi_io->n_esr =3D 1;
+ return 1;
+ }
+ persistent =3D NULL;
+ }
+#endif
+= tun_set(m->top.c1.tuntap, m->multi_io->es, EVENT_READ, MULTI_I= O_TUN, persistent);
+= #if defined(TARGET_LINUX) || defined(TARGET_FREEBSD)
+ dco_event_set(&m->top.c1.tunta= p->dco, m->multi_io->es, MULTI_IO_DCO);
+#endif
+
+#if= def ENABLE_MANAGEMENT
+ if (management)
+ {
+ mana= gement_socket_set(management, m->multi_io->es, MULTI_IO_MANAGEMENT, &= amp;m->multi_io->management_persist_flags);
+ }
+#endif
+#ifdef ENABLE_AS= YNC_PUSH
+ /* arm = inotify watcher */
+ = event_ctl(m->multi_io->es, m->top.c2.inotify_fd, EVENT_READ, MU= LTI_IO_FILE_CLOSE_WRITE);
+#endif
+=
+ status =3D event_wait(= m->multi_io->es, &m->top.c2.timeval, m->multi_io->esr, m= ->multi_io->maxevents);
+ update_time();
+ m->multi_io->n_esr =3D 0;
+ if (status > 0)
+ {
+ m->multi_io->n_esr =3D status;
+ }
+ return status;
+}
+
+static int
+multi_protocol_wait_li= te(struct multi_context *m, struct multi_instance *mi, const int action, bo= ol *tun_input_pending)
+ struct cont= ext *c =3D multi_tcp_context(m, mi);
+ unsigned int looking_for =3D 0;
+
+ dmsg(D_MULTI_DEBUG, "MULTI PROTOCOL: multi_protocol= _wait_lite a=3D%s mi=3D" ptr_format,
+ pract(action),
+ (ptr_type)mi);
+
+ tv_clear(&c->c2.timeval); /* ZERO-TIMEOUT */+
+ switch (action)
+ {
+ case TA_TUN_READ:
+ looking_for =3D TUN_READ;
+ tun_input_pending =3D NUL= L;
+ io_wa= it(c, IOW_READ_TUN);
= + break;
+=
+ case TA_SOC= KET_READ:
+ = looking_for =3D SOCKET_READ;
+ tun_input_pending =3D NULL;
+ io_wait(c, IOW_READ_LINK);
+ break;=
+
+ case TA_TUN_WRITE:
+ looking_for =3D TUN_WRITE;=
+ tun_inp= ut_pending =3D NULL;
= + c->c2.timeval.tv_sec =3D 1; /* For some reason, the Linux 2= .2 TUN/TAP driver hits this timeout */
+ perf_push(PERF_PROC_OUT_TUN_MTCP);+ io_wait(c, IOW_TO= _TUN);
+ p= erf_pop();
+ = break;
++ case TA_SOCKET_WRITE:=
+ looking= _for =3D SOCKET_WRITE;
+ break;
+
+ default:
+ msg(M_FATAL, "MULTI PROTOCOL: multi_protoc= ol_wait_lite, unhandled action=3D%d", action);
+ }
+
= + if (tun_input_pending && (c->c2.event_set_status & TUN_= READ))
+ {<= br>+ *tun_input_pending = =3D true;
+ }
+
+ if (c->c2.event_set_status & l= ooking_for)
+ {
+ return action;=
+ }
+ else

+ {
+ switch (action)
+ {
+ /* MULTI PROTOCOL socket output buffer is full */
+ case TA_SO= CKET_WRITE:
+ = return TA_SOCKET_WRITE_DEFERRED;
+
+ /* TUN device timed out on accepting write */
+ case TA_TUN_WRITE:
+ return T= A_TUN_WRITE_TIMEOUT;
= + }
++ return TA_UNDEF;
+ }
+}
+
= +static struct multi_instance *
+multi_protocol_dispatch(struct multi_context *m, struct multi_i= nstance *mi, const int action)
+{
+ con= st unsigned int mpp_flags =3D MPP_PRE_SELECT|MPP_RECORD_TOUCH;
+ struct multi_instance *touch= ed =3D mi;

+ m->= ;mpp_touched =3D &touched;
+
+ dmsg= (D_MULTI_DEBUG, "MULTI PROTOCOL: multi_protocol_dispatch a=3D%s mi=3D&= quot; ptr_format,
+ = pract(action),
+ (ptr_type)mi);
+
+ switch (a= ction)
+ {<= br>+ case TA_TUN_READ:
+ read_inco= ming_tun(&m->top);
+ if (!IS_SIG(&m->top))
+ {
+ multi_process_incoming_tun(m, mpp_flag= s);
+ }
+ break;
+
+ case TA_SOCKET_READ:
+ case TA_SOCKET_READ_RESI= DUAL:

+ AS= SERT(mi);
+ = ASSERT(mi->context.c2.link_sockets);
+ ASSERT(mi->context.c2.link_sockets[0])= ;
+ set_pr= efix(mi);
+ = read_incoming_link(&mi->context, mi->context.c2.link_sockets[0]= );
+ clear= _prefix();
+ = if (!IS_SIG(&mi->context))
+ {
+ multi_process_incoming_link(m, mi, mpp_flags,
+ = mi->context.c2.link_sockets[0]);
+ if (!IS_SIG(&mi-&= gt;context))
+ = {
+ = stream_buf_read_setup(mi->context.c2.link_sockets[0]);=
+ }+ }
+ break;

+

+ case TA_TIMEOUT:
+ multi_process_timeout(m, mpp_flags);<= /span>
+ break;
+
+ case TA_TUN_WRITE:
+ multi_process_outgoin= g_tun(m, mpp_flags);

= + break;
+=
+ case TA_TUN= _WRITE_TIMEOUT:
+ = multi_process_drop_outgoing_tun(m, mpp_flags);
+ break;
+
+ case TA_SOCKET_WRITE_READY:
+ ASSERT(mi);
+ multi_tcp_process_outgoing_l= ink_ready(m, mi, mpp_flags);
+ break;
+
+ cas= e TA_SOCKET_WRITE:
+ = multi_tcp_process_outgoing_link(m, false, mpp_flags);
= + break;
<= span style=3D"color: hsl(120, 100%, 40%);">+

+ case TA_SOCKET_WRITE_DEFERRED:
<= span style=3D"color: hsl(120, 100%, 40%);">+ multi_tcp_process_o= utgoing_link(m, true, mpp_flags);

+ break;
+
+ = case TA_INITIAL:
+ = ASSERT(mi);
+ multi_process_post(m, mi, mpp= _flags);
+ = break;
+
<= span style=3D"color: hsl(120, 100%, 40%);">+ default:

+ msg(M_FATAL, "MUL= TI PROTOCOL: multi_protocol_dispatch, unhandled action=3D%d", action);=

+ }
+

+ m->mpp_touched =3D NULL;
+ return touched;
+}
+
+st= atic int
+multi_proto= col_post(struct multi_context *m, struct multi_instance *mi, const int acti= on)
+{
+ struct context *c =3D multi_tc= p_context(m, mi);

+ = int newaction =3D TA_UNDEF;
+
+#define M= TP_NONE 0
+#d= efine MTP_TUN_OUT (1<<0)
+#define MTP_LINK_OUT (1<<1)
+ unsigned int flags =3D MTP_NONE;
+
+ if (TUN_OUT(c))
+ {
+ flags |=3D MTP_TUN_OUT;
+ }
+ if (LINK_OUT(c))
+ {
+ flags |=3D MTP_LINK_OUT;
+ }
+
+ switch (f= lags)
+ {+ case MTP_TUN_OUT|MTP= _LINK_OUT:
+ c= ase MTP_TUN_OUT:
+ = newaction =3D TA_TUN_WRITE;
+ break;
+
+ = case MTP_LINK_OUT:
+ newaction =3D TA_SOCKET_WRITE;
+ break;
+
+ case MTP_NONE:
+ if (mi && sockets_read_residual(c))+ {
+ newaction =3D TA_SO= CKET_READ_RESIDUAL;

+= }
+ = else
+ = {
+ = multi_tcp_set_global_rw_flags(m, mi);
+ }
+ break;
+
+ = default:
+ {<= /span>
+ struct g= c_arena gc =3D gc_new();
+ msg(M_FATAL, "MULTI PROTOCOL: multi_protocol_post bad= state, mi=3D%s flags=3D%d",
+ multi_instance_string(mi, false, &gc),
+ flags)= ;
+ gc_fre= e(&gc);
+ = break;
+ }=
+ }
+

+ dmsg(D_MULTI_DEBUG, "MULTI PROTOCOL: multi_= protocol_post %s -> %s",
+ pract(action),
+ pract(newaction));
+
+ return newaction;
+}
++void
+multi_protocol_process_io(struct multi_conte= xt *m)
+{
<= span style=3D"color: hsl(120, 100%, 40%);">+ struct multi_protocol *mult= i_io =3D m->multi_io;

+ int i;
+
+ for (i =3D 0; i <= ; multi_io->n_esr; ++i)
+ {
+ = struct event_set_return *e =3D &multi_io->esr[i];
+ struct event_arg *ev_arg =3D = (struct event_arg *)e->arg;
+
+ = /* incoming data for instance or listening socket? */
+ if (e->arg >=3D MULTI_N)
+ {
+ switch (ev_arg->t= ype)

+ {
+ struc= t multi_instance *mi;
+
+ /= * react to event on child instance */
+ case EVENT_ARG_MULTI_INSTANCE:
= + if (!ev_ar= g->u.mi)
+ = {
+ = msg(D_MULTI_ERRORS, "MULTI PROTOCOL: multi_proto_pro= c_io: null minstance");
+ break;
+ }
+
+ if (e->rwflags & EVEN= T_WRITE)
+ = {
+ = multi_protocol_action(m, mi, TA_SOCKET_WRITE_READY, false);<= /span>
+ = }
+ = else if (e->rwflags & EVENT_READ)
+ {
+ multi_protocol_action(m, m= i, TA_SOCKET_READ, false);
+ }
+ break;
+
+ = /* new incoming TCP client attempting to connect? */+ case EVENT_AR= G_LINK_SOCKET:
+ = if (!ev_arg->u.ls)
+ {
+ msg(D_MULTI_ERRORS, "MULTI = PROTOCOL: multi_proto_proc_io: null socket");
+ break;
+ }

<= span style=3D"color: hsl(120, 100%, 40%);">+

+ if (!proto_is_dgram(ev_arg->= ;u.ls->info.proto))
+ socket_reset_listen_persistent(ev_arg->u.ls= );
+ = mi =3D multi_create_instance_tcp(m, ev_arg->u.ls);
+ if (mi)
+ = {
+ = multi_protocol_action(m, mi, TA_INITIAL, false);
+ }
+ brea= k;
+ = }
+ }
+ }
<= span style=3D"color: hsl(120, 100%, 40%);">+ else

+ {
+#ifdef ENABLE_MANAGEMENT
+ if (e->arg =3D=3D MULTI_IO= _MANAGEMENT)
+ = {
+ = ASSERT(management);
+ }
+ else
+#endif
+ /* incoming data on TUN? */
+ if (e->arg =3D=3D MULTI_IO_TUN)
+ {
= + if (e->rwfl= ags & EVENT_WRITE)
= + multi_protocol_action(m, NULL, TA_TUN_WRITE, false);
+ }
+ else if= (e->rwflags & EVENT_READ)
+ {
+ multi_protocol_action(m, NULL, TA_TUN_READ,= false);
+ = }
+ }=
+ /* new = incoming TCP client attempting to connect? */
+ else if (e->arg =3D=3D MULTI_IO_SO= CKET)
+ {<= /span>
+ stru= ct multi_instance *mi;
+ socket_reset_listen_pe= rsistent(m->top.c2.link_sockets[0]);
+ mi =3D multi_create_instance_tcp(m, m-&= gt;top.c2.link_sockets[0]);
+ if (mi)
+ {
+ multi_protocol_action(m, mi, TA_INITIAL, fals= e);
+ = }
+ }
+#if defined(ENABLE_DCO) = && (defined(TARGET_LINUX) || defined(TARGET_FREEBSD))
+ /* incoming data on D= CO? */

+ e= lse if (e->arg =3D=3D MULTI_IO_DCO)
+ {
+ multi_process_incoming_dco(m);
+ }

+#endif
+ /* signal received? */
+ else if (e->arg =3D=3D M= ULTI_IO_SIG)
+ = {
+ = get_signal(&m->top.sig->signal_received);
+ }
+#ifdef ENABLE_ASYNC_PUSH
+ else if (e->arg =3D=3D MUL= TI_IO_FILE_CLOSE_WRITE)
+ {
+ = multi_process_file_closed(m, MPP_PRE_SELECT | MPP_RECORD_TOUC= H);
+ }
+#endif
+ }

+ if (IS_SIG(&m->top))+ {
+ break;
+ }
+ }
+ multi_io->n_esr =3D 0;
+
+ /*
+ * Proc= ess queued mbuf packets destined for TCP socket
+ */
+ {
+ struct multi_instance *mi;
+ while (!IS_SIG(&m->top) && (mi =3D = mbuf_peek(m->mbuf)) !=3D NULL)
+ {
+ multi_protocol_action(m, mi, TA_SOCKET_WRITE, true);=
+ }
+ }
+}
+
+void<= br>+multi_protocol_action(struc= t multi_context *m, struct multi_instance *mi, int action, bool poll)
+{
+ bool tun_input_pending =3D false;
+
+ do
+ {
+ dmsg(D_MULTI_DEBUG, "MULTI PROTOCOL: multi_protocol_act= ion a=3D%s p=3D%d",
+ pract(action),
+ poll);
+
+ = /*
+ * If T= A_SOCKET_READ_RESIDUAL, it means we still have pending
+ * input packets which were read= by a prior recv.
+ = *
+ * = Otherwise do a "lite" wait, which means we wait with 0 timeout
+ * on I/O even= ts only related to the current instance, not
+ * the big list of events.
+ *

+ * On our first pass, poll will be f= alse because we already know
+ * that input is available, and to call io_wait would be r= edundant.
+ *= /
+ if (poll &= amp;& action !=3D TA_SOCKET_READ_RESIDUAL)
+ {
+ const int orig_action =3D action;
+ action =3D multi_pro= tocol_wait_lite(m, mi, action, &tun_input_pending);

+ if (action =3D=3D TA_UNDEF)=
+ {
+ msg(M_FAT= AL, "MULTI PROTOCOL: I/O wait required blocking in multi_protocol_acti= on, action=3D%d", orig_action);
+ }
+ }
= +
+ /*<= br>+ * Dispatch the act= ion
+ */
+ struct multi_ins= tance *touched =3D multi_protocol_dispatch(m, mi, action);
+
+ /*
+ * Signal received or connection
+ * reset by peer?
+ */

+ if (touched && IS_SIG(&am= p;touched->context))
+ {
+ = if (mi =3D=3D touched)
+ {
+ }
+ multi_close_instance_on_signal(m, touched);
+ }

+
+
+ = /*
+ * If= dispatch produced any pending output
+ * for a particular instance, point to
= + * that instance.
+ */
+ if (m->pending)
+ {
+ mi =3D m->pending;
+ }
<= span style=3D"color: hsl(120, 100%, 40%);">+

+ /*
+ * Based on the effects of the action,
+ * such as generating pe= nding output,

+ = * possibly transition to a new action state.
+ */
+ action =3D multi_protocol_post(m, mi, action);<= /span>
+
+ /*
+ * If we are finished processing the ori= ginal action,
+ = * check if we have any TUN input. If so, transition
+ * our action state to processi= ng this input.
+ = */
+ if (t= un_input_pending && action =3D=3D TA_UNDEF)
+ {
+ action =3D TA_TUN_READ;
+ mi =3D NULL;

= + tun_input_pending = =3D false;
+ = poll =3D false;
+ = }
+ els= e
+ {+ poll =3D true;
+ }
<= span style=3D"color: hsl(120, 100%, 40%);">+

+ } while (action !=3D TA_UNDEF);
+}

+
+void
+multi_proto= col_delete_event(struct multi_protocol *multi_io, event_t event)
= +{
+ if (multi_io && multi_io->es)
+ {
+ event_del(multi_io->es, ev= ent);
+ }+}
diff --git= a/src/openvpn/multi_io.h b/src/openvpn/multi_io.h
new file= mode 100644
index 0000000..07fc935
--- /de= v/null
+++ b/src/openvpn/multi_io.h
@@ -0,0= +1,77 @@
+/*<= br>+ * OpenVPN -- An applicati= on to securely tunnel IP networks
+ * over a single TCP/UDP port, with support for S= SL/TLS-based
+ * = session authentication and key exchange,
+ * packet encryption, packet authe= ntication, and
+ * = packet compression.
+ *
+ * Cop= yright (C) 2002-2023 OpenVPN Inc <sales@...515...>
+ *
+ * This program is free software; you can redistribute= it and/or modify
+ *= it under the terms of the GNU General Public License version 2
= + * as published by the Free S= oftware Foundation.
+= *
+ * This program = is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even t= he implied warranty of
+ * GNU General Public Lic= ense for more details.
+ * You should= have received a copy of the GNU General Public License along
+ * with this program; if not, wr= ite to the Free Software Foundation, Inc.,

+ * 51 Franklin Street, Fifth Floor, Boston, MA 0211= 0-1301 USA.
+ */
+
+/*
+ * Multi-protocol specific code for --mode server+ */
+
+#ifndef MULTI_IO_H
+#define MULTI_IO_H
+
+#include = "event.h"
+=
+/*
+ * I/O processing States
<= span style=3D"color: hsl(120, 100%, 40%);">+ */

+
+#define TA_UNDEF 0
+#define TA_SOCKET_READ 1
+#define TA_SOCKET_READ_RESIDUAL 2
+#define TA_SOCKET_WRI= TE 3
+#defin= e TA_SOCKET_WRITE_READY 4
+#define TA_SOCKET_WRITE_DEFERRED 5
+#define TA_TUN_READ 6
+#define TA_TUN_WRITE 7
+#define TA_INITIAL = 8
+#defin= e TA_TIMEOUT 9
+#define TA_TUN_WRITE_TIMEOUT 10
+
+/*
+ * Extra st= ate info needed for Multi-protocol
+ */
+s= truct multi_protocol
= +{
+ struct event_= set *es;
+ struct = event_set_return *esr;
+ = int maxevents;
+ = unsigned int tun_rwflags;
+ unsigned int udp_flags;
+#ifdef ENABLE_MANAGEMENT
+ unsigned int management_persist_flags;
+#endif

+};
+
+struct= multi_protocol *multi_protocol_init(int maxevents, int *maxclients);
+
+void multi_protocol_free(struct multi_protoc= ol *multi_io);
+
+int multi_protocol_io_wa= it(struct multi_context *m);
+
+void multi= _protocol_process_io(struct multi_context *m);
+
+void multi_protocol_action(struct multi_context *m, struct multi_in= stance *mi, int action, bool poll);
+
+voi= d multi_protocol_delete_event(struct multi_protocol *multi_io, event_t even= t);
+
+#endif /* ifndef MULTI_IO_H */
diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c=
index f152071..5c7186e 100644
--- a/src/openvpn/s= ocket.c
+++ b/src/openvpn/socket.c
@@ -1123= ,7 +1123,9 @@
/* force binding IPv6-only if an= address was specified
* an it is a IPv6 */
if (sock->local_host && ai_family = =3D=3D AF_INET6)
+ = {
v6only =3D true;
+ }


socket_bind(sock->sd, sock->info.lsa->b= ind_local,
ai_family, "TCP/UD= P", v6only);

To view, visit change 763.= To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I1e5a84969988e4f027a18658d4a= b268c13fbf929
Gerrit-Change-Number: 763
Gerrit-PatchSet: 1
Gerrit-Owner: its_Giaan <gianmarco@...2786...= ..>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newchange
--q8UkSwkReAo=--