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

Comparing gvpe/src/vpn.C (file contents):
Revision 1.2 by pcg, Wed Apr 2 05:15:00 2003 UTC vs.
Revision 1.9 by pcg, Tue Apr 8 02:00:54 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 <arpa/inet.h>
		35	#include <netinet/in.h>
		36	#include <netinet/icmp.h>
36		37
37	#include "pidfile.h"	38	#include "pidfile.h"
38		39
39	#include "connection.h"	40	#include "connection.h"
40	#include "util.h"	41	#include "util.h"
41	#include "vpn.h"	42	#include "vpn.h"
42
43	#if ENABLE_TCP
44	# include <map>
45	# include <unistd.h>
46	# include <fcntl.h>
47	# include <sys/poll.h>
48	#endif
49		43
50	/////////////////////////////////////////////////////////////////////////////	44	/////////////////////////////////////////////////////////////////////////////
51		45
52	const char *vpn::script_if_up ()	46	const char *vpn::script_if_up ()
53	{	47	{
…		…
78	}	72	}
79		73
80	int	74	int
81	vpn::setup ()	75	vpn::setup ()
82	{	76	{
		77	ipv4_fd = -1;
		78
		79	if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
		80	{
		81	ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
		82
		83	if (ipv4_fd < 0)
		84	return -1;
		85
		86	#ifdef IP_MTU_DISCOVER
		87	// this I really consider a linux bug. I am neither connected
		88	// nor do I fragment myself. Linux still sets DF and doesn't
		89	// fragment for me sometimes.
		90	{
		91	int oval = IP_PMTUDISC_DONT;
		92	setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
		93	}
		94	#endif
		95
		96	sockinfo si (THISNODE, PROT_IPv4);
		97
		98	if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
		99	{
		100	slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
		101	exit (1);
		102	}
		103
		104	ipv4_ev_watcher.start (ipv4_fd, POLLIN);
		105	}
		106
83	udpv4_fd = -1;	107	udpv4_fd = -1;
84		108
85	if (THISNODE->protocols & PROT_UDPv4)	109	if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
86	{	110	{
87	udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);	111	udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
88		112
89	if (udpv4_fd < 0)	113	if (udpv4_fd < 0)
90	return -1;	114	return -1;
91		115
92	sockinfo si (THISNODE, PROT_UDPv4);	116	// standard daemon practise...
93
94	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
95	{	117	{
96	slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));	118	int oval = 1;
97	exit (1);	119	setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
98	}	120	}
99		121
100	#ifdef IP_MTU_DISCOVER	122	#ifdef IP_MTU_DISCOVER
101	// this I really consider a linux bug. I am neither connected	123	// this I really consider a linux bug. I am neither connected
102	// nor do I fragment myself. Linux still sets DF and doesn't	124	// nor do I fragment myself. Linux still sets DF and doesn't
103	// fragment for me sometimes.	125	// fragment for me sometimes.
…		…
105	int oval = IP_PMTUDISC_DONT;	127	int oval = IP_PMTUDISC_DONT;
106	setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);	128	setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
107	}	129	}
108	#endif	130	#endif
109		131
110	// standard daemon practise...	132	sockinfo si (THISNODE, PROT_UDPv4);
		133
		134	if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
		135	{
		136	slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
		137	exit (1);
		138	}
		139
		140	udpv4_ev_watcher.start (udpv4_fd, POLLIN);
		141	}
		142
		143	icmpv4_fd = -1;
		144
		145	#if ENABLE_ICMP
		146	if (THISNODE->protocols & PROT_ICMPv4)
		147	{
		148	icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
		149
		150	if (icmpv4_fd < 0)
		151	return -1;
		152
		153	#ifdef ICMP_FILTER
111	{	154	{
112	int oval = 1;	155	icmp_filter oval;
		156	oval.data = 0xffffffff;
		157	if (::conf.icmp_type < 32)
		158	oval.data &= ~(1 << ::conf.icmp_type);
		159
113	setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);	160	setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
114	}	161	}
115		162	#endif
116	udpv4_ev_watcher.start (udpv4_fd, POLLIN);
117	}
118
119	ipv4_fd = -1;
120	if (THISNODE->protocols & PROT_IPv4)
121	{
122	ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
123
124	if (ipv4_fd < 0)
125	return -1;
126
127	sockinfo si (THISNODE, PROT_IPv4);
128
129	if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
130	{
131	slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
132	exit (1);
133	}
134		163
135	#ifdef IP_MTU_DISCOVER	164	#ifdef IP_MTU_DISCOVER
136	// this I really consider a linux bug. I am neither connected	165	// this I really consider a linux bug. I am neither connected
137	// nor do I fragment myself. Linux still sets DF and doesn't	166	// nor do I fragment myself. Linux still sets DF and doesn't
138	// fragment for me sometimes.	167	// fragment for me sometimes.
139	{	168	{
140	int oval = IP_PMTUDISC_DONT;	169	int oval = IP_PMTUDISC_DONT;
141	setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);	170	setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
142	}	171	}
143	#endif	172	#endif
144		173
		174	sockinfo si (THISNODE, PROT_ICMPv4);
		175
		176	if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
		177	{
		178	slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
		179	exit (1);
		180	}
		181
