diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2010-04-08 21:18:42 +0200 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-04-08 21:38:19 +0200 |
| commit | 5acb71a0aab49e10233bcfbc84c6c4685cb93f9d (patch) | |
| tree | 9980f0ada49163f299e0d2cfb6a14df107676969 | |
| parent | Merge remote branch 'origin/bugfix2.1' into bugfix2.1 (diff) | |
| download | openvpn-5acb71a0aab49e10233bcfbc84c6c4685cb93f9d.tar.xz | |
Make use of counter_type instead of int when counting bytes and network packets
This is in response to a reported Debian bug, where the connection counter overflows.
<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=576827>
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
| -rw-r--r-- | ssl.c | 3 | ||||
| -rw-r--r-- | ssl.h | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -3747,7 +3747,8 @@ tls_process (struct tls_multi *multi, && ks->n_packets >= session->opt->renegotiate_packets) || (packet_id_close_to_wrapping (&ks->packet_id.send)))) { - msg (D_TLS_DEBUG_LOW, "TLS: soft reset sec=%d bytes=%d/%d pkts=%d/%d", + msg (D_TLS_DEBUG_LOW, + "TLS: soft reset sec=%d bytes=" counter_format "/%d pkts=" counter_format "/%d", (int)(ks->established + session->opt->renegotiate_seconds - now), ks->n_bytes, session->opt->renegotiate_bytes, ks->n_packets, session->opt->renegotiate_packets); @@ -376,8 +376,8 @@ struct key_state struct reliable *rec_reliable; /* order incoming ciphertext packets before we pass to TLS */ struct reliable_ack *rec_ack; /* buffers all packet IDs we want to ACK back to sender */ - int n_bytes; /* how many bytes sent/recvd since last key exchange */ - int n_packets; /* how many packets sent/recvd since last key exchange */ + counter_type n_bytes; /* how many bytes sent/recvd since last key exchange */ + counter_type n_packets; /* how many packets sent/recvd since last key exchange */ /* * If bad username/password, TLS connection will come up but 'authenticated' will be false. |