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.35 by pcg, Mon May 10 21:24:48 2004 UTC vs.
Revision 1.89 by root, Thu Dec 2 08:15:09 2010 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,2010 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 33
22#include <cassert>
23
24#include <list> 34#include <list>
35#include <queue>
36#include <utility>
25 37
26#include <openssl/rand.h> 38#include <openssl/rand.h>
27#include <openssl/evp.h> 39#include <openssl/evp.h>
28#include <openssl/rsa.h> 40#include <openssl/rsa.h>
29#include <openssl/err.h> 41#include <openssl/err.h>
30
31#include "gettext.h"
32 42
33#include "conf.h" 43#include "conf.h"
34#include "slog.h" 44#include "slog.h"
35#include "device.h" 45#include "device.h"
36#include "vpn.h" 46#include "vpn.h"
… …
40 50
41#if !HAVE_RAND_PSEUDO_BYTES 51#if !HAVE_RAND_PSEUDO_BYTES
42# define RAND_pseudo_bytes RAND_bytes 52# define RAND_pseudo_bytes RAND_bytes
43#endif 53#endif
44 54
45#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 55#define MAGIC_OLD "vped\xbd\xc6\xdb\x82" // 8 bytes of magic (still used in the protocol)
56#define MAGIC "gvpe\xbd\xc6\xdb\x82" // 8 bytes of magic (understood but not generated)
46 57
47#define ULTRA_FAST 1 58#define ULTRA_FAST 1
48#define HLOG 15 59#define HLOG 15
49#include "lzf/lzf.h" 60#include "lzf/lzf.h"
50#include "lzf/lzf_c.c" 61#include "lzf/lzf_c.c"
51#include "lzf/lzf_d.c" 62#include "lzf/lzf_d.c"
63
64//////////////////////////////////////////////////////////////////////////////
65
66static std::queue< std::pair<run_script_cb *, const char *> > rs_queue;
67static ev::child rs_child_ev;
68
69void // c++ requires external linkage here, apparently :(
70rs_child_cb (ev::child &w, int revents)
71{
72 w.stop ();
73
74 if (rs_queue.empty ())
75 return;
76
77 pid_t pid = run_script (*rs_queue.front ().first, false);
78 if (pid)
79 {
80 w.set (pid);
81 w.start ();
82 }
83 else
84 slog (L_WARN, rs_queue.front ().second);
85
86 delete rs_queue.front ().first;
87 rs_queue.pop ();
88}
89
90// despite the fancy name, this is quite a hack
91static void
92run_script_queued (run_script_cb *cb, const char *warnmsg)
93{
94 rs_queue.push (std::make_pair (cb, warnmsg));
95
96 if (!rs_child_ev.is_active ())
97 {
98 rs_child_ev.set<rs_child_cb> ();
99 rs_child_ev ();
100 }
101}
102
103//////////////////////////////////////////////////////////////////////////////
52 104
53struct crypto_ctx 105struct crypto_ctx
54{ 106{
55 EVP_CIPHER_CTX cctx; 107 EVP_CIPHER_CTX cctx;
56 HMAC_CTX hctx; 108 HMAC_CTX hctx;
… …
84 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 136 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
85 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 137 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
86 EVP_MD_CTX_cleanup (&ctx); 138 EVP_MD_CTX_cleanup (&ctx);
87} 139}
88 140
89struct rsa_entry { 141struct rsa_entry
142{
90 tstamp expire; 143 tstamp expire;
91 rsaid id; 144 rsaid id;
92 rsachallenge chg; 145 rsachallenge chg;
93}; 146};
94 147
95struct rsa_cache : list<rsa_entry> 148struct rsa_cache : list<rsa_entry>
96{ 149{
97 void cleaner_cb (time_watcher &w); time_watcher cleaner; 150 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
98 151
99 bool find (const rsaid &id, rsachallenge &chg) 152 bool find (const rsaid &id, rsachallenge &chg)
100 { 153 {
101 for (iterator i = begin (); i != end (); ++i) 154 for (iterator i = begin (); i != end (); ++i)
102 { 155 {
103 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 156 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
104 { 157 {
105 memcpy (&chg, &i->chg, sizeof chg); 158 memcpy (&chg, &i->chg, sizeof chg);
106 159
107 erase (i); 160 erase (i);
108 return true; 161 return true;
109 } 162 }
110 } 163 }
111 164
112 if (cleaner.at < NOW) 165 if (!cleaner.is_active ())
113 cleaner.start (NOW + RSA_TTL); 166 cleaner.again ();
114 167
115 return false; 168 return false;
116 } 169 }
117 170
118 void gen (rsaid &id, rsachallenge &chg) 171 void gen (rsaid &id, rsachallenge &chg)
119 { 172 {
120 rsa_entry e; 173 rsa_entry e;
121 174
122 RAND_bytes ((unsigned char *)&id, sizeof id); 175 RAND_bytes ((unsigned char *)&id, sizeof id);
123 RAND_bytes ((unsigned char *)&chg, sizeof chg); 176 RAND_bytes ((unsigned char *)&chg, sizeof chg);
124 177
125 e.expire = NOW + RSA_TTL; 178 e.expire = ev_now () + RSA_TTL;
126 e.id = id; 179 e.id = id;
127 memcpy (&e.chg, &chg, sizeof chg); 180 memcpy (&e.chg, &chg, sizeof chg);
128 181
129 push_back (e); 182 push_back (e);
130 183
131 if (cleaner.at < NOW) 184 if (!cleaner.is_active ())
132 cleaner.start (NOW + RSA_TTL); 185 cleaner.again ();
133 } 186 }
134 187
135 rsa_cache () 188 rsa_cache ()
136 : cleaner (this, &rsa_cache::cleaner_cb) 189 {
137 { } 190 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
191 cleaner.set (RSA_TTL, RSA_TTL);
192 }
138 193
139} rsa_cache; 194} rsa_cache;
140 195
141void rsa_cache::cleaner_cb (time_watcher &w) 196void rsa_cache::cleaner_cb (ev::timer &w, int revents)
142{ 197{
143 if (!empty ()) 198 if (empty ())
199 w.stop ();
200 else
144 { 201 {
145 w.start (NOW + RSA_TTL);
146
147 for (iterator i = begin (); i != end (); ) 202 for (iterator i = begin (); i != end (); )
148 if (i->expire <= NOW) 203 if (i->expire <= ev_now ())
149 i = erase (i); 204 i = erase (i);
150 else 205 else
151 ++i; 206 ++i;
152 } 207 }
153} 208}
154 209
155////////////////////////////////////////////////////////////////////////////// 210//////////////////////////////////////////////////////////////////////////////
156 211
157void pkt_queue::put (net_packet *p) 212pkt_queue::pkt_queue (double max_ttl, int max_queue)
213: max_ttl (max_ttl), max_queue (max_queue)
158{ 214{
159 if (queue[i]) 215 queue = new pkt [max_queue];
160 {
161 delete queue[i];
162 j = (j + 1) % QUEUEDEPTH;
163 }
164 216
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; 217 i = 0;
187 j = 0; 218 j = 0;
219
220 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
188} 221}
189 222
190pkt_queue::~pkt_queue () 223pkt_queue::~pkt_queue ()
191{ 224{
192 for (i = QUEUEDEPTH; --i > 0; ) 225 while (net_packet *p = get ())
226 delete p;
227
193 delete queue[i]; 228 delete [] queue;
194} 229}
195 230
231void pkt_queue::expire_cb (ev::timer &w, int revents)
232{
233 ev_tstamp expire = ev_now () - max_ttl;
234
235 for (;;)
236 {
237 if (empty ())
238 break;
239
240 double diff = queue[j].tstamp - expire;
241
242 if (diff >= 0.)
243 {
244 w.start (diff > 0.5 ? diff : 0.5);
245 break;
246 }
247
248 delete get ();
249 }
250}
251
252void pkt_queue::put (net_packet *p)
253{
254 ev_tstamp now = ev_now ();
255
256 // start expiry timer
257 if (empty ())
258 expire.start (max_ttl);
259
260 int ni = i + 1 == max_queue ? 0 : i + 1;
261
262 if (ni == j)
263 delete get ();
264
265 queue[i].pkt = p;
266 queue[i].tstamp = now;
267
268 i = ni;
269}
270
271net_packet *pkt_queue::get ()
272{
273 if (empty ())
274 return 0;
275
276 net_packet *p = queue[j].pkt;
277 queue[j].pkt = 0;
278
279 j = j + 1 == max_queue ? 0 : j + 1;
280
281 return p;
282}
283
196struct net_rateinfo { 284struct net_rateinfo
285{
197 u32 host; 286 u32 host;
198 double pcnt, diff; 287 double pcnt, diff;
199 tstamp last; 288 tstamp last;
200}; 289};
201 290
… …
220 iterator i; 309 iterator i;
221 310
222 for (i = begin (); i != end (); ) 311 for (i = begin (); i != end (); )
223 if (i->host == host) 312 if (i->host == host)
224 break; 313 break;
225 else if (i->last < NOW - NRL_EXPIRE) 314 else if (i->last < ev_now () - NRL_EXPIRE)
226 i = erase (i); 315 i = erase (i);
227 else 316 else
228 i++; 317 i++;
229 318
230 if (i == end ()) 319 if (i == end ())
… …
232 net_rateinfo ri; 321 net_rateinfo ri;
233 322
234 ri.host = host; 323 ri.host = host;
235 ri.pcnt = 1.; 324 ri.pcnt = 1.;
236 ri.diff = NRL_MAXDIF; 325 ri.diff = NRL_MAXDIF;
237 ri.last = NOW; 326 ri.last = ev_now ();
238 327
239 push_front (ri); 328 push_front (ri);
240 329
241 return true; 330 return true;
242 } 331 }
… …
244 { 333 {
245 net_rateinfo ri (*i); 334 net_rateinfo ri (*i);
246 erase (i); 335 erase (i);
247 336
248 ri.pcnt = ri.pcnt * NRL_ALPHA; 337 ri.pcnt = ri.pcnt * NRL_ALPHA;
249 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last); 338 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
250 339
251 ri.last = NOW; 340 ri.last = ev_now ();
252 341
253 double dif = ri.diff / ri.pcnt; 342 double dif = ri.diff / ri.pcnt;
254 343
255 bool send = dif > NRL_CUTOFF; 344 bool send = dif > NRL_CUTOFF;
256 345
… …
336 ptype type = PT_DATA_UNCOMPRESSED; 425 ptype type = PT_DATA_UNCOMPRESSED;
337 426
338#if ENABLE_COMPRESSION 427#if ENABLE_COMPRESSION
339 u8 cdata[MAX_MTU]; 428 u8 cdata[MAX_MTU];
340 429
341 if (conn->features & ENABLE_COMPRESSION) 430 if (conn->features & FEATURE_COMPRESSION)
342 { 431 {
343 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 432 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
344 433
345 if (cl) 434 if (cl)
346 { 435 {
… …
466 f |= FEATURE_COMPRESSION; 555 f |= FEATURE_COMPRESSION;
467#endif 556#endif
468#if ENABLE_ROHC 557#if ENABLE_ROHC
469 f |= FEATURE_ROHC; 558 f |= FEATURE_ROHC;
470#endif 559#endif
560#if ENABLE_BRIDGING
561 f |= FEATURE_BRIDGING;
562#endif
471 return f; 563 return f;
472 } 564 }
473}; 565};
474 566
475void config_packet::setup (ptype type, int dst) 567void config_packet::setup (ptype type, int dst)
476{ 568{
477 prot_major = PROTOCOL_MAJOR; 569 prot_major = PROTOCOL_MAJOR;
478 prot_minor = PROTOCOL_MINOR; 570 prot_minor = PROTOCOL_MINOR;
479 randsize = RAND_SIZE; 571 randsize = RAND_SIZE;
480 hmaclen = HMACLENGTH; 572 hmaclen = HMACLENGTH;
481 flags = ENABLE_COMPRESSION ? 0x81 : 0x80; 573 flags = 0;
482 challengelen = sizeof (rsachallenge); 574 challengelen = sizeof (rsachallenge);
483 features = get_features (); 575 features = get_features ();
484 576
485 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 577 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
486 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 578 digest_nid = htonl (EVP_MD_type (RSA_HASH));
… …
496 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 588 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
497 else if (randsize != RAND_SIZE) 589 else if (randsize != RAND_SIZE)
498 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 590 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
499 else if (hmaclen != HMACLENGTH) 591 else if (hmaclen != HMACLENGTH)
500 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH); 592 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
501#if 0 // this implementation should handle all flag settings
502 else if (flags != curflags ())
503 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
504#endif
505 else if (challengelen != sizeof (rsachallenge)) 593 else if (challengelen != sizeof (rsachallenge))
506 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 594 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
507 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 595 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
508 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 596 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
509 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 597 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
526 rsaencrdata encr; 614 rsaencrdata encr;
527 615
528 auth_req_packet (int dst, bool initiate_, u8 protocols_) 616 auth_req_packet (int dst, bool initiate_, u8 protocols_)
529 { 617 {
530 config_packet::setup (PT_AUTH_REQ, dst); 618 config_packet::setup (PT_AUTH_REQ, dst);
531 strncpy (magic, MAGIC, 8); 619 strncpy (magic, MAGIC_OLD, 8);
532 initiate = !!initiate_; 620 initiate = !!initiate_;
533 protocols = protocols_; 621 protocols = protocols_;
534 622
535 len = sizeof (*this) - sizeof (net_packet); 623 len = sizeof (*this) - sizeof (net_packet);
536 } 624 }
… …
585///////////////////////////////////////////////////////////////////////////// 673/////////////////////////////////////////////////////////////////////////////
586 674
587void 675void
588connection::connection_established () 676connection::connection_established ()
589{ 677{
678 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
679
590 if (ictx && octx) 680 if (ictx && octx)
591 { 681 {
592 connectmode = conf->connectmode; 682 // make sure rekeying timeouts are slightly asymmetric
593 683 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
594 rekey.start (NOW + ::conf.rekey); 684 rekey.start (rekey_interval, rekey_interval);
595 keepalive.start (NOW + ::conf.keepalive); 685 keepalive.start (::conf.keepalive);
596 686
597 // send queued packets 687 // send queued packets
598 if (ictx && octx) 688 if (ictx && octx)
599 { 689 {
600 while (tap_packet *p = (tap_packet *)data_queue.get ()) 690 while (tap_packet *p = (tap_packet *)data_queue.get ())
601 { 691 {
602 send_data_packet (p); 692 if (p->len) send_data_packet (p);
603 delete p; 693 delete p;
604 } 694 }
605 695
606 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 696 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
607 { 697 {
608 send_vpn_packet (p, si, IPTOS_RELIABILITY); 698 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
609 delete p; 699 delete p;
610 } 700 }
611 } 701 }
702
703 vpn->connection_established (this);
612 } 704 }
613 else 705 else
614 { 706 {
615 retry_cnt = 0; 707 retry_cnt = 0;
616 establish_connection.start (NOW + 5); 708 establish_connection.start (5);
617 keepalive.stop (); 709 keepalive.stop ();
618 rekey.stop (); 710 rekey.stop ();
619 } 711 }
620} 712}
621 713
622void 714void
623connection::reset_si () 715connection::reset_si ()
624{ 716{
717 if (vpn->can_direct (THISNODE, conf))
625 protocol = best_protocol (THISNODE->protocols & conf->protocols); 718 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
626 719 else
627 // mask out protocols we cannot establish 720 {
628 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 721 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
629 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 722 protocol = 0;
723 }
630 724
631 si.set (conf, protocol); 725 si.set (conf, protocol);
726
727 is_direct = si.valid ();
632} 728}
633 729
634// ensure sockinfo is valid, forward if necessary 730// ensure sockinfo is valid, forward if necessary
635const sockinfo & 731const sockinfo &
636connection::forward_si (const sockinfo &si) const 732connection::forward_si (const sockinfo &si) const
637{ 733{
638 if (!si.valid ()) 734 if (!si.valid ())
639 { 735 {
640 connection *r = vpn->find_router (); 736 connection *r = vpn->find_router_for (this);
641 737
642 if (r) 738 if (r)
643 { 739 {
644 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 740 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
645 conf->nodename, r->conf->nodename); 741 conf->nodename, r->conf->nodename);
646 return r->si; 742 return r->si;
647 } 743 }
648 else 744 else
649 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 745 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
650 conf->nodename); 746 conf->nodename);
651 } 747 }
652 748
653 return si; 749 return si;
654} 750}
… …
664connection::send_ping (const sockinfo &si, u8 pong) 760connection::send_ping (const sockinfo &si, u8 pong)
665{ 761{
666 ping_packet *pkt = new ping_packet; 762 ping_packet *pkt = new ping_packet;
667 763
668 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 764 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
765
766 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
767
669 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 768 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
670 769
671 delete pkt; 770 delete pkt;
672} 771}
673 772
… …
692 791
693 rsachallenge chg; 792 rsachallenge chg;
694 rsa_cache.gen (pkt->id, chg); 793 rsa_cache.gen (pkt->id, chg);
695 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 794 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
696 795
697 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 796 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
698 797
699 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 798 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
700 799
701 delete pkt; 800 delete pkt;
702} 801}
… …
710 809
711 rsa_hash (id, chg, pkt->response); 810 rsa_hash (id, chg, pkt->response);
712 811
713 pkt->hmac_set (octx); 812 pkt->hmac_set (octx);
714 813
715 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); 814 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
716 815
717 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 816 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
718 817
719 delete pkt; 818 delete pkt;
720} 819}
721 820
722void 821void
723connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 822connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
724{ 823{
725 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 824 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,
726 conf->id, rid, (const char *)rsi); 825 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
727 826
728 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 827 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
729 828
730 r->hmac_set (octx); 829 r->hmac_set (octx);
731 send_vpn_packet (r, si); 830 send_vpn_packet (r, si);
732 831
733 delete r; 832 delete r;
734} 833}
735 834
736void 835inline void
737connection::establish_connection_cb (time_watcher &w) 836connection::establish_connection_cb (ev::timer &w, int revents)
738{ 837{
739 if (!ictx 838 if (!ictx
740 && conf != THISNODE 839 && conf != THISNODE
741 && connectmode != conf_node::C_NEVER 840 && connectmode != conf_node::C_NEVER
742 && connectmode != conf_node::C_DISABLED 841 && connectmode != conf_node::C_DISABLED
743 && NOW > w.at) 842 && !w.is_active ())
744 { 843 {
745 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 844 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
746 845 // and stop trying. should probably be handled by a per-connection expire handler.
747 if (retry_int < 3600 * 8) 846 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
847 {
848 reset_connection ();
748 retry_cnt++; 849 return;
850 }
749 851
750 w.start (NOW + retry_int); 852 last_establish_attempt = ev_now ();
853
854 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
855 ? (retry_cnt & 3) + 1
856 : 1 << (retry_cnt >> 2));
751 857
752 reset_si (); 858 reset_si ();
753 859
754 if (si.prot && !si.host) 860 bool slow = si.prot & PROT_SLOW;
861
862 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
863 {
864 /*TODO*/ /* start the timer so we don't recurse endlessly */
865 w.start (1);
755 vpn->send_connect_request (conf->id); 866 vpn->send_connect_request (this);
867 }
756 else 868 else
757 { 869 {
870 if (si.valid ())
871 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
872 conf->nodename, (const char *)si);
873
758 const sockinfo &dsi = forward_si (si); 874 const sockinfo &dsi = forward_si (si);
875
876 slow = slow || (dsi.prot & PROT_SLOW);
759 877
760 if (dsi.valid () && auth_rate_limiter.can (dsi)) 878 if (dsi.valid () && auth_rate_limiter.can (dsi))
761 { 879 {
762 if (retry_cnt < 4) 880 if (retry_cnt < 4)
763 send_auth_request (dsi, true); 881 send_auth_request (dsi, true);
764 else 882 else
765 send_ping (dsi, 0); 883 send_ping (dsi, 0);
766 } 884 }
767 } 885 }
886
887 retry_int *= slow ? 8. : 0.9;
888
889 if (retry_int < conf->max_retry)
890 retry_cnt++;
891 else
892 retry_int = conf->max_retry;
893
894 w.start (retry_int);
768 } 895 }
769} 896}
770 897
771void 898void
772connection::reset_connection () 899connection::reset_connection ()
… …
775 { 902 {
776 slog (L_INFO, _("%s(%s): connection lost"), 903 slog (L_INFO, _("%s(%s): connection lost"),
777 conf->nodename, (const char *)si); 904 conf->nodename, (const char *)si);
778 905
779 if (::conf.script_node_down) 906 if (::conf.script_node_down)
780 run_script (run_script_cb (this, &connection::script_node_down), false); 907 {
908 run_script_cb *cb = new run_script_cb;
909 cb->set<connection, &connection::script_node_down> (this);
910 run_script_queued (cb, _("node-down command execution failed, continuing."));
911 }
781 } 912 }
782 913
783 delete ictx; ictx = 0; 914 delete ictx; ictx = 0;
784 delete octx; octx = 0; 915 delete octx; octx = 0;
916#if ENABLE_DNS
917 dnsv4_reset_connection ();
918#endif
785 919
786 si.host= 0; 920 si.host = 0;
787 921
788 last_activity = 0; 922 last_activity = 0.;
923 //last_si_change = 0.;
789 retry_cnt = 0; 924 retry_cnt = 0;
790 925
791 rekey.stop (); 926 rekey.stop ();
792 keepalive.stop (); 927 keepalive.stop ();
793 establish_connection.stop (); 928 establish_connection.stop ();
… …
800 send_reset (si); 935 send_reset (si);
801 936
802 reset_connection (); 937 reset_connection ();
803} 938}
804 939
805void 940// poor-man's rekeying
806connection::rekey_cb (time_watcher &w) 941inline void
942connection::rekey_cb (ev::timer &w, int revents)
807{ 943{
808 reset_connection (); 944 reset_connection ();
809 establish_connection (); 945 establish_connection ();
810} 946}
811 947
… …
827 if (oseqno > MAX_SEQNO) 963 if (oseqno > MAX_SEQNO)
828 rekey (); 964 rekey ();
829} 965}
830 966
831void 967void
968connection::post_inject_queue ()
969{
970 // force a connection every now and when when packets are sent (max 1/s)
971 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
972 establish_connection.stop ();
973
974 establish_connection ();
975}
976
977void
832connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 978connection::inject_data_packet (tap_packet *pkt)
833{ 979{
834 if (ictx && octx) 980 if (ictx && octx)
835 send_data_packet (pkt); 981 send_data_packet (pkt);
836 else 982 else
837 { 983 {
838 if (!broadcast)//DDDD
839 data_queue.put (new tap_packet (*pkt)); 984 data_queue.put (new tap_packet (*pkt));
840 985 post_inject_queue ();
841 establish_connection ();
842 } 986 }
843} 987}
844 988
845void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 989void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
846{ 990{
847 if (ictx && octx) 991 if (ictx && octx)
848 send_vpn_packet (pkt, si, tos); 992 send_vpn_packet (pkt, si, tos);
849 else 993 else
850 { 994 {
851 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 995 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
852 996 post_inject_queue ();
853 establish_connection ();
854 } 997 }
855} 998}
856 999
857void 1000void
858connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1001connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
859{ 1002{
860 last_activity = NOW; 1003 last_activity = ev_now ();
861 1004
862 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1005 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
863 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1006 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
1007
1008 if (connectmode == conf_node::C_DISABLED)
1009 return;
864 1010
865 switch (pkt->typ ()) 1011 switch (pkt->typ ())
866 { 1012 {
867 case vpn_packet::PT_PING: 1013 case vpn_packet::PT_PING:
1014 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1015
868 // we send pings instead of auth packets after some retries, 1016 // we send pings instead of auth packets after some retries,
869 // so reset the retry counter and establish a connection 1017 // so reset the retry counter and establish a connection
870 // when we receive a ping. 1018 // when we receive a ping.
871 if (!ictx) 1019 if (!ictx)
872 { 1020 {
873 if (auth_rate_limiter.can (rsi)) 1021 if (auth_rate_limiter.can (rsi))
874 send_auth_request (rsi, true); 1022 send_auth_request (rsi, true);
875 } 1023 }
876 else 1024 else
1025 // we would love to change the socket address here, but ping's aren't
1026 // authenticated, so we best ignore it.
877 send_ping (rsi, 1); // pong 1027 send_ping (rsi, 1); // pong
878 1028
879 break; 1029 break;
880 1030
881 case vpn_packet::PT_PONG: 1031 case vpn_packet::PT_PONG:
1032 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
1033
1034 // a PONG might mean that the other side doesn't really know
1035 // about our desire for communication.
1036 establish_connection ();
882 break; 1037 break;
883 1038
884 case vpn_packet::PT_RESET: 1039 case vpn_packet::PT_RESET:
885 { 1040 {
886 reset_connection (); 1041 reset_connection ();
887 1042
888 config_packet *p = (config_packet *) pkt; 1043 config_packet *p = (config_packet *) pkt;
889 1044
890 if (!p->chk_config ()) 1045 if (!p->chk_config ())
891 { 1046 {
892 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1047 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
893 conf->nodename, (const char *)rsi); 1048 conf->nodename, (const char *)rsi);
894 connectmode = conf_node::C_DISABLED; 1049 connectmode = conf_node::C_DISABLED;
895 } 1050 }
896 else if (connectmode == conf_node::C_ALWAYS) 1051 else if (connectmode == conf_node::C_ALWAYS)
897 establish_connection (); 1052 establish_connection ();
… …
901 case vpn_packet::PT_AUTH_REQ: 1056 case vpn_packet::PT_AUTH_REQ:
902 if (auth_rate_limiter.can (rsi)) 1057 if (auth_rate_limiter.can (rsi))
903 { 1058 {
904 auth_req_packet *p = (auth_req_packet *) pkt; 1059 auth_req_packet *p = (auth_req_packet *) pkt;
905 1060
906 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1061 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s)", conf->nodename, p->initiate ? "initiate" : "reply");
907 1062
908 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1063 if (p->chk_config ()
1064 && (!strncmp (p->magic, MAGIC_OLD, 8) || !strncmp (p->magic, MAGIC, 8)))
909 { 1065 {
910 if (p->prot_minor != PROTOCOL_MINOR) 1066 if (p->prot_minor != PROTOCOL_MINOR)
911 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1067 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
912 conf->nodename, (const char *)rsi, 1068 conf->nodename, (const char *)rsi,
913 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1069 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
928 delete octx; 1084 delete octx;
929 1085
930 octx = new crypto_ctx (k, 1); 1086 octx = new crypto_ctx (k, 1);
931 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1087 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
932 1088
933 // compatibility code, remove when no longer required
934 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
935
936 conf->protocols = p->protocols; 1089 conf->protocols = p->protocols;
937 features = p->features & config_packet::get_features (); 1090 features = p->features & config_packet::get_features ();
938 1091
939 send_auth_response (rsi, p->id, k); 1092 send_auth_response (rsi, p->id, k);
940 1093
… …
942 1095
943 break; 1096 break;
944 } 1097 }
945 } 1098 }
946 else 1099 else
947 slog (L_WARN, _("%s(%s): protocol mismatch"), 1100 slog (L_WARN, _("%s(%s): protocol mismatch."),
948 conf->nodename, (const char *)rsi); 1101 conf->nodename, (const char *)rsi);
949 1102
950 send_reset (rsi); 1103 send_reset (rsi);
951 } 1104 }
952 1105
953 break; 1106 break;
954 1107
955 case vpn_packet::PT_AUTH_RES: 1108 case vpn_packet::PT_AUTH_RES:
956 { 1109 {
957 auth_res_packet *p = (auth_res_packet *) pkt; 1110 auth_res_packet *p = (auth_res_packet *)pkt;
958 1111
959 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1112 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
960 1113
961 if (p->chk_config ()) 1114 if (p->chk_config ())
962 { 1115 {
963 if (p->prot_minor != PROTOCOL_MINOR) 1116 if (p->prot_minor != PROTOCOL_MINOR)
964 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1117 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
… …
967 1120
968 rsachallenge chg; 1121 rsachallenge chg;
969 1122
970 if (!rsa_cache.find (p->id, chg)) 1123 if (!rsa_cache.find (p->id, chg))
971 { 1124 {
972 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1125 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
973 conf->nodename, (const char *)rsi); 1126 conf->nodename, (const char *)rsi);
974 break; 1127 break;
975 } 1128 }
976 else 1129 else
977 { 1130 {
978 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1131 crypto_ctx *cctx = new crypto_ctx (chg, 0);
979 1132
980 if (!p->hmac_chk (cctx)) 1133 if (!p->hmac_chk (cctx))
981 { 1134 {
982 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1135 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
983 "could be an attack, or just corruption or a synchronization error"), 1136 "could be an attack, or just corruption or a synchronization error."),
984 conf->nodename, (const char *)rsi); 1137 conf->nodename, (const char *)rsi);
985 break; 1138 break;
986 } 1139 }
987 else 1140 else
988 { 1141 {
… …
999 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1152 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1000 1153
1001 si = rsi; 1154 si = rsi;
1002 protocol = rsi.prot; 1155 protocol = rsi.prot;
1003 1156
1157 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1158 conf->nodename, (const char *)rsi,
1159 is_direct ? "direct" : "forwarded",
1160 p->prot_major, p->prot_minor);
1161
1004 connection_established (); 1162 connection_established ();
1005 1163
1006 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1007 conf->nodename, (const char *)rsi,
1008 p->prot_major, p->prot_minor);
1009
1010 if (::conf.script_node_up) 1164 if (::conf.script_node_up)
1011 run_script (run_script_cb (this, &connection::script_node_up), false); 1165 {
1166 run_script_cb *cb = new run_script_cb;
1167 cb->set<connection, &connection::script_node_up> (this);
1168 run_script_queued (cb, _("node-up command execution failed, continuing."));
1169 }
1012 1170
1013 break; 1171 break;
1014 } 1172 }
1015 else 1173 else
1016 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1174 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1017 conf->nodename, (const char *)rsi); 1175 conf->nodename, (const char *)rsi);
1018 } 1176 }
1019 1177
1020 delete cctx; 1178 delete cctx;
1021 } 1179 }
… …
1037 { 1195 {
1038 vpndata_packet *p = (vpndata_packet *)pkt; 1196 vpndata_packet *p = (vpndata_packet *)pkt;
1039 1197
1040 if (!p->hmac_chk (ictx)) 1198 if (!p->hmac_chk (ictx))
1041 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1199 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1042 "could be an attack, or just corruption or a synchronization error"), 1200 "could be an attack, or just corruption or a synchronization error."),
1043 conf->nodename, (const char *)rsi); 1201 conf->nodename, (const char *)rsi);
1044 else 1202 else
1045 { 1203 {
1046 u32 seqno; 1204 u32 seqno;
1047 tap_packet *d = p->unpack (this, seqno); 1205 tap_packet *d = p->unpack (this, seqno);
1206 int seqclass = iseqno.seqno_classify (seqno);
1048 1207
1049 if (iseqno.recv_ok (seqno)) 1208 if (seqclass == 0) // ok
1050 { 1209 {
1051 vpn->tap->send (d); 1210 vpn->tap->send (d);
1052 1211
1053 if (si != rsi) 1212 if (si != rsi)
1054 { 1213 {
1055 // fast re-sync on connection changes, useful especially for tcp/ip 1214 // fast re-sync on source address changes, useful especially for tcp/ip
1215 //if (last_si_change < ev_now () + 5.)
1056 si = rsi; 1216 // {
1057
1058 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1217 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1059 conf->nodename, (const char *)si, (const char *)rsi); 1218 conf->nodename, (const char *)si, (const char *)rsi);
1219
1220 si = rsi;
1221
1222 if (::conf.script_node_change)
1223 {
1224 run_script_cb *cb = new run_script_cb;
1225 cb->set<connection, &connection::script_node_change> (this);
1226 run_script_queued (cb, _("node-change command execution failed, continuing."));
1227 }
1228
1229 // }
1230 //else
1231 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1232 // conf->nodename, (const char *)si, (const char *)rsi);
1060 } 1233 }
1234 }
1235 else if (seqclass == 1) // far history
1236 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1237 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1238 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1239 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1240 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1241 else if (seqclass == 3) // reset
1242 {
1243 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1244 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1245 send_reset (rsi);
1061 } 1246 }
1062 1247
1063 delete d; 1248 delete d;
1064 break; 1249 break;
1065 } 1250 }
… …
1069 break; 1254 break;
1070 1255
1071 case vpn_packet::PT_CONNECT_REQ: 1256 case vpn_packet::PT_CONNECT_REQ:
1072 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1257 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1073 { 1258 {
1074 connect_req_packet *p = (connect_req_packet *) pkt; 1259 connect_req_packet *p = (connect_req_packet *)pkt;
1075 1260
1076 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1261 if (p->id > 0 && p->id <= vpn->conns.size ())
1077 connection *c = vpn->conns[p->id - 1];
1078 conf->protocols = p->protocols;
1079
1080 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1081 conf->id, p->id, c->ictx && c->octx);
1082
1083 if (c->ictx && c->octx)
1084 { 1262 {
1263 connection *c = vpn->conns[p->id - 1];
1264 conf->protocols = p->protocols;
1265
1266 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]",
1267 conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx);
1268
1269 if (c->ictx && c->octx)
1270 {
1085 // send connect_info packets to both sides, in case one is 1271 // send connect_info packets to both sides, in case one is
1086 // behind a nat firewall (or both ;) 1272 // behind a nat firewall (or both ;)
1087 c->send_connect_info (conf->id, si, conf->protocols); 1273 c->send_connect_info (conf->id, si, conf->protocols);
1088 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1274 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1275 }
1276 else
1277 c->establish_connection ();
1089 } 1278 }
1090 else 1279 else
1091 c->establish_connection (); 1280 slog (L_WARN,
1281 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1282 p->id);
1092 } 1283 }
1093 1284
1094 break; 1285 break;
1095 1286
1096 case vpn_packet::PT_CONNECT_INFO: 1287 case vpn_packet::PT_CONNECT_INFO:
1097 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1288 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1098 { 1289 {
1099 connect_info_packet *p = (connect_info_packet *) pkt; 1290 connect_info_packet *p = (connect_info_packet *)pkt;
1100 1291
1101 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1292 if (p->id > 0 && p->id <= vpn->conns.size ())
1102 1293 {
1103 connection *c = vpn->conns[p->id - 1]; 1294 connection *c = vpn->conns[p->id - 1];
1104 1295
1105 c->conf->protocols = p->protocols; 1296 c->conf->protocols = p->protocols;
1106 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1297 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1107 p->si.upgrade_protocol (protocol, c->conf); 1298 p->si.upgrade_protocol (protocol, c->conf);
1108 1299
1109 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1300 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s) [%d]",
1301 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1110 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1302 (const char *)p->si, !c->ictx && !c->octx);
1111 1303
1112 const sockinfo &dsi = forward_si (p->si); 1304 const sockinfo &dsi = forward_si (p->si);
1113 1305
1114 if (dsi.valid ()) 1306 if (dsi.valid ())
1115 c->send_auth_request (dsi, true); 1307 c->send_auth_request (dsi, true);
1308 }
1309 else
1310 slog (L_WARN,
1311 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1312 p->id);
1116 } 1313 }
1117 1314
1118 break; 1315 break;
1119 1316
1120 default: 1317 default:
1121 send_reset (rsi); 1318 send_reset (rsi);
1122 break; 1319 break;
1123 } 1320 }
1124} 1321}
1125 1322
1126void connection::keepalive_cb (time_watcher &w) 1323inline void
1324connection::keepalive_cb (ev::timer &w, int revents)
1127{ 1325{
1128 if (NOW >= last_activity + ::conf.keepalive + 30) 1326 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1129 { 1327 {
1130 reset_connection (); 1328 reset_connection ();
1131 establish_connection (); 1329 establish_connection ();
1132 } 1330 }
1133 else if (NOW < last_activity + ::conf.keepalive) 1331 else if (ev_now () < last_activity + ::conf.keepalive)
1134 w.start (last_activity + ::conf.keepalive); 1332 w.start (last_activity + ::conf.keepalive - ev::now ());
1135 else if (conf->connectmode != conf_node::C_ONDEMAND 1333 else if (conf->connectmode != conf_node::C_ONDEMAND
1136 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1334 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1137 { 1335 {
1138 send_ping (si); 1336 send_ping (si);
1139 w.start (NOW + 5); 1337 w.start (3);
1140 } 1338 }
1141 else if (NOW < last_activity + ::conf.keepalive + 10) 1339 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1142 // hold ondemand connections implicitly a few seconds longer 1340 // hold ondemand connections implicitly a few seconds longer
1143 // should delete octx, though, or something like that ;) 1341 // should delete octx, though, or something like that ;)
1144 w.start (last_activity + ::conf.keepalive + 10); 1342 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1145 else 1343 else
1146 reset_connection (); 1344 reset_connection ();
1147} 1345}
1148 1346
1149void connection::send_connect_request (int id) 1347void connection::send_connect_request (int id)
1150{ 1348{
1151 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1349 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1152 1350
1153 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1351 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s)",
1352 conf->nodename, vpn->conns[id - 1]->conf->nodename);
1154 p->hmac_set (octx); 1353 p->hmac_set (octx);
1155 send_vpn_packet (p, si); 1354 send_vpn_packet (p, si);
1156 1355
1157 delete p; 1356 delete p;
1158} 1357}
1159 1358
1160void connection::script_node () 1359void connection::script_init_env (const char *ext)
1161{ 1360{
1162 vpn->script_if_up ();
1163
1164 char *env; 1361 char *env;
1362 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1363 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1364 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1365 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1366 conf->id & 0xff); putenv (env);
1367}
1368
1369void connection::script_init_connect_env ()
1370{
1371 vpn->script_init_env ();
1372
1373 char *env;
1165 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1374 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1375 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1166 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1376 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1167 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1377 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1168 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1378 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1169} 1379}
1170 1380
1381inline const char *
1171const char *connection::script_node_up () 1382connection::script_node_up ()
1172{ 1383{
1173 script_node (); 1384 script_init_connect_env ();
1174 1385
1175 putenv ("STATE=up"); 1386 putenv ((char *)"STATE=up");
1176 1387
1388 char *filename;
1389 asprintf (&filename,
1390 "%s/%s",
1391 confbase,
1177 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1392 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1178}
1179 1393
1394 return filename;
1395}
1396
1397inline const char *
1398connection::script_node_change ()
1399{
1400 script_init_connect_env ();
1401
1402 putenv ((char *)"STATE=change");
1403
1404 char *filename;
1405 asprintf (&filename,
1406 "%s/%s",
1407 confbase,
1408 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1409
1410 return filename;
1411}
1412
1413inline const char *
1180const char *connection::script_node_down () 1414connection::script_node_down ()
1181{ 1415{
1182 script_node (); 1416 script_init_connect_env ();
1183 1417
1184 putenv ("STATE=down"); 1418 putenv ((char *)"STATE=down");
1185 1419
1186 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1420 char *filename;
1187} 1421 asprintf (&filename,
1422 "%s/%s",
1423 confbase,
1424 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1188 1425
1426 return filename;
1427}
1428
1189connection::connection(struct vpn *vpn_) 1429connection::connection (struct vpn *vpn, conf_node *conf)
1190: vpn(vpn_) 1430: vpn(vpn), conf(conf),
1191, rekey (this, &connection::rekey_cb) 1431#if ENABLE_DNS
1192, keepalive (this, &connection::keepalive_cb) 1432 dns (0),
1433#endif
1434 data_queue(conf->max_ttl, conf->max_queue + 1),
1435 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1436{
1437 rekey .set<connection, &connection::rekey_cb > (this);
1438 keepalive .set<connection, &connection::keepalive_cb > (this);
1193, establish_connection (this, &connection::establish_connection_cb) 1439 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1194{ 1440
1441 last_establish_attempt = 0.;
1195 octx = ictx = 0; 1442 octx = ictx = 0;
1196 retry_cnt = 0;
1197 1443
1198 connectmode = conf_node::C_ALWAYS; // initial setting 1444 if (!conf->protocols) // make sure some protocol is enabled
1445 conf->protocols = PROT_UDPv4;
1446
1447 connectmode = conf->connectmode;
1448
1449 // queue a dummy packet to force an initial connection attempt
1450 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1451 vpn_queue.put (new net_packet);
1452
1199 reset_connection (); 1453 reset_connection ();
1200} 1454}
1201 1455
1202connection::~connection () 1456connection::~connection ()
1203{ 1457{

Diff Legend

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