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

Comparing gvpe/src/vpn.C (file contents):
Revision 1.14 by pcg, Tue Oct 14 03:22:09 2003 UTC vs.
Revision 1.30 by pcg, Fri Mar 4 20:26:50 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>
35	#include <sys/socket.h>	37	#include <sys/socket.h>
36	#include <netinet/in.h>	38
37	#include <arpa/inet.h>	39	#include "netcompat.h"
38	#include <net/if.h>
39	#ifdef HAVE_NETINET_IN_SYSTM_H
40	# include <netinet/in_systm.h>
41	#endif
42	#ifdef HAVE_NETINET_IP_H
43	# include <netinet/ip.h>
44	#endif
45	#ifdef HAVE_NETINET_TCP_H
46	# include <netinet/tcp.h>
47	#endif
48	#if ENABLE_ICMP
49	# include <netinet/ip_icmp.h>
50	#endif
51		40
52	#include "pidfile.h"	41	#include "pidfile.h"
53		42
54	#include "connection.h"	43	#include "connection.h"
55	#include "util.h"	44	#include "util.h"
56	#include "vpn.h"	45	#include "vpn.h"
57		46
58	#if !defined(SOL_IP) && defined(IPPROTO_IP)	47	vpn network; // THE vpn (bad design...)
59	# define SOL_IP IPPROTO_IP
60	#endif
61		48
62	/////////////////////////////////////////////////////////////////////////////	49	/////////////////////////////////////////////////////////////////////////////
63		50
64	const char *vpn::script_if_up ()	51	const char *vpn::script_if_up ()
65	{	52	{
69	mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion	56	mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
70	mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round	57	mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
71	mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again	58	mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
72		59
73	char *env;	60	char *env;
74	asprintf (&env, "CONFBASE=%s", confbase);	61	asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
75	putenv (env);
76	asprintf (&env, "NODENAME=%s", THISNODE->nodename);	62	asprintf (&env, "NODENAME=%s", THISNODE->nodename); putenv (env);
77	putenv (env);
78	asprintf (&env, "NODEID=%d", THISNODE->id);	63	asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
79	putenv (env);
80	asprintf (&env, "IFNAME=%s", tap->interface ());	64	asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
81	putenv (env);	65	asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
		66	asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
82	asprintf (&env, "MTU=%d", mtu);	67	asprintf (&env, "MTU=%d", mtu); putenv (env);
83	putenv (env);
84	asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x",	68	asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x",
85	0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,	69	0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
86	THISNODE->id & 0xff);	70	THISNODE->id & 0xff);
87	putenv (env);	71	putenv (env);
88		72
…		…
116	sockinfo si (THISNODE, PROT_IPv4);	100	sockinfo si (THISNODE, PROT_IPv4);
117		101
118	if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))	102	if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
119	{	103	{
120	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));
121	exit (1);	105	exit (EXIT_FAILURE);
122	}	106	}
123		107
124	ipv4_ev_watcher.start (ipv4_fd, POLLIN);	108	ipv4_ev_watcher.start (ipv4_fd, EVENT_READ);
125	}	109	}
126		110
127	udpv4_fd = -1;	111	udpv4_fd = -1;
128		112
129	if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)	113	if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
…		…
154	sockinfo si (THISNODE, PROT_UDPv4);	138	sockinfo si (THISNODE, PROT_UDPv4);
155		139
156	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))	140	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
157	{	141	{
158	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));
159	exit (1);	143	exit (EXIT_FAILURE);
160	}	144	}
161		145
162	udpv4_ev_watcher.start (udpv4_fd, POLLIN);	146	udpv4_ev_watcher.start (udpv4_fd, EVENT_READ);
163	}	147	}
164		148
165	icmpv4_fd = -1;	149	icmpv4_fd = -1;
166		150
167	#if ENABLE_ICMP	151	#if ENABLE_ICMP
…		…
198	sockinfo si (THISNODE, PROT_ICMPv4);	182	sockinfo si (THISNODE, PROT_ICMPv4);
199		183
200	if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))	184	if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
201	{	185	{
202	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));
203	exit (1);	187	exit (EXIT_FAILURE);
204	}	188	}
205		189
206	icmpv4_ev_watcher.start (icmpv4_fd, POLLIN);	190	icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ);
207	}	191	}
208	#endif	192	#endif
209		193
210	tcpv4_fd = -1;	194	tcpv4_fd = -1;
211		195
…		…
228	sockinfo si (THISNODE, PROT_TCPv4);	212	sockinfo si (THISNODE, PROT_TCPv4);
229		213
230	if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))	214	if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
231	{	215	{
232	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));
233	exit (1);	217	exit (EXIT_FAILURE);
234	}	218	}
235		219
236	if (listen (tcpv4_fd, 5))	220	if (listen (tcpv4_fd, 5))
237	{	221	{
238	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));
239	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 (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
		244	}
		245
		246	sockinfo si (THISNODE, PROT_DNSv4);
		247
		248	if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
