--- gvpe/src/vpn.h	2008/08/10 01:34:36	1.29
+++ gvpe/src/vpn.h	2011/12/17 22:05:34	1.32
@@ -42,6 +42,12 @@
   int udpv4_fd , tcpv4_fd, ipv4_fd , icmpv4_fd , dnsv4_fd;
   int udpv4_tos,           ipv4_tos, icmpv4_tos, dnsv4_tos;
 
+#if 1 //D
+  int ipv42_fd, ipv42_tos;
+  void ipv42_ev (ev::io &w, int revents); ev::io ipv42_ev_watcher;
+  bool send_ipv42_packet (vpn_packet *pkt, const sockinfo &si, int tos);
+#endif
+
   int events;
 
   enum {
@@ -69,7 +75,7 @@
   void tap_ev (ev::io &w, int revents); ev::io tap_ev_watcher;
   void inject_data_packet (tap_packet *pkt, int dst);
 
-  void send_connect_request (int id);
+  void send_connect_request (connection *c);
 
   void recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi);
   bool send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos = 0);
@@ -104,6 +110,7 @@
   vpn ();
   ~vpn ();
 
+  int setup_socket (u8 prot, int family, int type, int proto);
   int setup ();
 
   void dump_status ();