--- gvpe/src/connection.h	2013/07/19 18:18:27	1.39
+++ gvpe/src/connection.h	2013/10/11 04:07:24	1.40
@@ -194,7 +194,6 @@
 
   u8 protocol;
   u8 features;
-  bool is_direct; // current connection (si) is direct?
 
   pkt_queue data_queue, vpn_queue;
 
@@ -204,6 +203,7 @@
   void generate_auth_data ();
 
   ev_tstamp auth_expire; // when the snd_* and *_ecdh values expire
+  ev_tstamp hmac_error; // time of first hmac error in a series
 
   // send auth data - used for octx
   auth_data snd_auth;
@@ -229,10 +229,10 @@
 
   void shutdown ();
   void connection_established (const sockinfo &rsi);
-  void reset_connection ();
+  void reset_connection (const char *reason);
 
   void establish_connection_cb (ev::timer &w, int revents); ev::timer establish_connection;
-  void rekey_cb (ev::timer &w, int revents); ev::timer rekey; // next rekying (actually current reset + reestablishing)
+  void rekey_cb (ev::timer &w, int revents); ev::timer rekey; // next rekeying (actually current reset + reestablishing)
   void keepalive_cb (ev::timer &w, int revents); ev::timer keepalive; // next keepalive probe
 
   void send_connect_request (int id);