--- gvpe/src/protocol.h	2003/03/09 12:40:18	1.3
+++ gvpe/src/protocol.h	2003/03/26 01:58:46	1.8
@@ -26,6 +26,7 @@
 #include <openssl/rsa.h>
 
 #include "conf.h"
+#include "iom.h"
 #include "util.h"
 #include "device.h"
 
@@ -33,34 +34,49 @@
    incompatible version have different protocols.
  */
 
-#define PROTOCOL_MAJOR 2
+#define PROTOCOL_MAJOR 1
 #define PROTOCOL_MINOR 0
 
 struct vpn;
 struct vpn_packet;
 
-typedef u8 rsachallenge[RSA_KEYLEN - RSA_OVERHEAD]; // challenge data
+struct rsaid {
+  u8 id[RSA_IDLEN]; // the challenge id
+};
+
+typedef u8 rsachallenge[RSA_KEYLEN - RSA_OVERHEAD]; // challenge data;
 typedef u8 rsaencrdata[RSA_KEYLEN]; // encrypted challenge
+typedef u8 rsaresponse[RSA_HASHLEN]; // the ripemd160(!) hash of the challenge
 
 struct crypto_ctx;
 
-enum auth_subtype { AUTH_INIT, AUTH_INITREPLY, AUTH_REPLY };
+// a very simple fifo pkt-queue
+class pkt_queue
+  {
+    tap_packet *queue[QUEUEDEPTH];
+    int i, j;
+
+  public:
+
+    void put (tap_packet *p);
+    tap_packet *get ();
+
+    pkt_queue ();
+    ~pkt_queue ();
+  };
 
 struct connection
   {
     conf_node *conf;
     struct vpn *vpn;
 
-    SOCKADDR sa;
+    SOCKADDR sa; // the current(!) destination ip to send packets to
     int retry_cnt;
 
-    time_t next_retry;		// next connection retry
-    time_t next_rekey;		// next rekying (actually current reset + reestablishing)
-    time_t last_activity;	// time of last packet received
+    tstamp last_activity;	// time of last packet received
 
     u32 oseqno;
-    u32 iseqno;
-    u32 ismask; // bitmask with set bits for each received seqno (input seen mask)
+    sliding_window iseqno;
 
     pkt_queue queue;
 
@@ -72,10 +88,12 @@
 
     void shutdown ();
     void reset_connection ();
-    void establish_connection ();
-    void rekey ();
+    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 send_auth (auth_subtype subtype, SOCKADDR *sa, rsachallenge *k = 0);
+    void send_auth_request (SOCKADDR *sa, bool initiate);
+    void send_auth_response (SOCKADDR *sa, const rsaid &id, const rsachallenge &chg);
     void send_reset (SOCKADDR *dsa);
     void send_ping (SOCKADDR *dss, u8 pong = 0);
     void send_data_packet (tap_packet *pkt, bool broadcast = false);
@@ -84,25 +102,12 @@
 
     void recv_vpn_packet (vpn_packet *pkt, SOCKADDR *rsa);
 
-    void timer ();
-
-    connection(struct vpn *vpn_)
-        : vpn(vpn_)
-    {
-      octx = ictx = 0;
-      retry_cnt = 0;
-      connectmode = conf_node::C_ALWAYS; // initial setting
-      reset_connection ();
-    }
-
-    ~connection ()
-    {
-      shutdown ();
-    }
-
     void script_node ();
-    const char *script_node_up ();
-    const char *script_node_down ();
+    const char *script_node_up (int);
+    const char *script_node_down (int);
+
+    connection(struct vpn *vpn_);
+    ~connection ();
   };
 
 struct vpn
@@ -110,13 +115,15 @@
     int socket_fd;
     int events;
 
-    tap_device *tap;
-
     enum {
       EVENT_RECONNECT = 1,
       EVENT_SHUTDOWN  = 2,
     };
 
+    void event_cb (tstamp &ts); time_watcher event;
+
+    tap_device *tap;
+
     typedef vector<connection *> conns_vector;
     conns_vector conns;
 
@@ -127,13 +134,15 @@
     void shutdown_all ();
     void connect_request (int id);
 
+    void vpn_ev (short revents); io_watcher vpn_ev_watcher;
+    void udp_ev (short revents); io_watcher udp_ev_watcher;
+
     vpn ();
     ~vpn ();
 
     int setup ();
-    void main_loop ();
 
-    const char *script_if_up ();
+    const char *script_if_up (int);
   };
 
 #endif