summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Sommerseth <dazo@users.sourceforge.net>2010-04-08 21:18:42 +0200
committerDavid Sommerseth <dazo@users.sourceforge.net>2010-10-21 11:37:03 +0200
commit41104b4e23aaa17257cadb7f6c4ba1325c025b46 (patch)
treeecf700528f81bba00537dabab6eafae2c9565089
parent886593ac4ae79f4321f6f12fad0a51600e4aca28 (diff)
downloadopenvpn-41104b4e23aaa17257cadb7f6c4ba1325c025b46.tar.gz
openvpn-41104b4e23aaa17257cadb7f6c4ba1325c025b46.tar.xz
openvpn-41104b4e23aaa17257cadb7f6c4ba1325c025b46.zip
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.c3
-rw-r--r--ssl.h4
2 files changed, 4 insertions, 3 deletions
diff --git a/ssl.c b/ssl.c
index a1268ac..5b0eedf 100644
--- a/ssl.c
+++ b/ssl.c
@@ -3901,7 +3901,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);
diff --git a/ssl.h b/ssl.h
index c6a5627..0373faa 100644
--- a/ssl.h
+++ b/ssl.h
@@ -378,8 +378,8 @@ struct key_state
struct buffer_list *paybuf;
- 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.