mirrors/openvpn
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2024-11-23 09:43:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

io_work: convert shift argument to uintptr_t

Browse Source 
Instead of passing the shift argument as pointer, pass
directly its integer value. This will allow the code to
distinguish a shift value from a real object pointer,
like we already do in multi_tcp_process_io().

This change will allow us later to pass an event_arg
object as event handler argument instead of a simple
integer value.

Change-Id: Ib583bf17e35b14aed78fd8217b6e71e8c2b78089
Signed-off-by: Antonio Quartulli <a@unstable.cc>
Signed-off-by: Gianmarco De Gregori <gianmarco@mandelbit.com>
Acked-by: Frank Lichtenheld <frank@lichtenheld.com>
Message-Id: <20241023084208.12317-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg29604.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Antonio Quartulli 2024-10-23 10:42:08 +02:00 committed by Gert Doering
parent 490d1324c8
commit 04c34f81be
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/openvpn/forward.c
View File

@ -2065,20 +2065,18 @@ io_wait_dowork(struct context *c, const unsigned int flags)
unsigned int tuntap = 0;
struct event_set_return esr[4];
/* These shifts all depend on EVENT_READ (=1) and EVENT_WRITE (=2)
* and are added to the shift. Check openvpn.h for more details.
*/
static int socket_shift = SOCKET_SHIFT;
static int tun_shift = TUN_SHIFT;
static int err_shift = ERR_SHIFT;
/* These shifts all depend on EVENT_READ and EVENT_WRITE */
static uintptr_t socket_shift = SOCKET_SHIFT; /* depends on SOCKET_READ and SOCKET_WRITE */
static uintptr_t tun_shift = TUN_SHIFT; /* depends on TUN_READ and TUN_WRITE */
static uintptr_t err_shift = ERR_SHIFT; /* depends on ES_ERROR */
#ifdef ENABLE_MANAGEMENT
static int management_shift = MANAGEMENT_SHIFT;
static uintptr_t management_shift = MANAGEMENT_SHIFT; /* depends on MANAGEMENT_READ and MANAGEMENT_WRITE */
#endif
#ifdef ENABLE_ASYNC_PUSH
static int file_shift = FILE_SHIFT;
static uintptr_t file_shift = FILE_SHIFT;
#endif
#if defined(TARGET_LINUX) || defined(TARGET_FREEBSD)
static int dco_shift = DCO_SHIFT; /* Event from DCO linux kernel module */
static uintptr_t dco_shift = DCO_SHIFT; /* Event from DCO linux kernel module */
#endif
/*
@ -2092,7 +2090,7 @@ io_wait_dowork(struct context *c, const unsigned int flags)
*/
if (flags & IOW_WAIT_SIGNAL)
{
wait_signal(c->c2.event_set, (void *)&err_shift);
wait_signal(c->c2.event_set, (void *)err_shift);
}
/*
@ -2185,19 +2183,19 @@ 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);
tun_set(c->c1.tuntap, c->c2.event_set, tuntap, (void *)&tun_shift, NULL);
socket_set(c->c2.link_socket, c->c2.event_set, socket, (void *)socket_shift, NULL);
tun_set(c->c1.tuntap, c->c2.event_set, tuntap, (void *)tun_shift, NULL);
#if defined(TARGET_LINUX) || defined(TARGET_FREEBSD)
if (socket & EVENT_READ && c->c2.did_open_tun)
{
dco_event_set(&c->c1.tuntap->dco, c->c2.event_set, (void *)&dco_shift);
dco_event_set(&c->c1.tuntap->dco, c->c2.event_set, (void *)dco_shift);
}
#endif
#ifdef ENABLE_MANAGEMENT
if (management)
{
management_socket_set(management, c->c2.event_set, (void *)&management_shift, NULL);
management_socket_set(management, c->c2.event_set, (void *)management_shift, NULL);
}
#endif
@ -2205,7 +2203,7 @@ io_wait_dowork(struct context *c, const unsigned int flags)
/* arm inotify watcher */
if (c->options.mode == MODE_SERVER)
{
event_ctl(c->c2.event_set, c->c2.inotify_fd, EVENT_READ, (void *)&file_shift);
event_ctl(c->c2.event_set, c->c2.inotify_fd, EVENT_READ, (void *)file_shift);
}
#endif
@ -2248,7 +2246,7 @@ 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) << *((int *)e->arg));
c->c2.event_set_status |= ((e->rwflags & 3) << (uintptr_t)e->arg);
}
}
else if (status == 0)