[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.32 by pcg, Mon Mar 7 01:31:26 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	#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
		241	// this I really consider a linux bug. I am neither connected
		242	// nor do I fragment myself. Linux still sets DF and doesn't
		243	// fragment for me sometimes.
		244	{
		245	int oval = IP_PMTUDISC_DONT;
		246	setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
		247	}
		248	#endif
		249
		250	// standard daemon practise...
		251	{
		252	int oval = 1;
		253	setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
		254	}
		255
		256	sockinfo si (THISNODE->dns_hostname,
		257	THISNODE->dns_hostname ? THISNODE->dns_port : 0,
		258	PROT_DNSv4);
		259
		260	if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
223	}	261	{
		262	slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno));
		263	exit (EXIT_FAILURE);
		264	}
224		265
225	tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);	266	dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ);
226	}	267	}
227	#endif	268	#endif
228		269
229	tap = new tap_device ();	270	tap = new tap_device ();
230	if (!tap) //D this, of course, never catches	271	if (!tap) //D this, of course, never catches
231	{	272	{
232	slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);	273	slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
233	exit (1);	274	exit (EXIT_FAILURE);
234	}	275	}
235		276
236	run_script (run_script_cb (this, &vpn::script_if_up), true);	277	run_script (run_script_cb (this, &vpn::script_if_up), true);
237		278
238	tap_ev_watcher.start (tap->fd, POLLIN);	279	tap_ev_watcher.start (tap->fd, EVENT_READ);
239		280
240	reconnect_all ();	281	reconnect_all ();
241		282
242	return 0;	283	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	}	284	}
272		285
273	bool	286	bool
274	vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	287	vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
275	{	288	{
…		…
333	setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);	346	setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
334	#endif	347	#endif
335	sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());	348	sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
336		349
337	return true;	350	return true;
		351	}
		352
		353	void
		354	vpn::inject_data_packet (tap_packet *pkt, int dst)
		355	{
		356	if (dst)
		357	{
		358	// unicast
		359	if (dst != THISNODE->id)
		360	conns[dst - 1]->inject_data_packet (pkt);
		361	}
		362	else
		363	{
		364	// broadcast, this is ugly, but due to the security policy
		365	// we have to connect to all hosts...
		366	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
		367	if ((*c)->conf != THISNODE)
		368	(*c)->inject_data_packet (pkt, true);
		369	}
338	}	370	}
339		371
340	void	372	void
341	vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)	373	vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
342	{	374	{
…		…
359	connection *c = conns[src - 1];	391	connection *c = conns[src - 1];
360		392
361	if (dst == 0)	393	if (dst == 0)
362	slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),	394	slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),
363	c->conf->nodename, (const char *)rsi);	395	c->conf->nodename, (const char *)rsi);
364	else if (dst != 0 && dst != THISNODE->id)	396	else if (dst != THISNODE->id)
365	{	397	{
366	if (THISNODE->routerprio)	398	if (THISNODE->routerprio)
367	// the tos setting gets lost here. who cares.	399	// the tos setting gets lost here. who cares.
368	conns[dst - 1]->inject_vpn_packet (pkt);	400	conns[dst - 1]->inject_vpn_packet (pkt);
369	else	401	else
…		…
375	else	407	else
376	c->recv_vpn_packet (pkt, rsi);	408	c->recv_vpn_packet (pkt, rsi);
377	}	409	}
378	}	410	}
379		411
		412	bool
		413	vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
		414	{
		415	switch (si.prot)
		416	{
		417	case PROT_IPv4:
		418	return send_ipv4_packet (pkt, si, tos);
		419	case PROT_UDPv4:
		420	return send_udpv4_packet (pkt, si, tos);
		421	#if ENABLE_TCP
		422	case PROT_TCPv4:
		423	return send_tcpv4_packet (pkt, si, tos);
		424	#endif
		425	#if ENABLE_ICMP
		426	case PROT_ICMPv4:
		427	return send_icmpv4_packet (pkt, si, tos);
		428	#endif
		429	#if ENABLE_DNS
		430	case PROT_DNSv4:
		431	return send_dnsv4_packet (pkt, si, tos);
		432	#endif
		433
		434	default:
		435	slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
		436	}
		437
		438	return false;
		439	}
		440
