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>

diff --git a/ssl.c b/ssl.c
index a1268ac2a9291dc1512fa28e3ab4efc65085c952..5b0eedf815ba9b32e44d9b5e7820815281db687c 100644 (file)
--- 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 c6a5627f0296b02497278795a268e5b49f88fb01..0373faa52dd988d5b3306bf23a9cc8047f2d0643 100644 (file)
--- 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.