--- gvpe/src/connection.h	2005/03/01 06:27:20	1.15
+++ gvpe/src/connection.h	2005/04/26 00:55:56	1.25
@@ -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,12 +15,12 @@
     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
-    Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    along with gvpe; if not, write to the Free Software
+    Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef VPE_CONNECTION_H__
-#define VPE_CONNECTION_H__
+#ifndef GVPE_CONNECTION_H__
+#define GVPE_CONNECTION_H__
 
 #include <openssl/hmac.h>
 
@@ -138,11 +140,9 @@
     crypto_ctx *octx, *ictx;
 
 #if ENABLE_DNS
-    vector<struct dns_rep *> dns_rcvq;
-    vector<struct dns_req *> dns_sndq;
+    struct dns_connection *dns;
 
-    void dnsv4_cb (time_watcher &w); time_watcher dnsv4_tw;
-    bool send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos);
+    void dnsv4_reset_connection ();
 #endif
 
     enum conf_node::connectmode connectmode;
@@ -170,10 +170,11 @@
     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 ();
+    void script_init_env (const char *ext);
+    void script_init_connect_env ();
     const char *script_node_up ();
     const char *script_node_down ();