--- gvpe/src/connection.h	2003/04/05 02:32:40	1.5
+++ gvpe/src/connection.h	2004/02/08 07:24:25	1.14
@@ -1,5 +1,6 @@
 /*
     connection.h -- header for connection.C
+    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
@@ -36,15 +37,15 @@
   u8 id[RSA_IDLEN]; // the challenge id
 };
 
-typedef u8 rsachallenge[RSA_KEYLEN - RSA_OVERHEAD]; // challenge data;
-typedef u8 rsaencrdata[RSA_KEYLEN]; // encrypted challenge
+typedef rsaclear rsachallenge;      // challenge data;
+typedef rsacrypt rsaencrdata;       // encrypted challenge
 typedef u8 rsaresponse[RSA_RESLEN]; // the encrypted ripemd160 hash
 
 ////////////////////////////////////////////////////////////////////////////////////////
 
 struct crypto_ctx;
 
-struct hmac_packet:net_packet
+struct hmac_packet : net_packet
 {
   u8 hmac[HMACLENGTH];		// each and every packet has a hmac field, but that is not (yet) checked everywhere
 
@@ -98,18 +99,24 @@
 // a very simple fifo pkt-queue
 class pkt_queue
   {
-    tap_packet *queue[QUEUEDEPTH];
+    net_packet *queue[QUEUEDEPTH];
     int i, j;
 
   public:
 
-    void put (tap_packet *p);
-    tap_packet *get ();
+    void put (net_packet *p);
+    net_packet *get ();
 
     pkt_queue ();
     ~pkt_queue ();
   };
 
+enum
+  {
+    FEATURE_COMPRESSION = 0x01,
+    FEATURE_ROHC        = 0x02,
+  };
+
 struct connection
   {
     conf_node *conf;
@@ -124,31 +131,38 @@
     sliding_window iseqno;
 
     u8 protocol;
+    u8 features;
 
-    pkt_queue queue;
+    pkt_queue data_queue, vpn_queue;
 
     crypto_ctx *octx, *ictx;
 
     enum conf_node::connectmode connectmode;
     u8 prot_minor; // minor number of other side
 
-    void reset_dstaddr ();
+    void reset_si ();
+    const sockinfo &forward_si (const sockinfo &si) const;
 
     void shutdown ();
+    void connection_established ();
     void reset_connection ();
+
     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_connect_request (int id);
     void send_auth_request (const sockinfo &si, bool initiate);
     void send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg);
     void send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols);
     void send_reset (const sockinfo &dsi);
     void send_ping (const sockinfo &dsi, u8 pong = 0);
-    void send_data_packet (tap_packet *pkt, bool broadcast = false);
+    void send_data_packet (tap_packet *pkt);
+
     void inject_data_packet (tap_packet *pkt, bool broadcast = false);
-    void connect_request (int id);
+    void inject_vpn_packet (vpn_packet *pkt, int tos = 0); // for forwarding
 
+    void send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos = 0);
     void recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi);
 
     void script_node ();