[ViewVC] Diff of: cvs/gvpe/src/vpn.C

Comparing gvpe/src/vpn.C (file contents):
Revision 1.1 by pcg, Wed Apr 2 03:25:17 2003 UTC vs.
Revision 1.10 by pcg, Tue Apr 8 03:25:35 2003 UTC

…		…
26		26
27	#include <sys/types.h>	27	#include <sys/types.h>
28	#include <sys/socket.h>	28	#include <sys/socket.h>
29	#include <sys/poll.h>	29	#include <sys/poll.h>
30	#include <sys/wait.h>	30	#include <sys/wait.h>
31	#include <netinet/in.h>
32	#include <arpa/inet.h>
33	#include <errno.h>	31	#include <errno.h>
34	#include <time.h>	32	#include <time.h>
35	#include <unistd.h>	33	#include <unistd.h>
		34	#include <arpa/inet.h>
		35	#include <netinet/in.h>
		36	#include <netinet/ip_icmp.h>
36		37
37	#include "pidfile.h"	38	#include "pidfile.h"
38		39
39	#include "connection.h"	40	#include "connection.h"
40	#include "util.h"	41	#include "util.h"
41	#include "vpn.h"	42	#include "vpn.h"
42		43
43	/////////////////////////////////////////////////////////////////////////////	44	/////////////////////////////////////////////////////////////////////////////
44		45
45	const char *vpn::script_if_up (int)	46	const char *vpn::script_if_up ()
46	{	47	{
47	// the tunnel device mtu should be the physical mtu - overhead	48	// the tunnel device mtu should be the physical mtu - overhead
48	// the tricky part is rounding to the cipher key blocksize	49	// the tricky part is rounding to the cipher key blocksize
49	int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;	50	int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
50	mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion	51	mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
…		…
71	}	72	}
72		73
73	int	74	int
74	vpn::setup ()	75	vpn::setup ()
75	{	76	{
76	sockinfo si;	77	ipv4_fd = -1;
77		78
78	si.set (THISNODE);	79	if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
		80	{
		81	ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
		82
		83	if (ipv4_fd < 0)
		84	return -1;
		85
		86	#ifdef IP_MTU_DISCOVER
		87	// this I really consider a linux bug. I am neither connected
		88	// nor do I fragment myself. Linux still sets DF and doesn't
		89	// fragment for me sometimes.
		90	{
		91	int oval = IP_PMTUDISC_DONT;
		92	setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
		93	}
		94	#endif
		95
		96	sockinfo si (THISNODE, PROT_IPv4);
		97
		98	if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
		99	{
		100	slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
		101	exit (1);
		102	}
		103
		104	ipv4_ev_watcher.start (ipv4_fd, POLLIN);
		105	}
79		106
80	udpv4_fd = -1;	107	udpv4_fd = -1;
81		108
82	if (THISNODE->protocols & PROT_UDPv4)	109	if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
83	{	110	{
84	udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);	111	udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
85		112
86	if (udpv4_fd < 0)	113	if (udpv4_fd < 0)
87	return -1;	114	return -1;
88		115
89	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))	116	// standard daemon practise...
90	{	117	{
91	slog (L_ERR, _("can't bind udpv4 to %s: %s"), (const char *)si, strerror (errno));	118	int oval = 1;
92	exit (1);	119	setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
93	}	120	}
94		121
95	#ifdef IP_MTU_DISCOVER	122	#ifdef IP_MTU_DISCOVER
96	// this I really consider a linux bug. I am neither connected	123	// this I really consider a linux bug. I am neither connected
97	// nor do I fragment myself. Linux still sets DF and doesn't	124	// nor do I fragment myself. Linux still sets DF and doesn't
98	// fragment for me sometimes.	125	// fragment for me sometimes.
…		…
100	int oval = IP_PMTUDISC_DONT;	127	int oval = IP_PMTUDISC_DONT;
101	setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);	128	setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
102	}	129	}
103	#endif	130	#endif
104		131
105	// standard daemon practise...	132	sockinfo si (THISNODE, PROT_UDPv4);
		133
		134	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
		135	{
		136	slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
		137	exit (1);
		138	}
		139
		140	udpv4_ev_watcher.start (udpv4_fd, POLLIN);
		141	}
		142
		143	icmpv4_fd = -1;
		144
		145	#if ENABLE_ICMP
		146	if (THISNODE->protocols & PROT_ICMPv4)
		147	{
		148	icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
		149
		150	if (icmpv4_fd < 0)
		151	return -1;
		152
		153	#ifdef ICMP_FILTER
106	{	154	{
107	int oval = 1;	155	icmp_filter oval;
		156	oval.data = 0xffffffff;
		157	if (::conf.icmp_type < 32)
		158	oval.data &= ~(1 << ::conf.icmp_type);
		159
108	setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);	160	setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
109	}	161	}
110		162	#endif
111	udpv4_ev_watcher.start (udpv4_fd, POLLIN);
112	}
113
114	ipv4_fd = -1;
115	if (THISNODE->protocols & PROT_IPv4)
116	{
117	ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
118
119	if (ipv4_fd < 0)
120	return -1;
121
122	if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
123	{
124	slog (L_ERR, _("can't bind ipv4 socket to %s: %s"), (const char *)si, strerror (errno));
125	exit (1);
126	}
127		163
128	#ifdef IP_MTU_DISCOVER	164	#ifdef IP_MTU_DISCOVER
129	// this I really consider a linux bug. I am neither connected	165	// this I really consider a linux bug. I am neither connected
130	// nor do I fragment myself. Linux still sets DF and doesn't	166	// nor do I fragment myself. Linux still sets DF and doesn't
131	// fragment for me sometimes.	167	// fragment for me sometimes.
132	{	168	{
133	int oval = IP_PMTUDISC_DONT;	169	int oval = IP_PMTUDISC_DONT;
134	setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);	170	setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
135	}	171	}
136	#endif	172	#endif
137		173
		174	sockinfo si (THISNODE, PROT_ICMPv4);
		175
		176	if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
		177	{
		178	slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
		179	exit (1);
		180	}
		181