145	ipv4_ev_watcher.start (ipv4_fd, POLLIN);	182	icmpv4_ev_watcher.start (icmpv4_fd, POLLIN);
146	}	183	}
		184	#endif
		185
		186	tcpv4_fd = -1;
147		187
148	#if ENABLE_TCP	188	#if ENABLE_TCP
149	if (THISNODE->protocols & PROT_TCPv4)	189	if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
150	{	190	{
151	tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);	191	tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
152		192
153	if (tcpv4_fd < 0)	193	if (tcpv4_fd < 0)
154	return -1;	194	return -1;
155
156	sockinfo si (THISNODE, PROT_TCPv4);
157
158	if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
159	{
160	slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));
161	exit (1);
162	}
163
164	if (listen (tcpv4_fd, 5))
165	{
166	slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
167	exit (1);
168	}
169		195
170	// standard daemon practise...	196	// standard daemon practise...
171	{	197	{
172	int oval = 1;	198	int oval = 1;
173	setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);	199	setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
174	}	200	}
175		201
		202	sockinfo si (THISNODE, PROT_TCPv4);
		203
		204	if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
		205	{
		206	slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));
		207	exit (1);
		208	}
		209
		210	if (listen (tcpv4_fd, 5))
		211	{
		212	slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
		213	exit (1);
		214	}
		215
176	tcpv4_accept_watcher.start (tcpv4_fd, POLLIN);	216	tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
177	}	217	}
178	#endif	218	#endif
179		219
180	tap = new tap_device ();	220	tap = new tap_device ();
181	if (!tap) //D this, of course, never catches	221	if (!tap) //D this, of course, never catches
…		…
191	reconnect_all ();	231	reconnect_all ();
192		232
193	return 0;	233	return 0;
194	}	234	}
195		235
196	void	236	// send a vpn packet out to other hosts
		237	bool
		238	vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
		239	{
		240	switch (si.prot)
		241	{
		242	case PROT_IPv4:
		243	return send_ipv4_packet (pkt, si, tos);
		244
		245	case PROT_UDPv4:
		246	return send_udpv4_packet (pkt, si, tos);
		247
		248	#if ENABLE_TCP
		249	case PROT_TCPv4:
		250	return send_tcpv4_packet (pkt, si, tos);
		251	#endif
		252
		253	#if ENABLE_ICMP
		254	case PROT_ICMPv4:
		255	return send_icmpv4_packet (pkt, si, tos);
		256	#endif
		257
		258	default:
		259	slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
		260	return false;
		261	}
		262	}
		263
		264	bool
