--- gvpe/src/vpn.h	2003/04/02 05:15:00	1.2
+++ gvpe/src/vpn.h	2007/12/02 00:20:19	1.27
@@ -1,7 +1,10 @@
 /*
     vpn.h -- header for vpn.C
+    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.
@@ -12,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_VPN_H__
-#define VPE_VPN_H__
+#ifndef GVPE_VPN_H__
+#define GVPE_VPN_H__
 
 #include "global.h"
 #include "conf.h"
@@ -25,54 +28,78 @@
 #include "connection.h"
 
 struct vpn
-  {
-    int udpv4_fd, tcpv4_fd, ipv4_fd;
-
-    int events;
+{
+  int udpv4_fd , tcpv4_fd, ipv4_fd , icmpv4_fd , dnsv4_fd;
+  int udpv4_tos,           ipv4_tos, icmpv4_tos, dnsv4_tos;
+
+  int events;
+
+  enum {
+    EVENT_RECONNECT = 1,
+    EVENT_SHUTDOWN  = 2,
+  };
 
-    enum {
-      EVENT_RECONNECT = 1,
-      EVENT_SHUTDOWN  = 2,
-    };
+  void event_cb (ev::timer &w, int revents); ev::timer event;
 
-    void event_cb (tstamp &ts); time_watcher event;
+  tap_device *tap;
 
-    tap_device *tap;
+  typedef vector<connection *> conns_vector;
+  conns_vector conns;
 
-    typedef vector<connection *> conns_vector;
-    conns_vector conns;
+  connection *find_router ();
+  connection *find_forwarder ();
 
-    connection *find_router ();
+  void reconnect_all ();
+  void shutdown_all ();
 
-    void reconnect_all ();
-    void shutdown_all ();
-    void connect_request (int id);
+  void tap_ev (ev::io &w, int revents); ev::io tap_ev_watcher;
+  void inject_data_packet (tap_packet *pkt, int dst);
 
-    void recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi);
+  void send_connect_request (int id);
 
-    void tap_ev (int fd, short revents); io_watcher tap_ev_watcher;
+  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 (int fd, short revents);
-    void tcpv4_accept (int fd, short revents); io_watcher tcpv4_accept_watcher;
-    void send_tcpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos = IPTOS_RELIABILITY);
+  void tcpv4_ev (ev::io &w, int revents); ev::io tcpv4_ev_watcher;
+  bool send_tcpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos);
+#endif
+
+#if ENABLE_ICMP
+  void icmpv4_ev (ev::io &w, int revents); ev::io icmpv4_ev_watcher;
+  bool send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos);
 #endif
 
-    void udpv4_ev (int fd, short revents); io_watcher udpv4_ev_watcher;
-    void send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos = IPTOS_RELIABILITY);
+#if ENABLE_DNS
+  vector<struct dns_snd *> dns_sndpq;
+  sockinfo dns_forwarder;
+
+  void dnsv4_ev (ev::io &w, int revents); ev::io dnsv4_ev_watcher;
+  void dnsv4_server (struct dns_packet &pkt);
+  void dnsv4_client (struct dns_packet &pkt);
 
-    void ipv4_ev (int fd, short revents); io_watcher ipv4_ev_watcher;
-    void send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos = IPTOS_RELIABILITY);
+  bool send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos);
+#endif
 
-    vpn ();
-    ~vpn ();
+  void udpv4_ev (ev::io &w, int revents); ev::io udpv4_ev_watcher;
+  bool send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos);
 
-    int setup ();
+  void ipv4_ev (ev::io &w, int revents); ev::io ipv4_ev_watcher;
+  bool send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos);
 
-    void dump_status ();
+  vpn ();
+  ~vpn ();
 
-    const char *script_if_up ();
-  };
+  int setup ();
+
+  void dump_status ();
+
+  void script_init_env ();
+  const char *script_if_init ();
+  const char *script_if_up ();
+};
+
+extern vpn network; // THE vpn
 
 #endif