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

Diff Legend

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