--- gvpe/src/vpn.h	2005/03/03 16:54:34	1.18
+++ gvpe/src/vpn.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_VPN_H__
-#define VPE_VPN_H__
+#ifndef GVPE_VPN_H__
+#define GVPE_VPN_H__
 
 #include "global.h"
 #include "conf.h"
@@ -57,6 +57,7 @@
     void send_connect_request (int id);
 
     void recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi);
+    bool send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos = 0);
 
 #if ENABLE_TCP
     void tcpv4_ev (io_watcher &w, short revents); io_watcher tcpv4_ev_watcher;
@@ -69,11 +70,14 @@
 #endif
 
 #if ENABLE_DNS
-    vector<struct dns_req *> dns_sndpq;
+    vector<struct dns_snd *> dns_sndpq;
+    sockinfo dns_forwarder;
 
     void dnsv4_ev (io_watcher &w, short revents); io_watcher dnsv4_ev_watcher;
-    struct dns_packet *dnsv4_server (struct dns_packet *pkt);
-    void dnsv4_client (struct dns_packet *pkt);
+    void dnsv4_server (struct dns_packet &pkt);
+    void dnsv4_client (struct dns_packet &pkt);
+
+    bool send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos);
 #endif
 
     void udpv4_ev (io_watcher &w, short revents); io_watcher udpv4_ev_watcher;