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

Comparing gvpe/src/vpn.C (file contents):
Revision 1.20 by pcg, Thu Oct 16 14:12:00 2003 UTC vs.
Revision 1.35 by pcg, Fri Apr 8 16:12:49 2005 UTC

…		…
1	/*	1	/*
2	vpn.C -- handle the protocol, encryption, handshaking etc.	2	vpn.C -- handle the protocol, encryption, handshaking etc.
3	Copyright (C) 2003 Marc Lehmann <pcg@goof.com>	3	Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
4		4
		5	This file is part of GVPE.
		6
5	This program is free software; you can redistribute it and/or modify	7	GVPE is free software; you can redistribute it and/or modify
6	it under the terms of the GNU General Public License as published by	8	it under the terms of the GNU General Public License as published by
7	the Free Software Foundation; either version 2 of the License, or	9	the Free Software Foundation; either version 2 of the License, or
8	(at your option) any later version.	10	(at your option) any later version.
9		11
10	This program is distributed in the hope that it will be useful,	12	This program is distributed in the hope that it will be useful,
11	but WITHOUT ANY WARRANTY; without even the implied warranty of	13	but WITHOUT ANY WARRANTY; without even the implied warranty of
12	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13	GNU General Public License for more details.	15	GNU General Public License for more details.
14		16
15	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
16	along with this program; if not, write to the Free Software	18	along with gvpe; if not, write to the Free Software
17	Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	19	Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18	*/	20	*/
19		21
20	#include "config.h"	22	#include "config.h"
21		23
22	#include <list>	24	#include <list>
23		25
		26	#include <cstdio>
		27	#include <cstring>
24	#include <cstdlib>	28	#include <cstdlib>
25	#include <cstring>
26	#include <cstdio>
27		29
28	#include <sys/types.h>	30	#include <sys/types.h>
29	#include <sys/socket.h>	31	#include <sys/socket.h>
30	#include <sys/wait.h>	32	#include <sys/wait.h>
31	#include <errno.h>	33	#include <errno.h>
44		46
45	vpn network; // THE vpn (bad design...)	47	vpn network; // THE vpn (bad design...)
46		48
47	/////////////////////////////////////////////////////////////////////////////	49	/////////////////////////////////////////////////////////////////////////////
48		50
49	const char *vpn::script_if_up ()	51	void
		52	vpn::script_init_env ()
