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

Comparing gvpe/src/connection.C (file contents):
Revision 1.30 by pcg, Thu Jan 29 19:22:05 2004 UTC vs.
Revision 1.75 by pcg, Sun Aug 10 15:04:55 2008 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
6 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
7 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
8 (at your option) any later version. 10 option) any later version.
9 11
10 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful, but
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
13 GNU General Public License for more details. 15 Public License for more details.
14 16
15 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License along
16 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
18*/ 30*/
19 31
20#include "config.h" 32#include "config.h"
21 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);
… …
335 int outl = 0, outl2; 423 int outl = 0, outl2;
336 ptype type = PT_DATA_UNCOMPRESSED; 424 ptype type = PT_DATA_UNCOMPRESSED;
337 425
338#if ENABLE_COMPRESSION 426#if ENABLE_COMPRESSION
339 u8 cdata[MAX_MTU]; 427 u8 cdata[MAX_MTU];
340 u32 cl;
341 428
429 if (conn->features & ENABLE_COMPRESSION)
430 {
342 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 431 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
432
343 if (cl) 433 if (cl)
344 { 434 {
345 type = PT_DATA_COMPRESSED; 435 type = PT_DATA_COMPRESSED;
346 d = cdata; 436 d = cdata;
347 l = cl + 2; 437 l = cl + 2;
348 438
349 d[0] = cl >> 8; 439 d[0] = cl >> 8;
350 d[1] = cl; 440 d[1] = cl;
441 }
351 } 442 }
352#endif 443#endif
353 444
354 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0)); 445 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
355 446
… …
448{ 539{
449 // actually, hmaclen cannot be checked because the hmac 540 // actually, hmaclen cannot be checked because the hmac
450 // field comes before this data, so peers with other 541 // field comes before this data, so peers with other
451 // hmacs simply will not work. 542 // hmacs simply will not work.
452 u8 prot_major, prot_minor, randsize, hmaclen; 543 u8 prot_major, prot_minor, randsize, hmaclen;
453 u8 flags, challengelen, pad2, pad3; 544 u8 flags, challengelen, features, pad3;
454 u32 cipher_nid, digest_nid, hmac_nid; 545 u32 cipher_nid, digest_nid, hmac_nid;
455
456 const u8 curflags () const
457 {
458 return 0x80
459 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
460 }
461 546
462 void setup (ptype type, int dst); 547 void setup (ptype type, int dst);
463 bool chk_config () const; 548 bool chk_config () const;
549
550 static u8 get_features ()
551 {
552 u8 f = 0;
553#if ENABLE_COMPRESSION
554 f |= FEATURE_COMPRESSION;
555#endif
556#if ENABLE_ROHC
557 f |= FEATURE_ROHC;
558#endif
559#if ENABLE_BRIDGING
560 f |= FEATURE_BRIDGING;
561#endif
562 return f;
563 }
464}; 564};
465 565
466void config_packet::setup (ptype type, int dst) 566void config_packet::setup (ptype type, int dst)
467{ 567{
468 prot_major = PROTOCOL_MAJOR; 568 prot_major = PROTOCOL_MAJOR;
469 prot_minor = PROTOCOL_MINOR; 569 prot_minor = PROTOCOL_MINOR;
470 randsize = RAND_SIZE; 570 randsize = RAND_SIZE;
471 hmaclen = HMACLENGTH; 571 hmaclen = HMACLENGTH;
472 flags = curflags (); 572 flags = 0;
473 challengelen = sizeof (rsachallenge); 573 challengelen = sizeof (rsachallenge);
574 features = get_features ();
474 575
475 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 576 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
476 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 577 digest_nid = htonl (EVP_MD_type (RSA_HASH));
477 hmac_nid = htonl (EVP_MD_type (DIGEST)); 578 hmac_nid = htonl (EVP_MD_type (DIGEST));
478 579
… …
486 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);
487 else if (randsize != RAND_SIZE) 588 else if (randsize != RAND_SIZE)
488 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);
489 else if (hmaclen != HMACLENGTH) 590 else if (hmaclen != HMACLENGTH)
490 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);
491 else if (flags != curflags ())
492 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
493 else if (challengelen != sizeof (rsachallenge)) 592 else if (challengelen != sizeof (rsachallenge))
494 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));
495 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 594 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
496 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 595 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
497 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 596 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
573///////////////////////////////////////////////////////////////////////////// 672/////////////////////////////////////////////////////////////////////////////
574 673
575void 674void
576connection::connection_established () 675connection::connection_established ()
577{ 676{
677 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
678
578 if (ictx && octx) 679 if (ictx && octx)
579 { 680 {
580 connectmode = conf->connectmode; 681 // make sure rekeying timeouts are slightly asymmetric
581 682 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
582 rekey.start (NOW + ::conf.rekey); 683 rekey.start (rekey_interval, rekey_interval);
583 keepalive.start (NOW + ::conf.keepalive); 684 keepalive.start (::conf.keepalive);
584 685
585 // send queued packets 686 // send queued packets
586 if (ictx && octx) 687 if (ictx && octx)
587 { 688 {
588 while (tap_packet *p = (tap_packet *)data_queue.get ()) 689 while (tap_packet *p = (tap_packet *)data_queue.get ())
589 { 690 {
590 send_data_packet (p); 691 if (p->len) send_data_packet (p);
591 delete p; 692 delete p;
592 } 693 }
593 694
594 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 695 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
595 { 696 {
596 send_vpn_packet (p, si, IPTOS_RELIABILITY); 697 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
597 delete p; 698 delete p;
598 } 699 }
599 } 700 }
701
702 vpn->connection_established (this);
600 } 703 }
601 else 704 else
602 { 705 {
603 retry_cnt = 0; 706 retry_cnt = 0;
604 establish_connection.start (NOW + 5); 707 establish_connection.start (5);
605 keepalive.stop (); 708 keepalive.stop ();
606 rekey.stop (); 709 rekey.stop ();
607 } 710 }
608} 711}
609 712
610void 713void
611connection::reset_si () 714connection::reset_si ()
612{ 715{
716 if (vpn->can_direct (THISNODE, conf))
613 protocol = best_protocol (THISNODE->protocols & conf->protocols); 717 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
614 718 else
615 // mask out protocols we cannot establish 719 {
616 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 720 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
617 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 721 protocol = 0;
722 }
618 723
619 si.set (conf, protocol); 724 si.set (conf, protocol);
725
726 is_direct = si.valid ();
620} 727}
621 728
622// ensure sockinfo is valid, forward if necessary 729// ensure sockinfo is valid, forward if necessary
623const sockinfo & 730const sockinfo &
624connection::forward_si (const sockinfo &si) const 731connection::forward_si (const sockinfo &si) const
625{ 732{
626 if (!si.valid ()) 733 if (!si.valid ())
627 { 734 {
628 connection *r = vpn->find_router (); 735 connection *r = vpn->find_router_for (this);
629 736
630 if (r) 737 if (r)
631 { 738 {
632 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 739 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
633 conf->nodename, r->conf->nodename); 740 conf->nodename, r->conf->nodename);
634 return r->si; 741 return r->si;
635 } 742 }
636 else 743 else
637 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 744 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
638 conf->nodename); 745 conf->nodename);
639 } 746 }
640 747
641 return si; 748 return si;
642} 749}
… …
652connection::send_ping (const sockinfo &si, u8 pong) 759connection::send_ping (const sockinfo &si, u8 pong)
653{ 760{
654 ping_packet *pkt = new ping_packet; 761 ping_packet *pkt = new ping_packet;
655 762
656 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, ">>%d %s [%s]", conf->id, pong ? "PT_PONG" : "PT_PING", (const char *)si);
766
657 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 767 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
658 768
659 delete pkt; 769 delete pkt;
660} 770}
661 771
… …
708} 818}
709 819
710void 820void
711connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 821connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
712{ 822{
713 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 823 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
714 conf->id, rid, (const char *)rsi); 824 conf->id, rid, (const char *)rsi);
715 825
716 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);
717 827
718 r->hmac_set (octx); 828 r->hmac_set (octx);
719 send_vpn_packet (r, si); 829 send_vpn_packet (r, si);
720 830
721 delete r; 831 delete r;
722} 832}
723 833
724void 834inline void
725connection::establish_connection_cb (time_watcher &w) 835connection::establish_connection_cb (ev::timer &w, int revents)
726{ 836{
727 if (!ictx 837 if (!ictx
728 && conf != THISNODE 838 && conf != THISNODE
729 && connectmode != conf_node::C_NEVER 839 && connectmode != conf_node::C_NEVER
730 && connectmode != conf_node::C_DISABLED 840 && connectmode != conf_node::C_DISABLED
731 && NOW > w.at) 841 && !w.is_active ())
732 { 842 {
733 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
734 844 // and stop trying. should probably be handled by a per-connection expire handler.
735 if (retry_int < 3600 * 8) 845 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
846 {
847 reset_connection ();
736 retry_cnt++; 848 return;
849 }
737 850
738 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));
739 856
740 reset_si (); 857 reset_si ();
741 858
742 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);
743 vpn->send_connect_request (conf->id); 865 vpn->send_connect_request (this);
866 }
744 else 867 else
745 { 868 {
869 if (si.valid ())
870 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
871 conf->nodename, (const char *)si);
872
746 const sockinfo &dsi = forward_si (si); 873 const sockinfo &dsi = forward_si (si);
874
875 slow = slow || (dsi.prot & PROT_SLOW);
747 876
748 if (dsi.valid () && auth_rate_limiter.can (dsi)) 877 if (dsi.valid () && auth_rate_limiter.can (dsi))
749 { 878 {
750 if (retry_cnt < 4) 879 if (retry_cnt < 4)
751 send_auth_request (dsi, true); 880 send_auth_request (dsi, true);
752 else 881 else
753 send_ping (dsi, 0); 882 send_ping (dsi, 0);
754 } 883 }
755 } 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);
756 } 894 }
757} 895}
758 896
759void 897void
760connection::reset_connection () 898connection::reset_connection ()
… …
763 { 901 {
764 slog (L_INFO, _("%s(%s): connection lost"), 902 slog (L_INFO, _("%s(%s): connection lost"),
765 conf->nodename, (const char *)si); 903 conf->nodename, (const char *)si);
766 904
767 if (::conf.script_node_down) 905 if (::conf.script_node_down)
768 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 }
769 } 911 }
770 912
771 delete ictx; ictx = 0; 913 delete ictx; ictx = 0;
772 delete octx; octx = 0; 914 delete octx; octx = 0;
915#if ENABLE_DNS
916 dnsv4_reset_connection ();
917#endif
773 918
774 si.host= 0; 919 si.host = 0;
775 920
776 last_activity = 0; 921 last_activity = 0.;
922 //last_si_change = 0.;
777 retry_cnt = 0; 923 retry_cnt = 0;
778 924
779 rekey.stop (); 925 rekey.stop ();
780 keepalive.stop (); 926 keepalive.stop ();
781 establish_connection.stop (); 927 establish_connection.stop ();
… …
788 send_reset (si); 934 send_reset (si);
789 935
790 reset_connection (); 936 reset_connection ();
791} 937}
792 938
793void 939// poor-man's rekeying
794connection::rekey_cb (time_watcher &w) 940inline void
941connection::rekey_cb (ev::timer &w, int revents)
795{ 942{
796 reset_connection (); 943 reset_connection ();
797 establish_connection (); 944 establish_connection ();
798} 945}
799 946
… …
815 if (oseqno > MAX_SEQNO) 962 if (oseqno > MAX_SEQNO)
816 rekey (); 963 rekey ();
817} 964}
818 965
819void 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
820connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 977connection::inject_data_packet (tap_packet *pkt)
821{ 978{
822 if (ictx && octx) 979 if (ictx && octx)
823 send_data_packet (pkt); 980 send_data_packet (pkt);
824 else 981 else
825 { 982 {
826 if (!broadcast)//DDDD
827 data_queue.put (new tap_packet (*pkt)); 983 data_queue.put (new tap_packet (*pkt));
828 984 post_inject_queue ();
829 establish_connection ();
830 } 985 }
831} 986}
832 987
833void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 988void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
834{ 989{
835 if (ictx && octx) 990 if (ictx && octx)
836 send_vpn_packet (pkt, si, tos); 991 send_vpn_packet (pkt, si, tos);
837 else 992 else
838 { 993 {
839 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 994 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
840 995 post_inject_queue ();
841 establish_connection ();
842 } 996 }
843} 997}
844 998
845void 999void
846connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1000connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
847{ 1001{
848 last_activity = NOW; 1002 last_activity = ev_now ();
849 1003
850 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1004 slog (L_NOISE, "<<%d received packet type %d from %d to %d.",
851 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1005 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
1006
1007 if (connectmode == conf_node::C_DISABLED)
1008 return;
852 1009
853 switch (pkt->typ ()) 1010 switch (pkt->typ ())
854 { 1011 {
855 case vpn_packet::PT_PING: 1012 case vpn_packet::PT_PING:
856 // we send pings instead of auth packets after some retries, 1013 // we send pings instead of auth packets after some retries,
… …
860 { 1017 {
861 if (auth_rate_limiter.can (rsi)) 1018 if (auth_rate_limiter.can (rsi))
862 send_auth_request (rsi, true); 1019 send_auth_request (rsi, true);
863 } 1020 }
864 else 1021 else
1022 // we would love to change thre socket address here, but ping's aren't
1023 // authenticated, so we best ignore it.
865 send_ping (rsi, 1); // pong 1024 send_ping (rsi, 1); // pong
866 1025
867 break; 1026 break;
868 1027
869 case vpn_packet::PT_PONG: 1028 case vpn_packet::PT_PONG:
… …
875 1034
876 config_packet *p = (config_packet *) pkt; 1035 config_packet *p = (config_packet *) pkt;
877 1036
878 if (!p->chk_config ()) 1037 if (!p->chk_config ())
879 { 1038 {
880 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1039 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
881 conf->nodename, (const char *)rsi); 1040 conf->nodename, (const char *)rsi);
882 connectmode = conf_node::C_DISABLED; 1041 connectmode = conf_node::C_DISABLED;
883 } 1042 }
884 else if (connectmode == conf_node::C_ALWAYS) 1043 else if (connectmode == conf_node::C_ALWAYS)
885 establish_connection (); 1044 establish_connection ();
… …
917 1076
918 octx = new crypto_ctx (k, 1); 1077 octx = new crypto_ctx (k, 1);
919 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1078 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
920 1079
921 conf->protocols = p->protocols; 1080 conf->protocols = p->protocols;
1081 features = p->features & config_packet::get_features ();
922 1082
923 send_auth_response (rsi, p->id, k); 1083 send_auth_response (rsi, p->id, k);
924 1084
925 connection_established (); 1085 connection_established ();
926 1086
927 break; 1087 break;
928 } 1088 }
929 } 1089 }
930 else 1090 else
931 slog (L_WARN, _("%s(%s): protocol mismatch"), 1091 slog (L_WARN, _("%s(%s): protocol mismatch."),
932 conf->nodename, (const char *)rsi); 1092 conf->nodename, (const char *)rsi);
933 1093
934 send_reset (rsi); 1094 send_reset (rsi);
935 } 1095 }
936 1096
… …
951 1111
952 rsachallenge chg; 1112 rsachallenge chg;
953 1113
954 if (!rsa_cache.find (p->id, chg)) 1114 if (!rsa_cache.find (p->id, chg))
955 { 1115 {
956 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1116 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
957 conf->nodename, (const char *)rsi); 1117 conf->nodename, (const char *)rsi);
958 break; 1118 break;
959 } 1119 }
960 else 1120 else
961 { 1121 {
962 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1122 crypto_ctx *cctx = new crypto_ctx (chg, 0);
963 1123
964 if (!p->hmac_chk (cctx)) 1124 if (!p->hmac_chk (cctx))
965 { 1125 {
966 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1126 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
967 "could be an attack, or just corruption or a synchronization error"), 1127 "could be an attack, or just corruption or a synchronization error."),
968 conf->nodename, (const char *)rsi); 1128 conf->nodename, (const char *)rsi);
969 break; 1129 break;
970 } 1130 }
971 else 1131 else
972 { 1132 {
… …
983 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1143 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
984 1144
985 si = rsi; 1145 si = rsi;
986 protocol = rsi.prot; 1146 protocol = rsi.prot;
987 1147
988 connection_established ();
989
990 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1148 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d."),
991 conf->nodename, (const char *)rsi, 1149 conf->nodename, (const char *)rsi,
992 p->prot_major, p->prot_minor); 1150 p->prot_major, p->prot_minor);
993 1151
1152 connection_established ();
1153
994 if (::conf.script_node_up) 1154 if (::conf.script_node_up)
995 run_script (run_script_cb (this, &connection::script_node_up), false); 1155 {
1156 run_script_cb *cb = new run_script_cb;
1157 cb->set<connection, &connection::script_node_up> (this);
1158 run_script_queued (cb, _("node-up command execution failed, continuing."));
1159 }
996 1160
997 break; 1161 break;
998 } 1162 }
999 else 1163 else
1000 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1164 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1001 conf->nodename, (const char *)rsi); 1165 conf->nodename, (const char *)rsi);
1002 } 1166 }
1003 1167
1004 delete cctx; 1168 delete cctx;
1005 } 1169 }
… …
1021 { 1185 {
1022 vpndata_packet *p = (vpndata_packet *)pkt; 1186 vpndata_packet *p = (vpndata_packet *)pkt;
1023 1187
1024 if (!p->hmac_chk (ictx)) 1188 if (!p->hmac_chk (ictx))
1025 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1189 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1026 "could be an attack, or just corruption or a synchronization error"), 1190 "could be an attack, or just corruption or a synchronization error."),
1027 conf->nodename, (const char *)rsi); 1191 conf->nodename, (const char *)rsi);
1028 else 1192 else
1029 { 1193 {
1030 u32 seqno; 1194 u32 seqno;
1031 tap_packet *d = p->unpack (this, seqno); 1195 tap_packet *d = p->unpack (this, seqno);
1196 int seqclass = iseqno.seqno_classify (seqno);
1032 1197
1033 if (iseqno.recv_ok (seqno)) 1198 if (seqclass == 0) // ok
1034 { 1199 {
1035 vpn->tap->send (d); 1200 vpn->tap->send (d);
1036 1201
1037 if (si != rsi) 1202 if (si != rsi)
1038 { 1203 {
1039 // fast re-sync on connection changes, useful especially for tcp/ip 1204 // fast re-sync on source address changes, useful especially for tcp/ip
1205 //if (last_si_change < ev_now () + 5.)
1206 // {
1040 si = rsi; 1207 si = rsi;
1041 1208
1042 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1209 slog (L_INFO, _("%s(%s): socket address changed to %s."),
1043 conf->nodename, (const char *)si, (const char *)rsi); 1210 conf->nodename, (const char *)si, (const char *)rsi);
1211 // }
1212 //else
1213 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1214 // conf->nodename, (const char *)si, (const char *)rsi);
1044 } 1215 }
1045
1046 delete d;
1047
1048 break;
1049 } 1216 }
1217 else if (seqclass == 1) // far history
1218 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1219 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1220 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1221 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1222 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1223 else if (seqclass == 3) // reset
1224 {
1225 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1226 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1227 send_reset (rsi);
1228 }
1229
1230 delete d;
1231 break;
1050 } 1232 }
1051 } 1233 }
1052 1234
1053 send_reset (rsi); 1235 send_reset (rsi);
1054 break; 1236 break;
… …
1056 case vpn_packet::PT_CONNECT_REQ: 1238 case vpn_packet::PT_CONNECT_REQ:
1057 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1239 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1058 { 1240 {
1059 connect_req_packet *p = (connect_req_packet *) pkt; 1241 connect_req_packet *p = (connect_req_packet *) pkt;
1060 1242
1061 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1243 if (p->id > 0 && p->id <= vpn->conns.size ())
1062 connection *c = vpn->conns[p->id - 1];
1063 conf->protocols = p->protocols;
1064
1065 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1066 conf->id, p->id, c->ictx && c->octx);
1067
1068 if (c->ictx && c->octx)
1069 { 1244 {
1245 connection *c = vpn->conns[p->id - 1];
1246 conf->protocols = p->protocols;
1247
1248 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1249 conf->id, p->id, c->ictx && c->octx);
1250
1251 if (c->ictx && c->octx)
1252 {
1070 // send connect_info packets to both sides, in case one is 1253 // send connect_info packets to both sides, in case one is
1071 // behind a nat firewall (or both ;) 1254 // behind a nat firewall (or both ;)
1072 c->send_connect_info (conf->id, si, conf->protocols); 1255 c->send_connect_info (conf->id, si, conf->protocols);
1073 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1256 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1257 }
1258 else
1259 c->establish_connection ();
1074 } 1260 }
1075 else 1261 else
1076 c->establish_connection (); 1262 slog (L_WARN,
1263 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1264 p->id);
1077 } 1265 }
1078 1266
1079 break; 1267 break;
1080 1268
1081 case vpn_packet::PT_CONNECT_INFO: 1269 case vpn_packet::PT_CONNECT_INFO:
1082 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1270 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1083 { 1271 {
1084 connect_info_packet *p = (connect_info_packet *) pkt; 1272 connect_info_packet *p = (connect_info_packet *)pkt;
1085 1273
1086 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1274 if (p->id > 0 && p->id <= vpn->conns.size ())
1087 1275 {
1088 connection *c = vpn->conns[p->id - 1]; 1276 connection *c = vpn->conns[p->id - 1];
1089 1277
1090 c->conf->protocols = p->protocols; 1278 c->conf->protocols = p->protocols;
1091 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1279 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1092 p->si.upgrade_protocol (protocol, c->conf); 1280 p->si.upgrade_protocol (protocol, c->conf);
1093 1281
1094 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1282 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1095 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1283 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1096 1284
1097 const sockinfo &dsi = forward_si (p->si); 1285 const sockinfo &dsi = forward_si (p->si);
1098 1286
1099 if (dsi.valid ()) 1287 if (dsi.valid ())
1100 c->send_auth_request (dsi, true); 1288 c->send_auth_request (dsi, true);
1289 }
1290 else
1291 slog (L_WARN,
1292 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1293 p->id);
1101 } 1294 }
1102 1295
1103 break; 1296 break;
1104 1297
1105 default: 1298 default:
1106 send_reset (rsi); 1299 send_reset (rsi);
1107 break; 1300 break;
1108 } 1301 }
1109} 1302}
1110 1303
1111void connection::keepalive_cb (time_watcher &w) 1304inline void
1305connection::keepalive_cb (ev::timer &w, int revents)
1112{ 1306{
1113 if (NOW >= last_activity + ::conf.keepalive + 30) 1307 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1114 { 1308 {
1115 reset_connection (); 1309 reset_connection ();
1116 establish_connection (); 1310 establish_connection ();
1117 } 1311 }
1118 else if (NOW < last_activity + ::conf.keepalive) 1312 else if (ev_now () < last_activity + ::conf.keepalive)
1119 w.start (last_activity + ::conf.keepalive); 1313 w.start (last_activity + ::conf.keepalive - ev::now ());
1120 else if (conf->connectmode != conf_node::C_ONDEMAND 1314 else if (conf->connectmode != conf_node::C_ONDEMAND
1121 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1315 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1122 { 1316 {
1123 send_ping (si); 1317 send_ping (si);
1124 w.start (NOW + 5); 1318 w.start (5);
1125 } 1319 }
1126 else if (NOW < last_activity + ::conf.keepalive + 10) 1320 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1127 // hold ondemand connections implicitly a few seconds longer 1321 // hold ondemand connections implicitly a few seconds longer
1128 // should delete octx, though, or something like that ;) 1322 // should delete octx, though, or something like that ;)
1129 w.start (last_activity + ::conf.keepalive + 10); 1323 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1130 else 1324 else
1131 reset_connection (); 1325 reset_connection ();
1132} 1326}
1133 1327
1134void connection::send_connect_request (int id) 1328void connection::send_connect_request (int id)
… …
1140 send_vpn_packet (p, si); 1334 send_vpn_packet (p, si);
1141 1335
1142 delete p; 1336 delete p;
1143} 1337}
1144 1338
1339void connection::script_init_env (const char *ext)
1340{
1341 char *env;
1342 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1343 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1344 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1345 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1346 conf->id & 0xff); putenv (env);
1347}
1348
1145void connection::script_node () 1349void connection::script_init_connect_env ()
1146{ 1350{
1147 vpn->script_if_up (); 1351 vpn->script_init_env ();
1148 1352
1149 char *env; 1353 char *env;
1150 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1354 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1151 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1355 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1152 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1356 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1153 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1357 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1154} 1358}
1155 1359
1360inline const char *
1156const char *connection::script_node_up () 1361connection::script_node_up ()
1157{ 1362{
1158 script_node (); 1363 script_init_connect_env ();
1159 1364
1160 putenv ("STATE=up"); 1365 putenv ((char *)"STATE=up");
1161 1366
1367 char *filename;
1368 asprintf (&filename,
1369 "%s/%s",
1370 confbase,
1162 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1371 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1163}
1164 1372
1373 return filename;
1374}
1375
1376inline const char *
1165const char *connection::script_node_down () 1377connection::script_node_down ()
1166{ 1378{
1167 script_node (); 1379 script_init_connect_env ();
1168 1380
1169 putenv ("STATE=down"); 1381 putenv ((char *)"STATE=down");
1170 1382
1171 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1383 char *filename;
1172} 1384 asprintf (&filename,
1385 "%s/%s",
1386 confbase,
1387 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1173 1388
1389 return filename;
1390}
1391
1174connection::connection(struct vpn *vpn_) 1392connection::connection (struct vpn *vpn, conf_node *conf)
1175: vpn(vpn_) 1393: vpn(vpn), conf(conf),
1176, rekey (this, &connection::rekey_cb) 1394#if ENABLE_DNS
1177, keepalive (this, &connection::keepalive_cb) 1395 dns (0),
1396#endif
1397 data_queue(conf->max_ttl, conf->max_queue + 1),
1398 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1399{
1400 rekey .set<connection, &connection::rekey_cb > (this);
1401 keepalive .set<connection, &connection::keepalive_cb > (this);
1178, establish_connection (this, &connection::establish_connection_cb) 1402 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1179{ 1403
1404 last_establish_attempt = 0.;
1180 octx = ictx = 0; 1405 octx = ictx = 0;
1181 retry_cnt = 0;
1182 1406
1183 connectmode = conf_node::C_ALWAYS; // initial setting 1407 if (!conf->protocols) // make sure some protocol is enabled
1408 conf->protocols = PROT_UDPv4;
1409
1410 connectmode = conf->connectmode;
1411
1412 // queue a dummy packet to force an initial connection attempt
1413 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1414 vpn_queue.put (new net_packet);
1415
1184 reset_connection (); 1416 reset_connection ();
1185} 1417}
1186 1418
1187connection::~connection () 1419connection::~connection ()
1188{ 1420{

Diff Legend

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