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

Comparing gvpe/src/vpn.C (file contents):
Revision 1.11 by pcg, Sun Apr 13 00:35:46 2003 UTC vs.
Revision 1.23 by pcg, Thu Jan 29 18:55:10 2004 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-2004 Marc Lehmann <pcg@goof.com>
3		4
4	This program is free software; you can redistribute it and/or modify	5	This program is free software; you can redistribute it and/or modify
5	it under the terms of the GNU General Public License as published by	6	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	7	the Free Software Foundation; either version 2 of the License, or
7	(at your option) any later version.	8	(at your option) any later version.
18		19
19	#include "config.h"	20	#include "config.h"
20		21
21	#include <list>	22	#include <list>
22		23
		24	#include <cstdio>
		25	#include <cstring>
23	#include <cstdlib>	26	#include <cstdlib>
24	#include <cstring>
25	#include <cstdio>
26		27
27	#include <sys/types.h>	28	#include <sys/types.h>
28	#include <sys/socket.h>	29	#include <sys/socket.h>
29	#include <sys/poll.h>
30	#include <sys/wait.h>	30	#include <sys/wait.h>
31	#include <errno.h>	31	#include <errno.h>
32	#include <time.h>	32	#include <time.h>
33	#include <unistd.h>	33	#include <unistd.h>
34	#include <fcntl.h>	34	#include <fcntl.h>
35	#include <arpa/inet.h>	35	#include <sys/socket.h>
36	#include <netinet/in.h>	36
37	#include <netinet/ip_icmp.h>	37	#include "netcompat.h"
38		38
39	#include "pidfile.h"	39	#include "pidfile.h"
40		40
41	#include "connection.h"	41	#include "connection.h"
42	#include "util.h"	42	#include "util.h"
43	#include "vpn.h"	43	#include "vpn.h"
		44
		45	vpn network; // THE vpn (bad design...)
