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

Comparing gvpe/src/vpn.C (file contents):
Revision 1.21 by pcg, Thu Oct 16 21:57:54 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); putenv (env);	62	asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
60	asprintf (&env, "NODENAME=%s", THISNODE->nodename); putenv (env);
61	asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
62	asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);	63	asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
63	asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);	64	asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
64	asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);	65	asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
65	asprintf (&env, "MTU=%d", mtu); putenv (env);	66	asprintf (&env, "MTU=%d", mtu); putenv (env);
66	asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x",	67	asprintf (&env, "NODES=%d", conns.size ()); putenv (env);
67	0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,	68	asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
68	THISNODE->id & 0xff);
69	putenv (env);
70		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,
71	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;
72	}	98	}
73		99
74	int	100	int
75	vpn::setup ()	101	vpn::setup ()
76	{	102	{
…		…
98	sockinfo si (THISNODE, PROT_IPv4);	124	sockinfo si (THISNODE, PROT_IPv4);
99		125
100	if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))	126	if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
101	{	127	{
102	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));
103	exit (1);	129	exit (EXIT_FAILURE);
104	}	130	}
105		131
106	ipv4_ev_watcher.start (ipv4_fd, POLLIN);	132	ipv4_ev_watcher.start (ipv4_fd, EVENT_READ);
107	}	133	}
108		134
109	udpv4_fd = -1;	135	udpv4_fd = -1;
110		136
111	if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)	137	if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
…		…
136	sockinfo si (THISNODE, PROT_UDPv4);	162	sockinfo si (THISNODE, PROT_UDPv4);
137		163
138	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))	164	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
139	{	165	{
140	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));
141	exit (1);	167	exit (EXIT_FAILURE);
142	}	168	}
143		169
144	udpv4_ev_watcher.start (udpv4_fd, POLLIN);	170	udpv4_ev_watcher.start (udpv4_fd, EVENT_READ);
145	}	171	}
146		172
147	icmpv4_fd = -1;	173	icmpv4_fd = -1;
148		174
149	#if ENABLE_ICMP	175	#if ENABLE_ICMP
…		…
180	sockinfo si (THISNODE, PROT_ICMPv4);	206	sockinfo si (THISNODE, PROT_ICMPv4);
181		207
182	if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))	208	if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
183	{	209	{
184	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));
185	exit (1);	211	exit (EXIT_FAILURE);
186	}	212	}
187		213
188	icmpv4_ev_watcher.start (icmpv4_fd, POLLIN);	214	icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ);
189	}	215	}
190	#endif	216	#endif
191		217
192	tcpv4_fd = -1;	218	tcpv4_fd = -1;
193		219
…		…
210	sockinfo si (THISNODE, PROT_TCPv4);	236	sockinfo si (THISNODE, PROT_TCPv4);
211		237
212	if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))	238	if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
213	{	239	{
214	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));
215	exit (1);	241	exit (EXIT_FAILURE);
216	}	242	}
217		243
218	if (listen (tcpv4_fd, 5))	244	if (listen (tcpv4_fd, 5))
219	{	245	{
220	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));
221	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);
222	}	271	}
223
224	tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
225	}
226	#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	/////////////////////////////////////////////////////////////////////////////
227		299
228	tap = new tap_device ();	300	tap = new tap_device ();
229	if (!tap) //D this, of course, never catches	301	if (!tap) //D this, of course, never catches
230	{	302	{
231	slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);	303	slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
232	exit (1);	304	exit (EXIT_FAILURE);
233	}	305	}
234		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
235	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	}
236		320
237	tap_ev_watcher.start (tap->fd, POLLIN);	321	tap_ev_watcher.start (tap->fd, EVENT_READ);
238
239	reconnect_all ();
240		322
241	return 0;	323	return 0;
242	}
243
244	// send a vpn packet out to other hosts
245	bool
246	vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
247	{
248	switch (si.prot)
249	{
250	case PROT_IPv4:
251	return send_ipv4_packet (pkt, si, tos);
252
253	case PROT_UDPv4:
254	return send_udpv4_packet (pkt, si, tos);
255
256	#if ENABLE_TCP
257	case PROT_TCPv4:
258	return send_tcpv4_packet (pkt, si, tos);
259	#endif
260
261	#if ENABLE_ICMP
262	case PROT_ICMPv4:
263	return send_icmpv4_packet (pkt, si, tos);
264	#endif
265
266	default:
267	slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
268	return false;
269	}
270	}	324	}
271		325
272	bool	326	bool
273	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)
274	{	328	{
…		…
393	else	447	else
394	c->recv_vpn_packet (pkt, rsi);	448	c->recv_vpn_packet (pkt, rsi);
395	}	449	}
396	}	450	}
397		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
398	void	481	void
399	vpn::ipv4_ev (io_watcher &w, short revents)	482	vpn::ipv4_ev (io_watcher &w, short revents)
400	{	483	{
401	if (revents & (POLLIN \| POLLERR))	484	if (revents & EVENT_READ)
402	{	485	{
403	vpn_packet *pkt = new vpn_packet;	486	vpn_packet *pkt = new vpn_packet;
404	struct sockaddr_in sa;	487	struct sockaddr_in sa;
405	socklen_t sa_len = sizeof (sa);	488	socklen_t sa_len = sizeof (sa);
406	int len;	489	int len;
…		…
411		494
412	if (len > 0)	495	if (len > 0)
413	{	496	{
414	pkt->len = len;	497	pkt->len = len;
415		498
416	// 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
417	// this is slow, but...
418	pkt->skip_hdr (IP_OVERHEAD);	500	pkt->skip_hdr (IP_OVERHEAD);
419		501
420	recv_vpn_packet (pkt, si);	502	recv_vpn_packet (pkt, si);
421	}	503	}
422	else	504	else
…		…
425	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	507	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
426	}	508	}
427		509
428	delete pkt;	510	delete pkt;
429	}	511	}
430	else if (revents & POLLHUP)
431	{
432	// this cannot ;) happen on udp sockets
433	slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
434	exit (1);
435	}
436	else	512	else
437	{	513	{
438	slog (L_ERR,	514	slog (L_ERR,
439	_("FATAL: unknown revents %08x in socket, terminating\n"),	515	_("FATAL: unknown revents %08x in socket, terminating\n"),
440	revents);	516	revents);
441	exit (1);	517	exit (EXIT_FAILURE);
442	}	518	}
443	}	519	}
444		520
445	#if ENABLE_ICMP	521	#if ENABLE_ICMP
446	void	522	void
447	vpn::icmpv4_ev (io_watcher &w, short revents)	523	vpn::icmpv4_ev (io_watcher &w, short revents)
448	{	524	{
449	if (revents & (POLLIN \| POLLERR))	525	if (revents & EVENT_READ)
450	{	526	{
451	vpn_packet *pkt = new vpn_packet;	527	vpn_packet *pkt = new vpn_packet;
452	struct sockaddr_in sa;	528	struct sockaddr_in sa;
453	socklen_t sa_len = sizeof (sa);	529	socklen_t sa_len = sizeof (sa);
454	int len;	530	int len;
…		…
479	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	555	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
480	}	556	}
481		557
482	delete pkt;	558	delete pkt;
483	}	559	}
484	else if (revents & POLLHUP)
485	{
486	// this cannot ;) happen on udp sockets
487	slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
488	exit (1);
489	}
490	else	560	else
491	{	561	{
492	slog (L_ERR,	562	slog (L_ERR,
493	_("FATAL: unknown revents %08x in socket, terminating\n"),	563	_("FATAL: unknown revents %08x in socket, terminating\n"),
494	revents);	564	revents);
495	exit (1);	565	exit (EXIT_FAILURE);
496	}	566	}
497	}	567	}
498	#endif	568	#endif
499		569
500	void	570	void
501	vpn::udpv4_ev (io_watcher &w, short revents)	571	vpn::udpv4_ev (io_watcher &w, short revents)
502	{	572	{
503	if (revents & (POLLIN \| POLLERR))	573	if (revents & EVENT_READ)
504	{	574	{
505	vpn_packet *pkt = new vpn_packet;	575	vpn_packet *pkt = new vpn_packet;
506	struct sockaddr_in sa;	576	struct sockaddr_in sa;
507	socklen_t sa_len = sizeof (sa);	577	socklen_t sa_len = sizeof (sa);
508	int len;	578	int len;
…		…
523	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));
524	}	594	}
525		595
526	delete pkt;	596	delete pkt;
527	}	597	}
528	else if (revents & POLLHUP)
529	{
530	// this cannot ;) happen on udp sockets
531	slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
532	exit (1);
533	}
534	else	598	else
535	{	599	{
536	slog (L_ERR,	600	slog (L_ERR,
537	_("FATAL: unknown revents %08x in socket, terminating\n"),	601	_("FATAL: unknown revents %08x in socket, terminating\n"),
538	revents);	602	revents);
539	exit (1);	603	exit (EXIT_FAILURE);
540	}	604	}
541	}	605	}
542		606
543	void	607	void
544	vpn::tap_ev (io_watcher &w, short revents)	608	vpn::tap_ev (io_watcher &w, short revents)
545	{	609	{
546	if (revents & POLLIN)	610	if (revents & EVENT_READ)
547	{	611	{
548	/* process data */	612	/* process data */
549	tap_packet *pkt;	613	tap_packet *pkt;
550		614
551	pkt = tap->recv ();	615	pkt = tap->recv ();
…		…
558	int dst = mac2id (pkt->dst);	622	int dst = mac2id (pkt->dst);
559	int src = mac2id (pkt->src);	623	int src = mac2id (pkt->src);
560		624
561	if (src != THISNODE->id)	625	if (src != THISNODE->id)
562	{	626	{
563	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."));
564	exit (1);	628	exit (EXIT_FAILURE);
565	}	629	}
566		630
567	if (dst == THISNODE->id)	631	if (dst == THISNODE->id)
568	{	632	{
569	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."));
570	exit (1);	634	exit (EXIT_FAILURE);
571	}	635	}
572		636
573	if (dst > conns.size ())	637	if (dst > conns.size ())
574	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);
575	else	639	else
576	inject_data_packet (pkt, dst);	640	inject_data_packet (pkt, dst);
577	}	641	}
578		642
579	delete pkt;	643	delete pkt;
580	}	644	}
581	else if (revents & (POLLHUP \| POLLERR))
582	{
583	slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
584	exit (1);
585	}
586	else	645	else
587	abort ();	646	abort ();
588	}	647	}
589		648
590	void	649	void
…		…
595	if (events & EVENT_SHUTDOWN)	654	if (events & EVENT_SHUTDOWN)
596	{	655	{
597	slog (L_INFO, _("preparing shutdown..."));	656	slog (L_INFO, _("preparing shutdown..."));
598		657
599	shutdown_all ();	658	shutdown_all ();
600
601	remove_pid (pidfilename);	659	remove_pid (conf.pidfilename);
602
603	slog (L_INFO, _("terminating"));	660	slog (L_INFO, _("terminating"));
604		661	exit (EXIT_SUCCESS);
605	exit (0);
606	}	662	}
607		663
608	if (events & EVENT_RECONNECT)	664	if (events & EVENT_RECONNECT)
609	{	665	{
610	slog (L_INFO, _("forced reconnect"));	666	slog (L_INFO, _("forced reconnect"));
…		…
612	reconnect_all ();	668	reconnect_all ();
613	}	669	}
614		670
615	events = 0;	671	events = 0;
616	}	672	}
617
618	w.at = TSTAMP_CANCEL;
619	}	673	}
620		674
621	void	675	void
622	vpn::shutdown_all ()	676	vpn::shutdown_all ()
623	{	677	{
…		…
636	connection_init ();	690	connection_init ();
637		691
638	for (configuration::node_vector::iterator i = conf.nodes.begin ();	692	for (configuration::node_vector::iterator i = conf.nodes.begin ();
639	i != conf.nodes.end (); ++i)	693	i != conf.nodes.end (); ++i)
640	{	694	{
641	connection *conn = new connection (this);	695	connection conn = new connection (this, i);
642
643	conn->conf = *i;
644	conns.push_back (conn);	696	conns.push_back (conn);
645
646	conn->establish_connection ();	697	conn->establish_connection ();
647	}	698	}
648	}	699	}
649		700
650	connection *vpn::find_router ()	701	connection *vpn::find_router ()
…		…
713	, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)	764	, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
714	#endif	765	#endif
715	#if ENABLE_ICMP	766	#if ENABLE_ICMP
716	, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)	767	, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
717	#endif	768	#endif
		769	#if ENABLE_DNS
		770	, dnsv4_ev_watcher (this, &vpn::dnsv4_ev)
		771	#endif
718	, tap_ev_watcher (this, &vpn::tap_ev)	772	, tap_ev_watcher (this, &vpn::tap_ev)
719	{	773	{
720	}	774	}
721		775
722	vpn::~vpn ()	776	vpn::~vpn ()

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.21 by pcg, Thu Oct 16 21:57:54 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.21 by pcg, Thu Oct 16 21:57:54 2003 UTC vs.
Revision 1.35 by pcg, Fri Apr 8 16:12:49 2005 UTC