--- gvpe/src/connection.C	2003/10/22 00:42:53	1.23
+++ gvpe/src/connection.C	2004/01/17 01:18:36	1.25
@@ -1,6 +1,6 @@
 /*
     connection.C -- manage a single connection
-    Copyright (C) 2003 Marc Lehmann <pcg@goof.com>
+    Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,6 +23,8 @@
 # include "lzf/lzf.h"
 }
 
+#include <cassert>
+
 #include <list>
 
 #include <openssl/rand.h>
@@ -136,11 +138,9 @@
 
 void rsa_cache::cleaner_cb (time_watcher &w)
 {
-  if (empty ())
-    w.at = TSTAMP_CANCEL;
-  else
+  if (!empty ())
     {
-      w.at = NOW + RSA_TTL;
+      w.start (NOW + RSA_TTL);
 
       for (iterator i = begin (); i != end (); )
         if (i->expire <= NOW)
@@ -600,8 +600,8 @@
     {
       retry_cnt = 0;
       establish_connection.start (NOW + 5);
-      keepalive.reset ();
-      rekey.reset ();
+      keepalive.stop ();
+      rekey.stop ();
     }
 }
 
@@ -677,13 +677,8 @@
   auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
 
   rsachallenge chg;
-
   rsa_cache.gen (pkt->id, chg);
-
-  if (0 > RSA_public_encrypt (sizeof chg,
-                              (unsigned char *)&chg, (unsigned char *)&pkt->encr,
-                              conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
-    fatal ("RSA_public_encrypt error");
+  rsa_encrypt (conf->rsa_key, chg, pkt->encr);
 
   slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
 
@@ -727,18 +722,18 @@
 void
 connection::establish_connection_cb (time_watcher &w)
 {
-  if (ictx || conf == THISNODE
-      || connectmode == conf_node::C_NEVER
-      || connectmode == conf_node::C_DISABLED)
-    w.at = TSTAMP_CANCEL;
-  else if (w.at <= NOW)
+  if (!ictx
+      && conf != THISNODE
+      && connectmode != conf_node::C_NEVER
+      && connectmode != conf_node::C_DISABLED
+      && w.at <= NOW)
     {
       double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
 
       if (retry_int < 3600 * 8)
         retry_cnt++;
 
-      w.at = NOW + retry_int;
+      w.start (NOW + retry_int);
 
       reset_si ();
 
@@ -779,9 +774,9 @@
   last_activity = 0;
   retry_cnt = 0;
 
-  rekey.reset ();
-  keepalive.reset ();
-  establish_connection.reset ();
+  rekey.stop ();
+  keepalive.stop ();
+  establish_connection.stop ();
 }
 
 void
@@ -796,8 +791,6 @@
 void
 connection::rekey_cb (time_watcher &w)
 {
-  w.at = TSTAMP_CANCEL;
-
   reset_connection ();
   establish_connection ();
 }
@@ -910,9 +903,7 @@
 
                 rsachallenge k;
 
-                if (0 > RSA_private_decrypt (sizeof (p->encr),
-                                             (unsigned char *)&p->encr, (unsigned char *)&k,
-                                             ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
+                if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
                   {
                     slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
                           conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
@@ -1123,17 +1114,17 @@
       establish_connection ();
     }
   else if (NOW < last_activity + ::conf.keepalive)
-    w.at = last_activity + ::conf.keepalive;
+    w.start (last_activity + ::conf.keepalive);
   else if (conf->connectmode != conf_node::C_ONDEMAND
            || THISNODE->connectmode != conf_node::C_ONDEMAND)
     {
       send_ping (si);
-      w.at = NOW + 5;
+      w.start (NOW + 5);
     }
   else if (NOW < last_activity + ::conf.keepalive + 10)
     // hold ondemand connections implicitly a few seconds longer
     // should delete octx, though, or something like that ;)
-    w.at = last_activity + ::conf.keepalive + 10;
+    w.start (last_activity + ::conf.keepalive + 10);
   else
     reset_connection ();
 }