138	ipv4_ev_watcher.start (ipv4_fd, POLLIN);	182	icmpv4_ev_watcher.start (icmpv4_fd, POLLIN);
		183	}
		184	#endif
		185
		186	tcpv4_fd = -1;
		187
		188	#if ENABLE_TCP
		189	if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
		190	{
		191	tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
		192
		193	if (tcpv4_fd < 0)
		194	return -1;
		195
		196	// standard daemon practise...
		197	{
		198	int oval = 1;
		199	setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
139	}	200	}
		201
		202	sockinfo si (THISNODE, PROT_TCPv4);
		203
		204	if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
		205	{
		206	slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));
		207	exit (1);
		208	}
		209
		210	if (listen (tcpv4_fd, 5))
		211	{
		212	slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
		213	exit (1);
		214	}
		215
		216	tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
		217	}
		218	#endif
140		219
141	tap = new tap_device ();	220	tap = new tap_device ();
142	if (!tap) //D this, of course, never catches	221	if (!tap) //D this, of course, never catches
143	{	222	{
144	slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);	223	slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
…		…
152	reconnect_all ();	231	reconnect_all ();
153		232
154	return 0;	233	return 0;
155	}	234	}
156		235
157	void	236	// send a vpn packet out to other hosts
		237	bool
		238	vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
		239	{
		240	switch (si.prot)
		241	{
		242	case PROT_IPv4:
		243	return send_ipv4_packet (pkt, si, tos);
		244
		245	case PROT_UDPv4:
		246	return send_udpv4_packet (pkt, si, tos);
		247
		248	#if ENABLE_TCP
		249	case PROT_TCPv4:
		250	return send_tcpv4_packet (pkt, si, tos);
		251	#endif
		252
		253	#if ENABLE_ICMP
		254	case PROT_ICMPv4:
		255	return send_icmpv4_packet (pkt, si, tos);
		256	#endif
		257
		258	default:
		259	slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
		260	return false;
		261	}
		262	}
		263
		264	bool
