--- gvpe/src/connection.h	2003/04/13 16:53:36	1.8
+++ gvpe/src/connection.h	2005/03/01 06:27:20	1.15
@@ -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
 
@@ -110,6 +111,12 @@
     ~pkt_queue ();
   };
 
+enum
+  {
+    FEATURE_COMPRESSION = 0x01,
+    FEATURE_ROHC        = 0x02,
+  };
+
 struct connection
   {
     conf_node *conf;
@@ -124,11 +131,20 @@
     sliding_window iseqno;
 
     u8 protocol;
+    u8 features;
 
     pkt_queue data_queue, vpn_queue;
 
     crypto_ctx *octx, *ictx;
 
+#if ENABLE_DNS
+    vector<struct dns_rep *> dns_rcvq;
+    vector<struct dns_req *> dns_sndq;
+
+    void dnsv4_cb (time_watcher &w); time_watcher dnsv4_tw;
+    bool send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos);
+#endif
+
     enum conf_node::connectmode connectmode;
     u8 prot_minor; // minor number of other side
 
@@ -149,7 +165,7 @@
     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 inject_vpn_packet (vpn_packet *pkt, int tos = 0); // for forwarding
@@ -163,7 +179,7 @@
 
     void dump_status ();
 
-    connection(struct vpn *vpn_);
+    connection (struct vpn *vpn, conf_node *conf);
     ~connection ();
   };