From: David Sommerseth Date: Thu, 8 Apr 2010 19:18:42 +0000 (+0200) Subject: Make use of counter_type instead of int when counting bytes and network packets X-Git-Tag: v2.2-beta4~49 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41104b4e23aaa17257cadb7f6c4ba1325c025b46;p=thirdparty%2Fopenvpn.git 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. Signed-off-by: David Sommerseth Acked-by: Gert Doering --- diff --git a/ssl.c b/ssl.c index a1268ac2a..5b0eedf81 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 c6a5627f0..0373faa52 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.