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.10 by pcg, Tue Apr 8 03:25:35 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/ip_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
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#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;
… …
92 // standard daemon practise... 116 // standard daemon practise...
93 { 117 {
94 int oval = 1; 118 int oval = 1;
95 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 119 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
96 } 120 }
97
98 sockinfo si (THISNODE, PROT_UDPv4);
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 121
106#ifdef IP_MTU_DISCOVER 122#ifdef IP_MTU_DISCOVER
107 // this I really consider a linux bug. I am neither connected 123 // this I really consider a linux bug. I am neither connected
108 // 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
109 // fragment for me sometimes. 125 // fragment for me sometimes.
… …
111 int oval = IP_PMTUDISC_DONT; 127 int oval = IP_PMTUDISC_DONT;
112 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 128 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
113 } 129 }
114#endif 130#endif
115 131
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
116 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 140 udpv4_ev_watcher.start (udpv4_fd, POLLIN);
117 } 141 }
118 142
119 ipv4_fd = -1; 143 icmpv4_fd = -1;
144
145#if ENABLE_ICMP
120 if (THISNODE->protocols & PROT_IPv4) 146 if (THISNODE->protocols & PROT_ICMPv4)
121 { 147 {
122 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 148 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
123 149
124 if (ipv4_fd < 0) 150 if (icmpv4_fd < 0)
125 return -1; 151 return -1;
126 152
127 sockinfo si (THISNODE, PROT_IPv4); 153#ifdef ICMP_FILTER
128
129 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
130 { 154 {
131 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 155 icmp_filter oval;
132 exit (1); 156 oval.data = 0xffffffff;
157 if (::conf.icmp_type < 32)
158 oval.data &= ~(1 << ::conf.icmp_type);
159
160 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
133 } 161 }
162#endif
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;
… …
191 reconnect_all (); 231 reconnect_all ();
192 232
193 return 0; 233 return 0;
194} 234}
195 235
196void 236// send a vpn packet out to other hosts
237bool
238vpn::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
264bool
197vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 265vpn::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
203void 270 return true;
271}
272
273static u16
274ipv4_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
296bool
297vpn::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
314bool
204vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 315vpn::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
210void 323void
211vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 324vpn::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
243void 363void
244vpn::udpv4_ev (io_watcher &w, short revents) 364vpn::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 (w.p->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
286void 410void
287vpn::ipv4_ev (io_watcher &w, short revents) 411vpn::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 (w.p->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 463void
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); 464vpn::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{ 465{
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)) 466 if (revents & (POLLIN | POLLERR))
456 { 467 {
457 u32 len;
458
459 if (sizeof (len) == read (p->fd, &len, sizeof (len)))
460 {
461 vpn_packet *pkt = new vpn_packet; 468 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; 469 struct sockaddr_in sa;
486 socklen_t sa_len = sizeof (sa); 470 socklen_t sa_len = sizeof (sa);
487 int len; 471 int len;
488 472
489 int fd = accept (w.p->fd, (sockaddr *)&sa, &sa_len); 473 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
490 474
491 if (fd >= 0)
492 {
493 fcntl (fd, F_SETFL, O_NONBLOCK);
494
495 sockinfo si(sa, PROT_TCPv4); 475 sockinfo si(sa, PROT_UDPv4);
496 tcp_connection *i = new tcp_connection (fd, si, *this);
497 476
498 slog (L_DEBUG, _("accepted tcp connection from %s\n"), (const char *)si);//D 477 if (len > 0)
499
500 tcp_si.insert (*i);
501 } 478 {
479 pkt->len = len;
480
481 recv_vpn_packet (pkt, si);
482 }
483 else
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)
502 } 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 }
503} 504}
504
505#endif
506 505
507void 506void
508vpn::tap_ev (io_watcher &w, short revents) 507vpn::tap_ev (io_watcher &w, short revents)
509{ 508{
510 if (revents & POLLIN) 509 if (revents & POLLIN)
… …
644 } 643 }
645 644
646 return router; 645 return router;
647} 646}
648 647
649void vpn::connect_request (int id) 648void vpn::send_connect_request (int id)
650{ 649{
651 connection *c = find_router (); 650 connection *c = find_router ();
652 651
653 if (c) 652 if (c)
654 c->connect_request (id); 653 c->send_connect_request (id);
655 //else // does not work, because all others must connect to the same router 654 else
656 // // no router found, aggressively connect to all routers 655 // no router found, aggressively connect to all routers
657 // for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 656 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
658 // if ((*i)->conf->routerprio) 657 if ((*i)->conf->routerprio)
659 // (*i)->establish_connection (); 658 (*i)->establish_connection ();
660} 659}
661 660
662void 661void
663connection::dump_status () 662connection::dump_status ()
664{ 663{
… …
681 680
682 slog (L_NOTICE, _("END status dump")); 681 slog (L_NOTICE, _("END status dump"));
683} 682}
684 683
685vpn::vpn (void) 684vpn::vpn (void)
686: event(this, &vpn::event_cb) 685: event (this, &vpn::event_cb)
687, udpv4_ev_watcher(this, &vpn::udpv4_ev) 686, udpv4_ev_watcher (this, &vpn::udpv4_ev)
688, ipv4_ev_watcher (this, &vpn::ipv4_ev) 687, ipv4_ev_watcher (this, &vpn::ipv4_ev)
689, tap_ev_watcher (this, &vpn::tap_ev)
690#if ENABLE_TCP 688#if ENABLE_TCP
691, tcpv4_ev_watcher(this, &vpn::tcpv4_ev) 689, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
692#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)
693{ 695{
694} 696}
695 697
696vpn::~vpn () 698vpn::~vpn ()
697{ 699{

Diff Legend

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