50	{	53	{
51	// the tunnel device mtu should be the physical mtu - overhead	54	// the tunnel device mtu should be the physical mtu - overhead
52	// the tricky part is rounding to the cipher key blocksize	55	// the tricky part is rounding to the cipher key blocksize
53	int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;	56	int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
54	mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion	57	mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
55	mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round	58	mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
56	mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again	59	mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
57		60
58	char *env;	61	char *env;
59	asprintf (&env, "CONFBASE=%s", confbase);	62	asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
60	putenv (env);
61	asprintf (&env, "NODENAME=%s", THISNODE->nodename);
62	putenv (env);
63	asprintf (&env, "NODEID=%d", THISNODE->id);
64	putenv (env);
65	asprintf (&env, "IFNAME=%s", tap->interface ());	63	asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
66	putenv (env);	64	asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
		65	asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
67	asprintf (&env, "MTU=%d", mtu);	66	asprintf (&env, "MTU=%d", mtu); putenv (env);
68	putenv (env);	67	asprintf (&env, "NODES=%d", conns.size ()); putenv (env);
69	asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x",	68	asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
70	0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
71	THISNODE->id & 0xff);
72	putenv (env);
73		69
		70	conns [THISNODE->id - 1]->script_init_env ("");
		71
		72	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
		73	{
		74	char ext[16];
		75	snprintf (ext, 16, "_%d", (*c)->conf->id);
		76	(*c)->script_init_env (ext);
		77	}
		78	}
		79
		80	const char *vpn::script_if_init ()
		81	{
		82	script_init_env ();
		83
		84	return tap->if_up ();
		85	}
		86
		87	const char *vpn::script_if_up ()
		88	{
		89	script_init_env ();
		90
		91	char *filename;
		92	asprintf (&filename,
		93	"%s/%s",
		94	confbase,
74	return ::conf.script_if_up ? ::conf.script_if_up : "if-up";	95	::conf.script_if_up ? ::conf.script_if_up : "if-up");
		96
		97	return filename;
75	}	98	}
76		99
77	int	100	int
78	vpn::setup ()	101	vpn::setup ()
79	{	102	{
…		…
101	sockinfo si (THISNODE, PROT_IPv4);	124	sockinfo si (THISNODE, PROT_IPv4);
102		125
103	if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))	126	if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
104	{	127	{
105	slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));	128	slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
106	exit (1);	129	exit (EXIT_FAILURE);
107	}	130	}
108		131
109	ipv4_ev_watcher.start (ipv4_fd, POLLIN);	132	ipv4_ev_watcher.start (ipv4_fd, EVENT_READ);
110	}	133	}
111		134
112	udpv4_fd = -1;	135	udpv4_fd = -1;
113		136
114	if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)	137	if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
…		…
139	sockinfo si (THISNODE, PROT_UDPv4);	162	sockinfo si (THISNODE, PROT_UDPv4);
140		163
141	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))	164	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
142	{	165	{
143	slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));	166	slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
144	exit (1);	167	exit (EXIT_FAILURE);
145	}	168	}
146		169
147	udpv4_ev_watcher.start (udpv4_fd, POLLIN);	170	udpv4_ev_watcher.start (udpv4_fd, EVENT_READ);
148	}	171	}
149		172
150	icmpv4_fd = -1;	173	icmpv4_fd = -1;
151		174
152	#if ENABLE_ICMP	175	#if ENABLE_ICMP
…		…
183	sockinfo si (THISNODE, PROT_ICMPv4);	206	sockinfo si (THISNODE, PROT_ICMPv4);
184		207
185	if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))	208	if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
186	{	209	{
187	slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));	210	slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
188	exit (1);	211	exit (EXIT_FAILURE);
189	}	212	}
190		213
191	icmpv4_ev_watcher.start (icmpv4_fd, POLLIN);	214	icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ);
192	}	215	}
193	#endif	216	#endif
194		217
195	tcpv4_fd = -1;	218	tcpv4_fd = -1;
196		219
…		…
213	sockinfo si (THISNODE, PROT_TCPv4);	236	sockinfo si (THISNODE, PROT_TCPv4);
214		237
215	if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))	238	if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
216	{	239	{
217	slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));	240	slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));
218	exit (1);	241	exit (EXIT_FAILURE);
219	}	242	}
220		243
221	if (listen (tcpv4_fd, 5))	244	if (listen (tcpv4_fd, 5))
222	{	245	{
223	slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));	246	slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
224	exit (1);	247	exit (EXIT_FAILURE);
		248	}
		249
		250	tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ);
		251	}
		252	#endif
		253
		254	#if ENABLE_DNS
		255	if (THISNODE->protocols & PROT_DNSv4)
		256	{
		257	dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
		258
		259	dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
		260
		261	if (dnsv4_fd < 0)
		262	return -1;
		263
		264	# if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
		265	// this I really consider a linux bug. I am neither connected
		266	// nor do I fragment myself. Linux still sets DF and doesn't
		267	// fragment for me sometimes.
		268	{
		269	int oval = IP_PMTUDISC_DONT;
		270	setsockopt (dnsv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
225	}	271	}
226
227	tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
228	}
229	#endif	272	# endif
		273
		274	// standard daemon practise...
		275	{
		276	int oval = 1;
		277	setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
		278	}
		279
		280	sockinfo si (THISNODE->dns_hostname,
		281	THISNODE->dns_hostname ? THISNODE->dns_port : 0,
		282	PROT_DNSv4);
		283
		284	if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
		285	{
		286	slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno));
		287	exit (EXIT_FAILURE);
		288	}
		289
		290	dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ);
		291	}
		292	#endif
		293
		294	/////////////////////////////////////////////////////////////////////////////
		295
		296	reconnect_all ();
		297
		298	/////////////////////////////////////////////////////////////////////////////
