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.57 by pcg, Thu Jul 7 14:41:51 2005 UTC vs.
Revision 1.85 by pcg, Tue Jul 28 00:42:14 2009 UTC

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

Diff Legend

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