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

Comparing gvpe/src/connection.C (file contents):
Revision 1.30 by pcg, Thu Jan 29 19:22:05 2004 UTC vs.
Revision 1.69 by pcg, Thu Aug 7 17:54:26 2008 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
6 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
7 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
8 (at your option) any later version. 10 option) any later version.
9 11
10 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful, but
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
13 GNU General Public License for more details. 15 Public License for more details.
14 16
15 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License along
16 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
18*/ 30*/
19 31
20#include "config.h" 32#include "config.h"
21
22#include <cassert>
23 33
24#include <list> 34#include <list>
25 35
26#include <openssl/rand.h> 36#include <openssl/rand.h>
27#include <openssl/evp.h> 37#include <openssl/evp.h>
28#include <openssl/rsa.h> 38#include <openssl/rsa.h>
29#include <openssl/err.h> 39#include <openssl/err.h>
30
31#include "gettext.h"
32 40
33#include "conf.h" 41#include "conf.h"
34#include "slog.h" 42#include "slog.h"
35#include "device.h" 43#include "device.h"
36#include "vpn.h" 44#include "vpn.h"
… …
84 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 92 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
85 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 93 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
86 EVP_MD_CTX_cleanup (&ctx); 94 EVP_MD_CTX_cleanup (&ctx);
87} 95}
88 96
89struct rsa_entry { 97struct rsa_entry
98{
90 tstamp expire; 99 tstamp expire;
91 rsaid id; 100 rsaid id;
92 rsachallenge chg; 101 rsachallenge chg;
93}; 102};
94 103
95struct rsa_cache : list<rsa_entry> 104struct rsa_cache : list<rsa_entry>
96{ 105{
97 void cleaner_cb (time_watcher &w); time_watcher cleaner; 106 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
98 107
99 bool find (const rsaid &id, rsachallenge &chg) 108 bool find (const rsaid &id, rsachallenge &chg)
100 { 109 {
101 for (iterator i = begin (); i != end (); ++i) 110 for (iterator i = begin (); i != end (); ++i)
102 { 111 {
103 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 112 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
104 { 113 {
105 memcpy (&chg, &i->chg, sizeof chg); 114 memcpy (&chg, &i->chg, sizeof chg);
106 115
107 erase (i); 116 erase (i);
108 return true; 117 return true;
109 } 118 }
110 } 119 }
111 120
112 if (cleaner.at < NOW) 121 if (!cleaner.is_active ())
113 cleaner.start (NOW + RSA_TTL); 122 cleaner.again ();
114 123
115 return false; 124 return false;
116 } 125 }
117 126
118 void gen (rsaid &id, rsachallenge &chg) 127 void gen (rsaid &id, rsachallenge &chg)
119 { 128 {
120 rsa_entry e; 129 rsa_entry e;
121 130
122 RAND_bytes ((unsigned char *)&id, sizeof id); 131 RAND_bytes ((unsigned char *)&id, sizeof id);
123 RAND_bytes ((unsigned char *)&chg, sizeof chg); 132 RAND_bytes ((unsigned char *)&chg, sizeof chg);
124 133
125 e.expire = NOW + RSA_TTL; 134 e.expire = ev_now () + RSA_TTL;
126 e.id = id; 135 e.id = id;
127 memcpy (&e.chg, &chg, sizeof chg); 136 memcpy (&e.chg, &chg, sizeof chg);
128 137
129 push_back (e); 138 push_back (e);
130 139
131 if (cleaner.at < NOW) 140 if (!cleaner.is_active ())
132 cleaner.start (NOW + RSA_TTL); 141 cleaner.again ();
133 } 142 }
134 143
135 rsa_cache () 144 rsa_cache ()
136 : cleaner (this, &rsa_cache::cleaner_cb) 145 {
137 { } 146 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
147 cleaner.set (RSA_TTL, RSA_TTL);
148 }
138 149
139} rsa_cache; 150} rsa_cache;
140 151
141void rsa_cache::cleaner_cb (time_watcher &w) 152void rsa_cache::cleaner_cb (ev::timer &w, int revents)
142{ 153{
143 if (!empty ()) 154 if (empty ())
155 w.stop ();
156 else
144 { 157 {
145 w.start (NOW + RSA_TTL);
146
147 for (iterator i = begin (); i != end (); ) 158 for (iterator i = begin (); i != end (); )
148 if (i->expire <= NOW) 159 if (i->expire <= ev_now ())
149 i = erase (i); 160 i = erase (i);
150 else 161 else
151 ++i; 162 ++i;
152 } 163 }
153} 164}
154 165
155////////////////////////////////////////////////////////////////////////////// 166//////////////////////////////////////////////////////////////////////////////
156 167
157void pkt_queue::put (net_packet *p) 168pkt_queue::pkt_queue (double max_ttl, int max_queue)
169: max_ttl (max_ttl), max_queue (max_queue)
158{ 170{
159 if (queue[i]) 171 queue = new pkt [max_queue];
160 {
161 delete queue[i];
162 j = (j + 1) % QUEUEDEPTH;
163 }
164 172
165 queue[i] = p;
166
167 i = (i + 1) % QUEUEDEPTH;
168}
169
170net_packet *pkt_queue::get ()
171{
172 net_packet *p = queue[j];
173
174 if (p)
175 {
176 queue[j] = 0;
177 j = (j + 1) % QUEUEDEPTH;
178 }
179
180 return p;
181}
182
183pkt_queue::pkt_queue ()
184{
185 memset (queue, 0, sizeof (queue));
186 i = 0; 173 i = 0;
187 j = 0; 174 j = 0;
175
176 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
188} 177}
189 178
190pkt_queue::~pkt_queue () 179pkt_queue::~pkt_queue ()
191{ 180{
192 for (i = QUEUEDEPTH; --i > 0; ) 181 while (net_packet *p = get ())
182 delete p;
183
193 delete queue[i]; 184 delete [] queue;
194} 185}
195 186
187void pkt_queue::expire_cb (ev::timer &w, int revents)
188{
189 ev_tstamp expire = ev_now () - max_ttl;
190
191 for (;;)
192 {
193 if (empty ())
194 break;
195
196 double diff = queue[j].tstamp - expire;
197
198 if (diff >= 0.)
199 {
200 w.start (diff > 0.5 ? diff : 0.5);
201 break;
202 }
203
204 delete get ();
205 }
206}
207
208void pkt_queue::put (net_packet *p)
209{
210 ev_tstamp now = ev_now ();
211
212 // start expiry timer
213 if (empty ())
214 expire.start (max_ttl);
215
216 int ni = i + 1 == max_queue ? 0 : i + 1;
217
218 if (ni == j)
219 delete get ();
220
221 queue[i].pkt = p;
222 queue[i].tstamp = now;
223
224 i = ni;
225}
226
227net_packet *pkt_queue::get ()
228{
229 if (empty ())
230 return 0;
231
232 net_packet *p = queue[j].pkt;
233 queue[j].pkt = 0;
234
235 j = j + 1 == max_queue ? 0 : j + 1;
236
237 return p;
238}
239
196struct net_rateinfo { 240struct net_rateinfo
241{
197 u32 host; 242 u32 host;
198 double pcnt, diff; 243 double pcnt, diff;
199 tstamp last; 244 tstamp last;
200}; 245};
201 246
202// only do action once every x seconds per host whole allowing bursts. 247// only do action once every x seconds per host whole allowing bursts.
203// this implementation ("splay list" ;) is inefficient, 248// this implementation ("splay list" ;) is inefficient,
204// but low on resources. 249// but low on resources.
205struct net_rate_limiter : list<net_rateinfo> 250struct net_rate_limiter : list<net_rateinfo>
206{ 251{
207 static const double ALPHA = 1. - 1. / 600.; // allow bursts 252# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
208 static const double CUTOFF = 10.; // one event every CUTOFF seconds 253# define NRL_CUTOFF 10. // one event every CUTOFF seconds
209 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 254# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
210 static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value 255# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
211 256
212 bool can (const sockinfo &si) { return can((u32)si.host); } 257 bool can (const sockinfo &si) { return can((u32)si.host); }
213 bool can (u32 host); 258 bool can (u32 host);
214}; 259};
215 260
… …
220 iterator i; 265 iterator i;
221 266
222 for (i = begin (); i != end (); ) 267 for (i = begin (); i != end (); )
223 if (i->host == host) 268 if (i->host == host)
224 break; 269 break;
225 else if (i->last < NOW - EXPIRE) 270 else if (i->last < ev_now () - NRL_EXPIRE)
226 i = erase (i); 271 i = erase (i);
227 else 272 else
228 i++; 273 i++;
229 274
230 if (i == end ()) 275 if (i == end ())
231 { 276 {
232 net_rateinfo ri; 277 net_rateinfo ri;
233 278
234 ri.host = host; 279 ri.host = host;
235 ri.pcnt = 1.; 280 ri.pcnt = 1.;
236 ri.diff = MAXDIF; 281 ri.diff = NRL_MAXDIF;
237 ri.last = NOW; 282 ri.last = ev_now ();
238 283
239 push_front (ri); 284 push_front (ri);
240 285
241 return true; 286 return true;
242 } 287 }
243 else 288 else
244 { 289 {
245 net_rateinfo ri (*i); 290 net_rateinfo ri (*i);
246 erase (i); 291 erase (i);
247 292
248 ri.pcnt = ri.pcnt * ALPHA; 293 ri.pcnt = ri.pcnt * NRL_ALPHA;
249 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 294 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
250 295
251 ri.last = NOW; 296 ri.last = ev_now ();
252 297
253 double dif = ri.diff / ri.pcnt; 298 double dif = ri.diff / ri.pcnt;
254 299
255 bool send = dif > CUTOFF; 300 bool send = dif > NRL_CUTOFF;
256 301
257 if (dif > MAXDIF) 302 if (dif > NRL_MAXDIF)
258 { 303 {
259 ri.pcnt = 1.; 304 ri.pcnt = 1.;
260 ri.diff = MAXDIF; 305 ri.diff = NRL_MAXDIF;
261 } 306 }
262 else if (send) 307 else if (send)
263 ri.pcnt++; 308 ri.pcnt++;
264 309
265 push_front (ri); 310 push_front (ri);
… …
335 int outl = 0, outl2; 380 int outl = 0, outl2;
336 ptype type = PT_DATA_UNCOMPRESSED; 381 ptype type = PT_DATA_UNCOMPRESSED;
337 382
338#if ENABLE_COMPRESSION 383#if ENABLE_COMPRESSION
339 u8 cdata[MAX_MTU]; 384 u8 cdata[MAX_MTU];
340 u32 cl;
341 385
386 if (conn->features & ENABLE_COMPRESSION)
387 {
342 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 388 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
389
343 if (cl) 390 if (cl)
344 { 391 {
345 type = PT_DATA_COMPRESSED; 392 type = PT_DATA_COMPRESSED;
346 d = cdata; 393 d = cdata;
347 l = cl + 2; 394 l = cl + 2;
348 395
349 d[0] = cl >> 8; 396 d[0] = cl >> 8;
350 d[1] = cl; 397 d[1] = cl;
398 }
351 } 399 }
352#endif 400#endif
353 401
354 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0)); 402 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
355 403
… …
448{ 496{
449 // actually, hmaclen cannot be checked because the hmac 497 // actually, hmaclen cannot be checked because the hmac
450 // field comes before this data, so peers with other 498 // field comes before this data, so peers with other
451 // hmacs simply will not work. 499 // hmacs simply will not work.
452 u8 prot_major, prot_minor, randsize, hmaclen; 500 u8 prot_major, prot_minor, randsize, hmaclen;
453 u8 flags, challengelen, pad2, pad3; 501 u8 flags, challengelen, features, pad3;
454 u32 cipher_nid, digest_nid, hmac_nid; 502 u32 cipher_nid, digest_nid, hmac_nid;
455
456 const u8 curflags () const
457 {
458 return 0x80
459 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
460 }
461 503
462 void setup (ptype type, int dst); 504 void setup (ptype type, int dst);
463 bool chk_config () const; 505 bool chk_config () const;
506
507 static u8 get_features ()
508 {
509 u8 f = 0;
510#if ENABLE_COMPRESSION
511 f |= FEATURE_COMPRESSION;
512#endif
513#if ENABLE_ROHC
514 f |= FEATURE_ROHC;
515#endif
516#if ENABLE_BRIDGING
517 f |= FEATURE_BRIDGING;
518#endif
519 return f;
520 }
464}; 521};
465 522
466void config_packet::setup (ptype type, int dst) 523void config_packet::setup (ptype type, int dst)
467{ 524{
468 prot_major = PROTOCOL_MAJOR; 525 prot_major = PROTOCOL_MAJOR;
469 prot_minor = PROTOCOL_MINOR; 526 prot_minor = PROTOCOL_MINOR;
470 randsize = RAND_SIZE; 527 randsize = RAND_SIZE;
471 hmaclen = HMACLENGTH; 528 hmaclen = HMACLENGTH;
472 flags = curflags (); 529 flags = 0;
473 challengelen = sizeof (rsachallenge); 530 challengelen = sizeof (rsachallenge);
531 features = get_features ();
474 532
475 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 533 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
476 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 534 digest_nid = htonl (EVP_MD_type (RSA_HASH));
477 hmac_nid = htonl (EVP_MD_type (DIGEST)); 535 hmac_nid = htonl (EVP_MD_type (DIGEST));
478 536
… …
486 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 544 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
487 else if (randsize != RAND_SIZE) 545 else if (randsize != RAND_SIZE)
488 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 546 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
489 else if (hmaclen != HMACLENGTH) 547 else if (hmaclen != HMACLENGTH)
490 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH); 548 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
491 else if (flags != curflags ())
492 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
493 else if (challengelen != sizeof (rsachallenge)) 549 else if (challengelen != sizeof (rsachallenge))
494 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 550 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
495 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 551 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
496 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 552 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
497 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 553 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
573///////////////////////////////////////////////////////////////////////////// 629/////////////////////////////////////////////////////////////////////////////
574 630
575void 631void
576connection::connection_established () 632connection::connection_established ()
577{ 633{
634 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
635
578 if (ictx && octx) 636 if (ictx && octx)
579 { 637 {
580 connectmode = conf->connectmode; 638 // make sure rekeying timeouts are slightly asymmetric
581 639 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
582 rekey.start (NOW + ::conf.rekey); 640 rekey.start (rekey_interval, rekey_interval);
583 keepalive.start (NOW + ::conf.keepalive); 641 keepalive.start (::conf.keepalive);
584 642
585 // send queued packets 643 // send queued packets
586 if (ictx && octx) 644 if (ictx && octx)
587 { 645 {
588 while (tap_packet *p = (tap_packet *)data_queue.get ()) 646 while (tap_packet *p = (tap_packet *)data_queue.get ())
589 { 647 {
590 send_data_packet (p); 648 if (p->len) send_data_packet (p);
591 delete p; 649 delete p;
592 } 650 }
593 651
594 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 652 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
595 { 653 {
596 send_vpn_packet (p, si, IPTOS_RELIABILITY); 654 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
597 delete p; 655 delete p;
598 } 656 }
599 } 657 }
600 } 658 }
601 else 659 else
602 { 660 {
603 retry_cnt = 0; 661 retry_cnt = 0;
604 establish_connection.start (NOW + 5); 662 establish_connection.start (5);
605 keepalive.stop (); 663 keepalive.stop ();
606 rekey.stop (); 664 rekey.stop ();
607 } 665 }
608} 666}
609 667
… …
613 protocol = best_protocol (THISNODE->protocols & conf->protocols); 671 protocol = best_protocol (THISNODE->protocols & conf->protocols);
614 672
615 // mask out protocols we cannot establish 673 // mask out protocols we cannot establish
616 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 674 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
617 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 675 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
676 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
677
678 if (protocol
679 && (!conf->can_direct (THISNODE)
680 || !THISNODE->can_direct (conf)))
681 {
682 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename);
683 protocol = 0;
684 }
618 685
619 si.set (conf, protocol); 686 si.set (conf, protocol);
620} 687}
621 688
622// ensure sockinfo is valid, forward if necessary 689// ensure sockinfo is valid, forward if necessary
… …
627 { 694 {
628 connection *r = vpn->find_router (); 695 connection *r = vpn->find_router ();
629 696
630 if (r) 697 if (r)
631 { 698 {
632 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 699 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
633 conf->nodename, r->conf->nodename); 700 conf->nodename, r->conf->nodename, (const char *)r->si);
634 return r->si; 701 return r->si;
635 } 702 }
636 else 703 else
637 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 704 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
638 conf->nodename); 705 conf->nodename);
… …
708} 775}
709 776
710void 777void
711connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 778connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
712{ 779{
713 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 780 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
714 conf->id, rid, (const char *)rsi); 781 conf->id, rid, (const char *)rsi);
715 782
716 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 783 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
717 784
718 r->hmac_set (octx); 785 r->hmac_set (octx);
719 send_vpn_packet (r, si); 786 send_vpn_packet (r, si);
720 787
721 delete r; 788 delete r;
722} 789}
723 790
724void 791inline void
725connection::establish_connection_cb (time_watcher &w) 792connection::establish_connection_cb (ev::timer &w, int revents)
726{ 793{
727 if (!ictx 794 if (!ictx
728 && conf != THISNODE 795 && conf != THISNODE
729 && connectmode != conf_node::C_NEVER 796 && connectmode != conf_node::C_NEVER
730 && connectmode != conf_node::C_DISABLED 797 && connectmode != conf_node::C_DISABLED
731 && NOW > w.at) 798 && !w.is_active ())
732 { 799 {
733 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 800 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
734 801 // and stop trying. should probably be handled by a per-connection expire handler.
735 if (retry_int < 3600 * 8) 802 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
803 {
804 reset_connection ();
736 retry_cnt++; 805 return;
806 }
737 807
738 w.start (NOW + retry_int); 808 last_establish_attempt = ev_now ();
809
810 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
811 ? (retry_cnt & 3) + 1
812 : 1 << (retry_cnt >> 2));
739 813
740 reset_si (); 814 reset_si ();
741 815
816 bool slow = si.prot & PROT_SLOW;
817
742 if (si.prot && !si.host) 818 if (si.prot && !si.host)
819 {
820 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
821 /*TODO*/ /* start the timer so we don't recurse endlessly */
822 w.start (1);
743 vpn->send_connect_request (conf->id); 823 vpn->send_connect_request (conf->id);
824 }
744 else 825 else
745 { 826 {
827 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
828
746 const sockinfo &dsi = forward_si (si); 829 const sockinfo &dsi = forward_si (si);
830
831 slow = slow || (dsi.prot & PROT_SLOW);
747 832
748 if (dsi.valid () && auth_rate_limiter.can (dsi)) 833 if (dsi.valid () && auth_rate_limiter.can (dsi))
749 { 834 {
750 if (retry_cnt < 4) 835 if (retry_cnt < 4)
751 send_auth_request (dsi, true); 836 send_auth_request (dsi, true);
752 else 837 else
753 send_ping (dsi, 0); 838 send_ping (dsi, 0);
754 } 839 }
755 } 840 }
841
842 retry_int *= slow ? 8. : 0.9;
843
844 if (retry_int < conf->max_retry)
845 retry_cnt++;
846 else
847 retry_int = conf->max_retry;
848
849 w.start (retry_int);
756 } 850 }
757} 851}
758 852
759void 853void
760connection::reset_connection () 854connection::reset_connection ()
… …
763 { 857 {
764 slog (L_INFO, _("%s(%s): connection lost"), 858 slog (L_INFO, _("%s(%s): connection lost"),
765 conf->nodename, (const char *)si); 859 conf->nodename, (const char *)si);
766 860
767 if (::conf.script_node_down) 861 if (::conf.script_node_down)
768 run_script (run_script_cb (this, &connection::script_node_down), false); 862 {
863 run_script_cb cb;
864 cb.set<connection, &connection::script_node_down> (this);
865 if (!run_script (cb, false))
866 slog (L_WARN, _("node-down command execution failed, continuing."));
867 }
769 } 868 }
770 869
771 delete ictx; ictx = 0; 870 delete ictx; ictx = 0;
772 delete octx; octx = 0; 871 delete octx; octx = 0;
872#if ENABLE_DNS
873 dnsv4_reset_connection ();
874#endif
773 875
774 si.host= 0; 876 si.host = 0;
775 877
776 last_activity = 0; 878 last_activity = 0;
777 retry_cnt = 0; 879 retry_cnt = 0;
778 880
779 rekey.stop (); 881 rekey.stop ();
… …
788 send_reset (si); 890 send_reset (si);
789 891
790 reset_connection (); 892 reset_connection ();
791} 893}
792 894
793void 895inline void
794connection::rekey_cb (time_watcher &w) 896connection::rekey_cb (ev::timer &w, int revents)
795{ 897{
796 reset_connection (); 898 reset_connection ();
797 establish_connection (); 899 establish_connection ();
798} 900}
799 901
… …
815 if (oseqno > MAX_SEQNO) 917 if (oseqno > MAX_SEQNO)
816 rekey (); 918 rekey ();
817} 919}
818 920
819void 921void
922connection::post_inject_queue ()
923{
924 // force a connection every now and when when packets are sent (max 1/s)
925 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
926 establish_connection.stop ();
927
928 establish_connection ();
929}
930
931void
820connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 932connection::inject_data_packet (tap_packet *pkt)
821{ 933{
822 if (ictx && octx) 934 if (ictx && octx)
823 send_data_packet (pkt); 935 send_data_packet (pkt);
824 else 936 else
825 { 937 {
826 if (!broadcast)//DDDD
827 data_queue.put (new tap_packet (*pkt)); 938 data_queue.put (new tap_packet (*pkt));
828 939 post_inject_queue ();
829 establish_connection ();
830 } 940 }
831} 941}
832 942
833void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 943void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
834{ 944{
835 if (ictx && octx) 945 if (ictx && octx)
836 send_vpn_packet (pkt, si, tos); 946 send_vpn_packet (pkt, si, tos);
837 else 947 else
838 { 948 {
839 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 949 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
840 950 post_inject_queue ();
841 establish_connection ();
842 } 951 }
843} 952}
844 953
845void 954void
846connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 955connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
847{ 956{
848 last_activity = NOW; 957 last_activity = ev_now ();
849 958
850 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 959 slog (L_NOISE, "<<%d received packet type %d from %d to %d",
851 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 960 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
961
962 if (connectmode == conf_node::C_DISABLED)
963 return;
852 964
853 switch (pkt->typ ()) 965 switch (pkt->typ ())
854 { 966 {
855 case vpn_packet::PT_PING: 967 case vpn_packet::PT_PING:
856 // we send pings instead of auth packets after some retries, 968 // we send pings instead of auth packets after some retries,
… …
917 1029
918 octx = new crypto_ctx (k, 1); 1030 octx = new crypto_ctx (k, 1);
919 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1031 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
920 1032
921 conf->protocols = p->protocols; 1033 conf->protocols = p->protocols;
1034 features = p->features & config_packet::get_features ();
922 1035
923 send_auth_response (rsi, p->id, k); 1036 send_auth_response (rsi, p->id, k);
924 1037
925 connection_established (); 1038 connection_established ();
926 1039
… …
990 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1103 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
991 conf->nodename, (const char *)rsi, 1104 conf->nodename, (const char *)rsi,
992 p->prot_major, p->prot_minor); 1105 p->prot_major, p->prot_minor);
993 1106
994 if (::conf.script_node_up) 1107 if (::conf.script_node_up)
995 run_script (run_script_cb (this, &connection::script_node_up), false); 1108 {
1109 run_script_cb cb;
1110 cb.set<connection, &connection::script_node_up> (this);
1111 if (!run_script (cb, false))
1112 slog (L_WARN, _("node-up command execution failed, continuing."));
1113 }
996 1114
997 break; 1115 break;
998 } 1116 }
999 else 1117 else
1000 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1118 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
… …
1034 { 1152 {
1035 vpn->tap->send (d); 1153 vpn->tap->send (d);
1036 1154
1037 if (si != rsi) 1155 if (si != rsi)
1038 { 1156 {
1039 // fast re-sync on connection changes, useful especially for tcp/ip 1157 // fast re-sync on source address changes, useful especially for tcp/ip
1040 si = rsi; 1158 si = rsi;
1041 1159
1042 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1160 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1043 conf->nodename, (const char *)si, (const char *)rsi); 1161 conf->nodename, (const char *)si, (const char *)rsi);
1044 } 1162 }
1045
1046 delete d;
1047
1048 break;
1049 } 1163 }
1164
1165 delete d;
1166 break;
1050 } 1167 }
1051 } 1168 }
1052 1169
1053 send_reset (rsi); 1170 send_reset (rsi);
1054 break; 1171 break;
… …
1056 case vpn_packet::PT_CONNECT_REQ: 1173 case vpn_packet::PT_CONNECT_REQ:
1057 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1174 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1058 { 1175 {
1059 connect_req_packet *p = (connect_req_packet *) pkt; 1176 connect_req_packet *p = (connect_req_packet *) pkt;
1060 1177
1061 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1178 if (p->id > 0 && p->id <= vpn->conns.size ())
1062 connection *c = vpn->conns[p->id - 1];
1063 conf->protocols = p->protocols;
1064
1065 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1066 conf->id, p->id, c->ictx && c->octx);
1067
1068 if (c->ictx && c->octx)
1069 { 1179 {
1180 connection *c = vpn->conns[p->id - 1];
1181 conf->protocols = p->protocols;
1182
1183 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1184 conf->id, p->id, c->ictx && c->octx);
1185
1186 if (c->ictx && c->octx)
1187 {
1070 // send connect_info packets to both sides, in case one is 1188 // send connect_info packets to both sides, in case one is
1071 // behind a nat firewall (or both ;) 1189 // behind a nat firewall (or both ;)
1072 c->send_connect_info (conf->id, si, conf->protocols); 1190 c->send_connect_info (conf->id, si, conf->protocols);
1073 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1191 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1192 }
1193 else
1194 c->establish_connection ();
1074 } 1195 }
1075 else 1196 else
1076 c->establish_connection (); 1197 slog (L_WARN,
1198 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1199 p->id);
1077 } 1200 }
1078 1201
1079 break; 1202 break;
1080 1203
1081 case vpn_packet::PT_CONNECT_INFO: 1204 case vpn_packet::PT_CONNECT_INFO:
1082 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1205 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1083 { 1206 {
1084 connect_info_packet *p = (connect_info_packet *) pkt; 1207 connect_info_packet *p = (connect_info_packet *)pkt;
1085 1208
1086 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1209 if (p->id > 0 && p->id <= vpn->conns.size ())
1087 1210 {
1088 connection *c = vpn->conns[p->id - 1]; 1211 connection *c = vpn->conns[p->id - 1];
1089 1212
1090 c->conf->protocols = p->protocols; 1213 c->conf->protocols = p->protocols;
1091 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1214 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1092 p->si.upgrade_protocol (protocol, c->conf); 1215 p->si.upgrade_protocol (protocol, c->conf);
1093 1216
1094 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1217 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1095 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1218 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1096 1219
1097 const sockinfo &dsi = forward_si (p->si); 1220 const sockinfo &dsi = forward_si (p->si);
1098 1221
1099 if (dsi.valid ()) 1222 if (dsi.valid ())
1100 c->send_auth_request (dsi, true); 1223 c->send_auth_request (dsi, true);
1224 }
1225 else
1226 slog (L_WARN,
1227 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1228 p->id);
1101 } 1229 }
1102 1230
1103 break; 1231 break;
1104 1232
1105 default: 1233 default:
1106 send_reset (rsi); 1234 send_reset (rsi);
1107 break; 1235 break;
1108 } 1236 }
1109} 1237}
1110 1238
1111void connection::keepalive_cb (time_watcher &w) 1239inline void
1240connection::keepalive_cb (ev::timer &w, int revents)
1112{ 1241{
1113 if (NOW >= last_activity + ::conf.keepalive + 30) 1242 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1114 { 1243 {
1115 reset_connection (); 1244 reset_connection ();
1116 establish_connection (); 1245 establish_connection ();
1117 } 1246 }
1118 else if (NOW < last_activity + ::conf.keepalive) 1247 else if (ev_now () < last_activity + ::conf.keepalive)
1119 w.start (last_activity + ::conf.keepalive); 1248 w.start (last_activity + ::conf.keepalive - ev::now ());
1120 else if (conf->connectmode != conf_node::C_ONDEMAND 1249 else if (conf->connectmode != conf_node::C_ONDEMAND
1121 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1250 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1122 { 1251 {
1123 send_ping (si); 1252 send_ping (si);
1124 w.start (NOW + 5); 1253 w.start (5);
1125 } 1254 }
1126 else if (NOW < last_activity + ::conf.keepalive + 10) 1255 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1127 // hold ondemand connections implicitly a few seconds longer 1256 // hold ondemand connections implicitly a few seconds longer
1128 // should delete octx, though, or something like that ;) 1257 // should delete octx, though, or something like that ;)
1129 w.start (last_activity + ::conf.keepalive + 10); 1258 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1130 else 1259 else
1131 reset_connection (); 1260 reset_connection ();
1132} 1261}
1133 1262
1134void connection::send_connect_request (int id) 1263void connection::send_connect_request (int id)
… …
1140 send_vpn_packet (p, si); 1269 send_vpn_packet (p, si);
1141 1270
1142 delete p; 1271 delete p;
1143} 1272}
1144 1273
1274void connection::script_init_env (const char *ext)
1275{
1276 char *env;
1277 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1278 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1279 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1280 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1281 conf->id & 0xff); putenv (env);
1282}
1283
1145void connection::script_node () 1284void connection::script_init_connect_env ()
1146{ 1285{
1147 vpn->script_if_up (); 1286 vpn->script_init_env ();
1148 1287
1149 char *env; 1288 char *env;
1150 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1289 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1151 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1290 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1152 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1291 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1153 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1292 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1154} 1293}
1155 1294
1295inline const char *
1156const char *connection::script_node_up () 1296connection::script_node_up ()
1157{ 1297{
1158 script_node (); 1298 script_init_connect_env ();
1159 1299
1160 putenv ("STATE=up"); 1300 putenv ((char *)"STATE=up");
1161 1301
1302 char *filename;
1303 asprintf (&filename,
1304 "%s/%s",
1305 confbase,
1162 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1306 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1163}
1164 1307
1308 return filename;
1309}
1310
1311inline const char *
1165const char *connection::script_node_down () 1312connection::script_node_down ()
1166{ 1313{
1167 script_node (); 1314 script_init_connect_env ();
1168 1315
1169 putenv ("STATE=down"); 1316 putenv ((char *)"STATE=down");
1170 1317
1171 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1318 char *filename;
1172} 1319 asprintf (&filename,
1320 "%s/%s",
1321 confbase,
1322 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1173 1323
1324 return filename;
1325}
1326
1174connection::connection(struct vpn *vpn_) 1327connection::connection (struct vpn *vpn, conf_node *conf)
1175: vpn(vpn_) 1328: vpn(vpn), conf(conf),
1176, rekey (this, &connection::rekey_cb) 1329#if ENABLE_DNS
1177, keepalive (this, &connection::keepalive_cb) 1330 dns (0),
1331#endif
1332 data_queue(conf->max_ttl, conf->max_queue),
1333 vpn_queue(conf->max_ttl, conf->max_queue)
1334{
1335 rekey .set<connection, &connection::rekey_cb > (this);
1336 keepalive .set<connection, &connection::keepalive_cb > (this);
1178, establish_connection (this, &connection::establish_connection_cb) 1337 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1179{ 1338
1339 last_establish_attempt = 0.;
1180 octx = ictx = 0; 1340 octx = ictx = 0;
1181 retry_cnt = 0;
1182 1341
1183 connectmode = conf_node::C_ALWAYS; // initial setting 1342 if (!conf->protocols) // make sure some protocol is enabled
1343 conf->protocols = PROT_UDPv4;
1344
1345 connectmode = conf->connectmode;
1346
1347 // queue a dummy packet to force an initial connection attempt
1348 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1349 vpn_queue.put (new net_packet);
1350
1184 reset_connection (); 1351 reset_connection ();
1185} 1352}
1186 1353
1187connection::~connection () 1354connection::~connection ()
1188{ 1355{

Diff Legend

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