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.47 by pcg, Mon Mar 7 01:31:26 2005 UTC vs.
Revision 1.81 by pcg, Fri Aug 15 18:31:13 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>
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
… …
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;
472#endif 558#endif
559#if ENABLE_BRIDGING
560 f |= FEATURE_BRIDGING;
561#endif
473 return f; 562 return f;
474 } 563 }
475}; 564};
476 565
477void config_packet::setup (ptype type, int dst) 566void config_packet::setup (ptype type, int dst)
478{ 567{
479 prot_major = PROTOCOL_MAJOR; 568 prot_major = PROTOCOL_MAJOR;
480 prot_minor = PROTOCOL_MINOR; 569 prot_minor = PROTOCOL_MINOR;
481 randsize = RAND_SIZE; 570 randsize = RAND_SIZE;
482 hmaclen = HMACLENGTH; 571 hmaclen = HMACLENGTH;
483 flags = ENABLE_COMPRESSION ? 0x81 : 0x80; 572 flags = 0;
484 challengelen = sizeof (rsachallenge); 573 challengelen = sizeof (rsachallenge);
485 features = get_features (); 574 features = get_features ();
486 575
487 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 576 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
488 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 577 digest_nid = htonl (EVP_MD_type (RSA_HASH));
… …
498 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 587 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
499 else if (randsize != RAND_SIZE) 588 else if (randsize != RAND_SIZE)
500 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 589 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
501 else if (hmaclen != HMACLENGTH) 590 else if (hmaclen != HMACLENGTH)
502 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH); 591 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
503#if 0 // this implementation should handle all flag settings
504 else if (flags != curflags ())
505 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
506#endif
507 else if (challengelen != sizeof (rsachallenge)) 592 else if (challengelen != sizeof (rsachallenge))
508 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 593 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
509 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 594 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
510 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 595 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
511 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 596 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
587///////////////////////////////////////////////////////////////////////////// 672/////////////////////////////////////////////////////////////////////////////
588 673
589void 674void
590connection::connection_established () 675connection::connection_established ()
591{ 676{
677 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
678
592 if (ictx && octx) 679 if (ictx && octx)
593 { 680 {
594 connectmode = conf->connectmode;
595
596 // make sure rekeying timeouts are slightly asymmetric 681 // make sure rekeying timeouts are slightly asymmetric
597 rekey.start (NOW + ::conf.rekey 682 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
598 + (conf->id > THISNODE->id ? 10 : 0)); 683 rekey.start (rekey_interval, rekey_interval);
599 keepalive.start (NOW + ::conf.keepalive); 684 keepalive.start (::conf.keepalive);
600 685
601 // send queued packets 686 // send queued packets
602 if (ictx && octx) 687 if (ictx && octx)
603 { 688 {
604 while (tap_packet *p = (tap_packet *)data_queue.get ()) 689 while (tap_packet *p = (tap_packet *)data_queue.get ())
605 { 690 {
606 send_data_packet (p); 691 if (p->len) send_data_packet (p);
607 delete p; 692 delete p;
608 } 693 }
609 694
610 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 695 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
611 { 696 {
612 send_vpn_packet (p, si, IPTOS_RELIABILITY); 697 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
613 delete p; 698 delete p;
614 } 699 }
615 } 700 }
701
702 vpn->connection_established (this);
616 } 703 }
617 else 704 else
618 { 705 {
619 retry_cnt = 0; 706 retry_cnt = 0;
620 establish_connection.start (NOW + 5); 707 establish_connection.start (5);
621 keepalive.stop (); 708 keepalive.stop ();
622 rekey.stop (); 709 rekey.stop ();
623 } 710 }
624} 711}
625 712
626void 713void
627connection::reset_si () 714connection::reset_si ()
628{ 715{
716 if (vpn->can_direct (THISNODE, conf))
629 protocol = best_protocol (THISNODE->protocols & conf->protocols); 717 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
630 718 else
631 // mask out protocols we cannot establish 719 {
632 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 720 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
633 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 721 protocol = 0;
634 if (!conf->dns_port) protocol &= ~PROT_DNSv4; 722 }
635 723
636 si.set (conf, protocol); 724 si.set (conf, protocol);
725
726 is_direct = si.valid ();
637} 727}
638 728
639// ensure sockinfo is valid, forward if necessary 729// ensure sockinfo is valid, forward if necessary
640const sockinfo & 730const sockinfo &
641connection::forward_si (const sockinfo &si) const 731connection::forward_si (const sockinfo &si) const
642{ 732{
643 if (!si.valid ()) 733 if (!si.valid ())
644 { 734 {
645 connection *r = vpn->find_router (); 735 connection *r = vpn->find_router_for (this);
646 736
647 if (r) 737 if (r)
648 { 738 {
649 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."),
650 conf->nodename, r->conf->nodename, (const char *)r->si); 740 conf->nodename, r->conf->nodename);
651 return r->si; 741 return r->si;
652 } 742 }
653 else 743 else
654 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 744 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
655 conf->nodename); 745 conf->nodename);
656 } 746 }
657 747
658 return si; 748 return si;
659} 749}
… …
669connection::send_ping (const sockinfo &si, u8 pong) 759connection::send_ping (const sockinfo &si, u8 pong)
670{ 760{
671 ping_packet *pkt = new ping_packet; 761 ping_packet *pkt = new ping_packet;
672 762
673 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
674 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 767 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
675 768
676 delete pkt; 769 delete pkt;
677} 770}
678 771
… …
697 790
698 rsachallenge chg; 791 rsachallenge chg;
699 rsa_cache.gen (pkt->id, chg); 792 rsa_cache.gen (pkt->id, chg);
700 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 793 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
701 794
702 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);
703 796
704 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
705 798
706 delete pkt; 799 delete pkt;
707} 800}
… …
715 808
716 rsa_hash (id, chg, pkt->response); 809 rsa_hash (id, chg, pkt->response);
717 810
718 pkt->hmac_set (octx); 811 pkt->hmac_set (octx);
719 812
720 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);
721 814
722 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
723 816
724 delete pkt; 817 delete pkt;
725} 818}
726 819
727void 820void
728connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 821connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
729{ 822{
730 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 823 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,
731 conf->id, rid, (const char *)rsi); 824 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
732 825
733 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);
734 827
735 r->hmac_set (octx); 828 r->hmac_set (octx);
736 send_vpn_packet (r, si); 829 send_vpn_packet (r, si);
737 830
738 delete r; 831 delete r;
739} 832}
740 833
741void 834inline void
742connection::establish_connection_cb (time_watcher &w) 835connection::establish_connection_cb (ev::timer &w, int revents)
743{ 836{
744 if (!ictx 837 if (!ictx
745 && conf != THISNODE 838 && conf != THISNODE
746 && connectmode != conf_node::C_NEVER 839 && connectmode != conf_node::C_NEVER
747 && connectmode != conf_node::C_DISABLED 840 && connectmode != conf_node::C_DISABLED
748 && NOW > w.at) 841 && !w.is_active ())
749 { 842 {
750 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 }
751 850
752 double retry_int = double (retry_cnt & 3 851 last_establish_attempt = ev_now ();
852
853 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
753 ? (retry_cnt & 3) + 1 854 ? (retry_cnt & 3) + 1
754 : 1 << (retry_cnt >> 2)); 855 : 1 << (retry_cnt >> 2));
755 856
756 reset_si (); 857 reset_si ();
757 858
758 bool slow = si.prot & PROT_SLOW; 859 bool slow = si.prot & PROT_SLOW;
759 860
760 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);
761 vpn->send_connect_request (conf->id); 865 vpn->send_connect_request (this);
866 }
762 else 867 else
763 { 868 {
869 if (si.valid ())
870 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
871 conf->nodename, (const char *)si);
872
764 const sockinfo &dsi = forward_si (si); 873 const sockinfo &dsi = forward_si (si);
765 874
766 slow = slow || (dsi.prot & PROT_SLOW); 875 slow = slow || (dsi.prot & PROT_SLOW);
767 876
768 if (dsi.valid () && auth_rate_limiter.can (dsi)) 877 if (dsi.valid () && auth_rate_limiter.can (dsi))
… …
772 else 881 else
773 send_ping (dsi, 0); 882 send_ping (dsi, 0);
774 } 883 }
775 } 884 }
776 885
777 retry_int *= slow ? 3. : 0.7; 886 retry_int *= slow ? 8. : 0.9;
778 887
779 if (retry_int < conf->max_retry) 888 if (retry_int < conf->max_retry)
780 retry_cnt++; 889 retry_cnt++;
781 else 890 else
782 retry_int = conf->max_retry; 891 retry_int = conf->max_retry;
783 892
784 w.start (NOW + retry_int); 893 w.start (retry_int);
785 } 894 }
786} 895}
787 896
788void 897void
789connection::reset_connection () 898connection::reset_connection ()
… …
792 { 901 {
793 slog (L_INFO, _("%s(%s): connection lost"), 902 slog (L_INFO, _("%s(%s): connection lost"),
794 conf->nodename, (const char *)si); 903 conf->nodename, (const char *)si);
795 904
796 if (::conf.script_node_down) 905 if (::conf.script_node_down)
797 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 }
798 } 911 }
799 912
800 delete ictx; ictx = 0; 913 delete ictx; ictx = 0;
801 delete octx; octx = 0; 914 delete octx; octx = 0;
802#if ENABLE_DNS 915#if ENABLE_DNS
803 dnsv4_reset_connection (); 916 dnsv4_reset_connection ();
804#endif 917#endif
805 918
806 si.host = 0; 919 si.host = 0;
807 920
808 last_activity = 0; 921 last_activity = 0.;
922 //last_si_change = 0.;
809 retry_cnt = 0; 923 retry_cnt = 0;
810 924
811 rekey.stop (); 925 rekey.stop ();
812 keepalive.stop (); 926 keepalive.stop ();
813 establish_connection.stop (); 927 establish_connection.stop ();
… …
820 send_reset (si); 934 send_reset (si);
821 935
822 reset_connection (); 936 reset_connection ();
823} 937}
824 938
825void 939// poor-man's rekeying
826connection::rekey_cb (time_watcher &w) 940inline void
941connection::rekey_cb (ev::timer &w, int revents)
827{ 942{
828 reset_connection (); 943 reset_connection ();
829 establish_connection (); 944 establish_connection ();
830} 945}
831 946
… …
847 if (oseqno > MAX_SEQNO) 962 if (oseqno > MAX_SEQNO)
848 rekey (); 963 rekey ();
849} 964}
850 965
851void 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
852connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 977connection::inject_data_packet (tap_packet *pkt)
853{ 978{
854 if (ictx && octx) 979 if (ictx && octx)
855 send_data_packet (pkt); 980 send_data_packet (pkt);
856 else 981 else
857 { 982 {
858 if (!broadcast)//DDDD
859 data_queue.put (new tap_packet (*pkt)); 983 data_queue.put (new tap_packet (*pkt));
860 984 post_inject_queue ();
861 establish_connection ();
862 } 985 }
863} 986}
864 987
865void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 988void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
866{ 989{
867 if (ictx && octx) 990 if (ictx && octx)
868 send_vpn_packet (pkt, si, tos); 991 send_vpn_packet (pkt, si, tos);
869 else 992 else
870 { 993 {
871 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 994 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
872 995 post_inject_queue ();
873 establish_connection ();
874 } 996 }
875} 997}
876 998
877void 999void
878connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1000connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
879{ 1001{
880 last_activity = NOW; 1002 last_activity = ev_now ();
881 1003
882 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.",
883 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;
884 1009
885 switch (pkt->typ ()) 1010 switch (pkt->typ ())
886 { 1011 {
887 case vpn_packet::PT_PING: 1012 case vpn_packet::PT_PING:
1013 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1014
888 // we send pings instead of auth packets after some retries, 1015 // we send pings instead of auth packets after some retries,
889 // so reset the retry counter and establish a connection 1016 // so reset the retry counter and establish a connection
890 // when we receive a ping. 1017 // when we receive a ping.
891 if (!ictx) 1018 if (!ictx)
892 { 1019 {
893 if (auth_rate_limiter.can (rsi)) 1020 if (auth_rate_limiter.can (rsi))
894 send_auth_request (rsi, true); 1021 send_auth_request (rsi, true);
895 } 1022 }
896 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.
897 send_ping (rsi, 1); // pong 1026 send_ping (rsi, 1); // pong
898 1027
899 break; 1028 break;
900 1029
901 case vpn_packet::PT_PONG: 1030 case vpn_packet::PT_PONG:
1031 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
902 break; 1032 break;
903 1033
904 case vpn_packet::PT_RESET: 1034 case vpn_packet::PT_RESET:
905 { 1035 {
906 reset_connection (); 1036 reset_connection ();
907 1037
908 config_packet *p = (config_packet *) pkt; 1038 config_packet *p = (config_packet *) pkt;
909 1039
910 if (!p->chk_config ()) 1040 if (!p->chk_config ())
911 { 1041 {
912 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1042 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
913 conf->nodename, (const char *)rsi); 1043 conf->nodename, (const char *)rsi);
914 connectmode = conf_node::C_DISABLED; 1044 connectmode = conf_node::C_DISABLED;
915 } 1045 }
916 else if (connectmode == conf_node::C_ALWAYS) 1046 else if (connectmode == conf_node::C_ALWAYS)
917 establish_connection (); 1047 establish_connection ();
… …
921 case vpn_packet::PT_AUTH_REQ: 1051 case vpn_packet::PT_AUTH_REQ:
922 if (auth_rate_limiter.can (rsi)) 1052 if (auth_rate_limiter.can (rsi))
923 { 1053 {
924 auth_req_packet *p = (auth_req_packet *) pkt; 1054 auth_req_packet *p = (auth_req_packet *) pkt;
925 1055
926 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");
927 1057
928 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1058 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8))
929 { 1059 {
930 if (p->prot_minor != PROTOCOL_MINOR) 1060 if (p->prot_minor != PROTOCOL_MINOR)
931 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."),
… …
948 delete octx; 1078 delete octx;
949 1079
950 octx = new crypto_ctx (k, 1); 1080 octx = new crypto_ctx (k, 1);
951 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1081 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
952 1082
953 // compatibility code, remove when no longer required
954 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
955
956 conf->protocols = p->protocols; 1083 conf->protocols = p->protocols;
957 features = p->features & config_packet::get_features (); 1084 features = p->features & config_packet::get_features ();
958 1085
959 send_auth_response (rsi, p->id, k); 1086 send_auth_response (rsi, p->id, k);
960 1087
… …
962 1089
963 break; 1090 break;
964 } 1091 }
965 } 1092 }
966 else 1093 else
967 slog (L_WARN, _("%s(%s): protocol mismatch"), 1094 slog (L_WARN, _("%s(%s): protocol mismatch."),
968 conf->nodename, (const char *)rsi); 1095 conf->nodename, (const char *)rsi);
969 1096
970 send_reset (rsi); 1097 send_reset (rsi);
971 } 1098 }
972 1099
973 break; 1100 break;
974 1101
975 case vpn_packet::PT_AUTH_RES: 1102 case vpn_packet::PT_AUTH_RES:
976 { 1103 {
977 auth_res_packet *p = (auth_res_packet *) pkt; 1104 auth_res_packet *p = (auth_res_packet *)pkt;
978 1105
979 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1106 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
980 1107
981 if (p->chk_config ()) 1108 if (p->chk_config ())
982 { 1109 {
983 if (p->prot_minor != PROTOCOL_MINOR) 1110 if (p->prot_minor != PROTOCOL_MINOR)
984 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."),
… …
987 1114
988 rsachallenge chg; 1115 rsachallenge chg;
989 1116
990 if (!rsa_cache.find (p->id, chg)) 1117 if (!rsa_cache.find (p->id, chg))
991 { 1118 {
992 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1119 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
993 conf->nodename, (const char *)rsi); 1120 conf->nodename, (const char *)rsi);
994 break; 1121 break;
995 } 1122 }
996 else 1123 else
997 { 1124 {
998 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1125 crypto_ctx *cctx = new crypto_ctx (chg, 0);
999 1126
1000 if (!p->hmac_chk (cctx)) 1127 if (!p->hmac_chk (cctx))
1001 { 1128 {
1002 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"
1003 "could be an attack, or just corruption or a synchronization error"), 1130 "could be an attack, or just corruption or a synchronization error."),
1004 conf->nodename, (const char *)rsi); 1131 conf->nodename, (const char *)rsi);
1005 break; 1132 break;
1006 } 1133 }
1007 else 1134 else
1008 { 1135 {
… …
1019 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
1020 1147
1021 si = rsi; 1148 si = rsi;
1022 protocol = rsi.prot; 1149 protocol = rsi.prot;
1023 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
1024 connection_established (); 1156 connection_established ();
1025 1157
1026 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1027 conf->nodename, (const char *)rsi,
1028 p->prot_major, p->prot_minor);
1029
1030 if (::conf.script_node_up) 1158 if (::conf.script_node_up)
1031 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 }
1032 1164
1033 break; 1165 break;
1034 } 1166 }
1035 else 1167 else
1036 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."),
1037 conf->nodename, (const char *)rsi); 1169 conf->nodename, (const char *)rsi);
1038 } 1170 }
1039 1171
1040 delete cctx; 1172 delete cctx;
1041 } 1173 }
… …
1057 { 1189 {
1058 vpndata_packet *p = (vpndata_packet *)pkt; 1190 vpndata_packet *p = (vpndata_packet *)pkt;
1059 1191
1060 if (!p->hmac_chk (ictx)) 1192 if (!p->hmac_chk (ictx))
1061 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"
1062 "could be an attack, or just corruption or a synchronization error"), 1194 "could be an attack, or just corruption or a synchronization error."),
1063 conf->nodename, (const char *)rsi); 1195 conf->nodename, (const char *)rsi);
1064 else 1196 else
1065 { 1197 {
1066 u32 seqno; 1198 u32 seqno;
1067 tap_packet *d = p->unpack (this, seqno); 1199 tap_packet *d = p->unpack (this, seqno);
1200 int seqclass = iseqno.seqno_classify (seqno);
1068 1201
1069 if (iseqno.recv_ok (seqno)) 1202 if (seqclass == 0) // ok
1070 { 1203 {
1071 vpn->tap->send (d); 1204 vpn->tap->send (d);
1072 1205
1073 if (si != rsi) 1206 if (si != rsi)
1074 { 1207 {
1075 // 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.)
1076 si = rsi; 1210 // {
1077
1078 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1211 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1079 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);
1080 } 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);
1081 } 1232 }
1082 1233
1083 delete d; 1234 delete d;
1084 break; 1235 break;
1085 } 1236 }
… …
1091 case vpn_packet::PT_CONNECT_REQ: 1242 case vpn_packet::PT_CONNECT_REQ:
1092 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1243 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1093 { 1244 {
1094 connect_req_packet *p = (connect_req_packet *) pkt; 1245 connect_req_packet *p = (connect_req_packet *) pkt;
1095 1246
1096 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 ())
1097 connection *c = vpn->conns[p->id - 1];
1098 conf->protocols = p->protocols;
1099
1100 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1101 conf->id, p->id, c->ictx && c->octx);
1102
1103 if (c->ictx && c->octx)
1104 { 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 {
1105 // send connect_info packets to both sides, in case one is 1257 // send connect_info packets to both sides, in case one is
1106 // behind a nat firewall (or both ;) 1258 // behind a nat firewall (or both ;)
1107 c->send_connect_info (conf->id, si, conf->protocols); 1259 c->send_connect_info (conf->id, si, conf->protocols);
1108 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 ();
1109 } 1264 }
1110 else 1265 else
1111 c->establish_connection (); 1266 slog (L_WARN,
1267 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1268 p->id);
1112 } 1269 }
1113 1270
1114 break; 1271 break;
1115 1272
1116 case vpn_packet::PT_CONNECT_INFO: 1273 case vpn_packet::PT_CONNECT_INFO:
1117 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1274 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1118 { 1275 {
1119 connect_info_packet *p = (connect_info_packet *)pkt; 1276 connect_info_packet *p = (connect_info_packet *)pkt;
1120 1277
1121 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 ())
1122 { 1279 {
1123 connection *c = vpn->conns[p->id - 1]; 1280 connection *c = vpn->conns[p->id - 1];
1124 1281
1125 c->conf->protocols = p->protocols; 1282 c->conf->protocols = p->protocols;
1126 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));
1127 p->si.upgrade_protocol (protocol, c->conf); 1284 p->si.upgrade_protocol (protocol, c->conf);
1128 1285
1129 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,
1130 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1288 (const char *)p->si, !c->ictx && !c->octx);
1131 1289
1132 const sockinfo &dsi = forward_si (p->si); 1290 const sockinfo &dsi = forward_si (p->si);
1133 1291
1134 if (dsi.valid ()) 1292 if (dsi.valid ())
1135 c->send_auth_request (dsi, true); 1293 c->send_auth_request (dsi, true);
1136 } 1294 }
1295 else
1296 slog (L_WARN,
1297 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1298 p->id);
1137 } 1299 }
1138 1300
1139 break; 1301 break;
1140 1302
1141 default: 1303 default:
1142 send_reset (rsi); 1304 send_reset (rsi);
1143 break; 1305 break;
1144 } 1306 }
1145} 1307}
1146 1308
1147void connection::keepalive_cb (time_watcher &w) 1309inline void
1310connection::keepalive_cb (ev::timer &w, int revents)
1148{ 1311{
1149 if (NOW >= last_activity + ::conf.keepalive + 30) 1312 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1150 { 1313 {
1151 reset_connection (); 1314 reset_connection ();
1152 establish_connection (); 1315 establish_connection ();
1153 } 1316 }
1154 else if (NOW < last_activity + ::conf.keepalive) 1317 else if (ev_now () < last_activity + ::conf.keepalive)
1155 w.start (last_activity + ::conf.keepalive); 1318 w.start (last_activity + ::conf.keepalive - ev::now ());
1156 else if (conf->connectmode != conf_node::C_ONDEMAND 1319 else if (conf->connectmode != conf_node::C_ONDEMAND
1157 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1320 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1158 { 1321 {
1159 send_ping (si); 1322 send_ping (si);
1160 w.start (NOW + 5); 1323 w.start (5);
1161 } 1324 }
1162 else if (NOW < last_activity + ::conf.keepalive + 10) 1325 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1163 // hold ondemand connections implicitly a few seconds longer 1326 // hold ondemand connections implicitly a few seconds longer
1164 // should delete octx, though, or something like that ;) 1327 // should delete octx, though, or something like that ;)
1165 w.start (last_activity + ::conf.keepalive + 10); 1328 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1166 else 1329 else
1167 reset_connection (); 1330 reset_connection ();
1168} 1331}
1169 1332
1170void connection::send_connect_request (int id) 1333void connection::send_connect_request (int id)
1171{ 1334{
1172 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);
1173 1336
1174 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);
1175 p->hmac_set (octx); 1339 p->hmac_set (octx);
1176 send_vpn_packet (p, si); 1340 send_vpn_packet (p, si);
1177 1341
1178 delete p; 1342 delete p;
1179} 1343}
1180 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
1181void connection::script_node () 1355void connection::script_init_connect_env ()
1182{ 1356{
1183 vpn->script_if_up (); 1357 vpn->script_init_env ();
1184 1358
1185 char *env; 1359 char *env;
1186 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1360 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1187 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1361 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1188 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1362 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1189 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1363 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1190} 1364}
1191 1365
1366inline const char *
1192const char *connection::script_node_up () 1367connection::script_node_up ()
1193{ 1368{
1194 script_node (); 1369 script_init_connect_env ();
1195 1370
1196 putenv ("STATE=up"); 1371 putenv ((char *)"STATE=up");
1197 1372
1373 char *filename;
1374 asprintf (&filename,
1375 "%s/%s",
1376 confbase,
1198 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1377 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1199}
1200 1378
1379 return filename;
1380}
1381
1382inline const char *
1201const char *connection::script_node_down () 1383connection::script_node_down ()
1202{ 1384{
1203 script_node (); 1385 script_init_connect_env ();
1204 1386
1205 putenv ("STATE=down"); 1387 putenv ((char *)"STATE=down");
1206 1388
1207 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;
1208} 1396}
1209 1397
1210connection::connection (struct vpn *vpn, conf_node *conf) 1398connection::connection (struct vpn *vpn, conf_node *conf)
1211: vpn(vpn), conf(conf) 1399: vpn(vpn), conf(conf),
1212, rekey (this, &connection::rekey_cb)
1213, keepalive (this, &connection::keepalive_cb)
1214, establish_connection (this, &connection::establish_connection_cb)
1215#if ENABLE_DNS 1400#if ENABLE_DNS
1216, dns (0) 1401 dns (0),
1217#endif 1402#endif
1403 data_queue(conf->max_ttl, conf->max_queue + 1),
1404 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1218{ 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.;
1219 octx = ictx = 0; 1411 octx = ictx = 0;
1220 retry_cnt = 0;
1221 1412
1222 if (!conf->protocols) // make sure some protocol is enabled 1413 if (!conf->protocols) // make sure some protocol is enabled
1223 conf->protocols = PROT_UDPv4; 1414 conf->protocols = PROT_UDPv4;
1224 1415
1225 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
1226 reset_connection (); 1422 reset_connection ();
1227} 1423}
1228 1424
1229connection::~connection () 1425connection::~connection ()
1230{ 1426{

Diff Legend

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