mtio mode

Author: Jon Chiappetta

src/openvpn/forward.c

@@ -46,7 +46,9 @@
 #include "memdbg.h"
 
 #include <sys/select.h>
+#include <sys/socket.h>
 #include <sys/time.h>
+#include <pthread.h>
 
 counter_type link_read_bytes_global;  /* GLOBAL */
 counter_type link_write_bytes_global; /* GLOBAL */
@@ -1353,8 +1355,7 @@ read_incoming_tun_part2(struct context *c)
     ASSERT(buf_safe(&c->c2.buf, c->c2.frame.buf.payload_size));
     if (c->c1.tuntap->backend_driver == DRIVER_AFUNIX)
     {
-        c->c2.buf.len =
-            (int)read_tun_afunix(c->c1.tuntap, BPTR(&c->c2.buf), c->c2.frame.buf.payload_size);
+        c->c2.buf.len = (int)read_tun_afunix(c->c1.tuntap, BPTR(&c->c2.buf), c->c2.frame.buf.payload_size);
     }
     else
     {
@@ -2484,8 +2485,28 @@ io_wait(struct context *c, const unsigned int flags)
     dmsg(D_EVENT_WAIT, "I/O WAIT status=0x%04x", c->c2.event_set_status);
 }
 
+void threaded_fwd_inp_intf(struct context *c, struct link_socket *sock, struct thread_pointer *b)
+{
+    if (b->p->h == b->p->n)
+    {
+        ssize_t size;
+        uint8_t temp[1];
+        size = read(c->c1.tuntap->fd, temp, 1);
+        if (size < 1) { /* no-op */ }
+        if (!IS_SIG(c))
+        {
+            if (!BULK_MODE(c))
+            {
+                c->c2.buf = c->c2.buffers->read_tun_buf;
+            }
+            process_incoming_tun(c, sock);
+        }
+        size = write(c->c1.tuntap->fz, temp, 1);
+    }
+}
+
 void
-process_io(struct context *c, struct link_socket *sock)
+process_io(struct context *c, struct link_socket *sock, struct thread_pointer *b)
 {
     const unsigned int status = c->c2.event_set_status;
 
@@ -2519,11 +2540,7 @@ process_io(struct context *c, struct link_socket *sock)
     /* Incoming data on TUN device */
     else if (status & TUN_READ)
     {
-        read_incoming_tun(c);
-        if (!IS_SIG(c))
-        {
-            process_incoming_tun(c, sock);
-        }
+        threaded_fwd_inp_intf(c, sock, b);
     }
     else if (status & DCO_READ)
     {

src/openvpn/forward.h

@@ -79,7 +79,7 @@ void io_wait(struct context *c, const unsigned int flags);
 
 void pre_select(struct context *c);
 
-void process_io(struct context *c, struct link_socket *sock);
+void process_io(struct context *c, struct link_socket *sock, struct thread_pointer *b);
 
 
 /**********************************************************************/

src/openvpn/init.c

@@ -1896,6 +1896,7 @@ do_open_tun(struct context *c, int *error_flags)
         }
 
         /* do ifconfig */
+        c->c1.tuntap->skip_bind = c->skip_bind;
         if (!ifconfig_noexec_enabled(c) && ifconfig_order(c->c1.tuntap) == IFCONFIG_BEFORE_TUN_OPEN)
         {
             /* guess actual tun/tap unit number that will be returned
@@ -1989,6 +1990,10 @@ do_open_tun(struct context *c, int *error_flags)
 
         add_wfp_block(c);
     }
+    if (c->c1.tuntap)
+    {
+        c->c1.tuntap->fe = c->c1.tuntap->fd;
+    }
     gc_free(&gc);
     return ret;
 }

src/openvpn/mtcp.c

@@ -46,15 +46,18 @@ struct ta_iow_flags
 };
 
 struct multi_instance *
-multi_create_instance_tcp(struct multi_context *m, struct link_socket *sock)
+multi_create_instance_tcp(struct thread_pointer *b, struct link_socket *sock)
 {
     struct gc_arena gc = gc_new();
+    struct multi_context *m = b->p->m[b->i-1];
     struct multi_instance *mi = NULL;
     struct hash *hash = m->hash;
 
-    mi = multi_create_instance(m, NULL, sock);
+    mi = multi_create_instance(b, NULL, sock);
     if (mi)
     {
+        m = b->p->p;
+        hash = m->hash;
         mi->real.proto = sock->info.proto;
         struct hash_element *he;
         const uint32_t hv = hash_value(hash, &mi->real);

src/openvpn/mtcp.h

@@ -45,7 +45,7 @@ bool multi_tcp_process_outgoing_link(struct multi_context *m, bool defer,
 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 *sock);
+struct multi_instance *multi_create_instance_tcp(struct thread_pointer *b, struct link_socket *sock);
 
 void multi_tcp_link_out_deferred(struct multi_context *m, struct multi_instance *mi);
 

src/openvpn/mudp.c

@@ -193,6 +193,8 @@ multi_get_create_instance_udp(struct multi_context *m, bool *floated, struct lin
     struct mroute_addr real = { 0 };
     struct multi_instance *mi = NULL;
     struct hash *hash = m->hash;
+    struct context_pointer p = { 0 };
+    struct thread_pointer b = { 0 };
     real.proto = sock->info.proto;
     m->hmac_reply_ls = sock;
 
@@ -266,7 +268,8 @@ multi_get_create_instance_udp(struct multi_context *m, bool *floated, struct lin
                      * connect-freq but not against connect-freq-initial */
                     reflect_filter_rate_limit_decrease(m->initial_rate_limiter);
 
-                    mi = multi_create_instance(m, &real, sock);
+                    p.p = m; b.p = &p; b.i = -1;
+                    mi = multi_create_instance(&b, &real, sock);
                     if (mi)
                     {
                         hash_add_fast(hash, bucket, &mi->real, hv, mi);