From patchwork Wed Apr 25 09:57:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Quartulli X-Patchwork-Id: 321 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.27.255.56]) by backend30.mail.ord1d.rsapps.net (Dovecot) with LMTP id XkhNATXe4FrkSwAAIUCqbw for ; Wed, 25 Apr 2018 15:59:49 -0400 Received: from proxy2.mail.iad3a.rsapps.net ([172.27.255.56]) by director9.mail.ord1d.rsapps.net (Dovecot) with LMTP id NUXMCTXe4FqiTQAAalYnBA ; Wed, 25 Apr 2018 15:59:49 -0400 Received: from smtp22.gate.iad3a ([172.27.255.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy2.mail.iad3a.rsapps.net with LMTP id 6AHQDjXe4FrWOgAABcWvHw ; Wed, 25 Apr 2018 15:59:49 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp22.gate.iad3a.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=unstable.cc X-Suspicious-Flag: YES X-Classification-ID: 34e565ee-48c3-11e8-8797-5254005ae9fe-1-1 Received: from [216.105.38.7] ([216.105.38.7:25802] helo=lists.sourceforge.net) by smtp22.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 0A/11-19165-43ED0EA5; Wed, 25 Apr 2018 15:59:48 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1fBQZ7-0000ov-Gy; Wed, 25 Apr 2018 19:58:57 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1fBQZ6-0000on-8x for openvpn-devel@lists.sourceforge.net; Wed, 25 Apr 2018 19:58:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:Cc: To:From:Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Dlg53LzlfYkXMxlRUSuPIeS9lcNfCnlgSimT2aEVXag=; b=CMob4t8+iS3V8U6HvR8GsGMpWP U7UdyRCQteEMRTO4o0nsm+V4X7UdaEkSSVIhRK2BgoZCwIrHm/kJApLkLJIiS5rAq4myv1ETKSawl TqGR3gIa3oFxiWmb0k61yM7LbJOf3Z+qdoEb9/3v2MHaK4Pg1cM7xD278SuUJL8H4zAQ=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To :MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Dlg53LzlfYkXMxlRUSuPIeS9lcNfCnlgSimT2aEVXag=; b=KUV1fKxMZDQaR46Os7zE9cx/WC WPt/XZfrS2GzcbT8mz2TwBjRw4ekoTkFAzhyJ76Li8PRdzg1QZ6MnCbG3Uvyn8HkgFUZH4W9IugEC S2d22rP9smFv9T5CvmrOoJXDDrjTv32Bsb7tErZDtCUP0P6Jm0stMwwly6PAbsf4f4a0=; Received: from s2.neomailbox.net ([5.148.176.60]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) id 1fBQZ4-007NaZ-PU for openvpn-devel@lists.sourceforge.net; Wed, 25 Apr 2018 19:58:56 +0000 From: Antonio Quartulli To: openvpn-devel@lists.sourceforge.net Date: Thu, 26 Apr 2018 03:57:18 +0800 Message-Id: <20180425195722.20744-5-a@unstable.cc> In-Reply-To: <20180425195722.20744-1-a@unstable.cc> References: <20180425195722.20744-1-a@unstable.cc> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [5.148.176.60 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1fBQZ4-007NaZ-PU Subject: [Openvpn-devel] [RFC 4/8] io_work: pass event_arg object to event handler in case of socket event X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Antonio Quartulli MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox In order to allow the code to work with multiple listening sockets it is essential to allow the generic multi_io event handler to distinguish between the various socket objects. This can be achieved by passing an event_arg object that contains a pointer to the link_socket. This code path is used on clients as well as UDP servers. Signed-off-by: Antonio Quartulli --- src/openvpn/event.h | 6 ++++++ src/openvpn/forward.c | 25 +++++++++++++++++++++++-- src/openvpn/mtcp.c | 4 +--- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/openvpn/event.h b/src/openvpn/event.h index be199ad9..fd0ede04 100644 --- a/src/openvpn/event.h +++ b/src/openvpn/event.h @@ -41,6 +41,12 @@ #define EVENT_METHOD_US_TIMEOUT (1<<0) #define EVENT_METHOD_FAST (1<<1) +/* + * The following constant is used as boundary between integer value + * and real addresses when passing arguments to event handlers as (void *) + */ +#define MULTI_N ((void *)16) /* upper bound on MTCP_x */ + #ifdef _WIN32 typedef const struct rw_handle *event_t; diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index a4e4d98a..1b5dad9b 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -1714,7 +1714,8 @@ io_wait_dowork(struct context *c, const unsigned int flags) /* * Configure event wait based on socket, tuntap flags. */ - socket_set(c->c2.link_socket, c->c2.event_set, socket, (void *)socket_shift, NULL); + socket_set(c->c2.link_socket, c->c2.event_set, socket, + &c->c2.link_socket->ev_arg, NULL); tun_set(c->c1.tuntap, c->c2.event_set, tuntap, (void *)tun_shift, NULL); #ifdef ENABLE_MANAGEMENT @@ -1771,7 +1772,27 @@ io_wait_dowork(struct context *c, const unsigned int flags) for (i = 0; i < status; ++i) { const struct event_set_return *e = &esr[i]; - c->c2.event_set_status |= ((e->rwflags & 3) << (uintptr_t)e->arg); + uintptr_t shift; + + if (e->arg >= MULTI_N) + { + struct event_arg *ev_arg = (struct event_arg *)e->arg; + if (ev_arg->type != EVENT_ARG_LINK_SOCKET) + { + c->c2.event_set_status = ES_ERROR; + msg(D_LINK_ERRORS, + "io_work: non socket event delivered"); + return; + } + + shift = socket_shift; + } + else + { + shift = (uintptr_t)e->arg; + } + + c->c2.event_set_status |= ((e->rwflags & 3) << shift); } } else if (status == 0) diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c index 51f339d0..0be97ae4 100644 --- a/src/openvpn/mtcp.c +++ b/src/openvpn/mtcp.c @@ -68,8 +68,6 @@ #define MTCP_FILE_CLOSE_WRITE ((void *)5) #endif -#define MTCP_N ((void *)16) /* upper bound on MTCP_x */ - struct ta_iow_flags { unsigned int flags; @@ -682,7 +680,7 @@ multi_tcp_process_io(struct multi_context *m) struct event_arg *ev_arg = (struct event_arg *)e->arg; /* incoming data for instance or listening socket? */ - if (e->arg >= MTCP_N) + if (e->arg >= MULTI_N) { switch (ev_arg->type) {