ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/vpn.C
(Generate patch)

Comparing gvpe/src/vpn.C (file contents):
Revision 1.4 by pcg, Fri Apr 4 05:26:45 2003 UTC vs.
Revision 1.16 by pcg, Tue Oct 14 19:59:16 2003 UTC

… …
24#include <cstring> 24#include <cstring>
25#include <cstdio> 25#include <cstdio>
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>
30#include <sys/wait.h> 29#include <sys/wait.h>
31#include <netinet/in.h>
32#include <arpa/inet.h>
33#include <errno.h> 30#include <errno.h>
34#include <time.h> 31#include <time.h>
35#include <unistd.h> 32#include <unistd.h>
33#include <fcntl.h>
34#include <sys/socket.h>
35
36#include "netcompat.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
52const char *vpn::script_if_up () 46const char *vpn::script_if_up ()
53{ 47{
… …
78} 72}
79 73
80int 74int
81vpn::setup () 75vpn::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 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
87
88#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
89 // this I really consider a linux bug. I am neither connected
90 // nor do I fragment myself. Linux still sets DF and doesn't
91 // fragment for me sometimes.
92 {
93 int oval = IP_PMTUDISC_DONT;
94 setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
95 }
96#endif
97
98 sockinfo si (THISNODE, PROT_IPv4);
99
100 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
101 {
102 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
103 exit (1);
104 }
105
106 ipv4_ev_watcher.start (ipv4_fd, POLLIN);
107 }
108
83 udpv4_fd = -1; 109 udpv4_fd = -1;
84 110
85 if (THISNODE->protocols & PROT_UDPv4) 111 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
86 { 112 {
87 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 113 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
88 114
89 if (udpv4_fd < 0) 115 if (udpv4_fd < 0)
90 return -1; 116 return -1;
117
118 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
91 119
92 // standard daemon practise... 120 // standard daemon practise...
93 { 121 {
94 int oval = 1; 122 int oval = 1;
95 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 123 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
96 } 124 }
97 125
98 sockinfo si (THISNODE, PROT_UDPv4); 126#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
99
100 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
101 {
102 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
103 exit (1);
104 }
105
106#ifdef IP_MTU_DISCOVER
107 // this I really consider a linux bug. I am neither connected 127 // this I really consider a linux bug. I am neither connected
108 // 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
109 // fragment for me sometimes. 129 // fragment for me sometimes.
110 { 130 {
111 int oval = IP_PMTUDISC_DONT; 131 int oval = IP_PMTUDISC_DONT;
112 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 132 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
113 } 133 }
114#endif 134#endif
115 135
136 sockinfo si (THISNODE, PROT_UDPv4);
137
138 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
139 {
140 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
141 exit (1);
142 }
143
116 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 144 udpv4_ev_watcher.start (udpv4_fd, POLLIN);
117 } 145 }
118 146
119 ipv4_fd = -1; 147 icmpv4_fd = -1;
148
149#if ENABLE_ICMP
120 if (THISNODE->protocols & PROT_IPv4) 150 if (THISNODE->protocols & PROT_ICMPv4)
121 { 151 {
122 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 152 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
123 153
124 if (ipv4_fd < 0) 154 if (icmpv4_fd < 0)
125 return -1; 155 return -1;
126 156
127 sockinfo si (THISNODE, PROT_IPv4); 157 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
128 158
129 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 159#ifdef ICMP_FILTER
130 { 160 {
131 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 161 icmp_filter oval;
132 exit (1); 162 oval.data = 0xffffffff;
163 if (::conf.icmp_type < 32)
164 oval.data &= ~(1 << ::conf.icmp_type);
165
166 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
133 } 167 }
168#endif
134 169
135#ifdef IP_MTU_DISCOVER 170#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
136 // this I really consider a linux bug. I am neither connected 171 // this I really consider a linux bug. I am neither connected
137 // 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
138 // fragment for me sometimes. 173 // fragment for me sometimes.
139 { 174 {
140 int oval = IP_PMTUDISC_DONT; 175 int oval = IP_PMTUDISC_DONT;
141 setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 176 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
142 } 177 }
143#endif 178#endif
144 179
180 sockinfo si (THISNODE, PROT_ICMPv4);
181
182 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
183 {
184 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
185 exit (1);
186 }
187
145 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 188 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN);
146 } 189 }
190#endif
191
192 tcpv4_fd = -1;
147 193
148#if ENABLE_TCP 194#if ENABLE_TCP
149 if (THISNODE->protocols & PROT_TCPv4) 195 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
150 { 196 {
151 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 197 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
152 198
153 if (tcpv4_fd < 0) 199 if (tcpv4_fd < 0)
154 return -1; 200 return -1;
201
202 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
155 203
156 // standard daemon practise... 204 // standard daemon practise...
157 { 205 {
158 int oval = 1; 206 int oval = 1;
159 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 207 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
191 reconnect_all (); 239 reconnect_all ();
192 240
193 return 0; 241 return 0;
194} 242}
195 243
196void 244// send a vpn packet out to other hosts
245bool
246vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
247{
248 switch (si.prot)
249 {
250 case PROT_IPv4:
251 return send_ipv4_packet (pkt, si, tos);
252
253 case PROT_UDPv4:
254 return send_udpv4_packet (pkt, si, tos);
255
256#if ENABLE_TCP
257 case PROT_TCPv4:
258 return send_tcpv4_packet (pkt, si, tos);
259#endif
260
261#if ENABLE_ICMP
262 case PROT_ICMPv4:
263 return send_icmpv4_packet (pkt, si, tos);
264#endif
265
266 default:
267 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
268 return false;
269 }
270}
271
272bool
197vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 273vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
198{ 274{
275#if defined(SOL_IP) && defined(IP_TOS)
199 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 276 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
277#endif
200 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 ());
201}
202 279
203void 280 return true;
281}
282
283static u16
284ipv4_checksum (u16 *data, unsigned int len)
285{
286 // use 32 bit accumulator and fold back carry bits at the end
287 u32 sum = 0;
288
289 while (len > 1)
290 {
291 sum += *data++;
292 len -= 2;
293 }
294
295 // odd byte left?
296 if (len)
297 sum += *(u8 *)data;
298
299 // add back carry bits
300 sum = (sum >> 16) + (sum & 0xffff); // lo += hi
301 sum += (sum >> 16); // carry
302
303 return ~sum;
304}
305
306#if ENABLE_ICMP
307bool
308vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
309{
310#if defined(SOL_IP) && defined(IP_TOS)
311 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
312#endif
313
314 pkt->unshift_hdr (4);
315
316 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
317 hdr->type = ::conf.icmp_type;
318 hdr->code = 255;
319 hdr->checksum = 0;
320 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
321
322 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
323
324 return true;
325}
326#endif
327
328bool
204vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 329vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
205{ 330{
331#if defined(SOL_IP) && defined(IP_TOS)
206 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 332 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
333#endif
207 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 ());
335
336 return true;
208} 337}
209 338
210void 339void
211vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 340vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
212{ 341{
… …
219 if (src == 0 || src > conns.size () 348 if (src == 0 || src > conns.size ()
220 || dst > conns.size () 349 || dst > conns.size ()
221 || pkt->typ () >= vpn_packet::PT_MAX) 350 || pkt->typ () >= vpn_packet::PT_MAX)
222 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"), 351 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
223 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 352 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
353 else if (dst > conns.size ())
354 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
355 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
224 else 356 else
225 { 357 {
226 connection *c = conns[src - 1]; 358 connection *c = conns[src - 1];
227 359
228 if (dst == 0 && !THISNODE->routerprio) 360 if (dst == 0)
229 slog (L_WARN, _("%s(%s): received broadcast, but we are no router"), 361 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),
230 c->conf->nodename, (const char *)rsi); 362 c->conf->nodename, (const char *)rsi);
231 else if (dst != 0 && dst != THISNODE->id) 363 else if (dst != 0 && dst != THISNODE->id)
232 // FORWARDING NEEDED ;) 364 {
365 if (THISNODE->routerprio)
366 // the tos setting gets lost here. who cares.
367 conns[dst - 1]->inject_vpn_packet (pkt);
368 else
233 slog (L_WARN, 369 slog (L_WARN,
234 _("received frame for node %d ('%s') from %s, but this is node %d ('%s')"), 370 _("%s(%s): forwarding request (=> %s), but we are no router"),
371 c->conf->nodename, (const char *)rsi,
235 dst, conns[dst - 1]->conf->nodename, 372 conns[dst - 1]->conf->nodename);
236 (const char *)rsi, 373 }
237 THISNODE->id, THISNODE->nodename);
238 else 374 else
239 c->recv_vpn_packet (pkt, rsi); 375 c->recv_vpn_packet (pkt, rsi);
240 } 376 }
241} 377}
242 378
243void 379void
244vpn::udpv4_ev (io_watcher &w, short revents) 380vpn::ipv4_ev (io_watcher &w, short revents)
245{ 381{
246 if (revents & (POLLIN | POLLERR)) 382 if (revents & (POLLIN | POLLERR))
247 { 383 {
248 vpn_packet *pkt = new vpn_packet; 384 vpn_packet *pkt = new vpn_packet;
249 struct sockaddr_in sa; 385 struct sockaddr_in sa;
250 socklen_t sa_len = sizeof (sa); 386 socklen_t sa_len = sizeof (sa);
251 int len; 387 int len;
252 388
253 len = recvfrom (w.p->fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 389 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
254 390
255 sockinfo si(sa); 391 sockinfo si(sa, PROT_IPv4);
256 392
257 if (len > 0) 393 if (len > 0)
258 { 394 {
259 pkt->len = len; 395 pkt->len = len;
396
397 // raw sockets deliver the ipv4, but don't expect it on sends
398 // this is slow, but...
399 pkt->skip_hdr (IP_OVERHEAD);
260 400
261 recv_vpn_packet (pkt, si); 401 recv_vpn_packet (pkt, si);
262 } 402 }
263 else 403 else
264 { 404 {
… …
269 delete pkt; 409 delete pkt;
270 } 410 }
271 else if (revents & POLLHUP) 411 else if (revents & POLLHUP)
272 { 412 {
273 // this cannot ;) happen on udp sockets 413 // this cannot ;) happen on udp sockets
274 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating.")); 414 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
275 exit (1); 415 exit (1);
276 } 416 }
277 else 417 else
278 { 418 {
279 slog (L_ERR, 419 slog (L_ERR,
… …
281 revents); 421 revents);
282 exit (1); 422 exit (1);
283 } 423 }
284} 424}
285 425
426#if ENABLE_ICMP
286void 427void
287vpn::ipv4_ev (io_watcher &w, short revents) 428vpn::icmpv4_ev (io_watcher &w, short revents)
288{ 429{
289 if (revents & (POLLIN | POLLERR)) 430 if (revents & (POLLIN | POLLERR))
290 { 431 {
291 vpn_packet *pkt = new vpn_packet; 432 vpn_packet *pkt = new vpn_packet;
292 struct sockaddr_in sa; 433 struct sockaddr_in sa;
293 socklen_t sa_len = sizeof (sa); 434 socklen_t sa_len = sizeof (sa);
294 int len; 435 int len;
295 436
296 len = recvfrom (w.p->fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 437 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
297 438
298 sockinfo si(sa, PROT_IPv4); 439 sockinfo si(sa, PROT_ICMPv4);
299 440
300 if (len > 0) 441 if (len > 0)
301 { 442 {
302 pkt->len = len; 443 pkt->len = len;
303 444
445 icmp_header *hdr = (icmp_header *)&((*pkt)[IP_OVERHEAD]);
446
447 if (hdr->type == ::conf.icmp_type
448 && hdr->code == 255)
449 {
304 // raw sockets deliver the ipv4, but don't expect it on sends 450 // raw sockets deliver the ipv4, but don't expect it on sends
305 // this is slow, but... 451 // this is slow, but...
306 pkt->skip_hdr (IP_OVERHEAD); 452 pkt->skip_hdr (ICMP_OVERHEAD);
307 453
308 recv_vpn_packet (pkt, si); 454 recv_vpn_packet (pkt, si);
455 }
309 } 456 }
310 else 457 else
311 { 458 {
312 // probably ECONNRESET or somesuch 459 // probably ECONNRESET or somesuch
313 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 460 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
… …
316 delete pkt; 463 delete pkt;
317 } 464 }
318 else if (revents & POLLHUP) 465 else if (revents & POLLHUP)
319 { 466 {
320 // this cannot ;) happen on udp sockets 467 // this cannot ;) happen on udp sockets
321 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating.")); 468 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
322 exit (1); 469 exit (1);
323 } 470 }
324 else 471 else
325 { 472 {
326 slog (L_ERR, 473 slog (L_ERR,
327 _("FATAL: unknown revents %08x in socket, terminating\n"), 474 _("FATAL: unknown revents %08x in socket, terminating\n"),
328 revents); 475 revents);
329 exit (1); 476 exit (1);
330 } 477 }
331} 478}
479#endif
332 480
333#if ENABLE_TCP 481void
334
335struct tcp_connection;
336
337struct lt_sockinfo
338{
339 bool operator()(const sockinfo *a, const sockinfo *b) const
340 {
341 return *a < *b;
342 }
343};
344
345struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> {
346 void cleaner_cb (time_watcher &w); time_watcher cleaner;
347
348 tcp_si_map ()
349 : cleaner(this, &tcp_si_map::cleaner_cb)
350 {
351 cleaner.start (0);
352 }
353} tcp_si;
354
355struct tcp_connection : io_watcher {
356 tstamp last_activity;
357 const sockinfo si;
358 vpn &v;
359 bool ok;
360
361 vpn_packet *r_pkt;
362 u32 r_len, r_ofs;
363
364 void tcpv4_ev (io_watcher &w, short revents); 482vpn::udpv4_ev (io_watcher &w, short revents)
365
366 operator tcp_si_map::value_type()
367 {
368 return tcp_si_map::value_type (&si, this);
369 }
370
371 tcp_connection (int fd, const sockinfo &si_, vpn &v_)
372 : v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev)
373 {
374 last_activity = NOW;
375 ok = false;
376 r_pkt = 0;
377 start (fd, POLLOUT);
378 }
379
380 ~tcp_connection () { if (p) close (p->fd); }
381};
382
383void tcp_si_map::cleaner_cb (time_watcher &w)
384{ 483{
385 w.at = NOW + 600;
386 tstamp to = NOW - ::conf.keepalive - 30;
387
388 for (iterator i = begin (); i != end(); )
389 if (i->second->last_activity >= to)
390 ++i;
391 else
392 {
393 erase (i);
394 i = begin ();
395 }
396}
397
398void
399vpn::send_tcpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
400{
401 tcp_si_map::iterator info = tcp_si.find (&si);
402
403 if (info == tcp_si.end ())
404 {
405 // woaw, the first lost packet ;)
406 int fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
407
408 if (fd >= 0)
409 {
410 fcntl (fd, F_SETFL, O_NONBLOCK);
411
412 if (connect (fd, si.sav4 (), si.salenv4 ()) >= 0
413 || errno == EINPROGRESS)
414 {
415 tcp_connection *i = new tcp_connection (fd, si, *this);
416
417 tcp_si.insert (*i);
418 }
419 else
420 close (fd);
421 }
422 }
423 else
424 {
425 tcp_connection *i = info->second;
426
427 i->last_activity = NOW;
428
429 if (i->ok)
430 {
431 setsockopt (i->p->fd, SOL_IP, IP_TOS, &tos, sizeof tos);
432
433 // we use none of the advantages of tcp
434 write (i->p->fd, (void *)pkt, pkt->len + sizeof (u32)) != pkt->len + sizeof (u32);
435 }
436 }
437
438#if 0
439 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
440 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
441#endif
442}
443
444void
445tcp_connection::tcpv4_ev (io_watcher &w, short revents)
446{
447 last_activity = NOW;
448
449 if (!ok) // just established?
450 {
451 ok = true;
452 set (POLLIN);
453 }
454
455 if (revents & (POLLIN | POLLERR)) 484 if (revents & (POLLIN | POLLERR))
456 { 485 {
457 u32 len;
458
459 if (sizeof (len) == read (p->fd, &len, sizeof (len)))
460 {
461 vpn_packet *pkt = new vpn_packet; 486 vpn_packet *pkt = new vpn_packet;
462
463 if (len == read (p->fd, &((*pkt)[0]), len))
464 {
465 pkt->len = len;
466
467 v.recv_vpn_packet (pkt, si);
468 return;
469 }
470
471 delete pkt;
472 }
473
474 tcp_si.erase (&si);
475
476 set (0);//D
477 }
478}
479
480void
481vpn::tcpv4_ev (io_watcher &w, short revents)
482{
483 if (revents & (POLLIN | POLLERR))
484 {
485 struct sockaddr_in sa; 487 struct sockaddr_in sa;
486 socklen_t sa_len = sizeof (sa); 488 socklen_t sa_len = sizeof (sa);
487 int len; 489 int len;
488 490
489 int fd = accept (w.p->fd, (sockaddr *)&sa, &sa_len); 491 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
490 492
491 if (fd >= 0)
492 {
493 fcntl (fd, F_SETFL, O_NONBLOCK);
494
495 sockinfo si(sa, PROT_TCPv4); 493 sockinfo si(sa, PROT_UDPv4);
496 tcp_connection *i = new tcp_connection (fd, si, *this);
497 494
498 slog (L_DEBUG, _("accepted tcp connection from %s\n"), (const char *)si);//D 495 if (len > 0)
499
500 tcp_si.insert (*i);
501 } 496 {
497 pkt->len = len;
498
499 recv_vpn_packet (pkt, si);
500 }
501 else
502 {
503 // probably ECONNRESET or somesuch
504 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
505 }
506
507 delete pkt;
508 }
509 else if (revents & POLLHUP)
502 } 510 {
511 // this cannot ;) happen on udp sockets
512 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
513 exit (1);
514 }
515 else
516 {
517 slog (L_ERR,
518 _("FATAL: unknown revents %08x in socket, terminating\n"),
519 revents);
520 exit (1);
521 }
503} 522}
504
505#endif
506 523
507void 524void
508vpn::tap_ev (io_watcher &w, short revents) 525vpn::tap_ev (io_watcher &w, short revents)
509{ 526{
510 if (revents & POLLIN) 527 if (revents & POLLIN)
… …
517 int dst = mac2id (pkt->dst); 534 int dst = mac2id (pkt->dst);
518 int src = mac2id (pkt->src); 535 int src = mac2id (pkt->src);
519 536
520 if (src != THISNODE->id) 537 if (src != THISNODE->id)
521 { 538 {
522 slog (L_ERR, _("FATAL: tap packet not originating on current node received, terminating.")); 539 slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
523 exit (1); 540 exit (1);
524 } 541 }
525 542
526 if (dst == THISNODE->id) 543 if (dst == THISNODE->id)
527 { 544 {
528 slog (L_ERR, _("FATAL: tap packet destined for current node received, terminating.")); 545 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
529 exit (1); 546 exit (1);
530 } 547 }
531 548
532 if (dst > conns.size ()) 549 if (dst > conns.size ())
533 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst); 550 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
… …
539 if (dst != THISNODE->id) 556 if (dst != THISNODE->id)
540 conns[dst - 1]->inject_data_packet (pkt); 557 conns[dst - 1]->inject_data_packet (pkt);
541 } 558 }
542 else 559 else
543 { 560 {
544 // broadcast, first check router, then self, then english 561 // broadcast, this is ugly, but due to the security policy
545 connection *router = find_router (); 562 // we have to connect to all hosts...
546
547 if (router)
548 router->inject_data_packet (pkt, true);
549 else
550 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 563 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
551 if ((*c)->conf != THISNODE) 564 if ((*c)->conf != THISNODE)
552 (*c)->inject_data_packet (pkt); 565 (*c)->inject_data_packet (pkt);
553 } 566 }
554 } 567 }
555 568
556 delete pkt; 569 delete pkt;
557 } 570 }
… …
624 } 637 }
625} 638}
626 639
627connection *vpn::find_router () 640connection *vpn::find_router ()
628{ 641{
629 u32 prio = 0; 642 u32 prio = 1;
630 connection *router = 0; 643 connection *router = 0;
631 644
632 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 645 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
633 { 646 {
634 connection *c = *i; 647 connection *c = *i;
635 648
636 if (c->conf->routerprio > prio 649 if (c->conf->routerprio > prio
637 && c->connectmode == conf_node::C_ALWAYS 650 && c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use
638 && c->conf != THISNODE
639 && c->ictx && c->octx) 651 && c->ictx && c->octx
652 && c->conf != THISNODE) // redundant, since ictx==octx==0 always on thisnode
640 { 653 {
641 prio = c->conf->routerprio; 654 prio = c->conf->routerprio;
642 router = c; 655 router = c;
643 } 656 }
644 } 657 }
645 658
646 return router; 659 return router;
647} 660}
648 661
649void vpn::connect_request (int id) 662void vpn::send_connect_request (int id)
650{ 663{
651 connection *c = find_router (); 664 connection *c = find_router ();
652 665
653 if (c) 666 if (c)
654 c->connect_request (id); 667 c->send_connect_request (id);
655 //else // does not work, because all others must connect to the same router 668 else
656 // // no router found, aggressively connect to all routers 669 // no router found, aggressively connect to all routers
657 // for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 670 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
658 // if ((*i)->conf->routerprio) 671 if ((*i)->conf->routerprio && (*i)->conf != THISNODE)
659 // (*i)->establish_connection (); 672 (*i)->establish_connection ();
660} 673}
661 674
662void 675void
663connection::dump_status () 676connection::dump_status ()
664{ 677{
… …
681 694
682 slog (L_NOTICE, _("END status dump")); 695 slog (L_NOTICE, _("END status dump"));
683} 696}
684 697
685vpn::vpn (void) 698vpn::vpn (void)
686: event(this, &vpn::event_cb) 699: event (this, &vpn::event_cb)
687, udpv4_ev_watcher(this, &vpn::udpv4_ev) 700, udpv4_ev_watcher (this, &vpn::udpv4_ev)
688, ipv4_ev_watcher (this, &vpn::ipv4_ev) 701, ipv4_ev_watcher (this, &vpn::ipv4_ev)
689, tap_ev_watcher (this, &vpn::tap_ev)
690#if ENABLE_TCP 702#if ENABLE_TCP
691, tcpv4_ev_watcher(this, &vpn::tcpv4_ev) 703, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
692#endif 704#endif
705#if ENABLE_ICMP
706, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
707#endif
708, tap_ev_watcher (this, &vpn::tap_ev)
693{ 709{
694} 710}
695 711
696vpn::~vpn () 712vpn::~vpn ()
697{ 713{

Diff Legend

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