44		46
45	/////////////////////////////////////////////////////////////////////////////	47	/////////////////////////////////////////////////////////////////////////////
46		48
47	const char *vpn::script_if_up ()	49	const char *vpn::script_if_up ()
48	{	50	{
…		…
52	mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion	54	mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
53	mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round	55	mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
54	mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again	56	mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
55		57
56	char *env;	58	char *env;
57	asprintf (&env, "CONFBASE=%s", confbase);	59	asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
58	putenv (env);
59	asprintf (&env, "NODENAME=%s", THISNODE->nodename);	60	asprintf (&env, "NODENAME=%s", THISNODE->nodename); putenv (env);
60	putenv (env);
61	asprintf (&env, "NODEID=%d", THISNODE->id);	61	asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
62	putenv (env);
63	asprintf (&env, "IFNAME=%s", tap->interface ());	62	asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
64	putenv (env);	63	asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
		64	asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
65	asprintf (&env, "MTU=%d", mtu);	65	asprintf (&env, "MTU=%d", mtu); putenv (env);
66	putenv (env);
67	asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x",	66	asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x",
68	0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,	67	0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
69	THISNODE->id & 0xff);	68	THISNODE->id & 0xff);
70	putenv (env);	69	putenv (env);
71		70
…		…
84	if (ipv4_fd < 0)	83	if (ipv4_fd < 0)
85	return -1;	84	return -1;
86		85
87	fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);	86	fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
88		87
89	#ifdef IP_MTU_DISCOVER	88	#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
90	// this I really consider a linux bug. I am neither connected	89	// this I really consider a linux bug. I am neither connected
91	// nor do I fragment myself. Linux still sets DF and doesn't	90	// nor do I fragment myself. Linux still sets DF and doesn't
92	// fragment for me sometimes.	91	// fragment for me sometimes.
93	{	92	{
94	int oval = IP_PMTUDISC_DONT;	93	int oval = IP_PMTUDISC_DONT;
…		…
99	sockinfo si (THISNODE, PROT_IPv4);	98	sockinfo si (THISNODE, PROT_IPv4);
100		99
101	if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))	100	if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
102	{	101	{
103	slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));	102	slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
104	exit (1);	103	exit (EXIT_FAILURE);
105	}	104	}
106		105
107	ipv4_ev_watcher.start (ipv4_fd, POLLIN);	106	ipv4_ev_watcher.start (ipv4_fd, EVENT_READ);
108	}	107	}
109		108
110	udpv4_fd = -1;	109	udpv4_fd = -1;
111		110
112	if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)	111	if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
…		…
122	{	121	{
123	int oval = 1;	122	int oval = 1;
124	setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);	123	setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
125	}	124	}
126		125
127	#ifdef IP_MTU_DISCOVER	126	#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
128	// this I really consider a linux bug. I am neither connected	127	// this I really consider a linux bug. I am neither connected
129	// nor do I fragment myself. Linux still sets DF and doesn't	128	// nor do I fragment myself. Linux still sets DF and doesn't
130	// fragment for me sometimes.	129	// fragment for me sometimes.
131	{	130	{
132	int oval = IP_PMTUDISC_DONT;	131	int oval = IP_PMTUDISC_DONT;
…		…
137	sockinfo si (THISNODE, PROT_UDPv4);	136	sockinfo si (THISNODE, PROT_UDPv4);
138		137
139	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))	138	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
140	{	139	{
141	slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));	140	slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
142	exit (1);	141	exit (EXIT_FAILURE);
143	}	142	}
144		143
145	udpv4_ev_watcher.start (udpv4_fd, POLLIN);	144	udpv4_ev_watcher.start (udpv4_fd, EVENT_READ);
146	}	145	}
147		146
148	icmpv4_fd = -1;	147	icmpv4_fd = -1;
149		148
150	#if ENABLE_ICMP	149	#if ENABLE_ICMP
…		…
166		165
167	setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);	166	setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
168	}	167	}
169	#endif	168	#endif
170		169
171	#ifdef IP_MTU_DISCOVER	170	#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
172	// this I really consider a linux bug. I am neither connected	171	// this I really consider a linux bug. I am neither connected
173	// nor do I fragment myself. Linux still sets DF and doesn't	172	// nor do I fragment myself. Linux still sets DF and doesn't
174	// fragment for me sometimes.	173	// fragment for me sometimes.
175	{	174	{
176	int oval = IP_PMTUDISC_DONT;	175	int oval = IP_PMTUDISC_DONT;
…		…
181	sockinfo si (THISNODE, PROT_ICMPv4);	180	sockinfo si (THISNODE, PROT_ICMPv4);
182		181
183	if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))	182	if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
184	{	183	{
185	slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));	184	slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
186	exit (1);	185	exit (EXIT_FAILURE);
187	}	186	}
188		187
189	icmpv4_ev_watcher.start (icmpv4_fd, POLLIN);	188	icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ);
190	}	189	}
191	#endif	190	#endif
192		191
193	tcpv4_fd = -1;	192	tcpv4_fd = -1;
194		193
…		…
211	sockinfo si (THISNODE, PROT_TCPv4);	210	sockinfo si (THISNODE, PROT_TCPv4);
212		211
213	if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))	212	if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
214	{	213	{
215	slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));	214	slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));
216	exit (1);	215	exit (EXIT_FAILURE);
217	}	216	}
218		217
219	if (listen (tcpv4_fd, 5))	218	if (listen (tcpv4_fd, 5))
220	{	219	{
221	slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));	220	slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
222	exit (1);	221	exit (EXIT_FAILURE);
223	}	222	}
224		223
225	tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);	224	tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ);
226	}	225	}
227	#endif	226	#endif
228		227
229	tap = new tap_device ();	228	tap = new tap_device ();
230	if (!tap) //D this, of course, never catches	229	if (!tap) //D this, of course, never catches
231	{	230	{
232	slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);	231	slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
233	exit (1);	232	exit (EXIT_FAILURE);
234	}	233	}
235		234
236	run_script (run_script_cb (this, &vpn::script_if_up), true);	235	run_script (run_script_cb (this, &vpn::script_if_up), true);
237		236
238	tap_ev_watcher.start (tap->fd, POLLIN);	237	tap_ev_watcher.start (tap->fd, EVENT_READ);
239		238
240	reconnect_all ();	239	reconnect_all ();
241		240
242	return 0;	241	return 0;
243	}	242	}
…		…
271	}	270	}
272		271
273	bool	272	bool
274	vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	273	vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
275	{	274	{
		275	#if defined(SOL_IP) && defined(IP_TOS)
276	setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);	276	setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
		277	#endif
277	sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());	278	sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
278		279
279	return true;	280	return true;
280	}	281	}
281		282
…		…
300	sum += (sum >> 16); // carry	301	sum += (sum >> 16); // carry
301		302
302	return ~sum;	303	return ~sum;
303	}	304	}
304		305
		306	#if ENABLE_ICMP
305	bool	307	bool
306	vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	308	vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
307	{	309	{
		310	#if defined(SOL_IP) && defined(IP_TOS)
308	setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);	311	setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
		312	#endif
309		313
310	pkt->unshift_hdr (4);	314	pkt->unshift_hdr (4);
311		315
312	icmphdr hdr = (icmphdr )&((*pkt)[0]);	316	icmp_header hdr = (icmp_header )&((*pkt)[0]);
313	hdr->type = ::conf.icmp_type;	317	hdr->type = ::conf.icmp_type;
314	hdr->code = 255;	318	hdr->code = 255;
315	hdr->checksum = 0;	319	hdr->checksum = 0;
316	hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);	320	hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
317		321
318	sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());	322	sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
319		323
320	return true;	324	return true;
321	}	325	}
		326	#endif
322		327
323	bool	328	bool
324	vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	329	vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
325	{	330	{
		331	#if defined(SOL_IP) && defined(IP_TOS)
326	setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);	332	setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
		333	#endif
327	sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());	334	sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
328		335
329	return true;	336	return true;
		337	}
		338
		339	void
		340	vpn::inject_data_packet (tap_packet *pkt, int dst)
		341	{
		342	if (dst)
		343	{
		344	// unicast
		345	if (dst != THISNODE->id)
		346	conns[dst - 1]->inject_data_packet (pkt);
		347	}
		348	else
		349	{
		350	// broadcast, this is ugly, but due to the security policy
		351	// we have to connect to all hosts...
		352	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
		353	if ((*c)->conf != THISNODE)
		354	(*c)->inject_data_packet (pkt, true);
		355	}
330	}	356	}
331		357
332	void	358	void
333	vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)	359	vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
334	{	360	{
…		…
348	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());	374	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
349	else	375	else
350	{	376	{
351	connection *c = conns[src - 1];	377	connection *c = conns[src - 1];
352		378
353	if (dst == 0 && !THISNODE->routerprio)	379	if (dst == 0)
354	slog (L_WARN, _("%s(%s): received broadcast, but we are no router"),	380	slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),
355	c->conf->nodename, (const char *)rsi);	381	c->conf->nodename, (const char *)rsi);
356	else if (dst != 0 && dst != THISNODE->id)	382	else if (dst != THISNODE->id)
357	{	383	{
358	if (THISNODE->routerprio)	384	if (THISNODE->routerprio)
359	// the tos setting gets lost here. who cares.	385	// the tos setting gets lost here. who cares.
360	conns[dst - 1]->inject_vpn_packet (pkt);	386	conns[dst - 1]->inject_vpn_packet (pkt);
361	else	387	else
…		…
370	}	396	}
371		397
372	void	398	void
373	vpn::ipv4_ev (io_watcher &w, short revents)	399	vpn::ipv4_ev (io_watcher &w, short revents)
374	{	400	{
375	if (revents & (POLLIN \| POLLERR))	401	if (revents & EVENT_READ)
376	{	402	{
377	vpn_packet *pkt = new vpn_packet;	403	vpn_packet *pkt = new vpn_packet;
378	struct sockaddr_in sa;	404	struct sockaddr_in sa;
379	socklen_t sa_len = sizeof (sa);	405	socklen_t sa_len = sizeof (sa);
380	int len;	406	int len;
…		…
399	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	425	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
400	}	426	}
401		427
402	delete pkt;	428	delete pkt;
403	}	429	}
404	else if (revents & POLLHUP)
405	{
406	// this cannot ;) happen on udp sockets
407	slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
408	exit (1);
409	}
410	else	430	else
411	{	431	{
412	slog (L_ERR,	432	slog (L_ERR,
413	_("FATAL: unknown revents %08x in socket, terminating\n"),	433	_("FATAL: unknown revents %08x in socket, terminating\n"),
414	revents);	434	revents);
415	exit (1);	435	exit (EXIT_FAILURE);
416	}	436	}
417	}	437	}
418		438
		439	#if ENABLE_ICMP
419	void	440	void
420	vpn::icmpv4_ev (io_watcher &w, short revents)	441	vpn::icmpv4_ev (io_watcher &w, short revents)
421	{	442	{
422	if (revents & (POLLIN \| POLLERR))	443	if (revents & EVENT_READ)
423	{	444	{
424	vpn_packet *pkt = new vpn_packet;	445	vpn_packet *pkt = new vpn_packet;
425	struct sockaddr_in sa;	446	struct sockaddr_in sa;
426	socklen_t sa_len = sizeof (sa);	447	socklen_t sa_len = sizeof (sa);
427	int len;	448	int len;
…		…
432		453
433	if (len > 0)	454	if (len > 0)
434	{	455	{
435	pkt->len = len;	456	pkt->len = len;
436		457
437	icmphdr hdr = (icmphdr )&((*pkt)[IP_OVERHEAD]);	458	icmp_header hdr = (icmp_header )&((*pkt)[IP_OVERHEAD]);
438		459
439	if (hdr->type == ::conf.icmp_type	460	if (hdr->type == ::conf.icmp_type
440	&& hdr->code == 255)	461	&& hdr->code == 255)
441	{	462	{
442	// raw sockets deliver the ipv4, but don't expect it on sends	463	// raw sockets deliver the ipv4, but don't expect it on sends
…		…
452	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	473	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
453	}	474	}
454		475
455	delete pkt;	476	delete pkt;
456	}	477	}
457	else if (revents & POLLHUP)
458	{
459	// this cannot ;) happen on udp sockets
460	slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
461	exit (1);
462	}
463	else	478	else
464	{	479	{
465	slog (L_ERR,	480	slog (L_ERR,
466	_("FATAL: unknown revents %08x in socket, terminating\n"),	481	_("FATAL: unknown revents %08x in socket, terminating\n"),
467	revents);	482	revents);
468	exit (1);	483	exit (EXIT_FAILURE);
469	}	484	}
470	}	485	}
		486	#endif
471		487
472	void	488	void
473	vpn::udpv4_ev (io_watcher &w, short revents)	489	vpn::udpv4_ev (io_watcher &w, short revents)
474	{	490	{
475	if (revents & (POLLIN \| POLLERR))	491	if (revents & EVENT_READ)
476	{	492	{
477	vpn_packet *pkt = new vpn_packet;	493	vpn_packet *pkt = new vpn_packet;
478	struct sockaddr_in sa;	494	struct sockaddr_in sa;
479	socklen_t sa_len = sizeof (sa);	495	socklen_t sa_len = sizeof (sa);
480	int len;	496	int len;
…		…
495	slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));	511	slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
496	}	512	}
497		513
498	delete pkt;	514	delete pkt;
499	}	515	}
500	else if (revents & POLLHUP)
501	{
502	// this cannot ;) happen on udp sockets
503	slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
504	exit (1);
505	}
506	else	516	else
507	{	517	{
508	slog (L_ERR,	518	slog (L_ERR,
509	_("FATAL: unknown revents %08x in socket, terminating\n"),	519	_("FATAL: unknown revents %08x in socket, terminating\n"),
510	revents);	520	revents);
511	exit (1);	521	exit (EXIT_FAILURE);
512	}	522	}
513	}	523	}
514		524
515	void	525	void
516	vpn::tap_ev (io_watcher &w, short revents)	526	vpn::tap_ev (io_watcher &w, short revents)
517	{	527	{
518	if (revents & POLLIN)	528	if (revents & EVENT_READ)
519	{	529	{
520	/* process data */	530	/* process data */
521	tap_packet *pkt;	531	tap_packet *pkt;
522		532
523	pkt = tap->recv ();	533	pkt = tap->recv ();
524		534
		535	if (!pkt)
		536	return;
		537
		538	if (pkt->len > 14)
		539	{
525	int dst = mac2id (pkt->dst);	540	int dst = mac2id (pkt->dst);
526	int src = mac2id (pkt->src);	541	int src = mac2id (pkt->src);
527		542
528	if (src != THISNODE->id)	543	if (src != THISNODE->id)
529	{
530	slog (L_ERR, _("FATAL: tap packet not originating on current node received, terminating."));
531	exit (1);
532	}
533
534	if (dst == THISNODE->id)
535	{
536	slog (L_ERR, _("FATAL: tap packet destined for current node received, terminating."));
537	exit (1);
538	}
539
540	if (dst > conns.size ())
541	slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
542	else
543	{
544	if (dst)
545	{	544	{
546	// unicast	545	slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
547	if (dst != THISNODE->id)	546	exit (EXIT_FAILURE);
548	conns[dst - 1]->inject_data_packet (pkt);
549	}	547	}
		548
		549	if (dst == THISNODE->id)
		550	{
		551	slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
		552	exit (EXIT_FAILURE);
		553	}
		554
		555	if (dst > conns.size ())
		556	slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
550	else	557	else
551	{
552	// broadcast, first check router, then self, then english
553	connection *router = find_router ();
554
555	if (router)
556	router->inject_data_packet (pkt, true);	558	inject_data_packet (pkt, dst);
557	else
558	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
559	if ((*c)->conf != THISNODE)
560	(*c)->inject_data_packet (pkt);
561	}
562	}	559	}
563		560
564	delete pkt;	561	delete pkt;
565	}
566	else if (revents & (POLLHUP \| POLLERR))
567	{
568	slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
569	exit (1);
570	}	562	}
571	else	563	else
572	abort ();	564	abort ();
573	}	565	}
574		566
…		…
580	if (events & EVENT_SHUTDOWN)	572	if (events & EVENT_SHUTDOWN)
581	{	573	{
582	slog (L_INFO, _("preparing shutdown..."));	574	slog (L_INFO, _("preparing shutdown..."));
583		575
584	shutdown_all ();	576	shutdown_all ();
585
586	remove_pid (pidfilename);	577	remove_pid (pidfilename);
587
588	slog (L_INFO, _("terminating"));	578	slog (L_INFO, _("terminating"));
589		579	exit (EXIT_SUCCESS);
590	exit (0);
591	}	580	}
592		581
593	if (events & EVENT_RECONNECT)	582	if (events & EVENT_RECONNECT)
594	{	583	{
595	slog (L_INFO, _("forced reconnect"));	584	slog (L_INFO, _("forced reconnect"));
…		…
597	reconnect_all ();	586	reconnect_all ();
598	}	587	}
599		588
600	events = 0;	589	events = 0;
601	}	590	}
602
603	w.at = TSTAMP_CANCEL;
604	}	591	}
605		592
606	void	593	void
607	vpn::shutdown_all ()	594	vpn::shutdown_all ()
608	{	595	{
…		…
632	}	619	}
633	}	620	}
634		621
635	connection *vpn::find_router ()	622	connection *vpn::find_router ()
636	{	623	{
637	u32 prio = 0;	624	u32 prio = 1;
638	connection *router = 0;	625	connection *router = 0;
639		626
640	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)	627	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
641	{	628	{
642	connection c = i;	629	connection c = i;
643		630
644	if (c->conf->routerprio > prio	631	if (c->conf->routerprio > prio
645	&& c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use	632	&& c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use
646	&& c->ictx && c->octx	633	&& c->ictx && c->octx
647	&& c->conf != THISNODE // redundant, since ictx==octx==0 always on thisnode	634	&& c->conf != THISNODE) // redundant, since ictx==octx==0 always on thisnode
648	&& (!THISNODE->routerprio
649	\|\| c->conf->routerprio <= THISNODE->routerprio))
650	{	635	{
651	prio = c->conf->routerprio;	636	prio = c->conf->routerprio;
652	router = c;	637	router = c;
653	}	638	}
654	}	639	}
…		…
663	if (c)	648	if (c)
664	c->send_connect_request (id);	649	c->send_connect_request (id);
665	else	650	else
666	// no router found, aggressively connect to all routers	651	// no router found, aggressively connect to all routers
667	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)	652	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
668	if ((*i)->conf->routerprio)	653	if ((i)->conf->routerprio && (i)->conf != THISNODE)
669	(*i)->establish_connection ();	654	(*i)->establish_connection ();
670	}	655	}
671		656
672	void	657	void
673	connection::dump_status ()	658	connection::dump_status ()

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.11 by pcg, Sun Apr 13 00:35:46 2003 UTC vs. Revision 1.23 by pcg, Thu Jan 29 18:55:10 2004 UTC

Diff Legend

Comparing gvpe/src/vpn.C (file contents):
Revision 1.11 by pcg, Sun Apr 13 00:35:46 2003 UTC vs.
Revision 1.23 by pcg, Thu Jan 29 18:55:10 2004 UTC