--- gvpe/src/connection.h	2005/03/03 16:54:34	1.18
+++ gvpe/src/connection.h	2005/03/18 01:53:05	1.22
@@ -19,8 +19,8 @@
     Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#ifndef VPE_CONNECTION_H__
-#define VPE_CONNECTION_H__
+#ifndef GVPE_CONNECTION_H__
+#define GVPE_CONNECTION_H__
 
 #include <openssl/hmac.h>
 
@@ -140,16 +140,9 @@
     crypto_ctx *octx, *ictx;
 
 #if ENABLE_DNS
-    sockinfo dns_si; // forwarder
+    struct dns_connection *dns;
 
-    vector<struct dns_rcv *> dns_rcvpq; int dns_rcvseq; // received packets
-
-    struct byte_stream *dns_rcvdq;
-    struct byte_stream *dns_snddq; int dns_sndseq; //D
-
-    void dnsv4_cb (time_watcher &w); time_watcher dnsv4_tw;
-    bool send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos);
-    void dnsv4_receive_rep (struct dns_rcv *r);
+    void dnsv4_reset_connection ();
 #endif
 
     enum conf_node::connectmode connectmode;
@@ -177,8 +170,8 @@
     void inject_data_packet (tap_packet *pkt, bool broadcast = false);
     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 send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos = 0);
 
     void script_node ();
     const char *script_node_up ();