--- gvpe/src/connection.h	2004/02/08 07:24:25	1.14
+++ gvpe/src/connection.h	2005/03/03 16:54:34	1.18
@@ -1,8 +1,10 @@
 /*
     connection.h -- header for connection.C
-    Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>
+    Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
  
-    This program is free software; you can redistribute it and/or modify
+    This file is part of GVPE.
+
+    GVPE is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
@@ -13,7 +15,7 @@
     GNU General Public License for more details.
  
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
+    along with gvpe; if not, write to the Free Software
     Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
@@ -137,6 +139,19 @@
 
     crypto_ctx *octx, *ictx;
 
+#if ENABLE_DNS
+    sockinfo dns_si; // forwarder
+
+    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);
+#endif
+
     enum conf_node::connectmode connectmode;
     u8 prot_minor; // minor number of other side
 
@@ -171,7 +186,7 @@
 
     void dump_status ();
 
-    connection(struct vpn *vpn_);
+    connection (struct vpn *vpn, conf_node *conf);
     ~connection ();
   };