--- gvpe/src/vpn.h	2003/10/16 02:41:21	1.11
+++ gvpe/src/vpn.h	2005/03/02 05:49:31	1.16
@@ -1,6 +1,6 @@
 /*
     vpn.h -- header for vpn.C
-    Copyright (C) 2003 Marc Lehmann <pcg@goof.com>
+    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
@@ -27,7 +27,7 @@
 
 struct vpn
   {
-    int udpv4_fd, tcpv4_fd, ipv4_fd, icmpv4_fd;
+    int udpv4_fd, tcpv4_fd, ipv4_fd, icmpv4_fd, dnsv4_fd;
 
     int events;
 
@@ -55,7 +55,6 @@
     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);
 
 #if ENABLE_TCP
     void tcpv4_ev (io_watcher &w, short revents); io_watcher tcpv4_ev_watcher;
@@ -67,6 +66,15 @@
     bool send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos);
 #endif
 
+#if ENABLE_DNS
+    vector<struct dns_rep *> dns_rcvpq;
+    vector<struct dns_req *> dns_sndpq;
+
+    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);
+#endif
+
     void udpv4_ev (io_watcher &w, short revents); io_watcher udpv4_ev_watcher;
     bool send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos);
 
@@ -83,7 +91,7 @@
     const char *script_if_up ();
   };
 
-extern struct vpn network;
+extern vpn network; // THE vpn
 
 #endif