230		299
231	tap = new tap_device ();	300	tap = new tap_device ();
232	if (!tap) //D this, of course, never catches	301	if (!tap) //D this, of course, never catches
233	{	302	{
234	slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);	303	slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
235	exit (1);	304	exit (EXIT_FAILURE);
236	}	305	}
237		306
		307	if (tap->if_up () &&
		308	!run_script (run_script_cb (this, &vpn::script_if_init), true))
		309	{
		310	slog (L_ERR, _("interface initialization command '%s' failed, exiting."),
		311	tap->if_up ());
		312	exit (EXIT_FAILURE);
		313	}
		314
238	run_script (run_script_cb (this, &vpn::script_if_up), true);	315	if (!run_script (run_script_cb (this, &vpn::script_if_up), true))
		316	{
		317	slog (L_ERR, _("if-up command execution failed, exiting."));
		318	exit (EXIT_FAILURE);
		319	}
239		320
240	tap_ev_watcher.start (tap->fd, POLLIN);	321	tap_ev_watcher.start (tap->fd, EVENT_READ);
241
242	reconnect_all ();
243		322
244	return 0;	323	return 0;
245	}
246
247	// send a vpn packet out to other hosts
248	bool
249	vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
250	{
251	switch (si.prot)
252	{
253	case PROT_IPv4:
254	return send_ipv4_packet (pkt, si, tos);
255
256	case PROT_UDPv4:
257	return send_udpv4_packet (pkt, si, tos);
258
259	#if ENABLE_TCP
260	case PROT_TCPv4:
261	return send_tcpv4_packet (pkt, si, tos);
262	#endif
263
264	#if ENABLE_ICMP
265	case PROT_ICMPv4:
266	return send_icmpv4_packet (pkt, si, tos);
267	#endif
268
269	default:
270	slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
271	return false;
272	}
273	}	324	}
274		325
275	bool	326	bool
276	vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	327	vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
277	{	328	{
…		…
396	else	447	else
397	c->recv_vpn_packet (pkt, rsi);	448	c->recv_vpn_packet (pkt, rsi);
398	}	449	}
399	}	450	}
400		451
		452	bool
		453	vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
		454	{
		455	switch (si.prot)
		456	{
		457	case PROT_IPv4:
		458	return send_ipv4_packet (pkt, si, tos);
		459	case PROT_UDPv4:
		460	return send_udpv4_packet (pkt, si, tos);
		461	#if ENABLE_TCP
		462	case PROT_TCPv4:
		463	return send_tcpv4_packet (pkt, si, tos);
		464	#endif
		465	#if ENABLE_ICMP
		466	case PROT_ICMPv4:
		467	return send_icmpv4_packet (pkt, si, tos);
		468	#endif
		469	#if ENABLE_DNS
		470	case PROT_DNSv4:
		471	return send_dnsv4_packet (pkt, si, tos);
		472	#endif
		473
		474	default:
		475	slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
		476	}
		477
		478	return false;
		479	}
		480
