Attention is currently required from: cron2, its_Giaan, plaisthos.
Hello cron2, flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/764?usp=email
to look at the new patch set (#17).
Change subject: Add support for simultaneous use of UDP and TCP sockets
......................................................................
Add support for simultaneous use of UDP and TCP sockets
Add all the bound sockets to the event loop.
The main server loop has been updated to handle both
TCP and UDP connections.
The hash function has also been modified to include the
protocol during the creation of new client instances.
There are also a couple of refinements to make the
whole code flow management capable of handling
different kind of clients:
MULTI: properly remove TCP instances by checking the multi_instance
protocol instead of the global one.
TLS: set the tls_option xmit_hold bool value to true only in case of
TCP child instance to avoid checking the global protocol
value.
INIT: initialize the c->c2.event_set in the inherit_context_top()
by default and not only in case of UDP since we could have
multiple different sockets.
Change-Id: I31bbf87e4e568021445c7512ecefadfd4a69b363
Signed-off-by: Gianmarco De Gregori <gianma...@mandelbit.com>
---
M doc/man-sections/link-options.rst
M src/openvpn/forward.c
M src/openvpn/forward.h
M src/openvpn/init.c
M src/openvpn/mroute.c
M src/openvpn/mtcp.c
M src/openvpn/mtcp.h
M src/openvpn/mudp.c
M src/openvpn/mudp.h
M src/openvpn/multi.c
M src/openvpn/multi.h
M src/openvpn/multi_io.c
M src/openvpn/openvpn.h
M src/openvpn/options.c
M src/openvpn/options.h
M src/openvpn/socket.c
16 files changed, 491 insertions(+), 274 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/64/764/17
diff --git a/doc/man-sections/link-options.rst
b/doc/man-sections/link-options.rst
index 4496da2..d48021e 100644
--- a/doc/man-sections/link-options.rst
+++ b/doc/man-sections/link-options.rst
@@ -106,7 +106,7 @@
is not reliable. It is recommended to set tun-mtu with enough headroom
instead.
---local host|* [port]
+--local host|* [port] [protocol]
Local host name or IP address and port for bind. If specified, OpenVPN will
bind
to this address. If unspecified, OpenVPN will bind to all interfaces.
'*' can be used as hostname and means 'any host' (OpenVPN will listen on what
diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c
index f3f3503..9e9da6c 100644
--- a/src/openvpn/forward.c
+++ b/src/openvpn/forward.c
@@ -1767,7 +1767,7 @@
if (c->options.shaper)
{
int overhead =
datagram_overhead(c->c2.to_link_addr->dest.addr.sa.sa_family,
- c->options.ce.proto);
+ sock->info.proto);
shaper_wrote_bytes(&c->c2.shaper,
BLEN(&c->c2.to_link) + overhead);
}
@@ -2064,6 +2064,173 @@
*/
void
+get_io_flags_dowork_udp(struct context *c, struct multi_io *multi_io, const
unsigned int flags)
+{
+ unsigned int socket = 0;
+ unsigned int tuntap = 0;
+ static uintptr_t tun_shift = 2;
+ static uintptr_t err_shift = 4;
+
+ /*
+ * Calculate the flags based on the provided 'flags' argument.
+ */
+ if (flags & IOW_WAIT_SIGNAL)
+ {
+ wait_signal(multi_io->es, (void *)err_shift);
+ }
+
+ if (flags & IOW_TO_LINK)
+ {
+ if (flags & IOW_SHAPER)
+ {
+ /*
+ * If sending this packet would put us over our traffic shaping
+ * quota, don't send -- instead compute the delay we must wait
+ * until it will be OK to send the packet.
+ */
+ int delay = 0;
+
+ /* set traffic shaping delay in microseconds */
+ if (c->options.shaper)
+ {
+ delay = max_int(delay, shaper_delay(&c->c2.shaper));
+ }
+
+ if (delay < 1000)
+ {
+ socket |= EVENT_WRITE;
+ }
+ else
+ {
+ shaper_soonest_event(&c->c2.timeval, delay);
+ }
+ }
+ else
+ {
+ socket |= EVENT_WRITE;
+ }
+ }
+ else if (!((flags & IOW_FRAG) && TO_LINK_FRAG(c)))
+ {
+ if (flags & IOW_READ_TUN)
+ {
+ tuntap |= EVENT_READ;
+ }
+ }
+
+ /*
+ * If outgoing data (for TUN/TAP device) pending, wait for ready-to-send
status
+ * from device. Otherwise, wait for incoming data on TCP/UDP port.
+ */
+ if (flags & IOW_TO_TUN)
+ {
+ tuntap |= EVENT_WRITE;
+ }
+ else
+ {
+ if (flags & IOW_READ_LINK)
+ {
+ socket |= EVENT_READ;
+ }
+ }
+
+ /*
+ * outgoing bcast buffer waiting to be sent?
+ */
+ if (flags & IOW_MBUF)
+ {
+ socket |= EVENT_WRITE;
+ }
+
+ /*
+ * Force wait on TUN input, even if also waiting on TCP/UDP output
+ */
+ if (flags & IOW_READ_TUN_FORCE)
+ {
+ tuntap |= EVENT_READ;
+ }
+
+#ifdef _WIN32
+ if (tuntap_is_wintun(c->c1.tuntap))
+ {
+ /*
+ * With wintun we are only interested in read event. Ring buffer is
+ * always ready for write, so we don't do wait.
+ */
+ tuntap = EVENT_READ;
+ }
+#endif
+
+ /*
+ * Configure event wait based on socket, tuntap flags.
+ */
+ for (int i = 0; i < c->c1.link_sockets_num; i++)
+ {
+ if (proto_is_dgram(c->c2.link_sockets[i]->info.proto))
+ {
+ socket_set(c->c2.link_sockets[i], multi_io->es, socket,
+ &c->c2.link_sockets[i]->ev_arg, NULL);
+ }
+ }
+ tun_set(c->c1.tuntap, multi_io->es, tuntap, (void *)tun_shift, NULL);
+
+ multi_io->udp_flags = socket | tuntap;
+}
+
+void
+get_io_flags_udp(struct context *c, struct multi_io *multi_io, const unsigned
int flags)
+{
+ multi_io->udp_flags = ES_ERROR;
+ if (c->c2.fast_io && (flags & (IOW_TO_TUN | IOW_TO_LINK | IOW_MBUF)))
+ {
+ /* fast path -- only for TUN/TAP/UDP writes */
+ unsigned int ret = 0;
+ if (flags & IOW_TO_TUN)
+ {
+ ret |= TUN_WRITE;
+ }
+ if (flags & (IOW_TO_LINK | IOW_MBUF))
+ {
+ ret |= SOCKET_WRITE;
+ }
+ multi_io->udp_flags = ret;
+ }
+ else
+ {
+#ifdef _WIN32
+ bool skip_iowait = flags & IOW_TO_TUN;
+ if (flags & IOW_READ_TUN)
+ {
+ /*
+ * don't read from tun if we have pending write to link,
+ * since every tun read overwrites to_link buffer filled
+ * by previous tun read
+ */
+ skip_iowait = !(flags & IOW_TO_LINK);
+ }
+ if (tuntap_is_wintun(c->c1.tuntap) && skip_iowait)
+ {
+ unsigned int ret = 0;
+ if (flags & IOW_TO_TUN)
+ {
+ ret |= TUN_WRITE;
+ }
+ if (flags & IOW_READ_TUN)
+ {
+ ret |= TUN_READ;
+ }
+ multi_io->udp_flags = ret;
+ }
+ else
+#endif /* ifdef _WIN32 */
+ {
+ /* slow path - delegate to io_wait_dowork_udp to calculate flags */
+ get_io_flags_dowork_udp(c, multi_io, flags);
+ }
+ }
+}
+
+void
io_wait_dowork(struct context *c, const unsigned int flags)
{
unsigned int socket = 0;
@@ -2301,6 +2468,7 @@
dmsg(D_EVENT_WAIT, "I/O WAIT status=0x%04x", c->c2.event_set_status);
}
+
void
process_io(struct context *c, struct link_socket *sock)
{
diff --git a/src/openvpn/forward.h b/src/openvpn/forward.h
index 214a322..441bc16 100644
--- a/src/openvpn/forward.h
+++ b/src/openvpn/forward.h
@@ -69,6 +69,10 @@
extern counter_type link_write_bytes_global;
+void get_io_flags_dowork_udp(struct context *c, struct multi_io *multi_io,
const unsigned int flags);
+
+void get_io_flags_udp(struct context *c, struct multi_io *multi_io, const
unsigned int flags);
+
void io_wait_dowork(struct context *c, const unsigned int flags);
void pre_select(struct context *c);
diff --git a/src/openvpn/init.c b/src/openvpn/init.c
index 4014517..d84f826 100644
--- a/src/openvpn/init.c
+++ b/src/openvpn/init.c
@@ -225,7 +225,7 @@
if (streq(p[1], "HTTP"))
{
struct http_proxy_options *ho;
- if (ce->proto != PROTO_TCP && ce->proto != PROTO_TCP_CLIENT)
+ if (ce->proto != PROTO_TCP && c->mode != CM_CHILD_TCP)
{
msg(M_WARN, "HTTP proxy support only works for TCP based
connections");
return false;
@@ -611,7 +611,10 @@
ce_defined = false;
}
+ int proto = c->options.ce.proto;
c->options.ce = *ce;
+ c->options.ce.proto = proto;
+
#ifdef ENABLE_MANAGEMENT
if (ce_defined && management &&
management_query_remote_enabled(management))
{
@@ -2681,7 +2684,7 @@
if (found & OPT_P_EXPLICIT_NOTIFY)
{
- if (!proto_is_udp(c->options.ce.proto) &&
c->options.ce.explicit_exit_notification)
+ if (!proto_is_udp(c->c2.link_sockets[0]->info.proto) &&
c->options.ce.explicit_exit_notification)
{
msg(D_PUSH, "OPTIONS IMPORT: --explicit-exit-notify can only be
used with --proto udp");
c->options.ce.explicit_exit_notification = 0;
@@ -2837,14 +2840,21 @@
int sec = 2;
int backoff = 0;
- switch (c->options.ce.proto)
+ switch (c->mode)
{
- case PROTO_TCP_SERVER:
- sec = 1;
+ case CM_TOP:
+ if (has_udp_in_local_list(&c->options))
+ {
+ sec = c->options.ce.connect_retry_seconds;
+ }
+ else
+ {
+ sec = 1;
+ }
break;
- case PROTO_UDP:
- case PROTO_TCP_CLIENT:
+ case CM_CHILD_UDP:
+ case CM_CHILD_TCP:
sec = c->options.ce.connect_retry_seconds;
break;
}
@@ -2862,7 +2872,7 @@
}
/* Slow down reconnection after 5 retries per remote -- for TCP client or
UDP tls-client only */
- if (c->options.ce.proto == PROTO_TCP_CLIENT
+ if (c->mode == CM_CHILD_TCP
|| (c->options.ce.proto == PROTO_UDP && c->options.tls_client))
{
backoff = (c->options.unsuccessful_attempts /
c->options.connection_list->len) - 4;
@@ -3342,7 +3352,21 @@
to.server = options->tls_server;
to.replay_window = options->replay_window;
to.replay_time = options->replay_time;
- to.tcp_mode = link_socket_proto_connection_oriented(options->ce.proto);
+
+ if (c->options.ce.local_list->len > 1)
+ {
+ for (int i = 0; i < c->options.ce.local_list->len; i++)
+ {
+ if (proto_is_dgram(c->options.ce.local_list->array[i]->proto))
+ {
+ to.tcp_mode = false;
+ }
+ }
+ }
+ else
+ {
+ to.tcp_mode =
link_socket_proto_connection_oriented(c->options.ce.local_list->array[0]->proto);
+ }
to.config_ciphername = c->options.ciphername;
to.config_ncp_ciphers = c->options.ncp_ciphers;
to.transition_window = options->transition_window;
@@ -3387,7 +3411,7 @@
/* should we not xmit any packets until we get an initial
* response from client? */
- if (to.server && options->ce.proto == PROTO_TCP_SERVER)
+ if (to.server && c->mode == CM_CHILD_TCP)
{
to.xmit_hold = true;
}
@@ -3831,7 +3855,6 @@
for (int i = 0; i < c->c1.link_sockets_num; i++)
{
int mode = LS_MODE_DEFAULT;
-
/* mode allows CM_CHILD_TCP
* instances to inherit acceptable fds
* from a top-level parent */
@@ -3848,7 +3871,6 @@
mode = LS_MODE_TCP_ACCEPT_FROM;
}
}
-
/* init each socket with its specific args */
link_socket_init_phase1(c, i, mode);
}
@@ -4238,20 +4260,13 @@
#ifdef _WIN32
msg(M_INFO, "NOTE: --fast-io is disabled since we are running on
Windows");
#else
- if (!proto_is_udp(c->options.ce.proto))
+ if (c->options.shaper)
{
- msg(M_INFO, "NOTE: --fast-io is disabled since we are not using
UDP");
+ msg(M_INFO, "NOTE: --fast-io is disabled since we are using
--shaper");
}
else
{
- if (c->options.shaper)
- {
- msg(M_INFO, "NOTE: --fast-io is disabled since we are using
--shaper");
- }
- else
- {
- c->c2.fast_io = true;
- }
+ c->c2.fast_io = true;
}
#endif
}
@@ -4658,7 +4673,7 @@
}
/* our wait-for-i/o objects, different for posix vs. win32 */
- if (c->mode == CM_P2P)
+ if (c->mode == CM_P2P || c->mode == CM_TOP)
{
do_event_set_init(c, SHAPER_DEFINED(&c->options));
}
@@ -4925,7 +4940,7 @@
CLEAR(*dest);
/* proto_is_dgram will ASSERT(0) if proto is invalid */
- dest->mode = proto_is_dgram(src->options.ce.proto) ? CM_CHILD_UDP :
CM_CHILD_TCP;
+ dest->mode = proto_is_dgram(ls->info.proto) ? CM_CHILD_UDP : CM_CHILD_TCP;
dest->gc = gc_new();
@@ -4951,8 +4966,11 @@
/* options */
dest->options = src->options;
+ dest->options.ce.proto = ls->info.proto;
options_detach(&dest->options);
+ dest->c2.event_set = src->c2.event_set;
+
if (dest->mode == CM_CHILD_TCP)
{
/*
@@ -5044,10 +5062,7 @@
dest->c2.es_owned = false;
dest->c2.event_set = NULL;
- if (proto_is_dgram(src->options.ce.proto))
- {
- do_event_set_init(dest, false);
- }
+ do_event_set_init(dest, false);
#ifdef USE_COMP
dest->c2.comp_context = NULL;
diff --git a/src/openvpn/mroute.c b/src/openvpn/mroute.c
index 74923cf..5e37799 100644
--- a/src/openvpn/mroute.c
+++ b/src/openvpn/mroute.c
@@ -421,6 +421,7 @@
{
buf_printf(&out, ":%d", ntohs(maddr.v4.port));
}
+ buf_printf(&out, ":%d", maddr.proto);
}
break;
diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c
index 62ed044..582e9b3 100644
--- a/src/openvpn/mtcp.c
+++ b/src/openvpn/mtcp.c
@@ -54,7 +54,7 @@
struct hash *hash = m->hash;
mi = multi_create_instance(m, NULL, ls);
- if (mi)
+ if (mi && !proto_is_dgram(ls->info.proto))
{
mi->real.proto = ls->info.proto;
struct hash_element *he;
@@ -153,12 +153,19 @@
{
if (mi)
{
- mi->socket_set_called = true;
- socket_set(mi->context.c2.link_sockets[0],
- m->multi_io->es,
- mbuf_defined(mi->tcp_link_out_deferred) ? EVENT_WRITE :
EVENT_READ,
- &mi->ev_arg,
- &mi->tcp_rwflags);
+ if (proto_is_dgram(mi->context.c2.link_sockets[0]->info.proto))
+ {
+ return;
+ }
+ else
+ {
+ mi->socket_set_called = true;
+ socket_set(mi->context.c2.link_sockets[0],
+ m->multi_io->es,
+ mbuf_defined(mi->tcp_link_out_deferred) ? EVENT_WRITE :
EVENT_READ,
+ &mi->ev_arg,
+ &mi->tcp_rwflags);
+ }
}
}
@@ -229,87 +236,3 @@
}
return ret;
}
-
-/*
- * Top level event loop for single-threaded operation.
- * TCP mode.
- */
-void
-tunnel_server_tcp(struct context *top)
-{
- struct multi_context multi;
- int status;
-
- top->mode = CM_TOP;
- context_clear_2(top);
-
- /* initialize top-tunnel instance */
- init_instance_handle_signals(top, top->es, CC_HARD_USR1_TO_HUP);
- if (IS_SIG(top))
- {
- return;
- }
-
- /* initialize global multi_context object */
- multi_init(&multi, top, true);
-
- /* initialize our cloned top object */
- multi_top_init(&multi, top);
-
- /* initialize management interface */
- init_management_callback_multi(&multi);
-
- /* finished with initialization */
- initialization_sequence_completed(top, ISC_SERVER); /* --mode server
--proto tcp-server */
-
-#ifdef ENABLE_ASYNC_PUSH
- multi.top.c2.inotify_fd = inotify_init();
- if (multi.top.c2.inotify_fd < 0)
- {
- msg(D_MULTI_ERRORS | M_ERRNO, "MULTI: inotify_init error");
- }
-#endif
-
- /* per-packet event loop */
- while (true)
- {
- perf_push(PERF_EVENT_LOOP);
-
- /* wait on tun/socket list */
- multi_get_timeout(&multi, &multi.top.c2.timeval);
- status = multi_io_wait(&multi);
- MULTI_CHECK_SIG(&multi);
-
- /* check on status of coarse timers */
- multi_process_per_second_timers(&multi);
-
- /* timeout? */
- if (status > 0)
- {
- /* process the I/O which triggered select */
- multi_io_process_io(&multi);
- MULTI_CHECK_SIG(&multi);
- }
- else if (status == 0)
- {
- multi_io_action(&multi, NULL, TA_TIMEOUT, false);
- }
-
- perf_pop();
- }
-
-#ifdef ENABLE_ASYNC_PUSH
- close(top->c2.inotify_fd);
-#endif
-
- /* shut down management interface */
- uninit_management_callback();
-
- /* save ifconfig-pool */
- multi_ifconfig_pool_persist(&multi, true);
-
- /* tear down tunnel instance (unless --persist-tun) */
- multi_uninit(&multi);
- multi_top_free(&multi);
- close_instance(top);
-}
diff --git a/src/openvpn/mtcp.h b/src/openvpn/mtcp.h
index 0da0a7d..0a5b045 100644
--- a/src/openvpn/mtcp.h
+++ b/src/openvpn/mtcp.h
@@ -50,17 +50,6 @@
void multi_tcp_link_out_deferred(struct multi_context *m, struct
multi_instance *mi);
-
-/**************************************************************************/
-/**
- * Main event loop for OpenVPN in TCP server mode.
- * @ingroup eventloop
- *
- * @param top - Top-level context structure.
- */
-void tunnel_server_tcp(struct context *top);
-
-
void multi_tcp_delete_event(struct multi_io *multi_io, event_t event);
#endif /* ifndef MTCP_H */
diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c
index 4f2bbd7..86e1713 100644
--- a/src/openvpn/mudp.c
+++ b/src/openvpn/mudp.c
@@ -193,6 +193,7 @@
struct multi_instance *mi = NULL;
struct hash *hash = m->hash;
real.proto = ls->info.proto;
+ m->hmac_reply_ls = ls;
if (mroute_extract_openvpn_sockaddr(&real, &m->top.c2.from.dest, true)
&& m->top.c2.buf.len > 0)
@@ -319,7 +320,8 @@
msg_set_prefix("Connection Attempt");
m->top.c2.to_link = m->hmac_reply;
m->top.c2.to_link_addr = m->hmac_reply_dest;
- process_outgoing_link(&m->top, m->top.c2.link_sockets[0]);
+ process_outgoing_link(&m->top, m->hmac_reply_ls);
+ m->hmac_reply_ls = NULL;
m->hmac_reply_dest = NULL;
}
}
@@ -327,10 +329,10 @@
/*
* Process an I/O event.
*/
-static void
+void
multi_process_io_udp(struct multi_context *m, struct link_socket *sock)
{
- const unsigned int status = m->top.c2.event_set_status;
+ const unsigned int status = m->multi_io->udp_flags;
const unsigned int mpp_flags = m->top.c2.fast_io
? (MPP_CONDITIONAL_PRE_SELECT |
MPP_CLOSE_ON_SIGNAL)
: (MPP_PRE_SELECT | MPP_CLOSE_ON_SIGNAL);
@@ -423,7 +425,7 @@
* Return the io_wait() flags appropriate for
* a point-to-multipoint tunnel.
*/
-static inline unsigned int
+unsigned int
p2mp_iow_flags(const struct multi_context *m)
{
unsigned int flags = IOW_WAIT_SIGNAL;
@@ -458,87 +460,3 @@
#endif
return flags;
}
-
-
-void
-tunnel_server_udp(struct context *top)
-{
- struct multi_context multi;
-
- top->mode = CM_TOP;
- context_clear_2(top);
-
- /* initialize top-tunnel instance */
- init_instance_handle_signals(top, top->es, CC_HARD_USR1_TO_HUP);
- if (IS_SIG(top))
- {
- return;
- }
-
- /* initialize global multi_context object */
- multi_init(&multi, top, false);
-
- /* initialize our cloned top object */
- multi_top_init(&multi, top);
-
- /* initialize management interface */
- init_management_callback_multi(&multi);
-
- /* finished with initialization */
- initialization_sequence_completed(top, ISC_SERVER); /* --mode server
--proto udp */
-
-#ifdef ENABLE_ASYNC_PUSH
- multi.top.c2.inotify_fd = inotify_init();
- if (multi.top.c2.inotify_fd < 0)
- {
- msg(D_MULTI_ERRORS | M_ERRNO, "MULTI: inotify_init error");
- }
-#endif
-
- /* per-packet event loop */
- while (true)
- {
- perf_push(PERF_EVENT_LOOP);
-
- /* set up and do the io_wait() */
- multi_get_timeout(&multi, &multi.top.c2.timeval);
- io_wait(&multi.top, p2mp_iow_flags(&multi));
- MULTI_CHECK_SIG(&multi);
-
- /* check on status of coarse timers */
- multi_process_per_second_timers(&multi);
-
- /* timeout? */
- if (multi.top.c2.event_set_status == ES_TIMEOUT)
- {
- multi_process_timeout(&multi, MPP_PRE_SELECT|MPP_CLOSE_ON_SIGNAL);
- }
- else
- {
- /* process I/O */
-
- /* Since there's only one link_socket just use the first, in an
upcoming
- * patch this will be changed by using the link_socket returned by
the
- * event set */
- multi_process_io_udp(&multi, top->c2.link_sockets[0]);
- MULTI_CHECK_SIG(&multi);
- }
-
- perf_pop();
- }
-
-#ifdef ENABLE_ASYNC_PUSH
- close(top->c2.inotify_fd);
-#endif
-
- /* shut down management interface */
- uninit_management_callback();
-
- /* save ifconfig-pool */
- multi_ifconfig_pool_persist(&multi, true);
-
- /* tear down tunnel instance (unless --persist-tun) */
- multi_uninit(&multi);
- multi_top_free(&multi);
- close_instance(top);
-}
diff --git a/src/openvpn/mudp.h b/src/openvpn/mudp.h
index b378754..357b684 100644
--- a/src/openvpn/mudp.h
+++ b/src/openvpn/mudp.h
@@ -31,18 +31,9 @@
struct context;
struct multi_context;
+unsigned int p2mp_iow_flags(const struct multi_context *m);
-/**
- * Main event loop for OpenVPN in UDP server mode.
- * @ingroup eventloop
- *
- * This function implements OpenVPN's main event loop for UDP server mode.
- *
- * @param top - Top-level context structure.
- */
-void tunnel_server_udp(struct context *top);
-
-
+void multi_process_io_udp(struct multi_context *m, struct link_socket *ls);
/**************************************************************************/
/**
* Get, and if necessary create, the multi_instance associated with a
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 9c8c014..b83425c 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -289,7 +289,7 @@
* Main initialization function, init multi_context object.
*/
void
-multi_init(struct multi_context *m, struct context *t, bool tcp_mode)
+multi_init(struct multi_context *m, struct context *t)
{
int dev = DEV_TYPE_UNDEF;
@@ -435,13 +435,12 @@
m->instances = calloc(m->max_clients, sizeof(struct multi_instance *));
+ m->top.c2.event_set = t->c2.event_set;
+
/*
- * Initialize multi-socket TCP I/O wait object
+ * Initialize multi-socket I/O wait object
*/
- if (tcp_mode)
- {
- m->multi_io = multi_io_init(t->options.max_clients, &m->max_clients);
- }
+ m->multi_io = multi_io_init(t->options.max_clients, &m->max_clients);
m->tcp_queue_limit = t->options.tcp_queue_limit;
/*
@@ -607,6 +606,7 @@
ASSERT(!mi->halt);
mi->halt = true;
+ bool is_dgram = proto_is_dgram(mi->context.c2.link_sockets[0]->info.proto);
dmsg(D_MULTI_DEBUG, "MULTI: multi_close_instance called");
@@ -665,7 +665,7 @@
mi->did_iroutes = false;
}
- if (m->multi_io)
+ if (!is_dgram)
{
multi_tcp_dereference_instance(m->multi_io, mi);
}
@@ -3390,7 +3390,7 @@
/* decrypt in instance context */
perf_push(PERF_PROC_IN_LINK);
- lsi = get_link_socket_info(c);
+ lsi = &ls->info;
orig_buf = c->c2.buf.data;
if (process_incoming_link_part1(c, lsi, floated))
{
@@ -3839,7 +3839,7 @@
while ((he = hash_iterator_next(&hi)))
{
struct multi_instance *mi = (struct multi_instance *) he->value;
- if (!mi->halt)
+ if (!mi->halt && proto_is_dgram(mi->context.options.ce.proto))
{
send_control_channel_string(&mi->context, next_server ?
"RESTART,[N]" : "RESTART", D_PUSH);
multi_schedule_context_wakeup(m, mi);
@@ -3877,13 +3877,15 @@
status_close(so);
return false;
}
- else if (proto_is_dgram(m->top.options.ce.proto)
- && is_exit_restart(m->top.sig->signal_received)
- && (m->deferred_shutdown_signal.signal_received == 0)
- && m->top.options.ce.explicit_exit_notification != 0)
+ else if (has_udp_in_local_list(&m->top.options))
{
- multi_push_restart_schedule_exit(m,
m->top.options.ce.explicit_exit_notification == 2);
- return false;
+ if (is_exit_restart(m->top.sig->signal_received)
+ && (m->deferred_shutdown_signal.signal_received == 0)
+ && m->top.options.ce.explicit_exit_notification != 0)
+ {
+ multi_push_restart_schedule_exit(m,
m->top.options.ce.explicit_exit_notification == 2);
+ return false;
+ }
}
return true;
}
@@ -4156,6 +4158,98 @@
ASSERT(mi->context.c2.tls_multi->peer_id < m->max_clients);
}
+/**************************************************************************/
+/**
+ * Main event loop for OpenVPN in multi-protocol server mode.
+ * @ingroup eventloop
+ *
+ * @param top - Top-level context structure.
+ */
+void
+tunnel_server_loop(struct multi_context *multi)
+{
+ int status;
+
+ while (true)
+ {
+ perf_push(PERF_EVENT_LOOP);
+
+ /* wait on tun/socket list */
+ multi_get_timeout(multi, &multi->top.c2.timeval);
+ status = multi_io_wait(multi);
+ MULTI_CHECK_SIG(multi);
+
+ /* check on status of coarse timers */
+ multi_process_per_second_timers(multi);
+
+ /* timeout? */
+ if (status > 0)
+ {
+ /* process the I/O which triggered select */
+ multi_io_process_io(multi);
+ MULTI_CHECK_SIG(multi);
+ }
+ else if (status == 0)
+ {
+ multi_io_action(multi, NULL, TA_TIMEOUT, false);
+ }
+
+ perf_pop();
+ }
+}
+
+void
+tunnel_server_init(struct context *top)
+{
+ struct multi_context multi;
+
+ top->mode = CM_TOP;
+ context_clear_2(top);
+
+ /* initialize top-tunnel instance */
+ init_instance_handle_signals(top, top->es, CC_HARD_USR1_TO_HUP);
+ if (IS_SIG(top))
+ {
+ return;
+ }
+
+ /* initialize global multi_context object */
+ multi_init(&multi, top);
+
+ /* initialize our cloned top object */
+ multi_top_init(&multi, top);
+
+ /* initialize management interface */
+ init_management_callback_multi(&multi);
+
+ /* finished with initialization */
+ initialization_sequence_completed(top, ISC_SERVER); /* --mode server
--proto tcp-server */
+
+#ifdef ENABLE_ASYNC_PUSH
+ multi.top.c2.inotify_fd = inotify_init();
+ if (multi.top.c2.inotify_fd < 0)
+ {
+ msg(D_MULTI_ERRORS | M_ERRNO, "MULTI: inotify_init error");
+ }
+#endif
+
+ tunnel_server_loop(&multi);
+
+ #ifdef ENABLE_ASYNC_PUSH
+ close(top->c2.inotify_fd);
+#endif
+
+ /* shut down management interface */
+ uninit_management_callback();
+
+ /* save ifconfig-pool */
+ multi_ifconfig_pool_persist(&multi, true);
+
+ /* tear down tunnel instance (unless --persist-tun) */
+ multi_uninit(&multi);
+ multi_top_free(&multi);
+ close_instance(top);
+}
/*
* Top level event loop.
@@ -4165,12 +4259,6 @@
{
ASSERT(top->options.mode == MODE_SERVER);
- if (proto_is_dgram(top->options.ce.proto))
- {
- tunnel_server_udp(top);
- }
- else
- {
- tunnel_server_tcp(top);
- }
+ tunnel_server_init(top);
+
}
diff --git a/src/openvpn/multi.h b/src/openvpn/multi.h
index eacfb52..092aed6 100644
--- a/src/openvpn/multi.h
+++ b/src/openvpn/multi.h
@@ -204,6 +204,7 @@
struct buffer hmac_reply;
struct link_socket_actual *hmac_reply_dest;
+ struct link_socket *hmac_reply_ls;
/*
* Timer object for stale route check
@@ -251,10 +252,8 @@
* Main event loop for OpenVPN in server mode.
* @ingroup eventloop
*
- * This function calls the appropriate main event loop function depending
- * on the transport protocol used:
- * - \c tunnel_server_udp()
- * - \c tunnel_server_tcp()
+ * This function calls the main event loop function
+ * on the transport protocols:
*
* @param top - Top-level context structure.
*/
@@ -267,7 +266,7 @@
* Called by mtcp.c, mudp.c, or other (to be written) protocol drivers
*/
-void multi_init(struct multi_context *m, struct context *t, bool tcp_mode);
+void multi_init(struct multi_context *m, struct context *t);
void multi_uninit(struct multi_context *m);
@@ -663,9 +662,12 @@
multi_process_outgoing_tun(struct multi_context *m, const unsigned int
mpp_flags)
{
struct multi_instance *mi = m->pending;
+ if (!mi)
+ {
+ return false;
+ }
bool ret = true;
- ASSERT(mi);
#ifdef MULTI_DEBUG_EVENT_LOOP
printf("%s -> TUN len=%d\n",
id(mi),
diff --git a/src/openvpn/multi_io.c b/src/openvpn/multi_io.c
index e4174dd..9e012e0 100644
--- a/src/openvpn/multi_io.c
+++ b/src/openvpn/multi_io.c
@@ -155,6 +155,11 @@
&m->top.c2.link_sockets[i]->ev_arg);
}
+ if (has_udp_in_local_list(&m->top.options))
+ {
+ get_io_flags_udp(&m->top, m->multi_io, p2mp_iow_flags(m));
+ }
+
#ifdef _WIN32
if (tuntap_is_wintun(m->top.c1.tuntap))
{
@@ -442,14 +447,13 @@
}
break;
- /* new incoming TCP client attempting to connect? */
case EVENT_ARG_LINK_SOCKET:
if (!ev_arg->u.sock)
{
msg(D_MULTI_ERRORS, "MULTI IO: multi_io_proc_io: null
socket");
break;
}
-
+ /* new incoming TCP client attempting to connect? */
if (!proto_is_dgram(ev_arg->u.sock->info.proto))
{
socket_reset_listen_persistent(ev_arg->u.sock);
@@ -460,6 +464,11 @@
}
break;
}
+ else
+ {
+ multi_process_io_udp(m, ev_arg->u.sock);
+ break;
+ }
}
}
else
diff --git a/src/openvpn/openvpn.h b/src/openvpn/openvpn.h
index df43bba..581d248 100644
--- a/src/openvpn/openvpn.h
+++ b/src/openvpn/openvpn.h
@@ -216,8 +216,8 @@
* \c SIGUSR1 restarts.
*
* This structure is initialized at the top of the \c
- * tunnel_point_to_point(), \c tunnel_server_udp(), and \c
- * tunnel_server_tcp() functions. In other words, it is reset for every
+ * tunnel_point_to_point(), \c tunnel_server() \c
+ * functions. In other words, it is reset for every
* iteration of the \c main() function's inner \c SIGUSR1 loop.
*/
struct context_2
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index bd5c056..7af09bc 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -997,10 +997,6 @@
const struct connection_entry *e,
const int i)
{
- setenv_str_i(es, "proto", proto2ascii(e->proto, e->af, false), i);
- /* expected to be for single socket contexts only */
- setenv_str_i(es, "local", e->local_list->array[0]->local, i);
- setenv_str_i(es, "local_port", e->local_list->array[0]->port, i);
setenv_str_i(es, "remote", e->remote, i);
setenv_str_i(es, "remote_port", e->remote_port, i);
@@ -1016,6 +1012,16 @@
}
}
+static void
+setenv_local_entry(struct env_set *es,
+ const struct local_entry *e,
+ const int i)
+{
+ setenv_str_i(es, "proto", proto2ascii(e->proto, AF_UNSPEC, false), i+1);
+ setenv_str_i(es, "local", e->local, i+1);
+ setenv_str_i(es, "local_port", e->port, i+1);
+}
+
void
setenv_settings(struct env_set *es, const struct options *o)
{
@@ -1039,6 +1045,14 @@
setenv_connection_entry(es, &o->ce, 1);
}
+ if (o->ce.local_list)
+ {
+ for (int i = 0; i < o->ce.local_list->len; i++)
+ {
+ setenv_local_entry(es, o->ce.local_list->array[i], i+1);
+ }
+ }
+
if (!o->pull)
{
setenv_dns_options(&o->dns_options, es);
@@ -2203,6 +2217,7 @@
}
ALLOC_OBJ_CLEAR_GC(e, struct local_entry, gc);
+ e->proto = PROTO_NONE;
l->array[l->len++] = e;
return e;
@@ -2469,7 +2484,7 @@
{
struct local_entry *le = ce->local_list->array[i];
- if (proto_is_net(ce->proto)
+ if (proto_is_net(le->proto)
&& string_defined_equal(le->local, ce->remote)
&& string_defined_equal(le->port, ce->remote_port))
{
@@ -3174,14 +3189,30 @@
if (ce->proto == PROTO_TCP)
{
ce->proto = PROTO_TCP_SERVER;
+ o->ce.proto = ce->proto;
+ }
+ if (ce->local_list)
+ {
+ for (int i = 0; i < ce->local_list->len; i++)
+ {
+ if (ce->local_list->array[i]->proto == PROTO_TCP)
+ {
+ ce->local_list->array[i]->proto = PROTO_TCP_SERVER;
+ }
+ else if (ce->local_list->array[i]->proto == PROTO_NONE)
+ {
+ ce->local_list->array[i]->proto = ce->proto;
+ }
+ }
}
}
- if (o->client)
+ if (o->mode != MODE_SERVER)
{
if (ce->proto == PROTO_TCP)
{
ce->proto = PROTO_TCP_CLIENT;
+ o->ce.proto = ce->proto;
}
}
@@ -3330,6 +3361,11 @@
{
le->port = ce->local_port;
}
+ if (!le->proto)
+ {
+ le->proto = ce->proto;
+ }
+
}
#ifdef _WIN32
@@ -3787,6 +3823,7 @@
struct local_entry *e = alloc_local_entry(&o->ce, M_USAGE, &o->gc);
ASSERT(e);
e->port = o->ce.local_port;
+ e->proto = o->ce.proto;
}
/* use the same listen list for every outgoing connection */
@@ -3795,6 +3832,12 @@
o->connection_list->array[i]->local_list = o->ce.local_list;
}
+ if (has_tcp_in_local_list(o))
+ {
+ o->fast_io = false;
+ msg(M_INFO, "NOTE: --fast-io is disabled while using multi-socket");
+ }
+
if (o->tls_server)
{
/* Check that DH file is specified, or explicitly disabled */
@@ -6190,7 +6233,7 @@
VERIFY_PERMISSION(OPT_P_UP);
options->ifconfig_nowarn = true;
}
- else if (streq(p[0], "local") && p[1] && !p[3])
+ else if (streq(p[0], "local") && p[1] && !p[4])
{
struct local_entry *e;
@@ -6211,6 +6254,11 @@
{
e->port = p[2];
}
+
+ if (p[3])
+ {
+ e->proto = ascii2proto(p[3]);
+ }
}
else if (streq(p[0], "remote-random") && !p[1])
{
@@ -9645,3 +9693,37 @@
err:
gc_free(&gc);
}
+
+bool
+has_udp_in_local_list(const struct options *options)
+{
+ if (options->ce.local_list)
+ {
+ for (int i = 0; i < options->ce.local_list->len; i++)
+ {
+ if (proto_is_dgram(options->ce.local_list->array[i]->proto))
+ {
+ return true;
+ }
+ }
+ }
+
+ return false;
+}
+
+bool
+has_tcp_in_local_list(const struct options *options)
+{
+ if (options->ce.local_list)
+ {
+ for (int i = 0; i < options->ce.local_list->len; i++)
+ {
+ if (!proto_is_dgram(options->ce.local_list->array[i]->proto))
+ {
+ return true;
+ }
+ }
+ }
+
+ return false;
+}
diff --git a/src/openvpn/options.h b/src/openvpn/options.h
index 3f4cb90..161899a 100644
--- a/src/openvpn/options.h
+++ b/src/openvpn/options.h
@@ -98,6 +98,7 @@
{
const char *local;
const char *port;
+ int proto;
};
struct connection_entry
@@ -917,6 +918,10 @@
bool key_is_external(const struct options *options);
+bool has_udp_in_local_list(const struct options *options);
+
+bool has_tcp_in_local_list(const struct options *options);
+
/**
* Returns whether the current configuration has dco enabled.
*/
diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c
index 97dce02..ba0891a 100644
--- a/src/openvpn/socket.c
+++ b/src/openvpn/socket.c
@@ -1888,11 +1888,33 @@
struct options *o = &c->options;
ASSERT(sock);
+ const char *host = o->ce.local_list->array[sock_index]->local;
+ const char *port = o->ce.local_list->array[sock_index]->port;
+ int proto = o->ce.local_list->array[sock_index]->proto;
const char *remote_host = o->ce.remote;
const char *remote_port = o->ce.remote_port;
- sock->local_host = o->ce.local_list->array[sock_index]->local;
- sock->local_port = o->ce.local_list->array[sock_index]->port;
+ if (c->mode == CM_CHILD_TCP || c->mode == CM_CHILD_UDP)
+ {
+ struct link_socket *tmp_sock = NULL;
+ if (c->mode == CM_CHILD_TCP)
+ {
+ tmp_sock = (struct link_socket *)c->c2.accept_from;
+ }
+ else if (c->mode == CM_CHILD_UDP)
+ {
+ tmp_sock = c->c2.link_sockets[0];
+ }
+
+ host = tmp_sock->local_host;
+ port = tmp_sock->local_port;
+ proto = tmp_sock->info.proto;
+ }
+
+ ASSERT(c->c2.link_sockets[sock_index]);
+
+ sock->local_host = host;
+ sock->local_port = port;
sock->remote_host = remote_host;
sock->remote_port = remote_port;
sock->dns_cache = c->c1.dns_cache;
@@ -1920,7 +1942,7 @@
sock->mark = o->mark;
sock->bind_dev = o->bind_dev;
- sock->info.proto = o->ce.proto;
+ sock->info.proto = proto;
sock->info.af = o->ce.af;
sock->info.remote_float = o->ce.remote_float;
sock->info.lsa = &c->c1.link_socket_addrs[sock_index];
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/764?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I31bbf87e4e568021445c7512ecefadfd4a69b363
Gerrit-Change-Number: 764
Gerrit-PatchSet: 17
Gerrit-Owner: its_Giaan <gianma...@mandelbit.com>
Gerrit-Reviewer: cron2 <g...@greenie.muc.de>
Gerrit-Reviewer: flichtenheld <fr...@lichtenheld.com>
Gerrit-Reviewer: plaisthos <arne-open...@rfc2549.org>
Gerrit-CC: openvpn-devel <openvpn-devel@lists.sourceforge.net>
Gerrit-Attention: plaisthos <arne-open...@rfc2549.org>
Gerrit-Attention: cron2 <g...@greenie.muc.de>
Gerrit-Attention: its_Giaan <gianma...@mandelbit.com>
Gerrit-MessageType: newpatchset
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
