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.49 by pcg, Sat Mar 12 18:10:40 2005 UTC vs.
Revision 1.84 by pcg, Sat Jul 18 05:59:16 2009 UTC

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

Diff Legend

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