ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/vpn.h
(Generate patch)

Comparing gvpe/src/vpn.h (file contents):
Revision 1.24 by pcg, Tue Apr 26 00:55:56 2005 UTC vs.
Revision 1.25 by pcg, Sat Nov 10 05:14:22 2007 UTC

… …
36 enum { 36 enum {
37 EVENT_RECONNECT = 1, 37 EVENT_RECONNECT = 1,
38 EVENT_SHUTDOWN = 2, 38 EVENT_SHUTDOWN = 2,
39 }; 39 };
40 40
41 void event_cb (time_watcher &w); time_watcher event; 41 void event_cb (ev::timer &w, int revents); ev::timer event;
42 42
43 tap_device *tap; 43 tap_device *tap;
44 44
45 typedef vector<connection *> conns_vector; 45 typedef vector<connection *> conns_vector;
46 conns_vector conns; 46 conns_vector conns;
… …
49 connection *find_forwarder (); 49 connection *find_forwarder ();
50 50
51 void reconnect_all (); 51 void reconnect_all ();
52 void shutdown_all (); 52 void shutdown_all ();
53 53
54 void tap_ev (io_watcher &w, short revents); io_watcher tap_ev_watcher; 54 void tap_ev (ev::io &w, int revents); ev::io tap_ev_watcher;
55 void inject_data_packet (tap_packet *pkt, int dst); 55 void inject_data_packet (tap_packet *pkt, int dst);
56 56
57 void send_connect_request (int id); 57 void send_connect_request (int id);
58 58
59 void recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi); 59 void recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi);
60 bool send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos = 0); 60 bool send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos = 0);
61 61
62#if ENABLE_TCP 62#if ENABLE_TCP
63 void tcpv4_ev (io_watcher &w, short revents); io_watcher tcpv4_ev_watcher; 63 void tcpv4_ev (ev::io &w, int revents); ev::io tcpv4_ev_watcher;
64 bool send_tcpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos); 64 bool send_tcpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos);
65#endif 65#endif
66 66
67#if ENABLE_ICMP 67#if ENABLE_ICMP
68 void icmpv4_ev (io_watcher &w, short revents); io_watcher icmpv4_ev_watcher; 68 void icmpv4_ev (ev::io &w, int revents); ev::io icmpv4_ev_watcher;
69 bool send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos); 69 bool send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos);
70#endif 70#endif
71 71
72#if ENABLE_DNS 72#if ENABLE_DNS
73 vector<struct dns_snd *> dns_sndpq; 73 vector<struct dns_snd *> dns_sndpq;
74 sockinfo dns_forwarder; 74 sockinfo dns_forwarder;
75 75
76 void dnsv4_ev (io_watcher &w, short revents); io_watcher dnsv4_ev_watcher; 76 void dnsv4_ev (ev::io &w, int revents); ev::io dnsv4_ev_watcher;
77 void dnsv4_server (struct dns_packet &pkt); 77 void dnsv4_server (struct dns_packet &pkt);
78 void dnsv4_client (struct dns_packet &pkt); 78 void dnsv4_client (struct dns_packet &pkt);
79 79
80 bool send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos); 80 bool send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos);
81#endif 81#endif
82 82
83 void udpv4_ev (io_watcher &w, short revents); io_watcher udpv4_ev_watcher; 83 void udpv4_ev (ev::io &w, int revents); ev::io udpv4_ev_watcher;
84 bool send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos); 84 bool send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos);
85 85
86 void ipv4_ev (io_watcher &w, short revents); io_watcher ipv4_ev_watcher; 86 void ipv4_ev (ev::io &w, int revents); ev::io ipv4_ev_watcher;
87 bool send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos); 87 bool send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos);
88 88
89 vpn (); 89 vpn ();
90 ~vpn (); 90 ~vpn ();
91 91

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines