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

Comparing gvpe/src/vpn.C (file contents):
Revision 1.16 by pcg, Tue Oct 14 19:59:16 2003 UTC vs.
Revision 1.31 by pcg, Sat Mar 5 19:13:16 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-2005 Marc Lehmann <gvpe@schmorp.de>
3		4
		5	This file is part of GVPE.
		6
4	This program is free software; you can redistribute it and/or modify	7	GVPE is free software; you can redistribute it and/or modify
5	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
6	the Free Software Foundation; either version 2 of the License, or	9	the Free Software Foundation; either version 2 of the License, or
7	(at your option) any later version.	10	(at your option) any later version.
8		11
9	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,
10	but WITHOUT ANY WARRANTY; without even the implied warranty of	13	but WITHOUT ANY WARRANTY; without even the implied warranty of
11	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12	GNU General Public License for more details.	15	GNU General Public License for more details.
13		16
14	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
15	along with this program; if not, write to the Free Software	18	along with gvpe; if not, write to the Free Software
16	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
17	*/	20	*/
18		21
19	#include "config.h"	22	#include "config.h"
20		23
21	#include <list>	24	#include <list>
22		25
		26	#include <cstdio>
		27	#include <cstring>
23	#include <cstdlib>	28	#include <cstdlib>
24	#include <cstring>
25	#include <cstdio>
26		29
27	#include <sys/types.h>	30	#include <sys/types.h>
28	#include <sys/socket.h>	31	#include <sys/socket.h>
29	#include <sys/wait.h>	32	#include <sys/wait.h>
30	#include <errno.h>	33	#include <errno.h>
39		42
40	#include "connection.h"	43	#include "connection.h"
41	#include "util.h"	44	#include "util.h"
42	#include "vpn.h"	45	#include "vpn.h"
43		46
		47	vpn network; // THE vpn (bad design...)
		48
