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.11 by pcg, Sun Apr 13 00:35:46 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
43#if ENABLE_TCP
44# include <map>
45# include <unistd.h>
46# include <fcntl.h>
47# include <sys/poll.h>
48#endif
49 44
50///////////////////////////////////////////////////////////////////////////// 45/////////////////////////////////////////////////////////////////////////////
51 46
52const char *vpn::script_if_up () 47const char *vpn::script_if_up ()
53{ 48{
… …
78} 73}
79 74
80int 75int
81vpn::setup () 76vpn::setup ()
82{ 77{
78 ipv4_fd = -1;
79
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 }
109
83 udpv4_fd = -1; 110 udpv4_fd = -1;
84 111
85 if (THISNODE->protocols & PROT_UDPv4) 112 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
86 { 113 {
87 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 114 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
88 115
89 if (udpv4_fd < 0) 116 if (udpv4_fd < 0)
90 return -1; 117 return -1;
118
119 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
91 120
92 // standard daemon practise... 121 // standard daemon practise...
93 { 122 {
94 int oval = 1; 123 int oval = 1;
95 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 124 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
96 } 125 }
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 126
106#ifdef IP_MTU_DISCOVER 127#ifdef IP_MTU_DISCOVER
107 // this I really consider a linux bug. I am neither connected 128 // this I really consider a linux bug. I am neither connected
108 // 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
109 // fragment for me sometimes. 130 // fragment for me sometimes.
… …
111 int oval = IP_PMTUDISC_DONT; 132 int oval = IP_PMTUDISC_DONT;
112 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 133 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
113 } 134 }
114#endif 135#endif
115 136
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
116 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 145 udpv4_ev_watcher.start (udpv4_fd, POLLIN);
117 } 146 }
118 147
119 ipv4_fd = -1; 148 icmpv4_fd = -1;
149
150#if ENABLE_ICMP
120 if (THISNODE->protocols & PROT_IPv4) 151 if (THISNODE->protocols & PROT_ICMPv4)
121 { 152 {
122 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 153 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
123 154
124 if (ipv4_fd < 0) 155 if (icmpv4_fd < 0)
125 return -1; 156 return -1;
126 157
127 sockinfo si (THISNODE, PROT_IPv4); 158 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
128 159
129 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 160#ifdef ICMP_FILTER
130 { 161 {
131 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 162 icmp_filter oval;
132 exit (1); 163 oval.data = 0xffffffff;
164 if (::conf.icmp_type < 32)
165 oval.data &= ~(1 << ::conf.icmp_type);
166
167 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
133 } 168 }
169#endif
134 170
135#ifdef IP_MTU_DISCOVER 171#ifdef IP_MTU_DISCOVER
136 // this I really consider a linux bug. I am neither connected 172 // this I really consider a linux bug. I am neither connected
137 // 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
138 // fragment for me sometimes. 174 // fragment for me sometimes.
139 { 175 {
140 int oval = IP_PMTUDISC_DONT; 176 int oval = IP_PMTUDISC_DONT;
141 setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 177 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
142 } 178 }
143#endif 179#endif
144 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
145 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 189 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN);
146 } 190 }
191#endif
192
193 tcpv4_fd = -1;
147 194
148#if ENABLE_TCP 195#if ENABLE_TCP
149 if (THISNODE->protocols & PROT_TCPv4) 196 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
150 { 197 {
151 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 198 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
152 199
153 if (tcpv4_fd < 0) 200 if (tcpv4_fd < 0)
154 return -1; 201 return -1;
202
203 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
155 204
156 // standard daemon practise... 205 // standard daemon practise...
157 { 206 {
158 int oval = 1; 207 int oval = 1;
159 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 208 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
191 reconnect_all (); 240 reconnect_all ();
192 241
193 return 0; 242 return 0;
194} 243}
195 244
196void 245// send a vpn packet out to other hosts
246bool
247vpn::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
273bool
197vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 274vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
198{ 275{
199 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 276 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
200 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 ());
201}
202 278
203void 279 return true;
280}
281
282static u16
283ipv4_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
305bool
306vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
307{
308 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
309
310 pkt->unshift_hdr (4);
311
312 icmphdr *hdr = (icmphdr *)&((*pkt)[0]);
313 hdr->type = ::conf.icmp_type;
314 hdr->code = 255;
315 hdr->checksum = 0;
316 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
317
318 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
319
320 return true;
321}
322
323bool
204vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 324vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
205{ 325{
206 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 326 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
207 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 327 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
328
329 return true;
208} 330}
209 331
210void 332void
211vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 333vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
212{ 334{
… …
219 if (src == 0 || src > conns.size () 341 if (src == 0 || src > conns.size ()
220 || dst > conns.size () 342 || dst > conns.size ()
221 || pkt->typ () >= vpn_packet::PT_MAX) 343 || pkt->typ () >= vpn_packet::PT_MAX)
222 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"), 344 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
223 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 345 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
346 else if (dst > conns.size ())
347 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
348 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
224 else 349 else
225 { 350 {
226 connection *c = conns[src - 1]; 351 connection *c = conns[src - 1];
227 352
228 if (dst == 0 && !THISNODE->routerprio) 353 if (dst == 0 && !THISNODE->routerprio)
229 slog (L_WARN, _("%s(%s): received broadcast, but we are no router"), 354 slog (L_WARN, _("%s(%s): received broadcast, but we are no router"),
230 c->conf->nodename, (const char *)rsi); 355 c->conf->nodename, (const char *)rsi);
231 else if (dst != 0 && dst != THISNODE->id) 356 else if (dst != 0 && dst != THISNODE->id)
232 // FORWARDING NEEDED ;) 357 {
358 if (THISNODE->routerprio)
359 // the tos setting gets lost here. who cares.
360 conns[dst - 1]->inject_vpn_packet (pkt);
361 else
233 slog (L_WARN, 362 slog (L_WARN,
234 _("received frame for node %d ('%s') from %s, but this is node %d ('%s')"), 363 _("%s(%s): forwarding request (=> %s), but we are no router"),
364 c->conf->nodename, (const char *)rsi,
235 dst, conns[dst - 1]->conf->nodename, 365 conns[dst - 1]->conf->nodename);
236 (const char *)rsi, 366 }
237 THISNODE->id, THISNODE->nodename);
238 else 367 else
239 c->recv_vpn_packet (pkt, rsi); 368 c->recv_vpn_packet (pkt, rsi);
240 } 369 }
241} 370}
242 371
243void 372void
244vpn::udpv4_ev (io_watcher &w, short revents) 373vpn::ipv4_ev (io_watcher &w, short revents)
245{ 374{
246 if (revents & (POLLIN | POLLERR)) 375 if (revents & (POLLIN | POLLERR))
247 { 376 {
248 vpn_packet *pkt = new vpn_packet; 377 vpn_packet *pkt = new vpn_packet;
249 struct sockaddr_in sa; 378 struct sockaddr_in sa;
250 socklen_t sa_len = sizeof (sa); 379 socklen_t sa_len = sizeof (sa);
251 int len; 380 int len;
252 381
253 len = recvfrom (w.p->fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 382 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
254 383
255 sockinfo si(sa); 384 sockinfo si(sa, PROT_IPv4);
256 385
257 if (len > 0) 386 if (len > 0)
258 { 387 {
259 pkt->len = len; 388 pkt->len = len;
389
390 // raw sockets deliver the ipv4, but don't expect it on sends
391 // this is slow, but...
392 pkt->skip_hdr (IP_OVERHEAD);
260 393
261 recv_vpn_packet (pkt, si); 394 recv_vpn_packet (pkt, si);
262 } 395 }
263 else 396 else
264 { 397 {
… …
269 delete pkt; 402 delete pkt;
270 } 403 }
271 else if (revents & POLLHUP) 404 else if (revents & POLLHUP)
272 { 405 {
273 // this cannot ;) happen on udp sockets 406 // this cannot ;) happen on udp sockets
274 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating.")); 407 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
275 exit (1); 408 exit (1);
276 } 409 }
277 else 410 else
278 { 411 {
279 slog (L_ERR, 412 slog (L_ERR,
… …
282 exit (1); 415 exit (1);
283 } 416 }
284} 417}
285 418
286void 419void
287vpn::ipv4_ev (io_watcher &w, short revents) 420vpn::icmpv4_ev (io_watcher &w, short revents)
288{ 421{
289 if (revents & (POLLIN | POLLERR)) 422 if (revents & (POLLIN | POLLERR))
290 { 423 {
291 vpn_packet *pkt = new vpn_packet; 424 vpn_packet *pkt = new vpn_packet;
292 struct sockaddr_in sa; 425 struct sockaddr_in sa;
293 socklen_t sa_len = sizeof (sa); 426 socklen_t sa_len = sizeof (sa);
294 int len; 427 int len;
295 428
296 len = recvfrom (w.p->fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 429 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
297 430
298 sockinfo si(sa, PROT_IPv4); 431 sockinfo si(sa, PROT_ICMPv4);
299 432
300 if (len > 0) 433 if (len > 0)
301 { 434 {
302 pkt->len = len; 435 pkt->len = len;
303 436
437 icmphdr *hdr = (icmphdr *)&((*pkt)[IP_OVERHEAD]);
438
439 if (hdr->type == ::conf.icmp_type
440 && hdr->code == 255)
441 {
304 // raw sockets deliver the ipv4, but don't expect it on sends 442 // raw sockets deliver the ipv4, but don't expect it on sends
305 // this is slow, but... 443 // this is slow, but...
306 pkt->skip_hdr (IP_OVERHEAD); 444 pkt->skip_hdr (ICMP_OVERHEAD);
307 445
308 recv_vpn_packet (pkt, si); 446 recv_vpn_packet (pkt, si);
447 }
309 } 448 }
310 else 449 else
311 { 450 {
312 // probably ECONNRESET or somesuch 451 // probably ECONNRESET or somesuch
313 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 452 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
… …
316 delete pkt; 455 delete pkt;
317 } 456 }
318 else if (revents & POLLHUP) 457 else if (revents & POLLHUP)
319 { 458 {
320 // this cannot ;) happen on udp sockets 459 // this cannot ;) happen on udp sockets
321 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating.")); 460 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
322 exit (1); 461 exit (1);
323 } 462 }
324 else 463 else
325 { 464 {
326 slog (L_ERR, 465 slog (L_ERR,
… …
328 revents); 467 revents);
329 exit (1); 468 exit (1);
330 } 469 }
331} 470}
332 471
333#if ENABLE_TCP 472void
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); 473vpn::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{ 474{
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)) 475 if (revents & (POLLIN | POLLERR))
456 { 476 {
457 u32 len;
458
459 if (sizeof (len) == read (p->fd, &len, sizeof (len)))
460 {
461 vpn_packet *pkt = new vpn_packet; 477 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; 478 struct sockaddr_in sa;
486 socklen_t sa_len = sizeof (sa); 479 socklen_t sa_len = sizeof (sa);
487 int len; 480 int len;
488 481
489 int fd = accept (w.p->fd, (sockaddr *)&sa, &sa_len); 482 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
490 483
491 if (fd >= 0)
492 {
493 fcntl (fd, F_SETFL, O_NONBLOCK);
494
495 sockinfo si(sa, PROT_TCPv4); 484 sockinfo si(sa, PROT_UDPv4);
496 tcp_connection *i = new tcp_connection (fd, si, *this);
497 485
498 slog (L_DEBUG, _("accepted tcp connection from %s\n"), (const char *)si);//D 486 if (len > 0)
499
500 tcp_si.insert (*i);
501 } 487 {
488 pkt->len = len;
489
490 recv_vpn_packet (pkt, si);
491 }
492 else
493 {
494 // probably ECONNRESET or somesuch
495 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
496 }
497
498 delete pkt;
499 }
500 else if (revents & POLLHUP)
502 } 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
507 {
508 slog (L_ERR,
509 _("FATAL: unknown revents %08x in socket, terminating\n"),
510 revents);
511 exit (1);
512 }
503} 513}
504
505#endif
506 514
507void 515void
508vpn::tap_ev (io_watcher &w, short revents) 516vpn::tap_ev (io_watcher &w, short revents)
509{ 517{
510 if (revents & POLLIN) 518 if (revents & POLLIN)
… …
632 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 640 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
633 { 641 {
634 connection *c = *i; 642 connection *c = *i;
635 643
636 if (c->conf->routerprio > prio 644 if (c->conf->routerprio > prio
637 && c->connectmode == conf_node::C_ALWAYS 645 && 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) 646 && c->ictx && c->octx
647 && c->conf != THISNODE // redundant, since ictx==octx==0 always on thisnode
648 && (!THISNODE->routerprio
649 || c->conf->routerprio <= THISNODE->routerprio))
640 { 650 {
641 prio = c->conf->routerprio; 651 prio = c->conf->routerprio;
642 router = c; 652 router = c;
643 } 653 }
644 } 654 }
645 655
646 return router; 656 return router;
647} 657}
648 658
649void vpn::connect_request (int id) 659void vpn::send_connect_request (int id)
650{ 660{
651 connection *c = find_router (); 661 connection *c = find_router ();
652 662
653 if (c) 663 if (c)
654 c->connect_request (id); 664 c->send_connect_request (id);
655 //else // does not work, because all others must connect to the same router 665 else
656 // // no router found, aggressively connect to all routers 666 // no router found, aggressively connect to all routers
657 // for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 667 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
658 // if ((*i)->conf->routerprio) 668 if ((*i)->conf->routerprio)
659 // (*i)->establish_connection (); 669 (*i)->establish_connection ();
660} 670}
661 671
662void 672void
663connection::dump_status () 673connection::dump_status ()
664{ 674{
… …
681 691
682 slog (L_NOTICE, _("END status dump")); 692 slog (L_NOTICE, _("END status dump"));
683} 693}
684 694
685vpn::vpn (void) 695vpn::vpn (void)
686: event(this, &vpn::event_cb) 696: event (this, &vpn::event_cb)
687, udpv4_ev_watcher(this, &vpn::udpv4_ev) 697, udpv4_ev_watcher (this, &vpn::udpv4_ev)
688, ipv4_ev_watcher (this, &vpn::ipv4_ev) 698, ipv4_ev_watcher (this, &vpn::ipv4_ev)
689, tap_ev_watcher (this, &vpn::tap_ev)
690#if ENABLE_TCP 699#if ENABLE_TCP
691, tcpv4_ev_watcher(this, &vpn::tcpv4_ev) 700, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
692#endif 701#endif
702#if ENABLE_ICMP
703, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
704#endif
705, tap_ev_watcher (this, &vpn::tap_ev)
693{ 706{
694} 707}
695 708
696vpn::~vpn () 709vpn::~vpn ()
697{ 710{

Diff Legend

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