401	void	481	void
402	vpn::ipv4_ev (io_watcher &w, short revents)	482	vpn::ipv4_ev (io_watcher &w, short revents)
403	{	483	{
404	if (revents & (POLLIN \| POLLERR))	484	if (revents & EVENT_READ)
405	{	485	{
406	vpn_packet *pkt = new vpn_packet;	486	vpn_packet *pkt = new vpn_packet;
407	struct sockaddr_in sa;	487	struct sockaddr_in sa;
408	socklen_t sa_len = sizeof (sa);	488	socklen_t sa_len = sizeof (sa);
409	int len;	489	int len;
…		…
414		494
415	if (len > 0)	495	if (len > 0)
416	{	496	{
417	pkt->len = len;	497	pkt->len = len;
418		498
419	// raw sockets deliver the ipv4, but don't expect it on sends	499	// raw sockets deliver the ipv4 header, but don't expect it on sends
420	// this is slow, but...
421	pkt->skip_hdr (IP_OVERHEAD);	500	pkt->skip_hdr (IP_OVERHEAD);
422		501
423	recv_vpn_packet (pkt, si);	502	recv_vpn_packet (pkt, si);
424	}	503	}
425	else	504	else
…		…
428	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	507	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
429	}	508	}
430		509
431	delete pkt;	510	delete pkt;
432	}	511	}
433	else if (revents & POLLHUP)
434	{
435	// this cannot ;) happen on udp sockets
436	slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
437	exit (1);
438	}
439	else	512	else
440	{	513	{
441	slog (L_ERR,	514	slog (L_ERR,
442	_("FATAL: unknown revents %08x in socket, terminating\n"),	515	_("FATAL: unknown revents %08x in socket, terminating\n"),
443	revents);	516	revents);
444	exit (1);	517	exit (EXIT_FAILURE);
445	}	518	}
446	}	519	}
447		520
448	#if ENABLE_ICMP	521	#if ENABLE_ICMP
449	void	522	void
450	vpn::icmpv4_ev (io_watcher &w, short revents)	523	vpn::icmpv4_ev (io_watcher &w, short revents)
451	{	524	{
452	if (revents & (POLLIN \| POLLERR))	525	if (revents & EVENT_READ)
453	{	526	{
454	vpn_packet *pkt = new vpn_packet;	527	vpn_packet *pkt = new vpn_packet;
455	struct sockaddr_in sa;	528	struct sockaddr_in sa;
456	socklen_t sa_len = sizeof (sa);	529	socklen_t sa_len = sizeof (sa);
457	int len;	530	int len;
…		…
482	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	555	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
483	}	556	}
484		557
485	delete pkt;	558	delete pkt;
486	}	559	}
487	else if (revents & POLLHUP)
488	{
489	// this cannot ;) happen on udp sockets
490	slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
491	exit (1);
492	}
493	else	560	else
494	{	561	{
495	slog (L_ERR,	562	slog (L_ERR,
496	_("FATAL: unknown revents %08x in socket, terminating\n"),	563	_("FATAL: unknown revents %08x in socket, terminating\n"),
497	revents);	564	revents);
498	exit (1);	565	exit (EXIT_FAILURE);
499	}	566	}
500	}	567	}
501	#endif	568	#endif
502		569
503	void	570	void
504	vpn::udpv4_ev (io_watcher &w, short revents)	571	vpn::udpv4_ev (io_watcher &w, short revents)
505	{	572	{
506	if (revents & (POLLIN \| POLLERR))	573	if (revents & EVENT_READ)
507	{	574	{
508	vpn_packet *pkt = new vpn_packet;	575	vpn_packet *pkt = new vpn_packet;
509	struct sockaddr_in sa;	576	struct sockaddr_in sa;
510	socklen_t sa_len = sizeof (sa);	577	socklen_t sa_len = sizeof (sa);
511	int len;	578	int len;
…		…
526	slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));	593	slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
527	}	594	}
528		595
529	delete pkt;	596	delete pkt;
530	}	597	}
531	else if (revents & POLLHUP)
532	{
533	// this cannot ;) happen on udp sockets
534	slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
535	exit (1);
536	}
537	else	598	else
538	{	599	{
539	slog (L_ERR,	600	slog (L_ERR,
540	_("FATAL: unknown revents %08x in socket, terminating\n"),	601	_("FATAL: unknown revents %08x in socket, terminating\n"),
541	revents);	602	revents);
542	exit (1);	603	exit (EXIT_FAILURE);
543	}	604	}
544	}	605	}
545		606
546	void	607	void
547	vpn::tap_ev (io_watcher &w, short revents)	608	vpn::tap_ev (io_watcher &w, short revents)
548	{	609	{
549	if (revents & POLLIN)	610	if (revents & EVENT_READ)
550	{	611	{
551	/* process data */	612	/* process data */
552	tap_packet *pkt;	613	tap_packet *pkt;
553		614
554	pkt = tap->recv ();	615	pkt = tap->recv ();
…		…
561	int dst = mac2id (pkt->dst);	622	int dst = mac2id (pkt->dst);
562	int src = mac2id (pkt->src);	623	int src = mac2id (pkt->src);
563		624
564	if (src != THISNODE->id)	625	if (src != THISNODE->id)
565	{	626	{
566	slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));	627	slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
567	exit (1);	628	exit (EXIT_FAILURE);
568	}	629	}
569		630
570	if (dst == THISNODE->id)	631	if (dst == THISNODE->id)
571	{	632	{
572	slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));	633	slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
573	exit (1);	634	exit (EXIT_FAILURE);
574	}	635	}
575		636
576	if (dst > conns.size ())	637	if (dst > conns.size ())
577	slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);	638	slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
578	else	639	else
579	inject_data_packet (pkt, dst);	640	inject_data_packet (pkt, dst);
580	}	641	}
581		642
582	delete pkt;	643	delete pkt;
583	}	644	}
584	else if (revents & (POLLHUP \| POLLERR))
585	{
586	slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
587	exit (1);
588	}
589	else	645	else
590	abort ();	646	abort ();
591	}	647	}
592		648
593	void	649	void
…		…
598	if (events & EVENT_SHUTDOWN)	654	if (events & EVENT_SHUTDOWN)
599	{	655	{
600	slog (L_INFO, _("preparing shutdown..."));	656	slog (L_INFO, _("preparing shutdown..."));
601		657
602	shutdown_all ();	658	shutdown_all ();
603
604	remove_pid (pidfilename);	659	remove_pid (conf.pidfilename);
605
606	slog (L_INFO, _("terminating"));	660	slog (L_INFO, _("terminating"));
607		661	exit (EXIT_SUCCESS);
608	exit (0);
609	}	662	}
610		663
611	if (events & EVENT_RECONNECT)	664	if (events & EVENT_RECONNECT)
612	{	665	{
613	slog (L_INFO, _("forced reconnect"));	666	slog (L_INFO, _("forced reconnect"));
…		…
615	reconnect_all ();	668	reconnect_all ();
616	}	669	}
617		670
618	events = 0;	671	events = 0;
619	}	672	}
620
621	w.at = TSTAMP_CANCEL;
622	}	673	}
623		674
624	void	675	void
625	vpn::shutdown_all ()	676	vpn::shutdown_all ()
626	{	677	{
…		…
639	connection_init ();	690	connection_init ();
640		691
641	for (configuration::node_vector::iterator i = conf.nodes.begin ();	692	for (configuration::node_vector::iterator i = conf.nodes.begin ();
642	i != conf.nodes.end (); ++i)	693	i != conf.nodes.end (); ++i)
643	{	694	{
644	connection *conn = new connection (this);	695	connection conn = new connection (this, i);
645
646	conn->conf = *i;
647	conns.push_back (conn);	696	conns.push_back (conn);
648
649	conn->establish_connection ();	697	conn->establish_connection ();
650	}	698	}
651	}	699	}
652		700
653	connection *vpn::find_router ()	701	connection *vpn::find_router ()
…		…
716	, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)	764	, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
717	#endif	765	#endif
718	#if ENABLE_ICMP	766	#if ENABLE_ICMP
719	, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)	767	, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
720	#endif	768	#endif
		769	#if ENABLE_DNS
		770	, dnsv4_ev_watcher (this, &vpn::dnsv4_ev)
		771	#endif
721	, tap_ev_watcher (this, &vpn::tap_ev)	772	, tap_ev_watcher (this, &vpn::tap_ev)
722	{	773	{
723	}	774	}
724		775
725	vpn::~vpn ()	776	vpn::~vpn ()

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.20 by pcg, Thu Oct 16 14:12:00 2003 UTC vs. Revision 1.35 by pcg, Fri Apr 8 16:12:49 2005 UTC

Diff Legend

Comparing gvpe/src/vpn.C (file contents):
Revision 1.20 by pcg, Thu Oct 16 14:12:00 2003 UTC vs.
Revision 1.35 by pcg, Fri Apr 8 16:12:49 2005 UTC