240	}	249	{
		250	slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno));
		251	exit (EXIT_FAILURE);
		252	}
241		253
242	tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);	254	dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ);
243	}	255	}
244	#endif	256	#endif
245		257
246	tap = new tap_device ();	258	tap = new tap_device ();
247	if (!tap) //D this, of course, never catches	259	if (!tap) //D this, of course, never catches
248	{	260	{
249	slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);	261	slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
250	exit (1);	262	exit (EXIT_FAILURE);
251	}	263	}
252		264
253	run_script (run_script_cb (this, &vpn::script_if_up), true);	265	run_script (run_script_cb (this, &vpn::script_if_up), true);
254		266
255	tap_ev_watcher.start (tap->fd, POLLIN);	267	tap_ev_watcher.start (tap->fd, EVENT_READ);
256		268
257	reconnect_all ();	269	reconnect_all ();
258		270
259	return 0;	271	return 0;
260	}
261
262	// send a vpn packet out to other hosts
263	bool
264	vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
265	{
266	switch (si.prot)
267	{
268	case PROT_IPv4:
269	return send_ipv4_packet (pkt, si, tos);
270
271	case PROT_UDPv4:
272	return send_udpv4_packet (pkt, si, tos);
273
274	#if ENABLE_TCP
275	case PROT_TCPv4:
276	return send_tcpv4_packet (pkt, si, tos);
277	#endif
278
279	#if ENABLE_ICMP
280	case PROT_ICMPv4:
281	return send_icmpv4_packet (pkt, si, tos);
282	#endif
283
284	default:
285	slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
286	return false;
287	}
288	}	272	}
289		273
290	bool	274	bool
291	vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	275	vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
292	{	276	{
…		…
320		304
321	return ~sum;	305	return ~sum;
322	}	306	}
323		307
324	#if ENABLE_ICMP	308	#if ENABLE_ICMP
325	struct icmp_header {
326	u8 type;
327	u8 code;
328	u16 checksum;
329	union {
330	struct {
331	u16 id;
332	u16 sequence;
333	} echo;
334	u32 gateway;
335	struct {
336	u16 unused;
337	u16 mtu;
338	} frag;
339	} un;
340	};
341
342	bool	309	bool
343	vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	310	vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
344	{	311	{
345	#if defined(SOL_IP) && defined(IP_TOS)	312	#if defined(SOL_IP) && defined(IP_TOS)
346	setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);	313	setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
…		…
367	setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);	334	setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
368	#endif	335	#endif
369	sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());	336	sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
370		337
371	return true;	338	return true;
		339	}
		340
		341	void
		342	vpn::inject_data_packet (tap_packet *pkt, int dst)
		343	{
		344	if (dst)
		345	{
		346	// unicast
		347	if (dst != THISNODE->id)
		348	conns[dst - 1]->inject_data_packet (pkt);
		349	}
		350	else
		351	{
		352	// broadcast, this is ugly, but due to the security policy
		353	// we have to connect to all hosts...
		354	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
		355	if ((*c)->conf != THISNODE)
		356	(*c)->inject_data_packet (pkt, true);
		357	}
372	}	358	}
373		359
374	void	360	void
375	vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)	361	vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
376	{	362	{
…		…
393	connection *c = conns[src - 1];	379	connection *c = conns[src - 1];
394		380
395	if (dst == 0)	381	if (dst == 0)
396	slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),	382	slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),
397	c->conf->nodename, (const char *)rsi);	383	c->conf->nodename, (const char *)rsi);
398	else if (dst != 0 && dst != THISNODE->id)	384	else if (dst != THISNODE->id)
399	{	385	{
400	if (THISNODE->routerprio)	386	if (THISNODE->routerprio)
401	// the tos setting gets lost here. who cares.	387	// the tos setting gets lost here. who cares.
402	conns[dst - 1]->inject_vpn_packet (pkt);	388	conns[dst - 1]->inject_vpn_packet (pkt);
403	else	389	else
…		…
412	}	398	}
413		399
414	void	400	void
415	vpn::ipv4_ev (io_watcher &w, short revents)	401	vpn::ipv4_ev (io_watcher &w, short revents)
416	{	402	{
417	if (revents & (POLLIN \| POLLERR))	403	if (revents & EVENT_READ)
418	{	404	{
419	vpn_packet *pkt = new vpn_packet;	405	vpn_packet *pkt = new vpn_packet;
420	struct sockaddr_in sa;	406	struct sockaddr_in sa;
421	socklen_t sa_len = sizeof (sa);	407	socklen_t sa_len = sizeof (sa);
422	int len;	408	int len;
…		…
427		413
428	if (len > 0)	414	if (len > 0)
429	{	415	{
430	pkt->len = len;	416	pkt->len = len;
431		417
432	// raw sockets deliver the ipv4, but don't expect it on sends	418	// raw sockets deliver the ipv4 header, but don't expect it on sends
433	// this is slow, but...
434	pkt->skip_hdr (IP_OVERHEAD);	419	pkt->skip_hdr (IP_OVERHEAD);
435		420
436	recv_vpn_packet (pkt, si);	421	recv_vpn_packet (pkt, si);
437	}	422	}
438	else	423	else
…		…
441	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	426	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
442	}	427	}
443		428
444	delete pkt;	429	delete pkt;
445	}	430	}
446	else if (revents & POLLHUP)
447	{
448	// this cannot ;) happen on udp sockets
449	slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
450	exit (1);
451	}
452	else	431	else
453	{	432	{
454	slog (L_ERR,	433	slog (L_ERR,
455	_("FATAL: unknown revents %08x in socket, terminating\n"),	434	_("FATAL: unknown revents %08x in socket, terminating\n"),
456	revents);	435	revents);
457	exit (1);	436	exit (EXIT_FAILURE);
458	}	437	}
459	}	438	}
460		439
461	#if ENABLE_ICMP	440	#if ENABLE_ICMP
462	void	441	void
463	vpn::icmpv4_ev (io_watcher &w, short revents)	442	vpn::icmpv4_ev (io_watcher &w, short revents)
464	{	443	{
465	if (revents & (POLLIN \| POLLERR))	444	if (revents & EVENT_READ)
466	{	445	{
467	vpn_packet *pkt = new vpn_packet;	446	vpn_packet *pkt = new vpn_packet;
468	struct sockaddr_in sa;	447	struct sockaddr_in sa;
469	socklen_t sa_len = sizeof (sa);	448	socklen_t sa_len = sizeof (sa);
470	int len;	449	int len;
…		…
495	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	474	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
496	}	475	}
497		476
498	delete pkt;	477	delete pkt;
499	}	478	}
500	else if (revents & POLLHUP)
501	{
502	// this cannot ;) happen on udp sockets
503	slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
504	exit (1);
505	}
506	else	479	else
507	{	480	{
508	slog (L_ERR,	481	slog (L_ERR,
509	_("FATAL: unknown revents %08x in socket, terminating\n"),	482	_("FATAL: unknown revents %08x in socket, terminating\n"),
510	revents);	483	revents);
511	exit (1);	484	exit (EXIT_FAILURE);
512	}	485	}
513	}	486	}
514	#endif	487	#endif
515		488
516	void	489	void
517	vpn::udpv4_ev (io_watcher &w, short revents)	490	vpn::udpv4_ev (io_watcher &w, short revents)
518	{	491	{
519	if (revents & (POLLIN \| POLLERR))	492	if (revents & EVENT_READ)
520	{	493	{
521	vpn_packet *pkt = new vpn_packet;	494	vpn_packet *pkt = new vpn_packet;
522	struct sockaddr_in sa;	495	struct sockaddr_in sa;
523	socklen_t sa_len = sizeof (sa);	496	socklen_t sa_len = sizeof (sa);
524	int len;	497	int len;
…		…
539	slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));	512	slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
540	}	513	}
541		514
542	delete pkt;	515	delete pkt;
543	}	516	}
544	else if (revents & POLLHUP)
545	{
546	// this cannot ;) happen on udp sockets
547	slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
548	exit (1);
549	}
550	else	517	else
551	{	518	{
552	slog (L_ERR,	519	slog (L_ERR,
553	_("FATAL: unknown revents %08x in socket, terminating\n"),	520	_("FATAL: unknown revents %08x in socket, terminating\n"),
554	revents);	521	revents);
555	exit (1);	522	exit (EXIT_FAILURE);
556	}	523	}
557	}	524	}
558		525
559	void	526	void
560	vpn::tap_ev (io_watcher &w, short revents)	527	vpn::tap_ev (io_watcher &w, short revents)
561	{	528	{
562	if (revents & POLLIN)	529	if (revents & EVENT_READ)
563	{	530	{
564	/* process data */	531	/* process data */
565	tap_packet *pkt;	532	tap_packet *pkt;
566		533
567	pkt = tap->recv ();	534	pkt = tap->recv ();
568		535
		536	if (!pkt)
		537	return;
		538
		539	if (pkt->len > 14)
		540	{
569	int dst = mac2id (pkt->dst);	541	int dst = mac2id (pkt->dst);
570	int src = mac2id (pkt->src);	542	int src = mac2id (pkt->src);
571		543
572	if (src != THISNODE->id)	544	if (src != THISNODE->id)
573	{
574	slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
575	exit (1);
576	}
577
578	if (dst == THISNODE->id)
579	{
580	slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
581	exit (1);
582	}
583
584	if (dst > conns.size ())
585	slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
586	else
587	{
588	if (dst)
589	{	545	{
590	// unicast	546	slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
591	if (dst != THISNODE->id)	547	exit (EXIT_FAILURE);
592	conns[dst - 1]->inject_data_packet (pkt);
593	}	548	}
		549
		550	if (dst == THISNODE->id)
		551	{
		552	slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
		553	exit (EXIT_FAILURE);
		554	}
		555
		556	if (dst > conns.size ())
		557	slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
594	else	558	else
595	{
596	// broadcast, this is ugly, but due to the security policy
597	// we have to connect to all hosts...
598	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
599	if ((*c)->conf != THISNODE)
600	(*c)->inject_data_packet (pkt);	559	inject_data_packet (pkt, dst);
601	}
602	}	560	}
603		561
604	delete pkt;	562	delete pkt;
605	}
606	else if (revents & (POLLHUP \| POLLERR))
607	{
608	slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
609	exit (1);
610	}	563	}
611	else	564	else
612	abort ();	565	abort ();
613	}	566	}
614		567
…		…
620	if (events & EVENT_SHUTDOWN)	573	if (events & EVENT_SHUTDOWN)
621	{	574	{
622	slog (L_INFO, _("preparing shutdown..."));	575	slog (L_INFO, _("preparing shutdown..."));
623		576
624	shutdown_all ();	577	shutdown_all ();
625
626	remove_pid (pidfilename);	578	remove_pid (conf.pidfilename);
627
628	slog (L_INFO, _("terminating"));	579	slog (L_INFO, _("terminating"));
629		580	exit (EXIT_SUCCESS);
630	exit (0);
631	}	581	}
632		582
633	if (events & EVENT_RECONNECT)	583	if (events & EVENT_RECONNECT)
634	{	584	{
635	slog (L_INFO, _("forced reconnect"));	585	slog (L_INFO, _("forced reconnect"));
…		…
637	reconnect_all ();	587	reconnect_all ();
638	}	588	}
639		589
640	events = 0;	590	events = 0;
641	}	591	}
642
643	w.at = TSTAMP_CANCEL;
644	}	592	}
645		593
646	void	594	void
647	vpn::shutdown_all ()	595	vpn::shutdown_all ()
648	{	596	{
…		…
661	connection_init ();	609	connection_init ();
662		610
663	for (configuration::node_vector::iterator i = conf.nodes.begin ();	611	for (configuration::node_vector::iterator i = conf.nodes.begin ();
664	i != conf.nodes.end (); ++i)	612	i != conf.nodes.end (); ++i)
665	{	613	{
666	connection *conn = new connection (this);	614	connection conn = new connection (this, i);
667
668	conn->conf = *i;
669	conns.push_back (conn);	615	conns.push_back (conn);
670
671	conn->establish_connection ();	616	conn->establish_connection ();
672	}	617	}
673	}	618	}
674		619
675	connection *vpn::find_router ()	620	connection *vpn::find_router ()
…		…
738	, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)	683	, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
739	#endif	684	#endif
740	#if ENABLE_ICMP	685	#if ENABLE_ICMP
741	, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)	686	, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
742	#endif	687	#endif
		688	#if ENABLE_DNS
		689	, dnsv4_ev_watcher (this, &vpn::dnsv4_ev)
		690	#endif
743	, tap_ev_watcher (this, &vpn::tap_ev)	691	, tap_ev_watcher (this, &vpn::tap_ev)
744	{	692	{
745	}	693	}
746		694
747	vpn::~vpn ()	695	vpn::~vpn ()

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.14 by pcg, Tue Oct 14 03:22:09 2003 UTC vs. Revision 1.30 by pcg, Fri Mar 4 20:26:50 2005 UTC

Diff Legend

Comparing gvpe/src/vpn.C (file contents):
Revision 1.14 by pcg, Tue Oct 14 03:22:09 2003 UTC vs.
Revision 1.30 by pcg, Fri Mar 4 20:26:50 2005 UTC