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

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

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.15 by pcg, Tue Oct 14 15:48:15 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.15 by pcg, Tue Oct 14 15:48:15 2003 UTC vs.
Revision 1.31 by pcg, Sat Mar 5 19:13:16 2005 UTC