--- gvpe/src/connection.h	2003/04/02 03:06:22	1.1
+++ gvpe/src/connection.h	2003/04/02 21:02:25	1.4
@@ -21,11 +21,7 @@
 
 #include <netinet/ip.h> // for tos etc.
 
-#include <openssl/rand.h>
 #include <openssl/hmac.h>
-#include <openssl/evp.h>
-#include <openssl/rsa.h>
-#include <openssl/err.h>
 
 #include "global.h"
 #include "conf.h"
@@ -142,9 +138,9 @@
 
     void shutdown ();
     void reset_connection ();
-    void establish_connection_cb (tstamp &ts); time_watcher establish_connection;
-    void rekey_cb (tstamp &ts); time_watcher rekey; // next rekying (actually current reset + reestablishing)
-    void keepalive_cb (tstamp &ts); time_watcher keepalive; // next keepalive probe
+    void establish_connection_cb (time_watcher &w); time_watcher establish_connection;
+    void rekey_cb (time_watcher &w); time_watcher rekey; // next rekying (actually current reset + reestablishing)
+    void keepalive_cb (time_watcher &w); time_watcher keepalive; // next keepalive probe
 
     void send_auth_request (const sockinfo &si, bool initiate);
     void send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg);
@@ -159,8 +155,8 @@
     void recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi);
 
     void script_node ();
-    const char *script_node_up (int);
-    const char *script_node_down (int);
+    const char *script_node_up ();
+    const char *script_node_down ();
 
     void dump_status ();