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.41 by pcg, Wed Mar 2 05:49:31 2005 UTC vs.
Revision 1.86 by pcg, Thu Jan 21 04:30:32 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 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;
593
594 // make sure rekeying timeouts are slightly asymmetric 682 // make sure rekeying timeouts are slightly asymmetric
595 rekey.start (NOW + ::conf.rekey 683 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
596 + (conf->id > THISNODE->id ? 10 : 0)); 684 rekey.start (rekey_interval, rekey_interval);
597 keepalive.start (NOW + ::conf.keepalive); 685 keepalive.start (::conf.keepalive);
598 686
599 // send queued packets 687 // send queued packets
600 if (ictx && octx) 688 if (ictx && octx)
601 { 689 {
602 while (tap_packet *p = (tap_packet *)data_queue.get ()) 690 while (tap_packet *p = (tap_packet *)data_queue.get ())
603 { 691 {
604 send_data_packet (p); 692 if (p->len) send_data_packet (p);
605 delete p; 693 delete p;
606 } 694 }
607 695
608 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 696 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
609 { 697 {
610 send_vpn_packet (p, si, IPTOS_RELIABILITY); 698 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
611 delete p; 699 delete p;
612 } 700 }
613 } 701 }
702
703 vpn->connection_established (this);
614 } 704 }
615 else 705 else
616 { 706 {
617 retry_cnt = 0; 707 retry_cnt = 0;
618 establish_connection.start (NOW + 5); 708 establish_connection.start (5);
619 keepalive.stop (); 709 keepalive.stop ();
620 rekey.stop (); 710 rekey.stop ();
621 } 711 }
622} 712}
623 713
624void 714void
625connection::reset_si () 715connection::reset_si ()
626{ 716{
717 if (vpn->can_direct (THISNODE, conf))
627 protocol = best_protocol (THISNODE->protocols & conf->protocols); 718 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
628 719 else
629 // mask out protocols we cannot establish 720 {
630 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 721 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
631 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 722 protocol = 0;
632 if (!conf->dns_port) protocol &= ~PROT_DNSv4; 723 }
633 724
634 si.set (conf, protocol); 725 si.set (conf, protocol);
726
727 is_direct = si.valid ();
635} 728}
636 729
637// ensure sockinfo is valid, forward if necessary 730// ensure sockinfo is valid, forward if necessary
638const sockinfo & 731const sockinfo &
639connection::forward_si (const sockinfo &si) const 732connection::forward_si (const sockinfo &si) const
640{ 733{
641 if (!si.valid ()) 734 if (!si.valid ())
642 { 735 {
643 connection *r = vpn->find_router (); 736 connection *r = vpn->find_router_for (this);
644 737
645 if (r) 738 if (r)
646 { 739 {
647 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 740 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
648 conf->nodename, r->conf->nodename); 741 conf->nodename, r->conf->nodename);
649 return r->si; 742 return r->si;
650 } 743 }
651 else 744 else
652 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 745 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
653 conf->nodename); 746 conf->nodename);
654 } 747 }
655 748
656 return si; 749 return si;
657} 750}
658 751
659void 752void
660connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 753connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
661{ 754{
662 bool ok; 755 if (!vpn->send_vpn_packet (pkt, si, tos))
663
664 switch (si.prot)
665 {
666 case PROT_IPv4:
667 ok = vpn->send_ipv4_packet (pkt, si, tos); break;
668 case PROT_UDPv4:
669 ok = vpn->send_udpv4_packet (pkt, si, tos); break;
670#if ENABLE_TCP
671 case PROT_TCPv4:
672 ok = vpn->send_tcpv4_packet (pkt, si, tos); break;
673#endif
674#if ENABLE_ICMP
675 case PROT_ICMPv4:
676 ok = vpn->send_icmpv4_packet (pkt, si, tos); break;
677#endif
678#if ENABLE_DNS
679 case PROT_DNSv4:
680 ok = send_dnsv4_packet (pkt, si, tos); break;
681#endif
682
683 default:
684 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
685 ok = false;
686 }
687
688 if (!ok)
689 reset_connection (); 756 reset_connection ();
690} 757}
691 758
692void 759void
693connection::send_ping (const sockinfo &si, u8 pong) 760connection::send_ping (const sockinfo &si, u8 pong)
694{ 761{
695 ping_packet *pkt = new ping_packet; 762 ping_packet *pkt = new ping_packet;
696 763
697 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
698 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 768 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
699 769
700 delete pkt; 770 delete pkt;
701} 771}
702 772
… …
721 791
722 rsachallenge chg; 792 rsachallenge chg;
723 rsa_cache.gen (pkt->id, chg); 793 rsa_cache.gen (pkt->id, chg);
724 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 794 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
725 795
726 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);
727 797
728 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
729 799
730 delete pkt; 800 delete pkt;
731} 801}
… …
739 809
740 rsa_hash (id, chg, pkt->response); 810 rsa_hash (id, chg, pkt->response);
741 811
742 pkt->hmac_set (octx); 812 pkt->hmac_set (octx);
743 813
744 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);
745 815
746 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
747 817
748 delete pkt; 818 delete pkt;
749} 819}
750 820
751void 821void
752connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 822connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
753{ 823{
754 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 824 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,
755 conf->id, rid, (const char *)rsi); 825 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
756 826
757 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);
758 828
759 r->hmac_set (octx); 829 r->hmac_set (octx);
760 send_vpn_packet (r, si); 830 send_vpn_packet (r, si);
761 831
762 delete r; 832 delete r;
763} 833}
764 834
765void 835inline void
766connection::establish_connection_cb (time_watcher &w) 836connection::establish_connection_cb (ev::timer &w, int revents)
767{ 837{
768 if (!ictx 838 if (!ictx
769 && conf != THISNODE 839 && conf != THISNODE
770 && connectmode != conf_node::C_NEVER 840 && connectmode != conf_node::C_NEVER
771 && connectmode != conf_node::C_DISABLED 841 && connectmode != conf_node::C_DISABLED
772 && NOW > w.at) 842 && !w.is_active ())
773 { 843 {
774 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
775 845 // and stop trying. should probably be handled by a per-connection expire handler.
776 if (retry_int < conf->max_retry) 846 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
847 {
848 reset_connection ();
777 retry_cnt++; 849 return;
778 else 850 }
779 retry_int = conf->max_retry;
780 851
781 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));
782 857
783 reset_si (); 858 reset_si ();
784 859
785 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);
786 vpn->send_connect_request (conf->id); 866 vpn->send_connect_request (this);
867 }
787 else 868 else
788 { 869 {
870 if (si.valid ())
871 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
872 conf->nodename, (const char *)si);
873
789 const sockinfo &dsi = forward_si (si); 874 const sockinfo &dsi = forward_si (si);
875
876 slow = slow || (dsi.prot & PROT_SLOW);
790 877
791 if (dsi.valid () && auth_rate_limiter.can (dsi)) 878 if (dsi.valid () && auth_rate_limiter.can (dsi))
792 { 879 {
793 if (retry_cnt < 4) 880 if (retry_cnt < 4)
794 send_auth_request (dsi, true); 881 send_auth_request (dsi, true);
795 else 882 else
796 send_ping (dsi, 0); 883 send_ping (dsi, 0);
797 } 884 }
798 } 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);
799 } 895 }
800} 896}
801 897
802void 898void
803connection::reset_connection () 899connection::reset_connection ()
… …
806 { 902 {
807 slog (L_INFO, _("%s(%s): connection lost"), 903 slog (L_INFO, _("%s(%s): connection lost"),
808 conf->nodename, (const char *)si); 904 conf->nodename, (const char *)si);
809 905
810 if (::conf.script_node_down) 906 if (::conf.script_node_down)
811 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 }
812 } 912 }
813 913
814 delete ictx; ictx = 0; 914 delete ictx; ictx = 0;
815 delete octx; octx = 0; 915 delete octx; octx = 0;
916#if ENABLE_DNS
917 dnsv4_reset_connection ();
918#endif
816 919
817 si.host = 0; 920 si.host = 0;
818 921
819 last_activity = 0; 922 last_activity = 0.;
923 //last_si_change = 0.;
820 retry_cnt = 0; 924 retry_cnt = 0;
821 925
822 rekey.stop (); 926 rekey.stop ();
823 keepalive.stop (); 927 keepalive.stop ();
824 establish_connection.stop (); 928 establish_connection.stop ();
… …
831 send_reset (si); 935 send_reset (si);
832 936
833 reset_connection (); 937 reset_connection ();
834} 938}
835 939
836void 940// poor-man's rekeying
837connection::rekey_cb (time_watcher &w) 941inline void
942connection::rekey_cb (ev::timer &w, int revents)
838{ 943{
839 reset_connection (); 944 reset_connection ();
840 establish_connection (); 945 establish_connection ();
841} 946}
842 947
… …
858 if (oseqno > MAX_SEQNO) 963 if (oseqno > MAX_SEQNO)
859 rekey (); 964 rekey ();
860} 965}
861 966
862void 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
863connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 978connection::inject_data_packet (tap_packet *pkt)
864{ 979{
865 if (ictx && octx) 980 if (ictx && octx)
866 send_data_packet (pkt); 981 send_data_packet (pkt);
867 else 982 else
868 { 983 {
869 if (!broadcast)//DDDD
870 data_queue.put (new tap_packet (*pkt)); 984 data_queue.put (new tap_packet (*pkt));
871 985 post_inject_queue ();
872 establish_connection ();
873 } 986 }
874} 987}
875 988
876void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 989void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
877{ 990{
878 if (ictx && octx) 991 if (ictx && octx)
879 send_vpn_packet (pkt, si, tos); 992 send_vpn_packet (pkt, si, tos);
880 else 993 else
881 { 994 {
882 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 995 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
883 996 post_inject_queue ();
884 establish_connection ();
885 } 997 }
886} 998}
887 999
888void 1000void
889connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1001connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
890{ 1002{
891 last_activity = NOW; 1003 last_activity = ev_now ();
892 1004
893 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.",
894 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;
895 1010
896 switch (pkt->typ ()) 1011 switch (pkt->typ ())
897 { 1012 {
898 case vpn_packet::PT_PING: 1013 case vpn_packet::PT_PING:
1014 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1015
899 // we send pings instead of auth packets after some retries, 1016 // we send pings instead of auth packets after some retries,
900 // so reset the retry counter and establish a connection 1017 // so reset the retry counter and establish a connection
901 // when we receive a ping. 1018 // when we receive a ping.
902 if (!ictx) 1019 if (!ictx)
903 { 1020 {
904 if (auth_rate_limiter.can (rsi)) 1021 if (auth_rate_limiter.can (rsi))
905 send_auth_request (rsi, true); 1022 send_auth_request (rsi, true);
906 } 1023 }
907 else 1024 else
1025 // we would love to change thre socket address here, but ping's aren't
1026 // authenticated, so we best ignore it.
908 send_ping (rsi, 1); // pong 1027 send_ping (rsi, 1); // pong
909 1028
910 break; 1029 break;
911 1030
912 case vpn_packet::PT_PONG: 1031 case vpn_packet::PT_PONG:
1032 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
913 break; 1033 break;
914 1034
915 case vpn_packet::PT_RESET: 1035 case vpn_packet::PT_RESET:
916 { 1036 {
917 reset_connection (); 1037 reset_connection ();
918 1038
919 config_packet *p = (config_packet *) pkt; 1039 config_packet *p = (config_packet *) pkt;
920 1040
921 if (!p->chk_config ()) 1041 if (!p->chk_config ())
922 { 1042 {
923 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1043 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
924 conf->nodename, (const char *)rsi); 1044 conf->nodename, (const char *)rsi);
925 connectmode = conf_node::C_DISABLED; 1045 connectmode = conf_node::C_DISABLED;
926 } 1046 }
927 else if (connectmode == conf_node::C_ALWAYS) 1047 else if (connectmode == conf_node::C_ALWAYS)
928 establish_connection (); 1048 establish_connection ();
… …
932 case vpn_packet::PT_AUTH_REQ: 1052 case vpn_packet::PT_AUTH_REQ:
933 if (auth_rate_limiter.can (rsi)) 1053 if (auth_rate_limiter.can (rsi))
934 { 1054 {
935 auth_req_packet *p = (auth_req_packet *) pkt; 1055 auth_req_packet *p = (auth_req_packet *) pkt;
936 1056
937 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1057 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s)", conf->nodename, p->initiate ? "initiate" : "reply");
938 1058
939 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1059 if (p->chk_config ()
1060 && (!strncmp (p->magic, MAGIC_OLD, 8) || !strncmp (p->magic, MAGIC, 8)))
940 { 1061 {
941 if (p->prot_minor != PROTOCOL_MINOR) 1062 if (p->prot_minor != PROTOCOL_MINOR)
942 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1063 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
943 conf->nodename, (const char *)rsi, 1064 conf->nodename, (const char *)rsi,
944 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1065 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
959 delete octx; 1080 delete octx;
960 1081
961 octx = new crypto_ctx (k, 1); 1082 octx = new crypto_ctx (k, 1);
962 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1083 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
963 1084
964 // compatibility code, remove when no longer required
965 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
966
967 conf->protocols = p->protocols; 1085 conf->protocols = p->protocols;
968 features = p->features & config_packet::get_features (); 1086 features = p->features & config_packet::get_features ();
969 1087
970 send_auth_response (rsi, p->id, k); 1088 send_auth_response (rsi, p->id, k);
971 1089
… …
973 1091
974 break; 1092 break;
975 } 1093 }
976 } 1094 }
977 else 1095 else
978 slog (L_WARN, _("%s(%s): protocol mismatch"), 1096 slog (L_WARN, _("%s(%s): protocol mismatch."),
979 conf->nodename, (const char *)rsi); 1097 conf->nodename, (const char *)rsi);
980 1098
981 send_reset (rsi); 1099 send_reset (rsi);
982 } 1100 }
983 1101
984 break; 1102 break;
985 1103
986 case vpn_packet::PT_AUTH_RES: 1104 case vpn_packet::PT_AUTH_RES:
987 { 1105 {
988 auth_res_packet *p = (auth_res_packet *) pkt; 1106 auth_res_packet *p = (auth_res_packet *)pkt;
989 1107
990 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1108 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
991 1109
992 if (p->chk_config ()) 1110 if (p->chk_config ())
993 { 1111 {
994 if (p->prot_minor != PROTOCOL_MINOR) 1112 if (p->prot_minor != PROTOCOL_MINOR)
995 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1113 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
… …
998 1116
999 rsachallenge chg; 1117 rsachallenge chg;
1000 1118
1001 if (!rsa_cache.find (p->id, chg)) 1119 if (!rsa_cache.find (p->id, chg))
1002 { 1120 {
1003 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1121 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
1004 conf->nodename, (const char *)rsi); 1122 conf->nodename, (const char *)rsi);
1005 break; 1123 break;
1006 } 1124 }
1007 else 1125 else
1008 { 1126 {
1009 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1127 crypto_ctx *cctx = new crypto_ctx (chg, 0);
1010 1128
1011 if (!p->hmac_chk (cctx)) 1129 if (!p->hmac_chk (cctx))
1012 { 1130 {
1013 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1131 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
1014 "could be an attack, or just corruption or a synchronization error"), 1132 "could be an attack, or just corruption or a synchronization error."),
1015 conf->nodename, (const char *)rsi); 1133 conf->nodename, (const char *)rsi);
1016 break; 1134 break;
1017 } 1135 }
1018 else 1136 else
1019 { 1137 {
… …
1030 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1148 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1031 1149
1032 si = rsi; 1150 si = rsi;
1033 protocol = rsi.prot; 1151 protocol = rsi.prot;
1034 1152
1153 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1154 conf->nodename, (const char *)rsi,
1155 is_direct ? "direct" : "forwarded",
1156 p->prot_major, p->prot_minor);
1157
1035 connection_established (); 1158 connection_established ();
1036 1159
1037 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1038 conf->nodename, (const char *)rsi,
1039 p->prot_major, p->prot_minor);
1040
1041 if (::conf.script_node_up) 1160 if (::conf.script_node_up)
1042 run_script (run_script_cb (this, &connection::script_node_up), false); 1161 {
1162 run_script_cb *cb = new run_script_cb;
1163 cb->set<connection, &connection::script_node_up> (this);
1164 run_script_queued (cb, _("node-up command execution failed, continuing."));
1165 }
1043 1166
1044 break; 1167 break;
1045 } 1168 }
1046 else 1169 else
1047 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1170 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1048 conf->nodename, (const char *)rsi); 1171 conf->nodename, (const char *)rsi);
1049 } 1172 }
1050 1173
1051 delete cctx; 1174 delete cctx;
1052 } 1175 }
… …
1068 { 1191 {
1069 vpndata_packet *p = (vpndata_packet *)pkt; 1192 vpndata_packet *p = (vpndata_packet *)pkt;
1070 1193
1071 if (!p->hmac_chk (ictx)) 1194 if (!p->hmac_chk (ictx))
1072 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1195 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1073 "could be an attack, or just corruption or a synchronization error"), 1196 "could be an attack, or just corruption or a synchronization error."),
1074 conf->nodename, (const char *)rsi); 1197 conf->nodename, (const char *)rsi);
1075 else 1198 else
1076 { 1199 {
1077 u32 seqno; 1200 u32 seqno;
1078 tap_packet *d = p->unpack (this, seqno); 1201 tap_packet *d = p->unpack (this, seqno);
1202 int seqclass = iseqno.seqno_classify (seqno);
1079 1203
1080 if (iseqno.recv_ok (seqno)) 1204 if (seqclass == 0) // ok
1081 { 1205 {
1082 vpn->tap->send (d); 1206 vpn->tap->send (d);
1083 1207
1084 if (si != rsi) 1208 if (si != rsi)
1085 { 1209 {
1086 // fast re-sync on connection changes, useful especially for tcp/ip 1210 // fast re-sync on source address changes, useful especially for tcp/ip
1211 //if (last_si_change < ev_now () + 5.)
1087 si = rsi; 1212 // {
1088
1089 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1213 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1090 conf->nodename, (const char *)si, (const char *)rsi); 1214 conf->nodename, (const char *)si, (const char *)rsi);
1215
1216 si = rsi;
1217
1218 if (::conf.script_node_change)
1219 {
1220 run_script_cb *cb = new run_script_cb;
1221 cb->set<connection, &connection::script_node_change> (this);
1222 run_script_queued (cb, _("node-change command execution failed, continuing."));
1223 }
1224
1225 // }
1226 //else
1227 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1228 // conf->nodename, (const char *)si, (const char *)rsi);
1091 } 1229 }
1230 }
1231 else if (seqclass == 1) // far history
1232 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1233 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1234 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1235 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1236 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1237 else if (seqclass == 3) // reset
1238 {
1239 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1240 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1241 send_reset (rsi);
1092 } 1242 }
1093 1243
1094 delete d; 1244 delete d;
1095 break; 1245 break;
1096 } 1246 }
… …
1100 break; 1250 break;
1101 1251
1102 case vpn_packet::PT_CONNECT_REQ: 1252 case vpn_packet::PT_CONNECT_REQ:
1103 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1253 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1104 { 1254 {
1105 connect_req_packet *p = (connect_req_packet *) pkt; 1255 connect_req_packet *p = (connect_req_packet *)pkt;
1106 1256
1107 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1257 if (p->id > 0 && p->id <= vpn->conns.size ())
1108 connection *c = vpn->conns[p->id - 1];
1109 conf->protocols = p->protocols;
1110
1111 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1112 conf->id, p->id, c->ictx && c->octx);
1113
1114 if (c->ictx && c->octx)
1115 { 1258 {
1259 connection *c = vpn->conns[p->id - 1];
1260 conf->protocols = p->protocols;
1261
1262 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]",
1263 conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx);
1264
1265 if (c->ictx && c->octx)
1266 {
1116 // send connect_info packets to both sides, in case one is 1267 // send connect_info packets to both sides, in case one is
1117 // behind a nat firewall (or both ;) 1268 // behind a nat firewall (or both ;)
1118 c->send_connect_info (conf->id, si, conf->protocols); 1269 c->send_connect_info (conf->id, si, conf->protocols);
1119 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1270 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1271 }
1272 else
1273 c->establish_connection ();
1120 } 1274 }
1121 else 1275 else
1122 c->establish_connection (); 1276 slog (L_WARN,
1277 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1278 p->id);
1123 } 1279 }
1124 1280
1125 break; 1281 break;
1126 1282
1127 case vpn_packet::PT_CONNECT_INFO: 1283 case vpn_packet::PT_CONNECT_INFO:
1128 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1284 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1129 { 1285 {
1130 connect_info_packet *p = (connect_info_packet *)pkt; 1286 connect_info_packet *p = (connect_info_packet *)pkt;
1131 1287
1132 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything 1288 if (p->id > 0 && p->id <= vpn->conns.size ())
1133 { 1289 {
1134 connection *c = vpn->conns[p->id - 1]; 1290 connection *c = vpn->conns[p->id - 1];
1135 1291
1136 c->conf->protocols = p->protocols; 1292 c->conf->protocols = p->protocols;
1137 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1293 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1138 p->si.upgrade_protocol (protocol, c->conf); 1294 p->si.upgrade_protocol (protocol, c->conf);
1139 1295
1140 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1296 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s) [%d]",
1297 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1141 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1298 (const char *)p->si, !c->ictx && !c->octx);
1142 1299
1143 const sockinfo &dsi = forward_si (p->si); 1300 const sockinfo &dsi = forward_si (p->si);
1144 1301
1145 if (dsi.valid ()) 1302 if (dsi.valid ())
1146 c->send_auth_request (dsi, true); 1303 c->send_auth_request (dsi, true);
1147 } 1304 }
1305 else
1306 slog (L_WARN,
1307 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1308 p->id);
1148 } 1309 }
1149 1310
1150 break; 1311 break;
1151 1312
1152 default: 1313 default:
1153 send_reset (rsi); 1314 send_reset (rsi);
1154 break; 1315 break;
1155 } 1316 }
1156} 1317}
1157 1318
1158void connection::keepalive_cb (time_watcher &w) 1319inline void
1320connection::keepalive_cb (ev::timer &w, int revents)
1159{ 1321{
1160 if (NOW >= last_activity + ::conf.keepalive + 30) 1322 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1161 { 1323 {
1162 reset_connection (); 1324 reset_connection ();
1163 establish_connection (); 1325 establish_connection ();
1164 } 1326 }
1165 else if (NOW < last_activity + ::conf.keepalive) 1327 else if (ev_now () < last_activity + ::conf.keepalive)
1166 w.start (last_activity + ::conf.keepalive); 1328 w.start (last_activity + ::conf.keepalive - ev::now ());
1167 else if (conf->connectmode != conf_node::C_ONDEMAND 1329 else if (conf->connectmode != conf_node::C_ONDEMAND
1168 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1330 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1169 { 1331 {
1170 send_ping (si); 1332 send_ping (si);
1171 w.start (NOW + 5); 1333 w.start (3);
1172 } 1334 }
1173 else if (NOW < last_activity + ::conf.keepalive + 10) 1335 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1174 // hold ondemand connections implicitly a few seconds longer 1336 // hold ondemand connections implicitly a few seconds longer
1175 // should delete octx, though, or something like that ;) 1337 // should delete octx, though, or something like that ;)
1176 w.start (last_activity + ::conf.keepalive + 10); 1338 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1177 else 1339 else
1178 reset_connection (); 1340 reset_connection ();
1179} 1341}
1180 1342
1181void connection::send_connect_request (int id) 1343void connection::send_connect_request (int id)
1182{ 1344{
1183 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1345 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1184 1346
1185 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1347 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s)",
1348 conf->nodename, vpn->conns[id - 1]->conf->nodename);
1186 p->hmac_set (octx); 1349 p->hmac_set (octx);
1187 send_vpn_packet (p, si); 1350 send_vpn_packet (p, si);
1188 1351
1189 delete p; 1352 delete p;
1190} 1353}
1191 1354
1192void connection::script_node () 1355void connection::script_init_env (const char *ext)
1193{ 1356{
1194 vpn->script_if_up ();
1195
1196 char *env; 1357 char *env;
1358 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1359 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1360 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1361 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1362 conf->id & 0xff); putenv (env);
1363}
1364
1365void connection::script_init_connect_env ()
1366{
1367 vpn->script_init_env ();
1368
1369 char *env;
1197 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1370 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1371 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1198 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1372 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1199 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1373 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1200 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1374 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1201} 1375}
1202 1376
1377inline const char *
1203const char *connection::script_node_up () 1378connection::script_node_up ()
1204{ 1379{
1205 script_node (); 1380 script_init_connect_env ();
1206 1381
1207 putenv ("STATE=up"); 1382 putenv ((char *)"STATE=up");
1208 1383
1384 char *filename;
1385 asprintf (&filename,
1386 "%s/%s",
1387 confbase,
1209 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1388 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1210}
1211 1389
1390 return filename;
1391}
1392
1393inline const char *
1394connection::script_node_change ()
1395{
1396 script_init_connect_env ();
1397
1398 putenv ((char *)"STATE=change");
1399
1400 char *filename;
1401 asprintf (&filename,
1402 "%s/%s",
1403 confbase,
1404 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1405
1406 return filename;
1407}
1408
1409inline const char *
1212const char *connection::script_node_down () 1410connection::script_node_down ()
1213{ 1411{
1214 script_node (); 1412 script_init_connect_env ();
1215 1413
1216 putenv ("STATE=down"); 1414 putenv ((char *)"STATE=down");
1217 1415
1218 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1416 char *filename;
1417 asprintf (&filename,
1418 "%s/%s",
1419 confbase,
1420 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1421
1422 return filename;
1219} 1423}
1220 1424
1221connection::connection (struct vpn *vpn, conf_node *conf) 1425connection::connection (struct vpn *vpn, conf_node *conf)
1222: vpn(vpn), conf(conf) 1426: vpn(vpn), conf(conf),
1223, rekey (this, &connection::rekey_cb)
1224, keepalive (this, &connection::keepalive_cb)
1225, establish_connection (this, &connection::establish_connection_cb)
1226#if ENABLE_DNS 1427#if ENABLE_DNS
1227, dnsv4_tw (this, &connection::dnsv4_cb) 1428 dns (0),
1228, dns_rcvdq (0), dns_snddq (0)
1229, dns_rcvseq (0), dns_sndseq (0)
1230#endif 1429#endif
1430 data_queue(conf->max_ttl, conf->max_queue + 1),
1431 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1231{ 1432{
1433 rekey .set<connection, &connection::rekey_cb > (this);
1434 keepalive .set<connection, &connection::keepalive_cb > (this);
1435 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1436
1437 last_establish_attempt = 0.;
1232 octx = ictx = 0; 1438 octx = ictx = 0;
1233 retry_cnt = 0;
1234 1439
1235 if (!conf->protocols) // make sure some protocol is enabled 1440 if (!conf->protocols) // make sure some protocol is enabled
1236 conf->protocols = PROT_UDPv4; 1441 conf->protocols = PROT_UDPv4;
1237 1442
1238 connectmode = conf_node::C_ALWAYS; // initial setting 1443 connectmode = conf->connectmode;
1444
1445 // queue a dummy packet to force an initial connection attempt
1446 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1447 vpn_queue.put (new net_packet);
1448
1239 reset_connection (); 1449 reset_connection ();
1240} 1450}
1241 1451
1242connection::~connection () 1452connection::~connection ()
1243{ 1453{

Diff Legend

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