197	vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	265	vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
198	{	266	{
199	setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);	267	setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
200	sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());	268	sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
201	}
202		269
203	void	270	return true;
		271	}
		272
		273	static u16
		274	ipv4_checksum (u16 *data, unsigned int len)
		275	{
		276	// use 32 bit accumulator and fold back carry bits at the end
		277	u32 sum = 0;
		278
		279	while (len > 1)
		280	{
		281	sum += *data++;
		282	len -= 2;
		283	}
		284
		285	// odd byte left?
		286	if (len)
		287	sum += (u8 )data;
		288
		289	// add back carry bits
		290	sum = (sum >> 16) + (sum & 0xffff); // lo += hi
		291	sum += (sum >> 16); // carry
		292
		293	return ~sum;
		294	}
		295
		296	bool
		297	vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
		298	{
		299	setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
		300
		301	pkt->unshift_hdr (4);
		302
		303	icmphdr hdr = (icmphdr )&((*pkt)[0]);
		304	hdr->type = ::conf.icmp_type;
		305	hdr->code = 255;
		306	hdr->checksum = 0;
		307	hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
		308
		309	sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
		310
		311	return true;
		312	}
		313
		314	bool
204	vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	315	vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
205	{	316	{
206	setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);	317	setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
207	sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());	318	sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
		319
		320	return true;
