mtio mode

Author: Jon Chiappetta

src/openvpn/forward.c

@@ -47,7 +47,9 @@
 #include "mstats.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 */
@@ -2570,3 +2572,67 @@ process_io(struct context *c, struct link_socket *sock)
         }
     }
 }
+
+void threaded_read_tun(struct context *c, struct link_socket *sock, struct thread_pointer *b)
+{
+    if (b->i != b->p->i)
+    {
+        if (pthread_mutex_trylock(&(b->p->l)) == 0)
+        {
+            read_incoming_tun(c);
+            b->p->i = ((b->p->i % b->p->n) + 1);
+            pthread_mutex_unlock(&(b->p->l));
+            if (!IS_SIG(c))
+            {
+                process_incoming_tun(c, sock);
+            }
+        }
+    }
+}
+
+void threaded_io(struct context *c, struct link_socket *sock, struct thread_pointer *b)
+{
+    const unsigned int status = c->c2.event_set_status;
+
+#ifdef ENABLE_MANAGEMENT
+    if (status & (MANAGEMENT_READ | MANAGEMENT_WRITE))
+    {
+        ASSERT(management);
+        management_io(management);
+    }
+#endif
+
+    //msg(M_INFO, "MTIO MODE DEBUG PROC [%d] [%d][%d][%d][%d] [%d] [%d][%d][%p]",status,SOCKET_READ,SOCKET_WRITE,TUN_READ,TUN_WRITE,sock->sd,b->n,b->l,c->c2.buffers);
+
+    /* TCP/UDP port ready to accept write */
+    if (status & SOCKET_WRITE)
+    {
+        process_outgoing_link(c, sock);
+    }
+    /* TUN device ready to accept write */
+    else if (status & TUN_WRITE)
+    {
+        process_outgoing_tun(c, sock);
+    }
+    /* Incoming data on TCP/UDP port */
+    else if (status & SOCKET_READ)
+    {
+        read_incoming_link(c, sock);
+        if (!IS_SIG(c))
+        {
+            process_incoming_link(c, sock);
+        }
+    }
+    /* Incoming data on TUN device */
+    else if (status & TUN_READ)
+    {
+        threaded_read_tun(c, sock, b);
+    }
+    else if (status & DCO_READ)
+    {
+        if (!IS_SIG(c))
+        {
+            process_incoming_dco(c);
+        }
+    }
+}

src/openvpn/forward.h

@@ -330,6 +330,9 @@ void process_ip_header(struct context *c, unsigned int flags, struct buffer *buf
 
 bool schedule_exit(struct context *c);
 
+void threaded_io(struct context *c, struct link_socket *sock, struct thread_pointer *p);
+
+
 static inline struct link_socket_info *
 get_link_socket_info(struct context *c)
 {

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 multi_args *a, struct link_socket *sock)
 {
     struct gc_arena gc = gc_new();
+    struct multi_context *m = a->p->m[a->i-1];
     struct multi_instance *mi = NULL;
     struct hash *hash = m->hash;
 
-    mi = multi_create_instance(m, NULL, sock);
+    mi = multi_create_instance(a, NULL, sock);
     if (mi)
     {
+        m = a->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 multi_args *a, struct link_socket *sock);
 
 void multi_tcp_link_out_deferred(struct multi_context *m, struct multi_instance *mi);
 

src/openvpn/mudp.c

@@ -191,6 +191,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 multi_pointer p = { 0 };
+    struct multi_args a = { 0 };
     real.proto = sock->info.proto;
     m->hmac_reply_ls = sock;
 
@@ -264,7 +266,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; a.p = &p; a.i = -1;
+                    mi = multi_create_instance(&a, &real, sock);
                     if (mi)
                     {
                         hash_add_fast(hash, bucket, &mi->real, hv, mi);