380	void	441	void
381	vpn::ipv4_ev (io_watcher &w, short revents)	442	vpn::ipv4_ev (io_watcher &w, short revents)
382	{	443	{
383	if (revents & (POLLIN \| POLLERR))	444	if (revents & EVENT_READ)
384	{	445	{
385	vpn_packet *pkt = new vpn_packet;	446	vpn_packet *pkt = new vpn_packet;
386	struct sockaddr_in sa;	447	struct sockaddr_in sa;
387	socklen_t sa_len = sizeof (sa);	448	socklen_t sa_len = sizeof (sa);
388	int len;	449	int len;
…		…
393		454
394	if (len > 0)	455	if (len > 0)
395	{	456	{
396	pkt->len = len;	457	pkt->len = len;
397		458
398	// raw sockets deliver the ipv4, but don't expect it on sends	459	// raw sockets deliver the ipv4 header, but don't expect it on sends
399	// this is slow, but...
400	pkt->skip_hdr (IP_OVERHEAD);	460	pkt->skip_hdr (IP_OVERHEAD);
401		461
402	recv_vpn_packet (pkt, si);	462	recv_vpn_packet (pkt, si);
403	}	463	}
404	else	464	else
…		…
407	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	467	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
408	}	468	}
409		469
410	delete pkt;	470	delete pkt;
411	}	471	}
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	472	else
419	{	473	{
420	slog (L_ERR,	474	slog (L_ERR,
421	_("FATAL: unknown revents %08x in socket, terminating\n"),	475	_("FATAL: unknown revents %08x in socket, terminating\n"),
422	revents);	476	revents);
423	exit (1);	477	exit (EXIT_FAILURE);
424	}	478	}
425	}	479	}
426		480
427	#if ENABLE_ICMP	481	#if ENABLE_ICMP
428	void	482	void
429	vpn::icmpv4_ev (io_watcher &w, short revents)	483	vpn::icmpv4_ev (io_watcher &w, short revents)
430	{	484	{
431	if (revents & (POLLIN \| POLLERR))	485	if (revents & EVENT_READ)
432	{	486	{
433	vpn_packet *pkt = new vpn_packet;	487	vpn_packet *pkt = new vpn_packet;
434	struct sockaddr_in sa;	488	struct sockaddr_in sa;
435	socklen_t sa_len = sizeof (sa);	489	socklen_t sa_len = sizeof (sa);
436	int len;	490	int len;
…		…
461	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	515	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
462	}	516	}
463		517
464	delete pkt;	518	delete pkt;
465	}	519	}
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	520	else
473	{	521	{
474	slog (L_ERR,	522	slog (L_ERR,
475	_("FATAL: unknown revents %08x in socket, terminating\n"),	523	_("FATAL: unknown revents %08x in socket, terminating\n"),
476	revents);	524	revents);
477	exit (1);	525	exit (EXIT_FAILURE);
478	}	526	}
479	}	527	}
480	#endif	528	#endif
481		529
482	void	530	void
483	vpn::udpv4_ev (io_watcher &w, short revents)	531	vpn::udpv4_ev (io_watcher &w, short revents)
484	{	532	{
485	if (revents & (POLLIN \| POLLERR))	533	if (revents & EVENT_READ)
486	{	534	{
487	vpn_packet *pkt = new vpn_packet;	535	vpn_packet *pkt = new vpn_packet;
488	struct sockaddr_in sa;	536	struct sockaddr_in sa;
489	socklen_t sa_len = sizeof (sa);	537	socklen_t sa_len = sizeof (sa);
490	int len;	538	int len;
…		…
505	slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));	553	slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
506	}	554	}
507		555
508	delete pkt;	556	delete pkt;
509	}	557	}
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	558	else
517	{	559	{
518	slog (L_ERR,	560	slog (L_ERR,
519	_("FATAL: unknown revents %08x in socket, terminating\n"),	561	_("FATAL: unknown revents %08x in socket, terminating\n"),
520	revents);	562	revents);
521	exit (1);	563	exit (EXIT_FAILURE);
522	}	564	}
523	}	565	}
524		566
525	void	567	void
526	vpn::tap_ev (io_watcher &w, short revents)	568	vpn::tap_ev (io_watcher &w, short revents)
527	{	569	{
528	if (revents & POLLIN)	570	if (revents & EVENT_READ)
529	{	571	{
530	/* process data */	572	/* process data */
531	tap_packet *pkt;	573	tap_packet *pkt;
532		574
533	pkt = tap->recv ();	575	pkt = tap->recv ();
534		576
		577	if (!pkt)
		578	return;
		579
		580	if (pkt->len > 14)
		581	{
535	int dst = mac2id (pkt->dst);	582	int dst = mac2id (pkt->dst);
536	int src = mac2id (pkt->src);	583	int src = mac2id (pkt->src);
537		584
538	if (src != THISNODE->id)	585	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	{	586	{
556	// unicast	587	slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
557	if (dst != THISNODE->id)	588	exit (EXIT_FAILURE);
558	conns[dst - 1]->inject_data_packet (pkt);
559	}	589	}
		590
		591	if (dst == THISNODE->id)
		592	{
		593	slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
		594	exit (EXIT_FAILURE);
		595	}
		596
		597	if (dst > conns.size ())
		598	slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
560	else	599	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);	600	inject_data_packet (pkt, dst);
567	}
568	}	601	}
569		602
570	delete pkt;	603	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	}	604	}
577	else	605	else
578	abort ();	606	abort ();
579	}	607	}
580		608
…		…
586	if (events & EVENT_SHUTDOWN)	614	if (events & EVENT_SHUTDOWN)
587	{	615	{
588	slog (L_INFO, _("preparing shutdown..."));	616	slog (L_INFO, _("preparing shutdown..."));
589		617
590	shutdown_all ();	618	shutdown_all ();
591
592	remove_pid (pidfilename);	619	remove_pid (conf.pidfilename);
593
594	slog (L_INFO, _("terminating"));	620	slog (L_INFO, _("terminating"));
595		621	exit (EXIT_SUCCESS);
596	exit (0);
597	}	622	}
598		623
599	if (events & EVENT_RECONNECT)	624	if (events & EVENT_RECONNECT)
600	{	625	{
601	slog (L_INFO, _("forced reconnect"));	626	slog (L_INFO, _("forced reconnect"));
…		…
603	reconnect_all ();	628	reconnect_all ();
604	}	629	}
605		630
606	events = 0;	631	events = 0;
607	}	632	}
608
609	w.at = TSTAMP_CANCEL;
610	}	633	}
611		634
612	void	635	void
613	vpn::shutdown_all ()	636	vpn::shutdown_all ()
614	{	637	{
…		…
627	connection_init ();	650	connection_init ();
628		651
629	for (configuration::node_vector::iterator i = conf.nodes.begin ();	652	for (configuration::node_vector::iterator i = conf.nodes.begin ();
630	i != conf.nodes.end (); ++i)	653	i != conf.nodes.end (); ++i)
631	{	654	{
632	connection *conn = new connection (this);	655	connection conn = new connection (this, i);
633
634	conn->conf = *i;
635	conns.push_back (conn);	656	conns.push_back (conn);
636
637	conn->establish_connection ();	657	conn->establish_connection ();
638	}	658	}
639	}	659	}
640		660
641	connection *vpn::find_router ()	661	connection *vpn::find_router ()
…		…
704	, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)	724	, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
705	#endif	725	#endif
706	#if ENABLE_ICMP	726	#if ENABLE_ICMP
707	, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)	727	, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
708	#endif	728	#endif
		729	#if ENABLE_DNS
		730	, dnsv4_ev_watcher (this, &vpn::dnsv4_ev)
		731	#endif
709	, tap_ev_watcher (this, &vpn::tap_ev)	732	, tap_ev_watcher (this, &vpn::tap_ev)
710	{	733	{
711	}	734	}
712		735
713	vpn::~vpn ()	736	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.32 by pcg, Mon Mar 7 01:31:26 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.32 by pcg, Mon Mar 7 01:31:26 2005 UTC