208	}	321	}
209		322
210	void	323	void
211	vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)	324	vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
212	{	325	{
…		…
219	if (src == 0 \|\| src > conns.size ()	332	if (src == 0 \|\| src > conns.size ()
220	\|\| dst > conns.size ()	333	\|\| dst > conns.size ()
221	\|\| pkt->typ () >= vpn_packet::PT_MAX)	334	\|\| pkt->typ () >= vpn_packet::PT_MAX)
222	slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),	335	slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
223	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());	336	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
		337	else if (dst > conns.size ())
		338	slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
		339	(const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
224	else	340	else
225	{	341	{
226	connection *c = conns[src - 1];	342	connection *c = conns[src - 1];
227		343
228	if (dst == 0 && !THISNODE->routerprio)	344	if (dst == 0 && !THISNODE->routerprio)
229	slog (L_WARN, _("%s(%s): received broadcast, but we are no router"),	345	slog (L_WARN, _("%s(%s): received broadcast, but we are no router"),
230	c->conf->nodename, (const char *)rsi);	346	c->conf->nodename, (const char *)rsi);
231	else if (dst != 0 && dst != THISNODE->id)	347	else if (dst != 0 && dst != THISNODE->id)
232	// FORWARDING NEEDED ;)	348	{
		349	if (THISNODE->routerprio)
		350	// the tos setting gets lost here. who cares.
		351	conns[dst - 1]->inject_vpn_packet (pkt);
		352	else
233	slog (L_WARN,	353	slog (L_WARN,
234	_("received frame for node %d ('%s') from %s, but this is node %d ('%s')"),	354	_("%s(%s): forwarding request (=> %s), but we are no router"),
		355	c->conf->nodename, (const char *)rsi,
235	dst, conns[dst - 1]->conf->nodename,	356	conns[dst - 1]->conf->nodename);
236	(const char *)rsi,	357	}
237	THISNODE->id, THISNODE->nodename);
238	else	358	else
239	c->recv_vpn_packet (pkt, rsi);	359	c->recv_vpn_packet (pkt, rsi);
240	}	360	}
241	}	361	}
242		362
243	void	363	void
244	vpn::udpv4_ev (int fd, short revents)	364	vpn::ipv4_ev (io_watcher &w, short revents)
245	{	365	{
246	if (revents & (POLLIN \| POLLERR))	366	if (revents & (POLLIN \| POLLERR))
247	{	367	{
248	vpn_packet *pkt = new vpn_packet;	368	vpn_packet *pkt = new vpn_packet;
249	struct sockaddr_in sa;	369	struct sockaddr_in sa;
250	socklen_t sa_len = sizeof (sa);	370	socklen_t sa_len = sizeof (sa);
251	int len;	371	int len;
252		372
253	len = recvfrom (fd, &((pkt)[0]), MAXSIZE, 0, (sockaddr )&sa, &sa_len);	373	len = recvfrom (w.fd, &((pkt)[0]), MAXSIZE, 0, (sockaddr )&sa, &sa_len);
254		374
255	sockinfo si(sa);	375	sockinfo si(sa, PROT_IPv4);
256		376
257	if (len > 0)	377	if (len > 0)
258	{	378	{
259	pkt->len = len;	379	pkt->len = len;
		380
		381	// raw sockets deliver the ipv4, but don't expect it on sends
		382	// this is slow, but...
		383	pkt->skip_hdr (IP_OVERHEAD);
260		384
261	recv_vpn_packet (pkt, si);	385	recv_vpn_packet (pkt, si);
262	}	386	}
263	else	387	else
264	{	388	{
…		…
269	delete pkt;	393	delete pkt;
270	}	394	}
271	else if (revents & POLLHUP)	395	else if (revents & POLLHUP)
272	{	396	{
273	// this cannot ;) happen on udp sockets	397	// this cannot ;) happen on udp sockets
274	slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));	398	slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
275	exit (1);	399	exit (1);
276	}	400	}
277	else	401	else
278	{	402	{
279	slog (L_ERR,	403	slog (L_ERR,
…		…
282	exit (1);	406	exit (1);
283	}	407	}
284	}	408	}
285		409
286	void	410	void
287	vpn::ipv4_ev (int fd, short revents)	411	vpn::icmpv4_ev (io_watcher &w, short revents)
288	{	412	{
289	if (revents & (POLLIN \| POLLERR))	413	if (revents & (POLLIN \| POLLERR))
290	{	414	{
291	vpn_packet *pkt = new vpn_packet;	415	vpn_packet *pkt = new vpn_packet;
292	struct sockaddr_in sa;	416	struct sockaddr_in sa;
293	socklen_t sa_len = sizeof (sa);	417	socklen_t sa_len = sizeof (sa);
294	int len;	418	int len;
295		419
296	len = recvfrom (fd, &((pkt)[0]), MAXSIZE, 0, (sockaddr )&sa, &sa_len);	420	len = recvfrom (w.fd, &((pkt)[0]), MAXSIZE, 0, (sockaddr )&sa, &sa_len);
297		421
298	sockinfo si(sa, PROT_IPv4);	422	sockinfo si(sa, PROT_ICMPv4);
299		423
300	if (len > 0)	424	if (len > 0)
301	{	425	{
302	pkt->len = len;	426	pkt->len = len;
303		427
		428	icmphdr hdr = (icmphdr )&((*pkt)[IP_OVERHEAD]);
		429
		430	if (hdr->type == ::conf.icmp_type
		431	&& hdr->code == 255)
		432	{
304	// raw sockets deliver the ipv4, but don't expect it on sends	433	// raw sockets deliver the ipv4, but don't expect it on sends
305	// this is slow, but...	434	// this is slow, but...
306	pkt->skip_hdr (IP_OVERHEAD);	435	pkt->skip_hdr (ICMP_OVERHEAD);
307		436
308	recv_vpn_packet (pkt, si);	437	recv_vpn_packet (pkt, si);
		438	}
309	}	439	}
310	else	440	else
311	{	441	{
312	// probably ECONNRESET or somesuch	442	// probably ECONNRESET or somesuch
313	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));	443	slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
…		…
316	delete pkt;	446	delete pkt;
317	}	447	}
318	else if (revents & POLLHUP)	448	else if (revents & POLLHUP)
319	{	449	{
320	// this cannot ;) happen on udp sockets	450	// this cannot ;) happen on udp sockets
321	slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));	451	slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
322	exit (1);	452	exit (1);
323	}	453	}
324	else	454	else
325	{	455	{
326	slog (L_ERR,	456	slog (L_ERR,
…		…
328	revents);	458	revents);
329	exit (1);	459	exit (1);
330	}	460	}
331	}	461	}
332		462
333	#if ENABLE_TCP
334
335	struct tcp_info {
336	int fd;
337	bool ok;
338	io_watcher r;
339
340	tcp_info (vpn *v)
341	: r(v, &vpn::tcpv4_ev)
342	{
343	fd = -1;
344	}
345
346	~tcp_info () { close (fd); }
347	};
348
349	typedef map<sockinfo, tcp_info *> tcp_si_map;
350	typedef map<int, tcp_info *> tcp_fd_map; // unneecssary if iom would be cooler
351	static tcp_si_map tcp_si;
352	static tcp_fd_map tcp_fd;
353
354	void	463	void
355	vpn::send_tcpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	464	vpn::udpv4_ev (io_watcher &w, short revents)
356	{
357	tcp_si_map::iterator info = tcp_si.find (si);
358
359	if (info == tcp_si.end ())
360	{
361	// woaw, the first lost packet ;)
362	tcp_info *i = new tcp_info (this);
363
364	i->ok = false;
365	i->fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
366
367	if (i->fd >= 0)
368	{
369	fcntl (i->fd, F_SETFL, O_NONBLOCK);
370
371	if (connect (i->fd, si.sav4 (), si.salenv4 ()) >= 0
372	\|\| errno == EINPROGRESS)
373	{
374	tcp_si.insert (tcp_si_map::value_type (si, i));
375	tcp_fd.insert (tcp_fd_map::value_type (i->fd, i));
376	return;
377	}
378
379	delete i;
380	}
381	}
382	else
383	{
384	tcp_info *i = info->second;
385
386	if (i->ok)
387	{
388	setsockopt (i->fd, SOL_IP, IP_TOS, &tos, sizeof tos);
389
390	if (write (i->fd, (void *)pkt, pkt->len + sizeof (u32)) != pkt->len + sizeof (u32))
391	{
392	// error, close socket, forget it and retry immediately
393	tcp_si.erase (info);
394	tcp_fd.erase (i->fd);
395	delete i;
396
397	// tail recursion is... better than goto(?)
398	send_tcpv4_packet (pkt, si, tos);
399	}
400	}
401	}
402
403	#if 0
404	setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
405	sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
406	#endif
407	}
408
409	void
410	vpn::tcpv4_accept (int fd, short revents)
411	{	465	{
412	if (revents & (POLLIN \| POLLERR))	466	if (revents & (POLLIN \| POLLERR))
413	{	467	{
		468	vpn_packet *pkt = new vpn_packet;
414	struct sockaddr_in sa;	469	struct sockaddr_in sa;
415	socklen_t sa_len = sizeof (sa);	470	socklen_t sa_len = sizeof (sa);
416	int len;	471	int len;
417		472
418	fd = accept (fd, (sockaddr *)&sa, &sa_len);	473	len = recvfrom (w.fd, &((pkt)[0]), MAXSIZE, 0, (sockaddr )&sa, &sa_len);
419		474
420	if (fd >= 0)
421	{
422	fcntl (fd, F_SETFL, O_NONBLOCK);
423
424	sockinfo si(sa, PROT_TCPv4);	475	sockinfo si(sa, PROT_UDPv4);
425	tcp_info *i = new tcp_info (this);
426		476
427	i->fd = fd;	477	if (len > 0)
428	i->ok = true;
429	i->r.start (fd, POLLIN);
430
431	tcp_si.insert (tcp_si_map::value_type (si, i));
432	tcp_fd.insert (tcp_fd_map::value_type (fd, i));
433	}	478	{
434	}	479	pkt->len = len;
435	}
436		480
437	void	481	recv_vpn_packet (pkt, si);
438	vpn::tcpv4_ev (int fd, short revents)
439	{
440	if (revents & (POLLIN \| POLLERR))
441	{
442	tcp_fd_map::iterator info = tcp_fd.find (fd);
443
444	if (info != tcp_fd.end ())
445	{	482	}
446	tcp_info *i = info->second;	483	else
447
448	if (!i->ok) // not yet established
449	{
450	i->ok = true;
451	fcntl (i->fd, F_SETFL, 0);
452	}
453
454	u32 len;
455
456	if (sizeof (len) == read (fd, &len, sizeof (len)))
457	{
458	slog (L_ERR, "%d bytes received\n", len);
459	}
460
461	//tcp_si.erase (i);
462	tcp_fd.erase (fd);
463	delete i;
464	}	484	{
		485	// probably ECONNRESET or somesuch
		486	slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
		487	}
		488
		489	delete pkt;
		490	}
		491	else if (revents & POLLHUP)
465	}	492	{
		493	// this cannot ;) happen on udp sockets
		494	slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
		495	exit (1);
		496	}
		497	else
		498	{
		499	slog (L_ERR,
		500	_("FATAL: unknown revents %08x in socket, terminating\n"),
		501	revents);
		502	exit (1);
		503	}
466	}	504	}
467		505
468	#endif
469
470	void	506	void
471	vpn::tap_ev (int fd, short revents)	507	vpn::tap_ev (io_watcher &w, short revents)
472	{	508	{
473	if (revents & POLLIN)	509	if (revents & POLLIN)
474	{	510	{
475	/* process data */	511	/* process data */
476	tap_packet *pkt;	512	tap_packet *pkt;
…		…
526	else	562	else
527	abort ();	563	abort ();
528	}	564	}
529		565
530	void	566	void
531	vpn::event_cb (tstamp &ts)	567	vpn::event_cb (time_watcher &w)
532	{	568	{
533	if (events)	569	if (events)
534	{	570	{
535	if (events & EVENT_SHUTDOWN)	571	if (events & EVENT_SHUTDOWN)
536	{	572	{
…		…
553	}	589	}
554		590
555	events = 0;	591	events = 0;
556	}	592	}
557		593
558	ts = TSTAMP_CANCEL;	594	w.at = TSTAMP_CANCEL;
559	}	595	}
560		596
561	void	597	void
562	vpn::shutdown_all ()	598	vpn::shutdown_all ()
563	{	599	{
…		…
607	}	643	}
608		644
609	return router;	645	return router;
610	}	646	}
611		647
612	void vpn::connect_request (int id)	648	void vpn::send_connect_request (int id)
613	{	649	{
614	connection *c = find_router ();	650	connection *c = find_router ();
615		651
616	if (c)	652	if (c)
617	c->connect_request (id);	653	c->send_connect_request (id);
618	//else // does not work, because all others must connect to the same router	654	else
619	// // no router found, aggressively connect to all routers	655	// no router found, aggressively connect to all routers
620	// for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)	656	for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
621	// if ((*i)->conf->routerprio)	657	if ((*i)->conf->routerprio)
622	// (*i)->establish_connection ();	658	(*i)->establish_connection ();
623	}	659	}
624		660
625	void	661	void
626	connection::dump_status ()	662	connection::dump_status ()
627	{	663	{
…		…
644		680
645	slog (L_NOTICE, _("END status dump"));	681	slog (L_NOTICE, _("END status dump"));
646	}	682	}
647		683
648	vpn::vpn (void)	684	vpn::vpn (void)
649	: event(this, &vpn::event_cb)	685	: event (this, &vpn::event_cb)
650	, udpv4_ev_watcher(this, &vpn::udpv4_ev)	686	, udpv4_ev_watcher (this, &vpn::udpv4_ev)
651	, ipv4_ev_watcher (this, &vpn::ipv4_ev)	687	, ipv4_ev_watcher (this, &vpn::ipv4_ev)
652	, tap_ev_watcher (this, &vpn::tap_ev)
653	#if ENABLE_TCP	688	#if ENABLE_TCP
654	, tcpv4_accept_watcher(this, &vpn::tcpv4_accept)	689	, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
655	#endif	690	#endif
		691	#if ENABLE_ICMP
		692	, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
		693	#endif
		694	, tap_ev_watcher (this, &vpn::tap_ev)
656	{	695	{
657	}	696	}
658		697
659	vpn::~vpn ()	698	vpn::~vpn ()
660	{	699	{

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.2 by pcg, Wed Apr 2 05:15:00 2003 UTC vs. Revision 1.9 by pcg, Tue Apr 8 02:00:54 2003 UTC

Diff Legend

Comparing gvpe/src/vpn.C (file contents):
Revision 1.2 by pcg, Wed Apr 2 05:15:00 2003 UTC vs.
Revision 1.9 by pcg, Tue Apr 8 02:00:54 2003 UTC