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.2 by pcg, Wed Apr 2 05:15:00 2003 UTC vs.
Revision 1.9 by pcg, Tue Oct 14 03:22:09 2003 UTC

24#include "device.h" 24#include "device.h"
25#include "connection.h" 25#include "connection.h"
26 26
27struct vpn 27struct vpn
28 { 28 {
29 int udpv4_fd, tcpv4_fd, ipv4_fd; 29 int udpv4_fd, tcpv4_fd, ipv4_fd, icmpv4_fd;
30 30
31 int events; 31 int events;
32 32
33 enum { 33 enum {
34 EVENT_RECONNECT = 1, 34 EVENT_RECONNECT = 1,
35 EVENT_SHUTDOWN = 2, 35 EVENT_SHUTDOWN = 2,
36 }; 36 };
37 37
38 void event_cb (tstamp &ts); time_watcher event; 38 void event_cb (time_watcher &w); time_watcher event;
39 39
40 tap_device *tap; 40 tap_device *tap;
41 41
42 typedef vector<connection *> conns_vector; 42 typedef vector<connection *> conns_vector;
43 conns_vector conns; 43 conns_vector conns;
44 44
45 connection *find_router (); 45 connection *find_router ();
46 connection *find_forwarder ();
46 47
47 void reconnect_all (); 48 void reconnect_all ();
48 void shutdown_all (); 49 void shutdown_all ();
50
51 void tap_ev (io_watcher &w, short revents); io_watcher tap_ev_watcher;
52
49 void connect_request (int id); 53 void send_connect_request (int id);
50 54
51 void recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi); 55 void recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi);
52 56 bool send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos);
53 void tap_ev (int fd, short revents); io_watcher tap_ev_watcher;
54 57
55#if ENABLE_TCP 58#if ENABLE_TCP
56 void tcpv4_ev (int fd, short revents); 59 void tcpv4_ev (io_watcher &w, short revents); io_watcher tcpv4_ev_watcher;
57 void tcpv4_accept (int fd, short revents); io_watcher tcpv4_accept_watcher;
58 void send_tcpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos = IPTOS_RELIABILITY); 60 bool send_tcpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos);
59#endif 61#endif
60 62
61 void udpv4_ev (int fd, short revents); io_watcher udpv4_ev_watcher; 63#if ENABLE_ICMP
64 void icmpv4_ev (io_watcher &w, short revents); io_watcher icmpv4_ev_watcher;
62 void send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos = IPTOS_RELIABILITY); 65 bool send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos);
66#endif
63 67
64 void ipv4_ev (int fd, short revents); io_watcher ipv4_ev_watcher; 68 void udpv4_ev (io_watcher &w, short revents); io_watcher udpv4_ev_watcher;
69 bool send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos);
70
71 void ipv4_ev (io_watcher &w, short revents); io_watcher ipv4_ev_watcher;
65 void send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos = IPTOS_RELIABILITY); 72 bool send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos);
66 73
67 vpn (); 74 vpn ();
68 ~vpn (); 75 ~vpn ();
69 76
70 int setup (); 77 int setup ();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines