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

Comparing gvpe/src/vpn.C (file contents):
Revision 1.1 by pcg, Wed Apr 2 03:25:17 2003 UTC vs.
Revision 1.13 by pcg, Sun Apr 13 16:53:36 2003 UTC

…		…
26		26
27	#include <sys/types.h>	27	#include <sys/types.h>
28	#include <sys/socket.h>	28	#include <sys/socket.h>
29	#include <sys/poll.h>	29	#include <sys/poll.h>
30	#include <sys/wait.h>	30	#include <sys/wait.h>
31	#include <netinet/in.h>
32	#include <arpa/inet.h>
33	#include <errno.h>	31	#include <errno.h>
34	#include <time.h>	32	#include <time.h>
35	#include <unistd.h>	33	#include <unistd.h>
		34	#include <fcntl.h>
		35	#include <arpa/inet.h>
		36	#include <netinet/in.h>
		37	#include <netinet/ip_icmp.h>
36		38
37	#include "pidfile.h"	39	#include "pidfile.h"
38		40
39	#include "connection.h"	41	#include "connection.h"
40	#include "util.h"	42	#include "util.h"
41	#include "vpn.h"	43	#include "vpn.h"
42		44
43	/////////////////////////////////////////////////////////////////////////////	45	/////////////////////////////////////////////////////////////////////////////
44		46
45	const char *vpn::script_if_up (int)	47	const char *vpn::script_if_up ()
46	{	48	{
47	// the tunnel device mtu should be the physical mtu - overhead	49	// the tunnel device mtu should be the physical mtu - overhead
48	// the tricky part is rounding to the cipher key blocksize	50	// the tricky part is rounding to the cipher key blocksize
49	int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;	51	int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
50	mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion	52	mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
…		…
71	}	73	}
72		74
73	int	75	int
74	vpn::setup ()	76	vpn::setup ()
75	{	77	{
76	sockinfo si;	78	ipv4_fd = -1;
77		79
78	si.set (THISNODE);	80	if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
		81	{
		82	ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
		83
		84	if (ipv4_fd < 0)
		85	return -1;
		86
		87	fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
		88
		89	#ifdef IP_MTU_DISCOVER
		90	// this I really consider a linux bug. I am neither connected
		91	// nor do I fragment myself. Linux still sets DF and doesn't
		92	// fragment for me sometimes.
		93	{
		94	int oval = IP_PMTUDISC_DONT;
		95	setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
		96	}
		97	#endif
		98
		99	sockinfo si (THISNODE, PROT_IPv4);
		100
		101	if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
		102	{
		103	slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
		104	exit (1);
		105	}
		106
		107	ipv4_ev_watcher.start (ipv4_fd, POLLIN);
		108	}
79		109
80	udpv4_fd = -1;	110	udpv4_fd = -1;
81		111
82	if (THISNODE->protocols & PROT_UDPv4)	112	if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
83	{	113	{
84	udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);	114	udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
85		115
86	if (udpv4_fd < 0)	116	if (udpv4_fd < 0)
87	return -1;	117	return -1;
88		118
89	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))	119	fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
		120
		121	// standard daemon practise...
90	{	122	{
91	slog (L_ERR, _("can't bind udpv4 to %s: %s"), (const char *)si, strerror (errno));	123	int oval = 1;
92	exit (1);	124	setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
93	}	125	}
94		126
95	#ifdef IP_MTU_DISCOVER	127	#ifdef IP_MTU_DISCOVER
96	// this I really consider a linux bug. I am neither connected	128	// this I really consider a linux bug. I am neither connected
97	// nor do I fragment myself. Linux still sets DF and doesn't	129	// nor do I fragment myself. Linux still sets DF and doesn't
98	// fragment for me sometimes.	130	// fragment for me sometimes.
…		…
100	int oval = IP_PMTUDISC_DONT;	132	int oval = IP_PMTUDISC_DONT;
101	setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);	133	setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
102	}	134	}
103	#endif	135	#endif
104		136
105	// standard daemon practise...	137	sockinfo si (THISNODE, PROT_UDPv4);
		138
		139	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
		140	{
		141	slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
		142	exit (1);
		143	}
		144
		145	udpv4_ev_watcher.start (udpv4_fd, POLLIN);
		146	}
		147
		148	icmpv4_fd = -1;
		149
		150	#if ENABLE_ICMP
		151	if (THISNODE->protocols & PROT_ICMPv4)
		152	{
		153	icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
		154
		155	if (icmpv4_fd < 0)
		156	return -1;
		157
		158	fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
		159
		160	#ifdef ICMP_FILTER
106	{	161	{
107	int oval = 1;	162	icmp_filter oval;
		163	oval.data = 0xffffffff;
		164	if (::conf.icmp_type < 32)
		165	oval.data &= ~(1 << ::conf.icmp_type);
		166
108	setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);	167	setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
109	}	168	}
110		169	#endif
111	udpv4_ev_watcher.start (udpv4_fd, POLLIN);
112	}
113
114	ipv4_fd = -1;
115	if (THISNODE->protocols & PROT_IPv4)
116	{
117	ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
118
119	if (ipv4_fd < 0)
120	return -1;
121
122	if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
123	{
124	slog (L_ERR, _("can't bind ipv4 socket to %s: %s"), (const char *)si, strerror (errno));
125	exit (1);
126	}
127		170
128	#ifdef IP_MTU_DISCOVER	171	#ifdef IP_MTU_DISCOVER
129	// this I really consider a linux bug. I am neither connected	172	// this I really consider a linux bug. I am neither connected
130	// nor do I fragment myself. Linux still sets DF and doesn't	173	// nor do I fragment myself. Linux still sets DF and doesn't
131	// fragment for me sometimes.	174	// fragment for me sometimes.
132	{	175	{
133	int oval = IP_PMTUDISC_DONT;	176	int oval = IP_PMTUDISC_DONT;
134	setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);	177	setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
135	}	178	}
136	#endif	179	#endif
137		180
		181	sockinfo si (THISNODE, PROT_ICMPv4);
		182
		183	if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
		184	{
		185	slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
		186	exit (1);
		187	}
		188
138	ipv4_ev_watcher.start (ipv4_fd, POLLIN);	189	icmpv4_ev_watcher.start (icmpv4_fd, POLLIN);
		190	}
		191	#endif
		192
		193	tcpv4_fd = -1;
		194
		195	#if ENABLE_TCP
		196	if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
		197	{
		198	tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
		199
		200	if (tcpv4_fd < 0)
		201	return -1;
		202
		203	fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
		204
		205	// standard daemon practise...
		206	{
		207	int oval = 1;
		208	setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
139	}	209	}
		210
		211	sockinfo si (THISNODE, PROT_TCPv4);
		212
		213	if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
		214	{
		215	slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));
		216	exit (1);
		217	}
		218
		219	if (listen (tcpv4_fd, 5))
		220	{
		221	slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
		222	exit (1);
		223	}
		224
		225	tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
		226	}
		227	#endif
140		228
141	tap = new tap_device ();	229	tap = new tap_device ();
142	if (!tap) //D this, of course, never catches	230	if (!tap) //D this, of course, never catches
143	{	231	{
144	slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);	232	slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
…		…
152	reconnect_all ();	240	reconnect_all ();
153		241
154	return 0;	242	return 0;
155	}	243	}
156		244
157	void	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	}
		272
		273	bool
158	vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	274	vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
159	{	275	{
160	setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);	276	setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
161	sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());	277	sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
162	}
163		278
164	void	279	return true;
		280	}
		281
		282	static u16
		283	ipv4_checksum (u16 *data, unsigned int len)
		284	{
		285	// use 32 bit accumulator and fold back carry bits at the end
		286	u32 sum = 0;
		287
		288	while (len > 1)
		289	{
		290	sum += *data++;
		291	len -= 2;
		292	}
		293
		294	// odd byte left?
		295	if (len)
		296	sum += (u8 )data;
		297
		298	// add back carry bits
		299	sum = (sum >> 16) + (sum & 0xffff); // lo += hi
		300	sum += (sum >> 16); // carry
		301
		302	return ~sum;
		303	}
		304
		305	#if ENABLE_ICMP
		306	bool
		307	vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
		308	{
		309	setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
		310
		311	pkt->unshift_hdr (4);
		312
		313	icmphdr hdr = (icmphdr )&((*pkt)[0]);
		314	hdr->type = ::conf.icmp_type;
		315	hdr->code = 255;
		316	hdr->checksum = 0;
		317	hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
		318
		319	sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
		320
		321	return true;
		322	}
		323	#endif
		324
		325	bool
165	vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	326	vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
166	{	327	{
167	setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);	328	setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
168	sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());	329	sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
		330
		331	return true;
169	}	332	}
170		333
171	void	334	void
172	vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)	335	vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
173	{	336	{
…		…
180	if (src == 0 \|\| src > conns.size ()	343	if (src == 0 \|\| src > conns.size ()
181	\|\| dst > conns.size ()	344	\|\| dst > conns.size ()
182	\|\| pkt->typ () >= vpn_packet::PT_MAX)	345	\|\| pkt->typ () >= vpn_packet::PT_MAX)
183	slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),	346	slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
184	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());	347	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
		348	else if (dst > conns.size ())
		349	slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
		350	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
185	else	351	else
186	{	352	{
187	connection *c = conns[src - 1];	353	connection *c = conns[src - 1];
188		354
189	if (dst == 0 && !THISNODE->routerprio)	355	if (dst == 0)
190	slog (L_WARN, _("%s(%s): received broadcast, but we are no router"),	356	slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),
191	c->conf->nodename, (const char *)rsi);	357	c->conf->nodename, (const char *)rsi);
192	else if (dst != 0 && dst != THISNODE->id)	358	else if (dst != 0 && dst != THISNODE->id)
193	// FORWARDING NEEDED ;)	359	{
		360	if (THISNODE->routerprio)
		361	// the tos setting gets lost here. who cares.
		362	conns[dst - 1]->inject_vpn_packet (pkt);
		363	else
194	slog (L_WARN,	364	slog (L_WARN,
195	_("received frame for node %d ('%s') from %s, but this is node %d ('%s')"),	365	_("%s(%s): forwarding request (=> %s), but we are no router"),
		366	c->conf->nodename, (const char *)rsi,
196	dst, conns[dst - 1]->conf->nodename,	367	conns[dst - 1]->conf->nodename);
197	(const char *)rsi,	368	}
198	THISNODE->id, THISNODE->nodename);
199	else	369	else
200	c->recv_vpn_packet (pkt, rsi);	370	c->recv_vpn_packet (pkt, rsi);
201	}	371	}
202	}	372	}
203		373
204	void	374	void
205	vpn::udpv4_ev (short revents)	375	vpn::ipv4_ev (io_watcher &w, short revents)
206	{	376	{
207	if (revents & (POLLIN \| POLLERR))	377	if (revents & (POLLIN \| POLLERR))
208	{	378	{
209	vpn_packet *pkt = new vpn_packet;	379	vpn_packet *pkt = new vpn_packet;
210	struct sockaddr_in sa;	380	struct sockaddr_in sa;
211	socklen_t sa_len = sizeof (sa);	381	socklen_t sa_len = sizeof (sa);
212	int len;	382	int len;
213		383
214	len = recvfrom (udpv4_fd, &((pkt)[0]), MAXSIZE, 0, (sockaddr )&sa, &sa_len);	384	len = recvfrom (w.fd, &((pkt)[0]), MAXSIZE, 0, (sockaddr )&sa, &sa_len);
215		385
216	sockinfo si(sa);	386	sockinfo si(sa, PROT_IPv4);
217		387
218	if (len > 0)	388	if (len > 0)
219	{	389	{
220	pkt->len = len;	390	pkt->len = len;
		391
		392	// raw sockets deliver the ipv4, but don't expect it on sends
		393	// this is slow, but...
		394	pkt->skip_hdr (IP_OVERHEAD);
221		395
222	recv_vpn_packet (pkt, si);	396	recv_vpn_packet (pkt, si);
223	}	397	}
224	else	398	else
225	{	399	{
…		…
230	delete pkt;	404	delete pkt;
231	}	405	}
232	else if (revents & POLLHUP)	406	else if (revents & POLLHUP)
233	{	407	{
234	// this cannot ;) happen on udp sockets	408	// this cannot ;) happen on udp sockets
235	slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));	409	slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
236	exit (1);	410	exit (1);
237	}	411	}
238	else	412	else
239	{	413	{
240	slog (L_ERR,	414	slog (L_ERR,
…		…
242	revents);	416	revents);
243	exit (1);	417	exit (1);
244	}	418	}
245	}	419	}
246		420
		421	#if ENABLE_ICMP
247	void	422	void
248	vpn::ipv4_ev (short revents)	423	vpn::icmpv4_ev (io_watcher &w, short revents)
249	{	424	{
250	if (revents & (POLLIN \| POLLERR))	425	if (revents & (POLLIN \| POLLERR))
251	{	426	{
252	vpn_packet *pkt = new vpn_packet;	427	vpn_packet *pkt = new vpn_packet;
253	struct sockaddr_in sa;	428	struct sockaddr_in sa;
254	socklen_t sa_len = sizeof (sa);	429	socklen_t sa_len = sizeof (sa);
255	int len;	430	int len;
256		431
257	len = recvfrom (ipv4_fd, &((pkt)[0]), MAXSIZE, 0, (sockaddr )&sa, &sa_len);	432	len = recvfrom (w.fd, &((pkt)[0]), MAXSIZE, 0, (sockaddr )&sa, &sa_len);
258		433
259	sockinfo si(sa, PROT_IPv4);	434	sockinfo si(sa, PROT_ICMPv4);
260		435
261	if (len > 0)	436	if (len > 0)
262	{	437	{
263	pkt->len = len;	438	pkt->len = len;
264		439
		440	icmphdr hdr = (icmphdr )&((*pkt)[IP_OVERHEAD]);
		441
		442	if (hdr->type == ::conf.icmp_type
		443	&& hdr->code == 255)
		444	{
265	// raw sockets deliver the ipv4, but don't expect it on sends	445	// raw sockets deliver the ipv4, but don't expect it on sends
266	// this is slow, but...	446	// this is slow, but...
267	pkt->skip_hdr (IP_OVERHEAD);	447	pkt->skip_hdr (ICMP_OVERHEAD);
268		448
269	recv_vpn_packet (pkt, si);	449	recv_vpn_packet (pkt, si);
		450	}
270	}	451	}
271	else	452	else
272	{	453	{
273	// probably ECONNRESET or somesuch	454	// probably ECONNRESET or somesuch
274	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	455	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
…		…
277	delete pkt;	458	delete pkt;
278	}	459	}
279	else if (revents & POLLHUP)	460	else if (revents & POLLHUP)
280	{	461	{
281	// this cannot ;) happen on udp sockets	462	// this cannot ;) happen on udp sockets
282	slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));	463	slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
283	exit (1);	464	exit (1);
284	}	465	}
285	else	466	else
286	{	467	{
287	slog (L_ERR,	468	slog (L_ERR,
288	_("FATAL: unknown revents %08x in socket, terminating\n"),	469	_("FATAL: unknown revents %08x in socket, terminating\n"),
289	revents);	470	revents);
290	exit (1);	471	exit (1);
291	}	472	}
292	}	473	}
		474	#endif
293		475
294	void	476	void
		477	vpn::udpv4_ev (io_watcher &w, short revents)
		478	{
		479	if (revents & (POLLIN \| POLLERR))
		480	{
		481	vpn_packet *pkt = new vpn_packet;
		482	struct sockaddr_in sa;
		483	socklen_t sa_len = sizeof (sa);
		484	int len;
		485
		486	len = recvfrom (w.fd, &((pkt)[0]), MAXSIZE, 0, (sockaddr )&sa, &sa_len);
		487
		488	sockinfo si(sa, PROT_UDPv4);
		489
		490	if (len > 0)
		491	{
		492	pkt->len = len;
		493
		494	recv_vpn_packet (pkt, si);
		495	}
		496	else
		497	{
		498	// probably ECONNRESET or somesuch
		499	slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
		500	}
		501
		502	delete pkt;
		503	}
		504	else if (revents & POLLHUP)
		505	{
		506	// this cannot ;) happen on udp sockets
		507	slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
		508	exit (1);
		509	}
		510	else
		511	{
		512	slog (L_ERR,
		513	_("FATAL: unknown revents %08x in socket, terminating\n"),
		514	revents);
		515	exit (1);
		516	}
		517	}
		518
		519	void
295	vpn::tap_ev (short revents)	520	vpn::tap_ev (io_watcher &w, short revents)
296	{	521	{
297	if (revents & POLLIN)	522	if (revents & POLLIN)
298	{	523	{
299	/* process data */	524	/* process data */
300	tap_packet *pkt;	525	tap_packet *pkt;
…		…
326	if (dst != THISNODE->id)	551	if (dst != THISNODE->id)
327	conns[dst - 1]->inject_data_packet (pkt);	552	conns[dst - 1]->inject_data_packet (pkt);
328	}	553	}
329	else	554	else
330	{	555	{
331	// broadcast, first check router, then self, then english	556	// broadcast, this is ugly, but due to the security policy
332	connection *router = find_router ();	557	// we have to connect to all hosts...
333
334	if (router)
335	router->inject_data_packet (pkt, true);
336	else
337	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)	558	for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
338	if ((*c)->conf != THISNODE)	559	if ((*c)->conf != THISNODE)
339	(*c)->inject_data_packet (pkt);	560	(*c)->inject_data_packet (pkt);
340	}	561	}
341	}	562	}
342		563
343	delete pkt;	564	delete pkt;
344	}	565	}
…		…
350	else	571	else
351	abort ();	572	abort ();
352	}	573	}
353		574
354	void	575	void
355	vpn::event_cb (tstamp &ts)	576	vpn::event_cb (time_watcher &w)
356	{	577	{
357	if (events)	578	if (events)
358	{	579	{
359	if (events & EVENT_SHUTDOWN)	580	if (events & EVENT_SHUTDOWN)
360	{	581	{
…		…
377	}	598	}
378		599
379	events = 0;	600	events = 0;
380	}	601	}
381		602
382	ts = TSTAMP_CANCEL;	603	w.at = TSTAMP_CANCEL;
383	}	604	}
384		605
385	void	606	void
386	vpn::shutdown_all ()	607	vpn::shutdown_all ()
387	{	608	{
…		…
411	}	632	}
412	}	633	}
413		634
414	connection *vpn::find_router ()	635	connection *vpn::find_router ()
415	{	636	{
416	u32 prio = 0;	637	u32 prio = 1;
417	connection *router = 0;	638	connection *router = 0;
418		639
419	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)	640	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
420	{	641	{
421	connection c = i;	642	connection c = i;
422		643
423	if (c->conf->routerprio > prio	644	if (c->conf->routerprio > prio
424	&& c->connectmode == conf_node::C_ALWAYS	645	&& c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use
425	&& c->conf != THISNODE
426	&& c->ictx && c->octx)	646	&& c->ictx && c->octx
		647	&& c->conf != THISNODE) // redundant, since ictx==octx==0 always on thisnode
427	{	648	{
428	prio = c->conf->routerprio;	649	prio = c->conf->routerprio;
429	router = c;	650	router = c;
430	}	651	}
431	}	652	}
432		653
433	return router;	654	return router;
434	}	655	}
435		656
436	void vpn::connect_request (int id)	657	void vpn::send_connect_request (int id)
437	{	658	{
438	connection *c = find_router ();	659	connection *c = find_router ();
439		660
440	if (c)	661	if (c)
441	c->connect_request (id);	662	c->send_connect_request (id);
442	//else // does not work, because all others must connect to the same router	663	else
443	// // no router found, aggressively connect to all routers	664	// no router found, aggressively connect to all routers
444	// for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)	665	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
445	// if ((*i)->conf->routerprio)	666	if ((i)->conf->routerprio && (i)->conf != THISNODE)
446	// (*i)->establish_connection ();	667	(*i)->establish_connection ();
447	}	668	}
448		669
449	void	670	void
450	connection::dump_status ()	671	connection::dump_status ()
451	{	672	{
…		…
468		689
469	slog (L_NOTICE, _("END status dump"));	690	slog (L_NOTICE, _("END status dump"));
470	}	691	}
471		692
472	vpn::vpn (void)	693	vpn::vpn (void)
		694	: event (this, &vpn::event_cb)
473	: udpv4_ev_watcher(this, &vpn::udpv4_ev)	695	, udpv4_ev_watcher (this, &vpn::udpv4_ev)
474	, ipv4_ev_watcher(this, &vpn::ipv4_ev)	696	, ipv4_ev_watcher (this, &vpn::ipv4_ev)
		697	#if ENABLE_TCP
		698	, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
		699	#endif
		700	#if ENABLE_ICMP
		701	, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
		702	#endif
475	, tap_ev_watcher(this, &vpn::tap_ev)	703	, tap_ev_watcher (this, &vpn::tap_ev)
476	, event(this, &vpn::event_cb)
477	{	704	{
478	}	705	}
479		706
480	vpn::~vpn ()	707	vpn::~vpn ()
481	{	708	{

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.1 by pcg, Wed Apr 2 03:25:17 2003 UTC vs. Revision 1.13 by pcg, Sun Apr 13 16:53:36 2003 UTC

Diff Legend

Comparing gvpe/src/vpn.C (file contents):
Revision 1.1 by pcg, Wed Apr 2 03:25:17 2003 UTC vs.
Revision 1.13 by pcg, Sun Apr 13 16:53:36 2003 UTC