44	/////////////////////////////////////////////////////////////////////////////	49	/////////////////////////////////////////////////////////////////////////////
45		50
46	const char *vpn::script_if_up ()	51	const char *vpn::script_if_up ()
47	{	52	{
48	// the tunnel device mtu should be the physical mtu - overhead	53	// the tunnel device mtu should be the physical mtu - overhead
…		…
51	mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion	56	mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
52	mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round	57	mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
53	mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again	58	mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
54		59
55	char *env;	60	char *env;
56	asprintf (&env, "CONFBASE=%s", confbase);	61	asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
57	putenv (env);
58	asprintf (&env, "NODENAME=%s", THISNODE->nodename);	62	asprintf (&env, "NODENAME=%s", THISNODE->nodename); putenv (env);
59	putenv (env);
60	asprintf (&env, "NODEID=%d", THISNODE->id);	63	asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
61	putenv (env);
62	asprintf (&env, "IFNAME=%s", tap->interface ());	64	asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
63	putenv (env);	65	asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
		66	asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
64	asprintf (&env, "MTU=%d", mtu);	67	asprintf (&env, "MTU=%d", mtu); putenv (env);
65	putenv (env);
66	asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x",	68	asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x",
67	0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,	69	0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
68	THISNODE->id & 0xff);	70	THISNODE->id & 0xff);
69	putenv (env);	71	putenv (env);
70		72
…		…
98	sockinfo si (THISNODE, PROT_IPv4);	100	sockinfo si (THISNODE, PROT_IPv4);
99		101
100	if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))	102	if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
101	{	103	{
102	slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));	104	slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
103	exit (1);	105	exit (EXIT_FAILURE);
104	}	106	}
105		107
106	ipv4_ev_watcher.start (ipv4_fd, POLLIN);	108	ipv4_ev_watcher.start (ipv4_fd, EVENT_READ);
107	}	109	}
108		110
109	udpv4_fd = -1;	111	udpv4_fd = -1;
110		112
111	if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)	113	if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
…		…
136	sockinfo si (THISNODE, PROT_UDPv4);	138	sockinfo si (THISNODE, PROT_UDPv4);
137		139
138	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))	140	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
139	{	141	{
140	slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));	142	slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
141	exit (1);	143	exit (EXIT_FAILURE);
142	}	144	}
143		145
144	udpv4_ev_watcher.start (udpv4_fd, POLLIN);	146	udpv4_ev_watcher.start (udpv4_fd, EVENT_READ);
145	}	147	}
146		148
147	icmpv4_fd = -1;	149	icmpv4_fd = -1;
148		150
149	#if ENABLE_ICMP	151	#if ENABLE_ICMP
…		…
180	sockinfo si (THISNODE, PROT_ICMPv4);	182	sockinfo si (THISNODE, PROT_ICMPv4);
181		183
182	if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))	184	if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
183	{	185	{
184	slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));	186	slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
185	exit (1);	187	exit (EXIT_FAILURE);
186	}	188	}
187		189
188	icmpv4_ev_watcher.start (icmpv4_fd, POLLIN);	190	icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ);
189	}	191	}
190	#endif	192	#endif
191		193
192	tcpv4_fd = -1;	194	tcpv4_fd = -1;
193		195
…		…
210	sockinfo si (THISNODE, PROT_TCPv4);	212	sockinfo si (THISNODE, PROT_TCPv4);
211		213
212	if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))	214	if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
213	{	215	{
214	slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));	216	slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));
215	exit (1);	217	exit (EXIT_FAILURE);
216	}	218	}
217		219
218	if (listen (tcpv4_fd, 5))	220	if (listen (tcpv4_fd, 5))
219	{	221	{
220	slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));	222	slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
221	exit (1);	223	exit (EXIT_FAILURE);
		224	}
		225
		226	tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ);
		227	}
		228	#endif
		229
		230	#if ENABLE_DNS
		231	if (THISNODE->protocols & PROT_DNSv4)
		232	{
		233	dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
		234
		235	dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
		236
		237	if (dnsv4_fd < 0)
		238	return -1;
		239
		240	// standard daemon practise...
		241	{
		242	int oval = 1;
		243	setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
		244	}
		245
		246	sockinfo si (THISNODE->dns_hostname,
		247	THISNODE->dns_hostname ? THISNODE->dns_port : 0,
		248	PROT_DNSv4);
		249
		250	if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
222	}	251	{
		252	slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno));
		253	exit (EXIT_FAILURE);
		254	}
223		255
224	tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);	256	dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ);
225	}	257	}
226	#endif	258	#endif
227		259
228	tap = new tap_device ();	260	tap = new tap_device ();
229	if (!tap) //D this, of course, never catches	261	if (!tap) //D this, of course, never catches
230	{	262	{
231	slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);	263	slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
232	exit (1);	264	exit (EXIT_FAILURE);
233	}	265	}
234		266
235	run_script (run_script_cb (this, &vpn::script_if_up), true);	267	run_script (run_script_cb (this, &vpn::script_if_up), true);
236		268
237	tap_ev_watcher.start (tap->fd, POLLIN);	269	tap_ev_watcher.start (tap->fd, EVENT_READ);
238		270
239	reconnect_all ();	271	reconnect_all ();
240		272
241	return 0;	273	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	}	274	}
271		275
272	bool	276	bool
273	vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	277	vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
274	{	278	{
…		…
332	setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);	336	setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
333	#endif	337	#endif
334	sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());	338	sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
335		339
336	return true;	340	return true;
		341	}
		342
		343	void
		344	vpn::inject_data_packet (tap_packet *pkt, int dst)
		345	{
		346	if (dst)
		347	{
		348	// unicast
		349	if (dst != THISNODE->id)
		350	conns[dst - 1]->inject_data_packet (pkt);
		351	}
		352	else
		353	{
		354	// broadcast, this is ugly, but due to the security policy
		355	// we have to connect to all hosts...
		356	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
		357	if ((*c)->conf != THISNODE)
		358	(*c)->inject_data_packet (pkt, true);
		359	}
337	}	360	}
338		361
339	void	362	void
340	vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)	363	vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
341	{	364	{
…		…
358	connection *c = conns[src - 1];	381	connection *c = conns[src - 1];
359		382
360	if (dst == 0)	383	if (dst == 0)
361	slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),	384	slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),
362	c->conf->nodename, (const char *)rsi);	385	c->conf->nodename, (const char *)rsi);
363	else if (dst != 0 && dst != THISNODE->id)	386	else if (dst != THISNODE->id)
364	{	387	{
365	if (THISNODE->routerprio)	388	if (THISNODE->routerprio)
366	// the tos setting gets lost here. who cares.	389	// the tos setting gets lost here. who cares.
367	conns[dst - 1]->inject_vpn_packet (pkt);	390	conns[dst - 1]->inject_vpn_packet (pkt);
368	else	391	else
…		…
374	else	397	else
375	c->recv_vpn_packet (pkt, rsi);	398	c->recv_vpn_packet (pkt, rsi);
376	}	399	}
377	}	400	}
378		401
		402	bool
		403	vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
		404	{
		405	switch (si.prot)
		406	{
		407	case PROT_IPv4:
		408	return send_ipv4_packet (pkt, si, tos);
		409	case PROT_UDPv4:
		410	return send_udpv4_packet (pkt, si, tos);
		411	#if ENABLE_TCP
		412	case PROT_TCPv4:
		413	return send_tcpv4_packet (pkt, si, tos);
		414	#endif
		415	#if ENABLE_ICMP
		416	case PROT_ICMPv4:
		417	return send_icmpv4_packet (pkt, si, tos);
		418	#endif
		419	#if ENABLE_DNS
		420	case PROT_DNSv4:
		421	return send_dnsv4_packet (pkt, si, tos);
		422	#endif
		423
		424	default:
		425	slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
		426	}
		427
		428	return false;
		429	}
		430
