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.31 by pcg, Sun Feb 8 07:24:25 2004 UTC vs.
Revision 1.78 by pcg, Mon Aug 11 16:44:47 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);
… …
456 u8 flags, challengelen, features, pad3; 544 u8 flags, challengelen, features, pad3;
457 u32 cipher_nid, digest_nid, hmac_nid; 545 u32 cipher_nid, digest_nid, hmac_nid;
458 546
459 void setup (ptype type, int dst); 547 void setup (ptype type, int dst);
460 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 }
461}; 564};
462
463#define FEATURES ((ENABLE_COMPRESSION ? FEATURE_COMPRESSION : 0) \
464 | (ENABLE_ROHC ? FEATURE_ROHC : 0))
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 = ENABLE_COMPRESSION ? 0x81 : 0x80; 572 flags = 0;
473 challengelen = sizeof (rsachallenge); 573 challengelen = sizeof (rsachallenge);
474 features = FEATURES; 574 features = get_features ();
475 575
476 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 576 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
477 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 577 digest_nid = htonl (EVP_MD_type (RSA_HASH));
478 hmac_nid = htonl (EVP_MD_type (DIGEST)); 578 hmac_nid = htonl (EVP_MD_type (DIGEST));
479 579
… …
487 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);
488 else if (randsize != RAND_SIZE) 588 else if (randsize != RAND_SIZE)
489 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);
490 else if (hmaclen != HMACLENGTH) 590 else if (hmaclen != HMACLENGTH)
491 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);
492#if 0 // this implementation should handle all flag settings
493 else if (flags != curflags ())
494 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
495#endif
496 else if (challengelen != sizeof (rsachallenge)) 592 else if (challengelen != sizeof (rsachallenge))
497 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));
498 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 594 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
499 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));
500 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 596 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
576///////////////////////////////////////////////////////////////////////////// 672/////////////////////////////////////////////////////////////////////////////
577 673
578void 674void
579connection::connection_established () 675connection::connection_established ()
580{ 676{
677 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
678
581 if (ictx && octx) 679 if (ictx && octx)
582 { 680 {
583 connectmode = conf->connectmode; 681 // make sure rekeying timeouts are slightly asymmetric
584 682 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
585 rekey.start (NOW + ::conf.rekey); 683 rekey.start (rekey_interval, rekey_interval);
586 keepalive.start (NOW + ::conf.keepalive); 684 keepalive.start (::conf.keepalive);
587 685
588 // send queued packets 686 // send queued packets
589 if (ictx && octx) 687 if (ictx && octx)
590 { 688 {
591 while (tap_packet *p = (tap_packet *)data_queue.get ()) 689 while (tap_packet *p = (tap_packet *)data_queue.get ())
592 { 690 {
593 send_data_packet (p); 691 if (p->len) send_data_packet (p);
594 delete p; 692 delete p;
595 } 693 }
596 694
597 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 695 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
598 { 696 {
599 send_vpn_packet (p, si, IPTOS_RELIABILITY); 697 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
600 delete p; 698 delete p;
601 } 699 }
602 } 700 }
701
702 vpn->connection_established (this);
603 } 703 }
604 else 704 else
605 { 705 {
606 retry_cnt = 0; 706 retry_cnt = 0;
607 establish_connection.start (NOW + 5); 707 establish_connection.start (5);
608 keepalive.stop (); 708 keepalive.stop ();
609 rekey.stop (); 709 rekey.stop ();
610 } 710 }
611} 711}
612 712
613void 713void
614connection::reset_si () 714connection::reset_si ()
615{ 715{
716 if (vpn->can_direct (THISNODE, conf))
616 protocol = best_protocol (THISNODE->protocols & conf->protocols); 717 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
617 718 else
618 // mask out protocols we cannot establish 719 {
619 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 720 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
620 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 721 protocol = 0;
722 }
621 723
622 si.set (conf, protocol); 724 si.set (conf, protocol);
725
726 is_direct = si.valid ();
623} 727}
624 728
625// ensure sockinfo is valid, forward if necessary 729// ensure sockinfo is valid, forward if necessary
626const sockinfo & 730const sockinfo &
627connection::forward_si (const sockinfo &si) const 731connection::forward_si (const sockinfo &si) const
628{ 732{
629 if (!si.valid ()) 733 if (!si.valid ())
630 { 734 {
631 connection *r = vpn->find_router (); 735 connection *r = vpn->find_router_for (this);
632 736
633 if (r) 737 if (r)
634 { 738 {
635 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 739 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
636 conf->nodename, r->conf->nodename); 740 conf->nodename, r->conf->nodename);
637 return r->si; 741 return r->si;
638 } 742 }
639 else 743 else
640 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 744 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
641 conf->nodename); 745 conf->nodename);
642 } 746 }
643 747
644 return si; 748 return si;
645} 749}
… …
655connection::send_ping (const sockinfo &si, u8 pong) 759connection::send_ping (const sockinfo &si, u8 pong)
656{ 760{
657 ping_packet *pkt = new ping_packet; 761 ping_packet *pkt = new ping_packet;
658 762
659 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
660 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 767 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
661 768
662 delete pkt; 769 delete pkt;
663} 770}
664 771
… …
711} 818}
712 819
713void 820void
714connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 821connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
715{ 822{
716 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 823 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
717 conf->id, rid, (const char *)rsi); 824 conf->id, rid, (const char *)rsi);
718 825
719 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);
720 827
721 r->hmac_set (octx); 828 r->hmac_set (octx);
722 send_vpn_packet (r, si); 829 send_vpn_packet (r, si);
723 830
724 delete r; 831 delete r;
725} 832}
726 833
727void 834inline void
728connection::establish_connection_cb (time_watcher &w) 835connection::establish_connection_cb (ev::timer &w, int revents)
729{ 836{
730 if (!ictx 837 if (!ictx
731 && conf != THISNODE 838 && conf != THISNODE
732 && connectmode != conf_node::C_NEVER 839 && connectmode != conf_node::C_NEVER
733 && connectmode != conf_node::C_DISABLED 840 && connectmode != conf_node::C_DISABLED
734 && NOW > w.at) 841 && !w.is_active ())
735 { 842 {
736 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
737 844 // and stop trying. should probably be handled by a per-connection expire handler.
738 if (retry_int < 3600 * 8) 845 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
846 {
847 reset_connection ();
739 retry_cnt++; 848 return;
849 }
740 850
741 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));
742 856
743 reset_si (); 857 reset_si ();
744 858
745 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);
746 vpn->send_connect_request (conf->id); 865 vpn->send_connect_request (this);
866 }
747 else 867 else
748 { 868 {
869 if (si.valid ())
870 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
871 conf->nodename, (const char *)si);
872
749 const sockinfo &dsi = forward_si (si); 873 const sockinfo &dsi = forward_si (si);
874
875 slow = slow || (dsi.prot & PROT_SLOW);
750 876
751 if (dsi.valid () && auth_rate_limiter.can (dsi)) 877 if (dsi.valid () && auth_rate_limiter.can (dsi))
752 { 878 {
753 if (retry_cnt < 4) 879 if (retry_cnt < 4)
754 send_auth_request (dsi, true); 880 send_auth_request (dsi, true);
755 else 881 else
756 send_ping (dsi, 0); 882 send_ping (dsi, 0);
757 } 883 }
758 } 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);
759 } 894 }
760} 895}
761 896
762void 897void
763connection::reset_connection () 898connection::reset_connection ()
… …
766 { 901 {
767 slog (L_INFO, _("%s(%s): connection lost"), 902 slog (L_INFO, _("%s(%s): connection lost"),
768 conf->nodename, (const char *)si); 903 conf->nodename, (const char *)si);
769 904
770 if (::conf.script_node_down) 905 if (::conf.script_node_down)
771 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 }
772 } 911 }
773 912
774 delete ictx; ictx = 0; 913 delete ictx; ictx = 0;
775 delete octx; octx = 0; 914 delete octx; octx = 0;
915#if ENABLE_DNS
916 dnsv4_reset_connection ();
917#endif
776 918
777 si.host= 0; 919 si.host = 0;
778 920
779 last_activity = 0; 921 last_activity = 0.;
922 //last_si_change = 0.;
780 retry_cnt = 0; 923 retry_cnt = 0;
781 924
782 rekey.stop (); 925 rekey.stop ();
783 keepalive.stop (); 926 keepalive.stop ();
784 establish_connection.stop (); 927 establish_connection.stop ();
… …
791 send_reset (si); 934 send_reset (si);
792 935
793 reset_connection (); 936 reset_connection ();
794} 937}
795 938
796void 939// poor-man's rekeying
797connection::rekey_cb (time_watcher &w) 940inline void
941connection::rekey_cb (ev::timer &w, int revents)
798{ 942{
799 reset_connection (); 943 reset_connection ();
800 establish_connection (); 944 establish_connection ();
801} 945}
802 946
… …
818 if (oseqno > MAX_SEQNO) 962 if (oseqno > MAX_SEQNO)
819 rekey (); 963 rekey ();
820} 964}
821 965
822void 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
823connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 977connection::inject_data_packet (tap_packet *pkt)
824{ 978{
825 if (ictx && octx) 979 if (ictx && octx)
826 send_data_packet (pkt); 980 send_data_packet (pkt);
827 else 981 else
828 { 982 {
829 if (!broadcast)//DDDD
830 data_queue.put (new tap_packet (*pkt)); 983 data_queue.put (new tap_packet (*pkt));
831 984 post_inject_queue ();
832 establish_connection ();
833 } 985 }
834} 986}
835 987
836void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 988void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
837{ 989{
838 if (ictx && octx) 990 if (ictx && octx)
839 send_vpn_packet (pkt, si, tos); 991 send_vpn_packet (pkt, si, tos);
840 else 992 else
841 { 993 {
842 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 994 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
843 995 post_inject_queue ();
844 establish_connection ();
845 } 996 }
846} 997}
847 998
848void 999void
849connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1000connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
850{ 1001{
851 last_activity = NOW; 1002 last_activity = ev_now ();
852 1003
853 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.",
854 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;
855 1009
856 switch (pkt->typ ()) 1010 switch (pkt->typ ())
857 { 1011 {
858 case vpn_packet::PT_PING: 1012 case vpn_packet::PT_PING:
859 // we send pings instead of auth packets after some retries, 1013 // we send pings instead of auth packets after some retries,
… …
863 { 1017 {
864 if (auth_rate_limiter.can (rsi)) 1018 if (auth_rate_limiter.can (rsi))
865 send_auth_request (rsi, true); 1019 send_auth_request (rsi, true);
866 } 1020 }
867 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.
868 send_ping (rsi, 1); // pong 1024 send_ping (rsi, 1); // pong
869 1025
870 break; 1026 break;
871 1027
872 case vpn_packet::PT_PONG: 1028 case vpn_packet::PT_PONG:
… …
878 1034
879 config_packet *p = (config_packet *) pkt; 1035 config_packet *p = (config_packet *) pkt;
880 1036
881 if (!p->chk_config ()) 1037 if (!p->chk_config ())
882 { 1038 {
883 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1039 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
884 conf->nodename, (const char *)rsi); 1040 conf->nodename, (const char *)rsi);
885 connectmode = conf_node::C_DISABLED; 1041 connectmode = conf_node::C_DISABLED;
886 } 1042 }
887 else if (connectmode == conf_node::C_ALWAYS) 1043 else if (connectmode == conf_node::C_ALWAYS)
888 establish_connection (); 1044 establish_connection ();
… …
919 delete octx; 1075 delete octx;
920 1076
921 octx = new crypto_ctx (k, 1); 1077 octx = new crypto_ctx (k, 1);
922 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1078 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
923 1079
924 // compatibility code, remove when no longer required
925 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
926
927 conf->protocols = p->protocols; 1080 conf->protocols = p->protocols;
928 features = p->features & FEATURES; 1081 features = p->features & config_packet::get_features ();
929 1082
930 send_auth_response (rsi, p->id, k); 1083 send_auth_response (rsi, p->id, k);
931 1084
932 connection_established (); 1085 connection_established ();
933 1086
934 break; 1087 break;
935 } 1088 }
936 } 1089 }
937 else 1090 else
938 slog (L_WARN, _("%s(%s): protocol mismatch"), 1091 slog (L_WARN, _("%s(%s): protocol mismatch."),
939 conf->nodename, (const char *)rsi); 1092 conf->nodename, (const char *)rsi);
940 1093
941 send_reset (rsi); 1094 send_reset (rsi);
942 } 1095 }
943 1096
… …
958 1111
959 rsachallenge chg; 1112 rsachallenge chg;
960 1113
961 if (!rsa_cache.find (p->id, chg)) 1114 if (!rsa_cache.find (p->id, chg))
962 { 1115 {
963 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1116 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
964 conf->nodename, (const char *)rsi); 1117 conf->nodename, (const char *)rsi);
965 break; 1118 break;
966 } 1119 }
967 else 1120 else
968 { 1121 {
969 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1122 crypto_ctx *cctx = new crypto_ctx (chg, 0);
970 1123
971 if (!p->hmac_chk (cctx)) 1124 if (!p->hmac_chk (cctx))
972 { 1125 {
973 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"
974 "could be an attack, or just corruption or a synchronization error"), 1127 "could be an attack, or just corruption or a synchronization error."),
975 conf->nodename, (const char *)rsi); 1128 conf->nodename, (const char *)rsi);
976 break; 1129 break;
977 } 1130 }
978 else 1131 else
979 { 1132 {
… …
990 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
991 1144
992 si = rsi; 1145 si = rsi;
993 protocol = rsi.prot; 1146 protocol = rsi.prot;
994 1147
1148 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1149 conf->nodename, (const char *)rsi,
1150 is_direct ? "direct" : "routed",
1151 p->prot_major, p->prot_minor);
1152
995 connection_established (); 1153 connection_established ();
996 1154
997 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
998 conf->nodename, (const char *)rsi,
999 p->prot_major, p->prot_minor);
1000
1001 if (::conf.script_node_up) 1155 if (::conf.script_node_up)
1002 run_script (run_script_cb (this, &connection::script_node_up), false); 1156 {
1157 run_script_cb *cb = new run_script_cb;
1158 cb->set<connection, &connection::script_node_up> (this);
1159 run_script_queued (cb, _("node-up command execution failed, continuing."));
1160 }
1003 1161
1004 break; 1162 break;
1005 } 1163 }
1006 else 1164 else
1007 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1165 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1008 conf->nodename, (const char *)rsi); 1166 conf->nodename, (const char *)rsi);
1009 } 1167 }
1010 1168
1011 delete cctx; 1169 delete cctx;
1012 } 1170 }
… …
1028 { 1186 {
1029 vpndata_packet *p = (vpndata_packet *)pkt; 1187 vpndata_packet *p = (vpndata_packet *)pkt;
1030 1188
1031 if (!p->hmac_chk (ictx)) 1189 if (!p->hmac_chk (ictx))
1032 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1190 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1033 "could be an attack, or just corruption or a synchronization error"), 1191 "could be an attack, or just corruption or a synchronization error."),
1034 conf->nodename, (const char *)rsi); 1192 conf->nodename, (const char *)rsi);
1035 else 1193 else
1036 { 1194 {
1037 u32 seqno; 1195 u32 seqno;
1038 tap_packet *d = p->unpack (this, seqno); 1196 tap_packet *d = p->unpack (this, seqno);
1197 int seqclass = iseqno.seqno_classify (seqno);
1039 1198
1040 if (iseqno.recv_ok (seqno)) 1199 if (seqclass == 0) // ok
1041 { 1200 {
1042 vpn->tap->send (d); 1201 vpn->tap->send (d);
1043 1202
1044 if (si != rsi) 1203 if (si != rsi)
1045 { 1204 {
1046 // fast re-sync on connection changes, useful especially for tcp/ip 1205 // fast re-sync on source address changes, useful especially for tcp/ip
1206 //if (last_si_change < ev_now () + 5.)
1047 si = rsi; 1207 // {
1048
1049 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1208 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1050 conf->nodename, (const char *)si, (const char *)rsi); 1209 conf->nodename, (const char *)si, (const char *)rsi);
1210
1211 si = rsi;
1212 // }
1213 //else
1214 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1215 // conf->nodename, (const char *)si, (const char *)rsi);
1051 } 1216 }
1052
1053 delete d;
1054
1055 break;
1056 } 1217 }
1218 else if (seqclass == 1) // far history
1219 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1220 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1221 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1222 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1223 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1224 else if (seqclass == 3) // reset
1225 {
1226 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1227 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1228 send_reset (rsi);
1229 }
1230
1231 delete d;
1232 break;
1057 } 1233 }
1058 } 1234 }
1059 1235
1060 send_reset (rsi); 1236 send_reset (rsi);
1061 break; 1237 break;
… …
1063 case vpn_packet::PT_CONNECT_REQ: 1239 case vpn_packet::PT_CONNECT_REQ:
1064 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1240 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1065 { 1241 {
1066 connect_req_packet *p = (connect_req_packet *) pkt; 1242 connect_req_packet *p = (connect_req_packet *) pkt;
1067 1243
1068 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1244 if (p->id > 0 && p->id <= vpn->conns.size ())
1069 connection *c = vpn->conns[p->id - 1];
1070 conf->protocols = p->protocols;
1071
1072 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1073 conf->id, p->id, c->ictx && c->octx);
1074
1075 if (c->ictx && c->octx)
1076 { 1245 {
1246 connection *c = vpn->conns[p->id - 1];
1247 conf->protocols = p->protocols;
1248
1249 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1250 conf->id, p->id, c->ictx && c->octx);
1251
1252 if (c->ictx && c->octx)
1253 {
1077 // send connect_info packets to both sides, in case one is 1254 // send connect_info packets to both sides, in case one is
1078 // behind a nat firewall (or both ;) 1255 // behind a nat firewall (or both ;)
1079 c->send_connect_info (conf->id, si, conf->protocols); 1256 c->send_connect_info (conf->id, si, conf->protocols);
1080 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1257 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1258 }
1259 else
1260 c->establish_connection ();
1081 } 1261 }
1082 else 1262 else
1083 c->establish_connection (); 1263 slog (L_WARN,
1264 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1265 p->id);
1084 } 1266 }
1085 1267
1086 break; 1268 break;
1087 1269
1088 case vpn_packet::PT_CONNECT_INFO: 1270 case vpn_packet::PT_CONNECT_INFO:
1089 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1271 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1090 { 1272 {
1091 connect_info_packet *p = (connect_info_packet *) pkt; 1273 connect_info_packet *p = (connect_info_packet *)pkt;
1092 1274
1093 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1275 if (p->id > 0 && p->id <= vpn->conns.size ())
1094 1276 {
1095 connection *c = vpn->conns[p->id - 1]; 1277 connection *c = vpn->conns[p->id - 1];
1096 1278
1097 c->conf->protocols = p->protocols; 1279 c->conf->protocols = p->protocols;
1098 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1280 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1099 p->si.upgrade_protocol (protocol, c->conf); 1281 p->si.upgrade_protocol (protocol, c->conf);
1100 1282
1101 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1283 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1102 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1284 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1103 1285
1104 const sockinfo &dsi = forward_si (p->si); 1286 const sockinfo &dsi = forward_si (p->si);
1105 1287
1106 if (dsi.valid ()) 1288 if (dsi.valid ())
1107 c->send_auth_request (dsi, true); 1289 c->send_auth_request (dsi, true);
1290 }
1291 else
1292 slog (L_WARN,
1293 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1294 p->id);
1108 } 1295 }
1109 1296
1110 break; 1297 break;
1111 1298
1112 default: 1299 default:
1113 send_reset (rsi); 1300 send_reset (rsi);
1114 break; 1301 break;
1115 } 1302 }
1116} 1303}
1117 1304
1118void connection::keepalive_cb (time_watcher &w) 1305inline void
1306connection::keepalive_cb (ev::timer &w, int revents)
1119{ 1307{
1120 if (NOW >= last_activity + ::conf.keepalive + 30) 1308 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1121 { 1309 {
1122 reset_connection (); 1310 reset_connection ();
1123 establish_connection (); 1311 establish_connection ();
1124 } 1312 }
1125 else if (NOW < last_activity + ::conf.keepalive) 1313 else if (ev_now () < last_activity + ::conf.keepalive)
1126 w.start (last_activity + ::conf.keepalive); 1314 w.start (last_activity + ::conf.keepalive - ev::now ());
1127 else if (conf->connectmode != conf_node::C_ONDEMAND 1315 else if (conf->connectmode != conf_node::C_ONDEMAND
1128 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1316 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1129 { 1317 {
1130 send_ping (si); 1318 send_ping (si);
1131 w.start (NOW + 5); 1319 w.start (5);
1132 } 1320 }
1133 else if (NOW < last_activity + ::conf.keepalive + 10) 1321 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1134 // hold ondemand connections implicitly a few seconds longer 1322 // hold ondemand connections implicitly a few seconds longer
1135 // should delete octx, though, or something like that ;) 1323 // should delete octx, though, or something like that ;)
1136 w.start (last_activity + ::conf.keepalive + 10); 1324 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1137 else 1325 else
1138 reset_connection (); 1326 reset_connection ();
1139} 1327}
1140 1328
1141void connection::send_connect_request (int id) 1329void connection::send_connect_request (int id)
… …
1147 send_vpn_packet (p, si); 1335 send_vpn_packet (p, si);
1148 1336
1149 delete p; 1337 delete p;
1150} 1338}
1151 1339
1340void connection::script_init_env (const char *ext)
1341{
1342 char *env;
1343 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1344 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1345 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1346 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1347 conf->id & 0xff); putenv (env);
1348}
1349
1152void connection::script_node () 1350void connection::script_init_connect_env ()
1153{ 1351{
1154 vpn->script_if_up (); 1352 vpn->script_init_env ();
1155 1353
1156 char *env; 1354 char *env;
1157 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1355 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1158 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1356 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1159 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1357 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1160 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1358 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1161} 1359}
1162 1360
1361inline const char *
1163const char *connection::script_node_up () 1362connection::script_node_up ()
1164{ 1363{
1165 script_node (); 1364 script_init_connect_env ();
1166 1365
1167 putenv ("STATE=up"); 1366 putenv ((char *)"STATE=up");
1168 1367
1368 char *filename;
1369 asprintf (&filename,
1370 "%s/%s",
1371 confbase,
1169 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1372 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1170}
1171 1373
1374 return filename;
1375}
1376
1377inline const char *
1172const char *connection::script_node_down () 1378connection::script_node_down ()
1173{ 1379{
1174 script_node (); 1380 script_init_connect_env ();
1175 1381
1176 putenv ("STATE=down"); 1382 putenv ((char *)"STATE=down");
1177 1383
1178 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1384 char *filename;
1179} 1385 asprintf (&filename,
1386 "%s/%s",
1387 confbase,
1388 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1180 1389
1390 return filename;
1391}
1392
1181connection::connection(struct vpn *vpn_) 1393connection::connection (struct vpn *vpn, conf_node *conf)
1182: vpn(vpn_) 1394: vpn(vpn), conf(conf),
1183, rekey (this, &connection::rekey_cb) 1395#if ENABLE_DNS
1184, keepalive (this, &connection::keepalive_cb) 1396 dns (0),
1397#endif
1398 data_queue(conf->max_ttl, conf->max_queue + 1),
1399 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1400{
1401 rekey .set<connection, &connection::rekey_cb > (this);
1402 keepalive .set<connection, &connection::keepalive_cb > (this);
1185, establish_connection (this, &connection::establish_connection_cb) 1403 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1186{ 1404
1405 last_establish_attempt = 0.;
1187 octx = ictx = 0; 1406 octx = ictx = 0;
1188 retry_cnt = 0;
1189 1407
1190 connectmode = conf_node::C_ALWAYS; // initial setting 1408 if (!conf->protocols) // make sure some protocol is enabled
1409 conf->protocols = PROT_UDPv4;
1410
1411 connectmode = conf->connectmode;
1412
1413 // queue a dummy packet to force an initial connection attempt
1414 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1415 vpn_queue.put (new net_packet);
1416
1191 reset_connection (); 1417 reset_connection ();
1192} 1418}
1193 1419
1194connection::~connection () 1420connection::~connection ()
1195{ 1421{

Diff Legend

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