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.60 by pcg, Sat Nov 10 05:14:22 2007 UTC vs.
Revision 1.86 by pcg, Thu Jan 21 04:30:32 2010 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-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 (ev::timer &w, int revents); ev::timer 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 > ev::ev_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;
… …
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 = ev::ev_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.is_active ()) 184 if (!cleaner.is_active ())
130 cleaner.again (); 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);
136 cleaner.set (RSA_TTL, RSA_TTL); 191 cleaner.set (RSA_TTL, RSA_TTL);
137 } 192 }
138 193
139} rsa_cache; 194} rsa_cache;
140 195
… …
143 if (empty ()) 198 if (empty ())
144 w.stop (); 199 w.stop ();
145 else 200 else
146 { 201 {
147 for (iterator i = begin (); i != end (); ) 202 for (iterator i = begin (); i != end (); )
148 if (i->expire <= ev::ev_now ()) 203 if (i->expire <= ev_now ())
149 i = erase (i); 204 i = erase (i);
150 else 205 else
151 ++i; 206 ++i;
152 } 207 }
153} 208}
154 209
155////////////////////////////////////////////////////////////////////////////// 210//////////////////////////////////////////////////////////////////////////////
156 211
157void pkt_queue::put (net_packet *p) 212pkt_queue::pkt_queue (double max_ttl, int max_queue)
213: max_ttl (max_ttl), max_queue (max_queue)
158{ 214{
159 if (queue[i]) 215 queue = new pkt [max_queue];
160 {
161 delete queue[i];
162 j = (j + 1) % QUEUEDEPTH;
163 }
164 216
165 queue[i] = p;
166
167 i = (i + 1) % QUEUEDEPTH;
168}
169
170net_packet *pkt_queue::get ()
171{
172 net_packet *p = queue[j];
173
174 if (p)
175 {
176 queue[j] = 0;
177 j = (j + 1) % QUEUEDEPTH;
178 }
179
180 return p;
181}
182
183pkt_queue::pkt_queue ()
184{
185 memset (queue, 0, sizeof (queue));
186 i = 0; 217 i = 0;
187 j = 0; 218 j = 0;
219
220 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
188} 221}
189 222
190pkt_queue::~pkt_queue () 223pkt_queue::~pkt_queue ()
191{ 224{
192 for (i = QUEUEDEPTH; --i > 0; ) 225 while (net_packet *p = get ())
226 delete p;
227
193 delete queue[i]; 228 delete [] queue;
194} 229}
195 230
231void pkt_queue::expire_cb (ev::timer &w, int revents)
232{
233 ev_tstamp expire = ev_now () - max_ttl;
234
235 for (;;)
236 {
237 if (empty ())
238 break;
239
240 double diff = queue[j].tstamp - expire;
241
242 if (diff >= 0.)
243 {
244 w.start (diff > 0.5 ? diff : 0.5);
245 break;
246 }
247
248 delete get ();
249 }
250}
251
252void pkt_queue::put (net_packet *p)
253{
254 ev_tstamp now = ev_now ();
255
256 // start expiry timer
257 if (empty ())
258 expire.start (max_ttl);
259
260 int ni = i + 1 == max_queue ? 0 : i + 1;
261
262 if (ni == j)
263 delete get ();
264
265 queue[i].pkt = p;
266 queue[i].tstamp = now;
267
268 i = ni;
269}
270
271net_packet *pkt_queue::get ()
272{
273 if (empty ())
274 return 0;
275
276 net_packet *p = queue[j].pkt;
277 queue[j].pkt = 0;
278
279 j = j + 1 == max_queue ? 0 : j + 1;
280
281 return p;
282}
283
196struct net_rateinfo { 284struct net_rateinfo
285{
197 u32 host; 286 u32 host;
198 double pcnt, diff; 287 double pcnt, diff;
199 tstamp last; 288 tstamp last;
200}; 289};
201 290
… …
220 iterator i; 309 iterator i;
221 310
222 for (i = begin (); i != end (); ) 311 for (i = begin (); i != end (); )
223 if (i->host == host) 312 if (i->host == host)
224 break; 313 break;
225 else if (i->last < ev::ev_now () - NRL_EXPIRE) 314 else if (i->last < ev_now () - NRL_EXPIRE)
226 i = erase (i); 315 i = erase (i);
227 else 316 else
228 i++; 317 i++;
229 318
230 if (i == end ()) 319 if (i == end ())
… …
232 net_rateinfo ri; 321 net_rateinfo ri;
233 322
234 ri.host = host; 323 ri.host = host;
235 ri.pcnt = 1.; 324 ri.pcnt = 1.;
236 ri.diff = NRL_MAXDIF; 325 ri.diff = NRL_MAXDIF;
237 ri.last = ev::ev_now (); 326 ri.last = ev_now ();
238 327
239 push_front (ri); 328 push_front (ri);
240 329
241 return true; 330 return true;
242 } 331 }
… …
244 { 333 {
245 net_rateinfo ri (*i); 334 net_rateinfo ri (*i);
246 erase (i); 335 erase (i);
247 336
248 ri.pcnt = ri.pcnt * NRL_ALPHA; 337 ri.pcnt = ri.pcnt * NRL_ALPHA;
249 ri.diff = ri.diff * NRL_ALPHA + (ev::ev_now () - ri.last); 338 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
250 339
251 ri.last = ev::ev_now (); 340 ri.last = ev_now ();
252 341
253 double dif = ri.diff / ri.pcnt; 342 double dif = ri.diff / ri.pcnt;
254 343
255 bool send = dif > NRL_CUTOFF; 344 bool send = dif > NRL_CUTOFF;
256 345
… …
336 ptype type = PT_DATA_UNCOMPRESSED; 425 ptype type = PT_DATA_UNCOMPRESSED;
337 426
338#if ENABLE_COMPRESSION 427#if ENABLE_COMPRESSION
339 u8 cdata[MAX_MTU]; 428 u8 cdata[MAX_MTU];
340 429
341 if (conn->features & ENABLE_COMPRESSION) 430 if (conn->features & FEATURE_COMPRESSION)
342 { 431 {
343 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 432 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
344 433
345 if (cl) 434 if (cl)
346 { 435 {
… …
525 rsaencrdata encr; 614 rsaencrdata encr;
526 615
527 auth_req_packet (int dst, bool initiate_, u8 protocols_) 616 auth_req_packet (int dst, bool initiate_, u8 protocols_)
528 { 617 {
529 config_packet::setup (PT_AUTH_REQ, dst); 618 config_packet::setup (PT_AUTH_REQ, dst);
530 strncpy (magic, MAGIC, 8); 619 strncpy (magic, MAGIC_OLD, 8);
531 initiate = !!initiate_; 620 initiate = !!initiate_;
532 protocols = protocols_; 621 protocols = protocols_;
533 622
534 len = sizeof (*this) - sizeof (net_packet); 623 len = sizeof (*this) - sizeof (net_packet);
535 } 624 }
… …
584///////////////////////////////////////////////////////////////////////////// 673/////////////////////////////////////////////////////////////////////////////
585 674
586void 675void
587connection::connection_established () 676connection::connection_established ()
588{ 677{
678 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
679
589 if (ictx && octx) 680 if (ictx && octx)
590 { 681 {
591 connectmode = conf->connectmode;
592
593 // make sure rekeying timeouts are slightly asymmetric 682 // make sure rekeying timeouts are slightly asymmetric
594 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0); 683 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
595 rekey.start (rekey_interval, rekey_interval); 684 rekey.start (rekey_interval, rekey_interval);
596 keepalive.start (::conf.keepalive); 685 keepalive.start (::conf.keepalive);
597 686
598 // send queued packets 687 // send queued packets
599 if (ictx && octx) 688 if (ictx && octx)
600 { 689 {
601 while (tap_packet *p = (tap_packet *)data_queue.get ()) 690 while (tap_packet *p = (tap_packet *)data_queue.get ())
602 { 691 {
603 send_data_packet (p); 692 if (p->len) send_data_packet (p);
604 delete p; 693 delete p;
605 } 694 }
606 695
607 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 696 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
608 { 697 {
609 send_vpn_packet (p, si, IPTOS_RELIABILITY); 698 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
610 delete p; 699 delete p;
611 } 700 }
612 } 701 }
702
703 vpn->connection_established (this);
613 } 704 }
614 else 705 else
615 { 706 {
616 retry_cnt = 0; 707 retry_cnt = 0;
617 establish_connection.start (5); 708 establish_connection.start (5);
… …
621} 712}
622 713
623void 714void
624connection::reset_si () 715connection::reset_si ()
625{ 716{
717 if (vpn->can_direct (THISNODE, conf))
626 protocol = best_protocol (THISNODE->protocols & conf->protocols); 718 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
627 719 else
628 // mask out protocols we cannot establish
629 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
630 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
631 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
632
633 if (protocol
634 && (!conf->can_direct (THISNODE)
635 || !THISNODE->can_direct (conf)))
636 { 720 {
637 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename); 721 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
638 protocol = 0; 722 protocol = 0;
639 } 723 }
640 724
641 si.set (conf, protocol); 725 si.set (conf, protocol);
726
727 is_direct = si.valid ();
642} 728}
643 729
644// ensure sockinfo is valid, forward if necessary 730// ensure sockinfo is valid, forward if necessary
645const sockinfo & 731const sockinfo &
646connection::forward_si (const sockinfo &si) const 732connection::forward_si (const sockinfo &si) const
647{ 733{
648 if (!si.valid ()) 734 if (!si.valid ())
649 { 735 {
650 connection *r = vpn->find_router (); 736 connection *r = vpn->find_router_for (this);
651 737
652 if (r) 738 if (r)
653 { 739 {
654 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."),
655 conf->nodename, r->conf->nodename, (const char *)r->si); 741 conf->nodename, r->conf->nodename);
656 return r->si; 742 return r->si;
657 } 743 }
658 else 744 else
659 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 745 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
660 conf->nodename); 746 conf->nodename);
661 } 747 }
662 748
663 return si; 749 return si;
664} 750}
… …
674connection::send_ping (const sockinfo &si, u8 pong) 760connection::send_ping (const sockinfo &si, u8 pong)
675{ 761{
676 ping_packet *pkt = new ping_packet; 762 ping_packet *pkt = new ping_packet;
677 763
678 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
679 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 768 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
680 769
681 delete pkt; 770 delete pkt;
682} 771}
683 772
… …
702 791
703 rsachallenge chg; 792 rsachallenge chg;
704 rsa_cache.gen (pkt->id, chg); 793 rsa_cache.gen (pkt->id, chg);
705 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 794 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
706 795
707 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);
708 797
709 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
710 799
711 delete pkt; 800 delete pkt;
712} 801}
… …
720 809
721 rsa_hash (id, chg, pkt->response); 810 rsa_hash (id, chg, pkt->response);
722 811
723 pkt->hmac_set (octx); 812 pkt->hmac_set (octx);
724 813
725 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);
726 815
727 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
728 817
729 delete pkt; 818 delete pkt;
730} 819}
731 820
732void 821void
733connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 822connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
734{ 823{
735 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)", 824 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,
736 conf->id, rid, (const char *)rsi); 825 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
737 826
738 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);
739 828
740 r->hmac_set (octx); 829 r->hmac_set (octx);
741 send_vpn_packet (r, si); 830 send_vpn_packet (r, si);
742 831
743 delete r; 832 delete r;
744} 833}
745 834
746void 835inline void
747connection::establish_connection_cb (ev::timer &w, int revents) 836connection::establish_connection_cb (ev::timer &w, int revents)
748{ 837{
749 if (!ictx 838 if (!ictx
750 && conf != THISNODE 839 && conf != THISNODE
751 && connectmode != conf_node::C_NEVER 840 && connectmode != conf_node::C_NEVER
752 && connectmode != conf_node::C_DISABLED 841 && connectmode != conf_node::C_DISABLED
753 && !w.is_active ()) 842 && !w.is_active ())
754 { 843 {
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 }
851
852 last_establish_attempt = ev_now ();
853
755 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 854 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
756 ? (retry_cnt & 3) + 1 855 ? (retry_cnt & 3) + 1
757 : 1 << (retry_cnt >> 2)); 856 : 1 << (retry_cnt >> 2));
758 857
759 reset_si (); 858 reset_si ();
760 859
761 bool slow = si.prot & PROT_SLOW; 860 bool slow = si.prot & PROT_SLOW;
762 861
763 if (si.prot && !si.host) 862 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
764 { 863 {
765 /*TODO*/ /* start the timer so we don't recurse endlessly */ 864 /*TODO*/ /* start the timer so we don't recurse endlessly */
766 w.start (1); 865 w.start (1);
767 vpn->send_connect_request (conf->id); 866 vpn->send_connect_request (this);
768 } 867 }
769 else 868 else
770 { 869 {
870 if (si.valid ())
871 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
872 conf->nodename, (const char *)si);
873
771 const sockinfo &dsi = forward_si (si); 874 const sockinfo &dsi = forward_si (si);
772 875
773 slow = slow || (dsi.prot & PROT_SLOW); 876 slow = slow || (dsi.prot & PROT_SLOW);
774 877
775 if (dsi.valid () && auth_rate_limiter.can (dsi)) 878 if (dsi.valid () && auth_rate_limiter.can (dsi))
… …
779 else 882 else
780 send_ping (dsi, 0); 883 send_ping (dsi, 0);
781 } 884 }
782 } 885 }
783 886
784 retry_int *= slow ? 8. : 0.7; 887 retry_int *= slow ? 8. : 0.9;
785 888
786 if (retry_int < conf->max_retry) 889 if (retry_int < conf->max_retry)
787 retry_cnt++; 890 retry_cnt++;
788 else 891 else
789 retry_int = conf->max_retry; 892 retry_int = conf->max_retry;
… …
799 { 902 {
800 slog (L_INFO, _("%s(%s): connection lost"), 903 slog (L_INFO, _("%s(%s): connection lost"),
801 conf->nodename, (const char *)si); 904 conf->nodename, (const char *)si);
802 905
803 if (::conf.script_node_down) 906 if (::conf.script_node_down)
804 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);
805 slog (L_WARN, _("node-down command execution failed, continuing.")); 910 run_script_queued (cb, _("node-down command execution failed, continuing."));
911 }
806 } 912 }
807 913
808 delete ictx; ictx = 0; 914 delete ictx; ictx = 0;
809 delete octx; octx = 0; 915 delete octx; octx = 0;
810#if ENABLE_DNS 916#if ENABLE_DNS
811 dnsv4_reset_connection (); 917 dnsv4_reset_connection ();
812#endif 918#endif
813 919
814 si.host = 0; 920 si.host = 0;
815 921
816 last_activity = 0; 922 last_activity = 0.;
923 //last_si_change = 0.;
817 retry_cnt = 0; 924 retry_cnt = 0;
818 925
819 rekey.stop (); 926 rekey.stop ();
820 keepalive.stop (); 927 keepalive.stop ();
821 establish_connection.stop (); 928 establish_connection.stop ();
… …
828 send_reset (si); 935 send_reset (si);
829 936
830 reset_connection (); 937 reset_connection ();
831} 938}
832 939
833void 940// poor-man's rekeying
941inline void
834connection::rekey_cb (ev::timer &w, int revents) 942connection::rekey_cb (ev::timer &w, int revents)
835{ 943{
836 reset_connection (); 944 reset_connection ();
837 establish_connection (); 945 establish_connection ();
838} 946}
… …
855 if (oseqno > MAX_SEQNO) 963 if (oseqno > MAX_SEQNO)
856 rekey (); 964 rekey ();
857} 965}
858 966
859void 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
860connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 978connection::inject_data_packet (tap_packet *pkt)
861{ 979{
862 if (ictx && octx) 980 if (ictx && octx)
863 send_data_packet (pkt); 981 send_data_packet (pkt);
864 else 982 else
865 { 983 {
866 if (!broadcast)
867 data_queue.put (new tap_packet (*pkt)); 984 data_queue.put (new tap_packet (*pkt));
868 985 post_inject_queue ();
869 establish_connection ();
870 } 986 }
871} 987}
872 988
873void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 989void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
874{ 990{
875 if (ictx && octx) 991 if (ictx && octx)
876 send_vpn_packet (pkt, si, tos); 992 send_vpn_packet (pkt, si, tos);
877 else 993 else
878 { 994 {
879 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 995 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
880 996 post_inject_queue ();
881 establish_connection ();
882 } 997 }
883} 998}
884 999
885void 1000void
886connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1001connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
887{ 1002{
888 last_activity = ev::ev_now (); 1003 last_activity = ev_now ();
889 1004
890 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.",
891 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;
892 1010
893 switch (pkt->typ ()) 1011 switch (pkt->typ ())
894 { 1012 {
895 case vpn_packet::PT_PING: 1013 case vpn_packet::PT_PING:
1014 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1015
896 // we send pings instead of auth packets after some retries, 1016 // we send pings instead of auth packets after some retries,
897 // so reset the retry counter and establish a connection 1017 // so reset the retry counter and establish a connection
898 // when we receive a ping. 1018 // when we receive a ping.
899 if (!ictx) 1019 if (!ictx)
900 { 1020 {
901 if (auth_rate_limiter.can (rsi)) 1021 if (auth_rate_limiter.can (rsi))
902 send_auth_request (rsi, true); 1022 send_auth_request (rsi, true);
903 } 1023 }
904 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.
905 send_ping (rsi, 1); // pong 1027 send_ping (rsi, 1); // pong
906 1028
907 break; 1029 break;
908 1030
909 case vpn_packet::PT_PONG: 1031 case vpn_packet::PT_PONG:
1032 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
910 break; 1033 break;
911 1034
912 case vpn_packet::PT_RESET: 1035 case vpn_packet::PT_RESET:
913 { 1036 {
914 reset_connection (); 1037 reset_connection ();
915 1038
916 config_packet *p = (config_packet *) pkt; 1039 config_packet *p = (config_packet *) pkt;
917 1040
918 if (!p->chk_config ()) 1041 if (!p->chk_config ())
919 { 1042 {
920 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1043 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
921 conf->nodename, (const char *)rsi); 1044 conf->nodename, (const char *)rsi);
922 connectmode = conf_node::C_DISABLED; 1045 connectmode = conf_node::C_DISABLED;
923 } 1046 }
924 else if (connectmode == conf_node::C_ALWAYS) 1047 else if (connectmode == conf_node::C_ALWAYS)
925 establish_connection (); 1048 establish_connection ();
… …
929 case vpn_packet::PT_AUTH_REQ: 1052 case vpn_packet::PT_AUTH_REQ:
930 if (auth_rate_limiter.can (rsi)) 1053 if (auth_rate_limiter.can (rsi))
931 { 1054 {
932 auth_req_packet *p = (auth_req_packet *) pkt; 1055 auth_req_packet *p = (auth_req_packet *) pkt;
933 1056
934 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");
935 1058
936 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)))
937 { 1061 {
938 if (p->prot_minor != PROTOCOL_MINOR) 1062 if (p->prot_minor != PROTOCOL_MINOR)
939 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."),
940 conf->nodename, (const char *)rsi, 1064 conf->nodename, (const char *)rsi,
941 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1065 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
967 1091
968 break; 1092 break;
969 } 1093 }
970 } 1094 }
971 else 1095 else
972 slog (L_WARN, _("%s(%s): protocol mismatch"), 1096 slog (L_WARN, _("%s(%s): protocol mismatch."),
973 conf->nodename, (const char *)rsi); 1097 conf->nodename, (const char *)rsi);
974 1098
975 send_reset (rsi); 1099 send_reset (rsi);
976 } 1100 }
977 1101
978 break; 1102 break;
979 1103
980 case vpn_packet::PT_AUTH_RES: 1104 case vpn_packet::PT_AUTH_RES:
981 { 1105 {
982 auth_res_packet *p = (auth_res_packet *) pkt; 1106 auth_res_packet *p = (auth_res_packet *)pkt;
983 1107
984 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1108 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
985 1109
986 if (p->chk_config ()) 1110 if (p->chk_config ())
987 { 1111 {
988 if (p->prot_minor != PROTOCOL_MINOR) 1112 if (p->prot_minor != PROTOCOL_MINOR)
989 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."),
… …
992 1116
993 rsachallenge chg; 1117 rsachallenge chg;
994 1118
995 if (!rsa_cache.find (p->id, chg)) 1119 if (!rsa_cache.find (p->id, chg))
996 { 1120 {
997 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1121 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
998 conf->nodename, (const char *)rsi); 1122 conf->nodename, (const char *)rsi);
999 break; 1123 break;
1000 } 1124 }
1001 else 1125 else
1002 { 1126 {
1003 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1127 crypto_ctx *cctx = new crypto_ctx (chg, 0);
1004 1128
1005 if (!p->hmac_chk (cctx)) 1129 if (!p->hmac_chk (cctx))
1006 { 1130 {
1007 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"
1008 "could be an attack, or just corruption or a synchronization error"), 1132 "could be an attack, or just corruption or a synchronization error."),
1009 conf->nodename, (const char *)rsi); 1133 conf->nodename, (const char *)rsi);
1010 break; 1134 break;
1011 } 1135 }
1012 else 1136 else
1013 { 1137 {
… …
1024 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
1025 1149
1026 si = rsi; 1150 si = rsi;
1027 protocol = rsi.prot; 1151 protocol = rsi.prot;
1028 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
1029 connection_established (); 1158 connection_established ();
1030 1159
1031 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1032 conf->nodename, (const char *)rsi,
1033 p->prot_major, p->prot_minor);
1034
1035 if (::conf.script_node_up) 1160 if (::conf.script_node_up)
1036 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);
1037 slog (L_WARN, _("node-up command execution failed, continuing.")); 1164 run_script_queued (cb, _("node-up command execution failed, continuing."));
1165 }
1038 1166
1039 break; 1167 break;
1040 } 1168 }
1041 else 1169 else
1042 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."),
1043 conf->nodename, (const char *)rsi); 1171 conf->nodename, (const char *)rsi);
1044 } 1172 }
1045 1173
1046 delete cctx; 1174 delete cctx;
1047 } 1175 }
… …
1063 { 1191 {
1064 vpndata_packet *p = (vpndata_packet *)pkt; 1192 vpndata_packet *p = (vpndata_packet *)pkt;
1065 1193
1066 if (!p->hmac_chk (ictx)) 1194 if (!p->hmac_chk (ictx))
1067 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"
1068 "could be an attack, or just corruption or a synchronization error"), 1196 "could be an attack, or just corruption or a synchronization error."),
1069 conf->nodename, (const char *)rsi); 1197 conf->nodename, (const char *)rsi);
1070 else 1198 else
1071 { 1199 {
1072 u32 seqno; 1200 u32 seqno;
1073 tap_packet *d = p->unpack (this, seqno); 1201 tap_packet *d = p->unpack (this, seqno);
1202 int seqclass = iseqno.seqno_classify (seqno);
1074 1203
1075 if (iseqno.recv_ok (seqno)) 1204 if (seqclass == 0) // ok
1076 { 1205 {
1077 vpn->tap->send (d); 1206 vpn->tap->send (d);
1078 1207
1079 if (si != rsi) 1208 if (si != rsi)
1080 { 1209 {
1081 // 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.)
1082 si = rsi; 1212 // {
1083
1084 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1213 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1085 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);
1086 } 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);
1087 } 1242 }
1088 1243
1089 delete d; 1244 delete d;
1090 break; 1245 break;
1091 } 1246 }
… …
1095 break; 1250 break;
1096 1251
1097 case vpn_packet::PT_CONNECT_REQ: 1252 case vpn_packet::PT_CONNECT_REQ:
1098 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1253 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1099 { 1254 {
1100 connect_req_packet *p = (connect_req_packet *) pkt; 1255 connect_req_packet *p = (connect_req_packet *)pkt;
1101 1256
1102 if (p->id > 0 && p->id <= vpn->conns.size ()) 1257 if (p->id > 0 && p->id <= vpn->conns.size ())
1103 { 1258 {
1104 connection *c = vpn->conns[p->id - 1]; 1259 connection *c = vpn->conns[p->id - 1];
1105 conf->protocols = p->protocols; 1260 conf->protocols = p->protocols;
1106 1261
1107 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]", 1262 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]",
1108 conf->id, p->id, c->ictx && c->octx); 1263 conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx);
1109 1264
1110 if (c->ictx && c->octx) 1265 if (c->ictx && c->octx)
1111 { 1266 {
1112 // send connect_info packets to both sides, in case one is 1267 // send connect_info packets to both sides, in case one is
1113 // behind a nat firewall (or both ;) 1268 // behind a nat firewall (or both ;)
… …
1136 1291
1137 c->conf->protocols = p->protocols; 1292 c->conf->protocols = p->protocols;
1138 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));
1139 p->si.upgrade_protocol (protocol, c->conf); 1294 p->si.upgrade_protocol (protocol, c->conf);
1140 1295
1141 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,
1142 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1298 (const char *)p->si, !c->ictx && !c->octx);
1143 1299
1144 const sockinfo &dsi = forward_si (p->si); 1300 const sockinfo &dsi = forward_si (p->si);
1145 1301
1146 if (dsi.valid ()) 1302 if (dsi.valid ())
1147 c->send_auth_request (dsi, true); 1303 c->send_auth_request (dsi, true);
… …
1158 send_reset (rsi); 1314 send_reset (rsi);
1159 break; 1315 break;
1160 } 1316 }
1161} 1317}
1162 1318
1319inline void
1163void connection::keepalive_cb (ev::timer &w, int revents) 1320connection::keepalive_cb (ev::timer &w, int revents)
1164{ 1321{
1165 if (ev::ev_now () >= last_activity + ::conf.keepalive + 30) 1322 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1166 { 1323 {
1167 reset_connection (); 1324 reset_connection ();
1168 establish_connection (); 1325 establish_connection ();
1169 } 1326 }
1170 else if (ev::ev_now () < last_activity + ::conf.keepalive) 1327 else if (ev_now () < last_activity + ::conf.keepalive)
1171 w.start (last_activity + ::conf.keepalive - ev::now ()); 1328 w.start (last_activity + ::conf.keepalive - ev::now ());
1172 else if (conf->connectmode != conf_node::C_ONDEMAND 1329 else if (conf->connectmode != conf_node::C_ONDEMAND
1173 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1330 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1174 { 1331 {
1175 send_ping (si); 1332 send_ping (si);
1176 w.start (5); 1333 w.start (3);
1177 } 1334 }
1178 else if (ev::ev_now () < last_activity + ::conf.keepalive + 10) 1335 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1179 // hold ondemand connections implicitly a few seconds longer 1336 // hold ondemand connections implicitly a few seconds longer
1180 // should delete octx, though, or something like that ;) 1337 // should delete octx, though, or something like that ;)
1181 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1338 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1182 else 1339 else
1183 reset_connection (); 1340 reset_connection ();
… …
1185 1342
1186void connection::send_connect_request (int id) 1343void connection::send_connect_request (int id)
1187{ 1344{
1188 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);
1189 1346
1190 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);
1191 p->hmac_set (octx); 1349 p->hmac_set (octx);
1192 send_vpn_packet (p, si); 1350 send_vpn_packet (p, si);
1193 1351
1194 delete p; 1352 delete p;
1195} 1353}
1196 1354
1197void connection::script_init_env (const char *ext) 1355void connection::script_init_env (const char *ext)
1198{ 1356{
1199 char *env; 1357 char *env;
1200 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);
1201 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1359 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1202 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1360 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1203 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1361 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1204 conf->id & 0xff); putenv (env); 1362 conf->id & 0xff); putenv (env);
1205} 1363}
1206 1364
1207void connection::script_init_connect_env () 1365void connection::script_init_connect_env ()
1208{ 1366{
1209 vpn->script_init_env (); 1367 vpn->script_init_env ();
1210 1368
1211 char *env; 1369 char *env;
1212 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);
1213 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1372 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1214 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1373 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1215 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1374 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1216} 1375}
1217 1376
1377inline const char *
1218const char *connection::script_node_up () 1378connection::script_node_up ()
1219{ 1379{
1220 script_init_connect_env (); 1380 script_init_connect_env ();
1221 1381
1222 putenv ((char *)"STATE=up"); 1382 putenv ((char *)"STATE=up");
1223 1383
… …
1228 ::conf.script_node_up ? ::conf.script_node_up : "node-up"); 1388 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1229 1389
1230 return filename; 1390 return filename;
1231} 1391}
1232 1392
1393inline const char *
1394connection::script_node_change ()
1395{
1396 script_init_connect_env ();
1397
1398 putenv ((char *)"STATE=change");
1399
1400 char *filename;
1401 asprintf (&filename,
1402 "%s/%s",
1403 confbase,
1404 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1405
1406 return filename;
1407}
1408
1409inline const char *
1233const char *connection::script_node_down () 1410connection::script_node_down ()
1234{ 1411{
1235 script_init_connect_env (); 1412 script_init_connect_env ();
1236 1413
1237 putenv ((char *)"STATE=down"); 1414 putenv ((char *)"STATE=down");
1238 1415
… …
1244 1421
1245 return filename; 1422 return filename;
1246} 1423}
1247 1424
1248connection::connection (struct vpn *vpn, conf_node *conf) 1425connection::connection (struct vpn *vpn, conf_node *conf)
1249: vpn(vpn), conf(conf) 1426: vpn(vpn), conf(conf),
1250, rekey (this, &connection::rekey_cb)
1251, keepalive (this, &connection::keepalive_cb)
1252, establish_connection (this, &connection::establish_connection_cb)
1253#if ENABLE_DNS 1427#if ENABLE_DNS
1254, dns (0) 1428 dns (0),
1255#endif 1429#endif
1430 data_queue(conf->max_ttl, conf->max_queue + 1),
1431 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1256{ 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.;
1257 octx = ictx = 0; 1438 octx = ictx = 0;
1258 retry_cnt = 0;
1259 1439
1260 if (!conf->protocols) // make sure some protocol is enabled 1440 if (!conf->protocols) // make sure some protocol is enabled
1261 conf->protocols = PROT_UDPv4; 1441 conf->protocols = PROT_UDPv4;
1262 1442
1263 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
1264 reset_connection (); 1449 reset_connection ();
1265} 1450}
1266 1451
1267connection::~connection () 1452connection::~connection ()
1268{ 1453{

Diff Legend

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