upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-06-03 13:47:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Unconditionally enable TLS_AGGREGATE_ACK

Browse source 
This define has been enabled by default since 2005, and was not
configurable through ./configure (but just by changing ssl.h).  Let's
get rid of it.

Signed-off-by: Steffan Karger <steffan.karger@fox-it.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1480344801-27855-2-git-send-email-steffan.karger@fox-it.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg13261.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Steffan Karger 2016-11-28 15:53:21 +01:00 committed by Gert Doering
parent 06c54466c8
commit 718257811b
2 changed files with 1 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/openvpn/ssl.c
View file

@ -2639,22 +2639,6 @@ tls_process (struct tls_multi *multi,
break;
}
#ifndef TLS_AGGREGATE_ACK
/* Send 1 or more ACKs (each received control packet gets one ACK) */
if (!to_link->len && !reliable_ack_empty (ks->rec_ack))
{
buf = &ks->ack_write_buf;
ASSERT (buf_init (buf, FRAME_HEADROOM (&multi->opt.frame)));
write_control_auth (session, ks, buf, to_link_addr, P_ACK_V1,
RELIABLE_ACK_SIZE, false);
*to_link = *buf;
active = true;
state_change = true;
dmsg (D_TLS_DEBUG, "Dedicated ACK -> TCP/UDP");
break;
}
#endif
/* Write incoming ciphertext to TLS object */
buf = reliable_get_buf_sequenced (ks->rec_reliable);
if (buf)
@ -2799,7 +2783,6 @@ tls_process (struct tls_multi *multi,
update_time ();
#ifdef TLS_AGGREGATE_ACK
/* Send 1 or more ACKs (each received control packet gets one ACK) */
if (!to_link->len && !reliable_ack_empty (ks->rec_ack))
{
@ -2811,7 +2794,6 @@ tls_process (struct tls_multi *multi,
active = true;
dmsg (D_TLS_DEBUG, "Dedicated ACK -> TCP/UDP");
}
#endif
/* When should we wake up again? */
{

9
src/openvpn/ssl.h
View file

@ -70,15 +70,8 @@
#define P_FIRST_OPCODE 1
#define P_LAST_OPCODE 9
/* Should we aggregate TLS
* acknowledgements, and tack them onto
* control packets? */
#define TLS_AGGREGATE_ACK
/*
* If TLS_AGGREGATE_ACK, set the
* max number of acknowledgments that
* can "hitch a ride" on an outgoing
* Set the max number of acknowledgments that can "hitch a ride" on an outgoing
* non-P_ACK_V1 control packet.
*/
#define CONTROL_SEND_ACK_MAX 4