158	vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	265	vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
159	{	266	{
160	setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);	267	setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
161	sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());	268	sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
162	}
163		269
164	void	270	return true;
		271	}
		272
		273	static u16
		274	ipv4_checksum (u16 *data, unsigned int len)
		275	{
		276	// use 32 bit accumulator and fold back carry bits at the end
		277	u32 sum = 0;
		278
		279	while (len > 1)
		280	{
		281	sum += *data++;
		282	len -= 2;
		283	}
		284
		285	// odd byte left?
		286	if (len)
		287	sum += (u8 )data;
		288
		289	// add back carry bits
		290	sum = (sum >> 16) + (sum & 0xffff); // lo += hi
		291	sum += (sum >> 16); // carry
		292
		293	return ~sum;
		294	}
		295
		296	bool
		297	vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
		298	{
		299	setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
		300
		301	pkt->unshift_hdr (4);
		302
		303	icmphdr hdr = (icmphdr )&((*pkt)[0]);
		304	hdr->type = ::conf.icmp_type;
		305	hdr->code = 255;
		306	hdr->checksum = 0;
		307	hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
		308
		309	sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
		310
		311	return true;
		312	}
		313
		314	bool
165	vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	315	vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
166	{	316	{
167	setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);	317	setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
168	sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());	318	sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
		319
		320	return true;
169	}	321	}
170		322
171	void	323	void
172	vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)	324	vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
173	{	325	{
…		…
180	if (src == 0 \|\| src > conns.size ()	332	if (src == 0 \|\| src > conns.size ()
181	\|\| dst > conns.size ()	333	\|\| dst > conns.size ()
182	\|\| pkt->typ () >= vpn_packet::PT_MAX)	334	\|\| pkt->typ () >= vpn_packet::PT_MAX)
183	slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),	335	slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
184	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());	336	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
		337	else if (dst > conns.size ())
		338	slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
		339	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
