Browse code
Unconditionally enable TLS_AGGREGATE_ACK
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>
Steffan Karger authored on 2016/11/28 23:53:21Showing 2 changed files
| ... | ... |
@@ -2639,22 +2639,6 @@ tls_process (struct tls_multi *multi, |
| 2639 | 2639 |
break; |
| 2640 | 2640 |
} |
| 2641 | 2641 |
|
| 2642 |
-#ifndef TLS_AGGREGATE_ACK |
|
| 2643 |
- /* Send 1 or more ACKs (each received control packet gets one ACK) */ |
|
| 2644 |
- if (!to_link->len && !reliable_ack_empty (ks->rec_ack)) |
|
| 2645 |
- {
|
|
| 2646 |
- buf = &ks->ack_write_buf; |
|
| 2647 |
- ASSERT (buf_init (buf, FRAME_HEADROOM (&multi->opt.frame))); |
|
| 2648 |
- write_control_auth (session, ks, buf, to_link_addr, P_ACK_V1, |
|
| 2649 |
- RELIABLE_ACK_SIZE, false); |
|
| 2650 |
- *to_link = *buf; |
|
| 2651 |
- active = true; |
|
| 2652 |
- state_change = true; |
|
| 2653 |
- dmsg (D_TLS_DEBUG, "Dedicated ACK -> TCP/UDP"); |
|
| 2654 |
- break; |
|
| 2655 |
- } |
|
| 2656 |
-#endif |
|
| 2657 |
- |
|
| 2658 | 2642 |
/* Write incoming ciphertext to TLS object */ |
| 2659 | 2643 |
buf = reliable_get_buf_sequenced (ks->rec_reliable); |
| 2660 | 2644 |
if (buf) |
| ... | ... |
@@ -2799,7 +2783,6 @@ tls_process (struct tls_multi *multi, |
| 2799 | 2799 |
|
| 2800 | 2800 |
update_time (); |
| 2801 | 2801 |
|
| 2802 |
-#ifdef TLS_AGGREGATE_ACK |
|
| 2803 | 2802 |
/* Send 1 or more ACKs (each received control packet gets one ACK) */ |
| 2804 | 2803 |
if (!to_link->len && !reliable_ack_empty (ks->rec_ack)) |
| 2805 | 2804 |
{
|
| ... | ... |
@@ -2811,7 +2794,6 @@ tls_process (struct tls_multi *multi, |
| 2811 | 2811 |
active = true; |
| 2812 | 2812 |
dmsg (D_TLS_DEBUG, "Dedicated ACK -> TCP/UDP"); |
| 2813 | 2813 |
} |
| 2814 |
-#endif |
|
| 2815 | 2814 |
|
| 2816 | 2815 |
/* When should we wake up again? */ |
| 2817 | 2816 |
{
|
| ... | ... |
@@ -70,15 +70,8 @@ |
| 70 | 70 |
#define P_FIRST_OPCODE 1 |
| 71 | 71 |
#define P_LAST_OPCODE 9 |
| 72 | 72 |
|
| 73 |
-/* Should we aggregate TLS |
|
| 74 |
- * acknowledgements, and tack them onto |
|
| 75 |
- * control packets? */ |
|
| 76 |
-#define TLS_AGGREGATE_ACK |
|
| 77 |
- |
|
| 78 | 73 |
/* |
| 79 |
- * If TLS_AGGREGATE_ACK, set the |
|
| 80 |
- * max number of acknowledgments that |
|
| 81 |
- * can "hitch a ride" on an outgoing |
|
| 74 |
+ * Set the max number of acknowledgments that can "hitch a ride" on an outgoing |
|
| 82 | 75 |
* non-P_ACK_V1 control packet. |
| 83 | 76 |
*/ |
| 84 | 77 |
#define CONTROL_SEND_ACK_MAX 4 |