379	void	431	void
380	vpn::ipv4_ev (io_watcher &w, short revents)	432	vpn::ipv4_ev (io_watcher &w, short revents)
381	{	433	{
382	if (revents & (POLLIN \| POLLERR))	434	if (revents & EVENT_READ)
383	{	435	{
384	vpn_packet *pkt = new vpn_packet;	436	vpn_packet *pkt = new vpn_packet;
385	struct sockaddr_in sa;	437	struct sockaddr_in sa;
386	socklen_t sa_len = sizeof (sa);	438	socklen_t sa_len = sizeof (sa);
387	int len;	439	int len;
…		…
392		444
393	if (len > 0)	445	if (len > 0)
394	{	446	{
395	pkt->len = len;	447	pkt->len = len;
396		448
397	// raw sockets deliver the ipv4, but don't expect it on sends	449	// raw sockets deliver the ipv4 header, but don't expect it on sends
398	// this is slow, but...
399	pkt->skip_hdr (IP_OVERHEAD);	450	pkt->skip_hdr (IP_OVERHEAD);
400		451
401	recv_vpn_packet (pkt, si);	452	recv_vpn_packet (pkt, si);
402	}	453	}
403	else	454	else
…		…
406	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	457	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
407	}	458	}
408		459
409	delete pkt;	460	delete pkt;
410	}	461	}
411	else if (revents & POLLHUP)
412	{
413	// this cannot ;) happen on udp sockets
414	slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
415	exit (1);
416	}
417	else	462	else
418	{	463	{
419	slog (L_ERR,	464	slog (L_ERR,
420	_("FATAL: unknown revents %08x in socket, terminating\n"),	465	_("FATAL: unknown revents %08x in socket, terminating\n"),
421	revents);	466	revents);
422	exit (1);	467	exit (EXIT_FAILURE);
423	}	468	}
424	}	469	}
425		470
426	#if ENABLE_ICMP	471	#if ENABLE_ICMP
427	void	472	void
428	vpn::icmpv4_ev (io_watcher &w, short revents)	473	vpn::icmpv4_ev (io_watcher &w, short revents)
429	{	474	{
430	if (revents & (POLLIN \| POLLERR))	475	if (revents & EVENT_READ)
431	{	476	{
432	vpn_packet *pkt = new vpn_packet;	477	vpn_packet *pkt = new vpn_packet;
433	struct sockaddr_in sa;	478	struct sockaddr_in sa;
434	socklen_t sa_len = sizeof (sa);	479	socklen_t sa_len = sizeof (sa);
435	int len;	480	int len;
…		…
460	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	505	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
461	}	506	}
462		507
463	delete pkt;	508	delete pkt;
464	}	509	}
465	else if (revents & POLLHUP)
466	{
467	// this cannot ;) happen on udp sockets
468	slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
469	exit (1);
470	}
471	else	510	else
472	{	511	{
473	slog (L_ERR,	512	slog (L_ERR,
474	_("FATAL: unknown revents %08x in socket, terminating\n"),	513	_("FATAL: unknown revents %08x in socket, terminating\n"),
475	revents);	514	revents);
476	exit (1);	515	exit (EXIT_FAILURE);
477	}	516	}
478	}	517	}
479	#endif	518	#endif
480		519
481	void	520	void
482	vpn::udpv4_ev (io_watcher &w, short revents)	521	vpn::udpv4_ev (io_watcher &w, short revents)
483	{	522	{
484	if (revents & (POLLIN \| POLLERR))	523	if (revents & EVENT_READ)
485	{	524	{
486	vpn_packet *pkt = new vpn_packet;	525	vpn_packet *pkt = new vpn_packet;
487	struct sockaddr_in sa;	526	struct sockaddr_in sa;
488	socklen_t sa_len = sizeof (sa);	527	socklen_t sa_len = sizeof (sa);
489	int len;	528	int len;
…		…
504	slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));	543	slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
505	}	544	}
506		545
507	delete pkt;	546	delete pkt;
508	}	547	}
509	else if (revents & POLLHUP)
510	{
511	// this cannot ;) happen on udp sockets
512	slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
513	exit (1);
514	}
515	else	548	else
516	{	549	{
517	slog (L_ERR,	550	slog (L_ERR,
518	_("FATAL: unknown revents %08x in socket, terminating\n"),	551	_("FATAL: unknown revents %08x in socket, terminating\n"),
519	revents);	552	revents);
520	exit (1);	553	exit (EXIT_FAILURE);
521	}	554	}
522	}	555	}
523		556
524	void	557	void
525	vpn::tap_ev (io_watcher &w, short revents)	558	vpn::tap_ev (io_watcher &w, short revents)
526	{	559	{
527	if (revents & POLLIN)	560	if (revents & EVENT_READ)
528	{	561	{
529	/* process data */	562	/* process data */
530	tap_packet *pkt;	563	tap_packet *pkt;
531		564
532	pkt = tap->recv ();	565	pkt = tap->recv ();
533		566
		567	if (!pkt)
		568	return;
		569
		570	if (pkt->len > 14)
		571	{
534	int dst = mac2id (pkt->dst);	572	int dst = mac2id (pkt->dst);
535	int src = mac2id (pkt->src);	573	int src = mac2id (pkt->src);
536		574
537	if (src != THISNODE->id)	575	if (src != THISNODE->id)
538	{
539	slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
540	exit (1);
541	}
542
543	if (dst == THISNODE->id)
544	{
545	slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
546	exit (1);
547	}
548
549	if (dst > conns.size ())
550	slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
551	else
552	{
553	if (dst)
554	{	576	{
555	// unicast	577	slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
556	if (dst != THISNODE->id)	578	exit (EXIT_FAILURE);
557	conns[dst - 1]->inject_data_packet (pkt);
558	}	579	}
		580
		581	if (dst == THISNODE->id)
		582	{
		583	slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
		584	exit (EXIT_FAILURE);
		585	}
		586
		587	if (dst > conns.size ())
		588	slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
559	else	589	else
560	{
561	// broadcast, this is ugly, but due to the security policy
562	// we have to connect to all hosts...
563	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
564	if ((*c)->conf != THISNODE)
565	(*c)->inject_data_packet (pkt);	590	inject_data_packet (pkt, dst);
566	}
567	}	591	}
568		592
569	delete pkt;	593	delete pkt;
570	}
571	else if (revents & (POLLHUP \| POLLERR))
572	{
573	slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
574	exit (1);
575	}	594	}
576	else	595	else
577	abort ();	596	abort ();
578	}	597	}
579		598
…		…
585	if (events & EVENT_SHUTDOWN)	604	if (events & EVENT_SHUTDOWN)
586	{	605	{
587	slog (L_INFO, _("preparing shutdown..."));	606	slog (L_INFO, _("preparing shutdown..."));
588		607
589	shutdown_all ();	608	shutdown_all ();
590
591	remove_pid (pidfilename);	609	remove_pid (conf.pidfilename);
592
593	slog (L_INFO, _("terminating"));	610	slog (L_INFO, _("terminating"));
594		611	exit (EXIT_SUCCESS);
595	exit (0);
596	}	612	}
597		613
598	if (events & EVENT_RECONNECT)	614	if (events & EVENT_RECONNECT)
599	{	615	{
600	slog (L_INFO, _("forced reconnect"));	616	slog (L_INFO, _("forced reconnect"));
…		…
602	reconnect_all ();	618	reconnect_all ();
603	}	619	}
604		620
605	events = 0;	621	events = 0;
606	}	622	}
607
608	w.at = TSTAMP_CANCEL;
609	}	623	}
610		624
611	void	625	void
612	vpn::shutdown_all ()	626	vpn::shutdown_all ()
613	{	627	{
…		…
626	connection_init ();	640	connection_init ();
627		641
628	for (configuration::node_vector::iterator i = conf.nodes.begin ();	642	for (configuration::node_vector::iterator i = conf.nodes.begin ();
629	i != conf.nodes.end (); ++i)	643	i != conf.nodes.end (); ++i)
630	{	644	{
631	connection *conn = new connection (this);	645	connection conn = new connection (this, i);
632
633	conn->conf = *i;
634	conns.push_back (conn);	646	conns.push_back (conn);
635
636	conn->establish_connection ();	647	conn->establish_connection ();
637	}	648	}
638	}	649	}
639		650
640	connection *vpn::find_router ()	651	connection *vpn::find_router ()
…		…
703	, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)	714	, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
704	#endif	715	#endif
705	#if ENABLE_ICMP	716	#if ENABLE_ICMP
706	, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)	717	, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
707	#endif	718	#endif
		719	#if ENABLE_DNS
		720	, dnsv4_ev_watcher (this, &vpn::dnsv4_ev)
		721	#endif
708	, tap_ev_watcher (this, &vpn::tap_ev)	722	, tap_ev_watcher (this, &vpn::tap_ev)
709	{	723	{
710	}	724	}
711		725
712	vpn::~vpn ()	726	vpn::~vpn ()

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.16 by pcg, Tue Oct 14 19:59:16 2003 UTC vs. Revision 1.31 by pcg, Sat Mar 5 19:13:16 2005 UTC

Diff Legend

Comparing gvpe/src/vpn.C (file contents):
Revision 1.16 by pcg, Tue Oct 14 19:59:16 2003 UTC vs.
Revision 1.31 by pcg, Sat Mar 5 19:13:16 2005 UTC