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

Diff Legend

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