From: Lev Stipakov Date: Mon, 9 Sep 2019 08:57:16 +0000 (+0300) Subject: tun.h: remove TUN_PASS_BUFFER define X-Git-Tag: v2.5_beta1~281 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=daaa43941c7fa3b7689a5abcbd4e8e30f63856d2;p=thirdparty%2Fopenvpn.git tun.h: remove TUN_PASS_BUFFER define Since the very beginning this define has only been used together with _WIN32 and code wrapped into it uses Win32 API, so it could be safely removed and replaced with _WIN32. Signed-off-by: Lev Stipakov Acked-by: David Sommerseth Message-Id: <1568019436-28527-1-git-send-email-lstipakov@gmail.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg18808.html Signed-off-by: Gert Doering --- diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index c2dcb538b..8451706be 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -1256,7 +1256,7 @@ read_incoming_tun(struct context *c) perf_push(PERF_READ_IN_TUN); c->c2.buf = c->c2.buffers->read_tun_buf; -#ifdef TUN_PASS_BUFFER +#ifdef _WIN32 read_tun_buffered(c->c1.tuntap, &c->c2.buf); #else ASSERT(buf_init(&c->c2.buf, FRAME_HEADROOM(&c->c2.frame))); @@ -1877,7 +1877,7 @@ process_outgoing_tun(struct context *c) &c->c2.n_trunc_tun_write); #endif -#ifdef TUN_PASS_BUFFER +#ifdef _WIN32 size = write_tun_buffered(c->c1.tuntap, &c->c2.to_tun); #else size = write_tun(c->c1.tuntap, BPTR(&c->c2.to_tun), BLEN(&c->c2.to_tun)); diff --git a/src/openvpn/tun.h b/src/openvpn/tun.h index 475643ac9..5a0a9331f 100644 --- a/src/openvpn/tun.h +++ b/src/openvpn/tun.h @@ -336,8 +336,6 @@ route_order(void) #ifdef _WIN32 -#define TUN_PASS_BUFFER - struct tap_reg { const char *guid;