185	else	340	else
186	{	341	{
187	connection *c = conns[src - 1];	342	connection *c = conns[src - 1];
188		343
189	if (dst == 0 && !THISNODE->routerprio)	344	if (dst == 0 && !THISNODE->routerprio)
190	slog (L_WARN, _("%s(%s): received broadcast, but we are no router"),	345	slog (L_WARN, _("%s(%s): received broadcast, but we are no router"),
191	c->conf->nodename, (const char *)rsi);	346	c->conf->nodename, (const char *)rsi);
192	else if (dst != 0 && dst != THISNODE->id)	347	else if (dst != 0 && dst != THISNODE->id)
193	// FORWARDING NEEDED ;)	348	{
		349	if (THISNODE->routerprio)
		350	// the tos setting gets lost here. who cares.
		351	conns[dst - 1]->inject_vpn_packet (pkt);
		352	else
194	slog (L_WARN,	353	slog (L_WARN,
195	_("received frame for node %d ('%s') from %s, but this is node %d ('%s')"),	354	_("%s(%s): forwarding request (=> %s), but we are no router"),
		355	c->conf->nodename, (const char *)rsi,
196	dst, conns[dst - 1]->conf->nodename,	356	conns[dst - 1]->conf->nodename);
197	(const char *)rsi,	357	}
198	THISNODE->id, THISNODE->nodename);
199	else	358	else
200	c->recv_vpn_packet (pkt, rsi);	359	c->recv_vpn_packet (pkt, rsi);
201	}	360	}
202	}	361	}
203		362
204	void	363	void
205	vpn::udpv4_ev (short revents)	364	vpn::ipv4_ev (io_watcher &w, short revents)
206	{	365	{
207	if (revents & (POLLIN \| POLLERR))	366	if (revents & (POLLIN \| POLLERR))
208	{	367	{
209	vpn_packet *pkt = new vpn_packet;	368	vpn_packet *pkt = new vpn_packet;
210	struct sockaddr_in sa;	369	struct sockaddr_in sa;
211	socklen_t sa_len = sizeof (sa);	370	socklen_t sa_len = sizeof (sa);
212	int len;	371	int len;
213		372
214	len = recvfrom (udpv4_fd, &((pkt)[0]), MAXSIZE, 0, (sockaddr )&sa, &sa_len);	373	len = recvfrom (w.fd, &((pkt)[0]), MAXSIZE, 0, (sockaddr )&sa, &sa_len);
215		374
216	sockinfo si(sa);	375	sockinfo si(sa, PROT_IPv4);
217		376
218	if (len > 0)	377	if (len > 0)
219	{	378	{
220	pkt->len = len;	379	pkt->len = len;
		380
		381	// raw sockets deliver the ipv4, but don't expect it on sends
		382	// this is slow, but...
		383	pkt->skip_hdr (IP_OVERHEAD);
221		384
222	recv_vpn_packet (pkt, si);	385	recv_vpn_packet (pkt, si);
223	}	386	}
224	else	387	else
225	{	388	{
…		…
230	delete pkt;	393	delete pkt;
231	}	394	}
232	else if (revents & POLLHUP)	395	else if (revents & POLLHUP)
233	{	396	{
234	// this cannot ;) happen on udp sockets	397	// this cannot ;) happen on udp sockets
235	slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));	398	slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
236	exit (1);	399	exit (1);
237	}	400	}
238	else	401	else
239	{	402	{
240	slog (L_ERR,	403	slog (L_ERR,
…		…
243	exit (1);	406	exit (1);
244	}	407	}
245	}	408	}
246		409
247	void	410	void
248	vpn::ipv4_ev (short revents)	411	vpn::icmpv4_ev (io_watcher &w, short revents)
249	{	412	{
250	if (revents & (POLLIN \| POLLERR))	413	if (revents & (POLLIN \| POLLERR))
251	{	414	{
252	vpn_packet *pkt = new vpn_packet;	415	vpn_packet *pkt = new vpn_packet;
253	struct sockaddr_in sa;	416	struct sockaddr_in sa;
254	socklen_t sa_len = sizeof (sa);	417	socklen_t sa_len = sizeof (sa);
255	int len;	418	int len;
256		419
257	len = recvfrom (ipv4_fd, &((pkt)[0]), MAXSIZE, 0, (sockaddr )&sa, &sa_len);	420	len = recvfrom (w.fd, &((pkt)[0]), MAXSIZE, 0, (sockaddr )&sa, &sa_len);
258		421
259	sockinfo si(sa, PROT_IPv4);	422	sockinfo si(sa, PROT_ICMPv4);
260		423
261	if (len > 0)	424	if (len > 0)
262	{	425	{
263	pkt->len = len;	426	pkt->len = len;
264		427
		428	icmphdr hdr = (icmphdr )&((*pkt)[IP_OVERHEAD]);
		429
		430	if (hdr->type == ::conf.icmp_type
		431	&& hdr->code == 255)
		432	{
265	// raw sockets deliver the ipv4, but don't expect it on sends	433	// raw sockets deliver the ipv4, but don't expect it on sends
266	// this is slow, but...	434	// this is slow, but...
267	pkt->skip_hdr (IP_OVERHEAD);	435	pkt->skip_hdr (ICMP_OVERHEAD);
268		436
269	recv_vpn_packet (pkt, si);	437	recv_vpn_packet (pkt, si);
		438	}
270	}	439	}
271	else	440	else
272	{	441	{
273	// probably ECONNRESET or somesuch	442	// probably ECONNRESET or somesuch
274	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	443	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
…		…
277	delete pkt;	446	delete pkt;
278	}	447	}
279	else if (revents & POLLHUP)	448	else if (revents & POLLHUP)
280	{	449	{
281	// this cannot ;) happen on udp sockets	450	// this cannot ;) happen on udp sockets
282	slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));	451	slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
283	exit (1);	452	exit (1);
284	}	453	}
285	else	454	else
286	{	455	{
287	slog (L_ERR,	456	slog (L_ERR,
…		…
290	exit (1);	459	exit (1);
291	}	460	}
292	}	461	}
293		462
294	void	463	void
		464	vpn::udpv4_ev (io_watcher &w, short revents)
		465	{
		466	if (revents & (POLLIN \| POLLERR))
		467	{
		468	vpn_packet *pkt = new vpn_packet;
		469	struct sockaddr_in sa;
		470	socklen_t sa_len = sizeof (sa);
		471	int len;
		472
		473	len = recvfrom (w.fd, &((pkt)[0]), MAXSIZE, 0, (sockaddr )&sa, &sa_len);
		474
		475	sockinfo si(sa, PROT_UDPv4);
		476
		477	if (len > 0)
		478	{
		479	pkt->len = len;
		480
		481	recv_vpn_packet (pkt, si);
		482	}
		483	else
		484	{
		485	// probably ECONNRESET or somesuch
		486	slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
		487	}
		488
		489	delete pkt;
		490	}
		491	else if (revents & POLLHUP)
		492	{
		493	// this cannot ;) happen on udp sockets
		494	slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
		495	exit (1);
		496	}
		497	else
		498	{
		499	slog (L_ERR,
		500	_("FATAL: unknown revents %08x in socket, terminating\n"),
		501	revents);
		502	exit (1);
		503	}
		504	}
		505
		506	void
295	vpn::tap_ev (short revents)	507	vpn::tap_ev (io_watcher &w, short revents)
296	{	508	{
297	if (revents & POLLIN)	509	if (revents & POLLIN)
298	{	510	{
299	/* process data */	511	/* process data */
300	tap_packet *pkt;	512	tap_packet *pkt;
…		…
350	else	562	else
351	abort ();	563	abort ();
352	}	564	}
353		565
354	void	566	void
355	vpn::event_cb (tstamp &ts)	567	vpn::event_cb (time_watcher &w)
356	{	568	{
357	if (events)	569	if (events)
358	{	570	{
359	if (events & EVENT_SHUTDOWN)	571	if (events & EVENT_SHUTDOWN)
360	{	572	{
…		…
377	}	589	}
378		590
379	events = 0;	591	events = 0;
380	}	592	}
381		593
382	ts = TSTAMP_CANCEL;	594	w.at = TSTAMP_CANCEL;
383	}	595	}
384		596
385	void	597	void
386	vpn::shutdown_all ()	598	vpn::shutdown_all ()
387	{	599	{
…		…
431	}	643	}
432		644
433	return router;	645	return router;
434	}	646	}
435		647
436	void vpn::connect_request (int id)	648	void vpn::send_connect_request (int id)
437	{	649	{
438	connection *c = find_router ();	650	connection *c = find_router ();
439		651
440	if (c)	652	if (c)
441	c->connect_request (id);	653	c->send_connect_request (id);
442	//else // does not work, because all others must connect to the same router	654	else
443	// // no router found, aggressively connect to all routers	655	// no router found, aggressively connect to all routers
444	// for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)	656	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
445	// if ((*i)->conf->routerprio)	657	if ((*i)->conf->routerprio)
446	// (*i)->establish_connection ();	658	(*i)->establish_connection ();
447	}	659	}
448		660
449	void	661	void
450	connection::dump_status ()	662	connection::dump_status ()
451	{	663	{
…		…
468		680
469	slog (L_NOTICE, _("END status dump"));	681	slog (L_NOTICE, _("END status dump"));
470	}	682	}
471		683
472	vpn::vpn (void)	684	vpn::vpn (void)
		685	: event (this, &vpn::event_cb)
473	: udpv4_ev_watcher(this, &vpn::udpv4_ev)	686	, udpv4_ev_watcher (this, &vpn::udpv4_ev)
474	, ipv4_ev_watcher(this, &vpn::ipv4_ev)	687	, ipv4_ev_watcher (this, &vpn::ipv4_ev)
		688	#if ENABLE_TCP
		689	, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
		690	#endif
		691	#if ENABLE_ICMP
		692	, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
		693	#endif
475	, tap_ev_watcher(this, &vpn::tap_ev)	694	, tap_ev_watcher (this, &vpn::tap_ev)
476	, event(this, &vpn::event_cb)
477	{	695	{
478	}	696	}
479		697
480	vpn::~vpn ()	698	vpn::~vpn ()
481	{	699	{

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.1 by pcg, Wed Apr 2 03:25:17 2003 UTC vs. Revision 1.10 by pcg, Tue Apr 8 03:25:35 2003 UTC

Diff Legend

Comparing gvpe/src/vpn.C (file contents):
Revision 1.1 by pcg, Wed Apr 2 03:25:17 2003 UTC vs.
Revision 1.10 by pcg, Tue Apr 8 03:25:35 2003 UTC