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.37 by pcg, Fri Jun 11 15:56:34 2004 UTC vs.
Revision 1.73 by pcg, Sun Aug 10 01:34:36 2008 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
6 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
7 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
8 (at your option) any later version. 10 option) any later version.
9 11
10 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
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
13 GNU General Public License for more details. 15 Public License for more details.
14 16
15 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
16 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
17 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.
18*/ 30*/
19 31
20#include "config.h" 32#include "config.h"
21 33
22#include <cassert>
23
24#include <list> 34#include <list>
35#include <queue>
36#include <utility>
25 37
26#include <openssl/rand.h> 38#include <openssl/rand.h>
27#include <openssl/evp.h> 39#include <openssl/evp.h>
28#include <openssl/rsa.h> 40#include <openssl/rsa.h>
29#include <openssl/err.h> 41#include <openssl/err.h>
30
31#include "gettext.h"
32 42
33#include "conf.h" 43#include "conf.h"
34#include "slog.h" 44#include "slog.h"
35#include "device.h" 45#include "device.h"
36#include "vpn.h" 46#include "vpn.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)
119 { 171 {
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) 188 {
137 { } 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
… …
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;
470#endif 558#endif
559#if ENABLE_BRIDGING
560 f |= FEATURE_BRIDGING;
561#endif
471 return f; 562 return f;
472 } 563 }
473}; 564};
474 565
475void config_packet::setup (ptype type, int dst) 566void config_packet::setup (ptype type, int dst)
476{ 567{
477 prot_major = PROTOCOL_MAJOR; 568 prot_major = PROTOCOL_MAJOR;
478 prot_minor = PROTOCOL_MINOR; 569 prot_minor = PROTOCOL_MINOR;
479 randsize = RAND_SIZE; 570 randsize = RAND_SIZE;
480 hmaclen = HMACLENGTH; 571 hmaclen = HMACLENGTH;
481 flags = ENABLE_COMPRESSION ? 0x81 : 0x80; 572 flags = 0;
482 challengelen = sizeof (rsachallenge); 573 challengelen = sizeof (rsachallenge);
483 features = get_features (); 574 features = get_features ();
484 575
485 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 576 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
486 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 577 digest_nid = htonl (EVP_MD_type (RSA_HASH));
… …
496 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);
497 else if (randsize != RAND_SIZE) 588 else if (randsize != RAND_SIZE)
498 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);
499 else if (hmaclen != HMACLENGTH) 590 else if (hmaclen != HMACLENGTH)
500 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);
501#if 0 // this implementation should handle all flag settings
502 else if (flags != curflags ())
503 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
504#endif
505 else if (challengelen != sizeof (rsachallenge)) 592 else if (challengelen != sizeof (rsachallenge))
506 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));
507 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 594 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
508 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));
509 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 596 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
585///////////////////////////////////////////////////////////////////////////// 672/////////////////////////////////////////////////////////////////////////////
586 673
587void 674void
588connection::connection_established () 675connection::connection_established ()
589{ 676{
677 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
678
590 if (ictx && octx) 679 if (ictx && octx)
591 { 680 {
592 connectmode = conf->connectmode;
593
594 // make sure rekeying timeouts are slightly asymmetric 681 // make sure rekeying timeouts are slightly asymmetric
595 rekey.start (NOW + ::conf.rekey 682 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
596 + (conf->id > THISNODE->id ? 10 : 0)); 683 rekey.start (rekey_interval, rekey_interval);
597 keepalive.start (NOW + ::conf.keepalive); 684 keepalive.start (::conf.keepalive);
598 685
599 // send queued packets 686 // send queued packets
600 if (ictx && octx) 687 if (ictx && octx)
601 { 688 {
602 while (tap_packet *p = (tap_packet *)data_queue.get ()) 689 while (tap_packet *p = (tap_packet *)data_queue.get ())
603 { 690 {
604 send_data_packet (p); 691 if (p->len) send_data_packet (p);
605 delete p; 692 delete p;
606 } 693 }
607 694
608 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 695 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
609 { 696 {
610 send_vpn_packet (p, si, IPTOS_RELIABILITY); 697 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
611 delete p; 698 delete p;
612 } 699 }
613 } 700 }
701
702 vpn->connection_established (this);
614 } 703 }
615 else 704 else
616 { 705 {
617 retry_cnt = 0; 706 retry_cnt = 0;
618 establish_connection.start (NOW + 5); 707 establish_connection.start (5);
619 keepalive.stop (); 708 keepalive.stop ();
620 rekey.stop (); 709 rekey.stop ();
621 } 710 }
622} 711}
623 712
624void 713void
625connection::reset_si () 714connection::reset_si ()
626{ 715{
716 if (vpn->can_direct (THISNODE, conf))
627 protocol = best_protocol (THISNODE->protocols & conf->protocols); 717 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
628 718 else
629 // mask out protocols we cannot establish 719 {
630 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 720 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
631 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 721 protocol = 0;
722 }
632 723
633 si.set (conf, protocol); 724 si.set (conf, protocol);
725
726 is_direct = si.valid ();
634} 727}
635 728
636// ensure sockinfo is valid, forward if necessary 729// ensure sockinfo is valid, forward if necessary
637const sockinfo & 730const sockinfo &
638connection::forward_si (const sockinfo &si) const 731connection::forward_si (const sockinfo &si) const
639{ 732{
640 if (!si.valid ()) 733 if (!si.valid ())
641 { 734 {
642 connection *r = vpn->find_router (); 735 connection *r = vpn->find_router_for (this);
643 736
644 if (r) 737 if (r)
645 { 738 {
646 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 739 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
647 conf->nodename, r->conf->nodename); 740 conf->nodename, r->conf->nodename);
648 return r->si; 741 return r->si;
649 } 742 }
650 else 743 else
651 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 744 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
652 conf->nodename); 745 conf->nodename);
653 } 746 }
654 747
655 return si; 748 return si;
656} 749}
… …
666connection::send_ping (const sockinfo &si, u8 pong) 759connection::send_ping (const sockinfo &si, u8 pong)
667{ 760{
668 ping_packet *pkt = new ping_packet; 761 ping_packet *pkt = new ping_packet;
669 762
670 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, ">>%d %s [%s]", conf->id, pong ? "PT_PONG" : "PT_PING", (const char *)si);
766
671 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 767 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
672 768
673 delete pkt; 769 delete pkt;
674} 770}
675 771
… …
722} 818}
723 819
724void 820void
725connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 821connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
726{ 822{
727 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 823 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
728 conf->id, rid, (const char *)rsi); 824 conf->id, rid, (const char *)rsi);
729 825
730 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);
731 827
732 r->hmac_set (octx); 828 r->hmac_set (octx);
733 send_vpn_packet (r, si); 829 send_vpn_packet (r, si);
734 830
735 delete r; 831 delete r;
736} 832}
737 833
738void 834inline void
739connection::establish_connection_cb (time_watcher &w) 835connection::establish_connection_cb (ev::timer &w, int revents)
740{ 836{
741 if (!ictx 837 if (!ictx
742 && conf != THISNODE 838 && conf != THISNODE
743 && connectmode != conf_node::C_NEVER 839 && connectmode != conf_node::C_NEVER
744 && connectmode != conf_node::C_DISABLED 840 && connectmode != conf_node::C_DISABLED
745 && NOW > w.at) 841 && !w.is_active ())
746 { 842 {
747 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 843 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
748 844 // and stop trying. should probably be handled by a per-connection expire handler.
749 if (retry_int < conf->max_retry) 845 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
846 {
847 reset_connection ();
750 retry_cnt++; 848 return;
751 else 849 }
752 retry_int = conf->max_retry;
753 850
754 w.start (NOW + retry_int); 851 last_establish_attempt = ev_now ();
852
853 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
854 ? (retry_cnt & 3) + 1
855 : 1 << (retry_cnt >> 2));
755 856
756 reset_si (); 857 reset_si ();
757 858
758 if (si.prot && !si.host) 859 bool slow = si.prot & PROT_SLOW;
860
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);
759 vpn->send_connect_request (conf->id); 865 vpn->send_connect_request (conf->id);
866 }
760 else 867 else
761 { 868 {
869 if (si.valid ())
870 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
871 conf->nodename, (const char *)si);
872
762 const sockinfo &dsi = forward_si (si); 873 const sockinfo &dsi = forward_si (si);
874
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))
765 { 878 {
766 if (retry_cnt < 4) 879 if (retry_cnt < 4)
767 send_auth_request (dsi, true); 880 send_auth_request (dsi, true);
768 else 881 else
769 send_ping (dsi, 0); 882 send_ping (dsi, 0);
770 } 883 }
771 } 884 }
885
886 retry_int *= slow ? 8. : 0.9;
887
888 if (retry_int < conf->max_retry)
889 retry_cnt++;
890 else
891 retry_int = conf->max_retry;
892
893 w.start (retry_int);
772 } 894 }
773} 895}
774 896
775void 897void
776connection::reset_connection () 898connection::reset_connection ()
… …
779 { 901 {
780 slog (L_INFO, _("%s(%s): connection lost"), 902 slog (L_INFO, _("%s(%s): connection lost"),
781 conf->nodename, (const char *)si); 903 conf->nodename, (const char *)si);
782 904
783 if (::conf.script_node_down) 905 if (::conf.script_node_down)
784 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 }
785 } 911 }
786 912
787 delete ictx; ictx = 0; 913 delete ictx; ictx = 0;
788 delete octx; octx = 0; 914 delete octx; octx = 0;
915#if ENABLE_DNS
916 dnsv4_reset_connection ();
917#endif
789 918
790 si.host= 0; 919 si.host = 0;
791 920
792 last_activity = 0; 921 last_activity = 0.;
922 //last_si_change = 0.;
793 retry_cnt = 0; 923 retry_cnt = 0;
794 924
795 rekey.stop (); 925 rekey.stop ();
796 keepalive.stop (); 926 keepalive.stop ();
797 establish_connection.stop (); 927 establish_connection.stop ();
… …
804 send_reset (si); 934 send_reset (si);
805 935
806 reset_connection (); 936 reset_connection ();
807} 937}
808 938
809void 939// poor-man's rekeying
810connection::rekey_cb (time_watcher &w) 940inline void
941connection::rekey_cb (ev::timer &w, int revents)
811{ 942{
812 reset_connection (); 943 reset_connection ();
813 establish_connection (); 944 establish_connection ();
814} 945}
815 946
… …
831 if (oseqno > MAX_SEQNO) 962 if (oseqno > MAX_SEQNO)
832 rekey (); 963 rekey ();
833} 964}
834 965
835void 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
836connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 977connection::inject_data_packet (tap_packet *pkt)
837{ 978{
838 if (ictx && octx) 979 if (ictx && octx)
839 send_data_packet (pkt); 980 send_data_packet (pkt);
840 else 981 else
841 { 982 {
842 if (!broadcast)//DDDD
843 data_queue.put (new tap_packet (*pkt)); 983 data_queue.put (new tap_packet (*pkt));
844 984 post_inject_queue ();
845 establish_connection ();
846 } 985 }
847} 986}
848 987
849void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 988void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
850{ 989{
851 if (ictx && octx) 990 if (ictx && octx)
852 send_vpn_packet (pkt, si, tos); 991 send_vpn_packet (pkt, si, tos);
853 else 992 else
854 { 993 {
855 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 994 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
856 995 post_inject_queue ();
857 establish_connection ();
858 } 996 }
859} 997}
860 998
861void 999void
862connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1000connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
863{ 1001{
864 last_activity = NOW; 1002 last_activity = ev_now ();
865 1003
866 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1004 slog (L_NOISE, "<<%d received packet type %d from %d to %d.",
867 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1005 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
1006
1007 if (connectmode == conf_node::C_DISABLED)
1008 return;
868 1009
869 switch (pkt->typ ()) 1010 switch (pkt->typ ())
870 { 1011 {
871 case vpn_packet::PT_PING: 1012 case vpn_packet::PT_PING:
872 // we send pings instead of auth packets after some retries, 1013 // we send pings instead of auth packets after some retries,
… …
876 { 1017 {
877 if (auth_rate_limiter.can (rsi)) 1018 if (auth_rate_limiter.can (rsi))
878 send_auth_request (rsi, true); 1019 send_auth_request (rsi, true);
879 } 1020 }
880 else 1021 else
1022 // we would love to change thre socket address here, but ping's aren't
1023 // authenticated, so we best ignore it.
881 send_ping (rsi, 1); // pong 1024 send_ping (rsi, 1); // pong
882 1025
883 break; 1026 break;
884 1027
885 case vpn_packet::PT_PONG: 1028 case vpn_packet::PT_PONG:
… …
891 1034
892 config_packet *p = (config_packet *) pkt; 1035 config_packet *p = (config_packet *) pkt;
893 1036
894 if (!p->chk_config ()) 1037 if (!p->chk_config ())
895 { 1038 {
896 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1039 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
897 conf->nodename, (const char *)rsi); 1040 conf->nodename, (const char *)rsi);
898 connectmode = conf_node::C_DISABLED; 1041 connectmode = conf_node::C_DISABLED;
899 } 1042 }
900 else if (connectmode == conf_node::C_ALWAYS) 1043 else if (connectmode == conf_node::C_ALWAYS)
901 establish_connection (); 1044 establish_connection ();
… …
932 delete octx; 1075 delete octx;
933 1076
934 octx = new crypto_ctx (k, 1); 1077 octx = new crypto_ctx (k, 1);
935 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1078 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
936 1079
937 // compatibility code, remove when no longer required
938 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
939
940 conf->protocols = p->protocols; 1080 conf->protocols = p->protocols;
941 features = p->features & config_packet::get_features (); 1081 features = p->features & config_packet::get_features ();
942 1082
943 send_auth_response (rsi, p->id, k); 1083 send_auth_response (rsi, p->id, k);
944 1084
… …
946 1086
947 break; 1087 break;
948 } 1088 }
949 } 1089 }
950 else 1090 else
951 slog (L_WARN, _("%s(%s): protocol mismatch"), 1091 slog (L_WARN, _("%s(%s): protocol mismatch."),
952 conf->nodename, (const char *)rsi); 1092 conf->nodename, (const char *)rsi);
953 1093
954 send_reset (rsi); 1094 send_reset (rsi);
955 } 1095 }
956 1096
… …
971 1111
972 rsachallenge chg; 1112 rsachallenge chg;
973 1113
974 if (!rsa_cache.find (p->id, chg)) 1114 if (!rsa_cache.find (p->id, chg))
975 { 1115 {
976 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1116 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
977 conf->nodename, (const char *)rsi); 1117 conf->nodename, (const char *)rsi);
978 break; 1118 break;
979 } 1119 }
980 else 1120 else
981 { 1121 {
982 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1122 crypto_ctx *cctx = new crypto_ctx (chg, 0);
983 1123
984 if (!p->hmac_chk (cctx)) 1124 if (!p->hmac_chk (cctx))
985 { 1125 {
986 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1126 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
987 "could be an attack, or just corruption or a synchronization error"), 1127 "could be an attack, or just corruption or a synchronization error."),
988 conf->nodename, (const char *)rsi); 1128 conf->nodename, (const char *)rsi);
989 break; 1129 break;
990 } 1130 }
991 else 1131 else
992 { 1132 {
… …
1003 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1143 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1004 1144
1005 si = rsi; 1145 si = rsi;
1006 protocol = rsi.prot; 1146 protocol = rsi.prot;
1007 1147
1008 connection_established ();
1009
1010 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1148 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d."),
1011 conf->nodename, (const char *)rsi, 1149 conf->nodename, (const char *)rsi,
1012 p->prot_major, p->prot_minor); 1150 p->prot_major, p->prot_minor);
1013 1151
1152 connection_established ();
1153
1014 if (::conf.script_node_up) 1154 if (::conf.script_node_up)
1015 run_script (run_script_cb (this, &connection::script_node_up), false); 1155 {
1156 run_script_cb *cb = new run_script_cb;
1157 cb->set<connection, &connection::script_node_up> (this);
1158 run_script_queued (cb, _("node-up command execution failed, continuing."));
1159 }
1016 1160
1017 break; 1161 break;
1018 } 1162 }
1019 else 1163 else
1020 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1164 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1021 conf->nodename, (const char *)rsi); 1165 conf->nodename, (const char *)rsi);
1022 } 1166 }
1023 1167
1024 delete cctx; 1168 delete cctx;
1025 } 1169 }
… …
1041 { 1185 {
1042 vpndata_packet *p = (vpndata_packet *)pkt; 1186 vpndata_packet *p = (vpndata_packet *)pkt;
1043 1187
1044 if (!p->hmac_chk (ictx)) 1188 if (!p->hmac_chk (ictx))
1045 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1189 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1046 "could be an attack, or just corruption or a synchronization error"), 1190 "could be an attack, or just corruption or a synchronization error."),
1047 conf->nodename, (const char *)rsi); 1191 conf->nodename, (const char *)rsi);
1048 else 1192 else
1049 { 1193 {
1050 u32 seqno; 1194 u32 seqno;
1051 tap_packet *d = p->unpack (this, seqno); 1195 tap_packet *d = p->unpack (this, seqno);
1196 int seqclass = iseqno.seqno_classify (seqno);
1052 1197
1053 if (iseqno.recv_ok (seqno)) 1198 if (seqclass == 0) // ok
1054 { 1199 {
1055 vpn->tap->send (d); 1200 vpn->tap->send (d);
1056 1201
1057 if (si != rsi) 1202 if (si != rsi)
1058 { 1203 {
1059 // fast re-sync on connection changes, useful especially for tcp/ip 1204 // fast re-sync on source address changes, useful especially for tcp/ip
1205 //if (last_si_change < ev_now () + 5.)
1206 // {
1060 si = rsi; 1207 si = rsi;
1061 1208
1062 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1209 slog (L_INFO, _("%s(%s): socket address changed to %s."),
1063 conf->nodename, (const char *)si, (const char *)rsi); 1210 conf->nodename, (const char *)si, (const char *)rsi);
1211 // }
1212 //else
1213 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1214 // conf->nodename, (const char *)si, (const char *)rsi);
1064 } 1215 }
1216 }
1217 else if (seqclass == 1) // silently ignore
1218 slog (L_ERR, _("received duplicate packet (received %08lx, expected %08lx)\n"
1219 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1220 else if (seqclass == 2) // reset
1221 {
1222 slog (L_ERR, _("received duplicate or out-of-sync packet (received %08lx, expected %08lx)\n"
1223 "possible replay attack, or just massive packet loss, resetting connection."), seqno, iseqno.seq + 1);
1224 send_reset (rsi);
1065 } 1225 }
1066 1226
1067 delete d; 1227 delete d;
1068 break; 1228 break;
1069 } 1229 }
… …
1075 case vpn_packet::PT_CONNECT_REQ: 1235 case vpn_packet::PT_CONNECT_REQ:
1076 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1236 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1077 { 1237 {
1078 connect_req_packet *p = (connect_req_packet *) pkt; 1238 connect_req_packet *p = (connect_req_packet *) pkt;
1079 1239
1080 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1240 if (p->id > 0 && p->id <= vpn->conns.size ())
1081 connection *c = vpn->conns[p->id - 1];
1082 conf->protocols = p->protocols;
1083
1084 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1085 conf->id, p->id, c->ictx && c->octx);
1086
1087 if (c->ictx && c->octx)
1088 { 1241 {
1242 connection *c = vpn->conns[p->id - 1];
1243 conf->protocols = p->protocols;
1244
1245 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1246 conf->id, p->id, c->ictx && c->octx);
1247
1248 if (c->ictx && c->octx)
1249 {
1089 // send connect_info packets to both sides, in case one is 1250 // send connect_info packets to both sides, in case one is
1090 // behind a nat firewall (or both ;) 1251 // behind a nat firewall (or both ;)
1091 c->send_connect_info (conf->id, si, conf->protocols); 1252 c->send_connect_info (conf->id, si, conf->protocols);
1092 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1253 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1254 }
1255 else
1256 c->establish_connection ();
1093 } 1257 }
1094 else 1258 else
1095 c->establish_connection (); 1259 slog (L_WARN,
1260 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1261 p->id);
1096 } 1262 }
1097 1263
1098 break; 1264 break;
1099 1265
1100 case vpn_packet::PT_CONNECT_INFO: 1266 case vpn_packet::PT_CONNECT_INFO:
1101 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1267 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1102 { 1268 {
1103 connect_info_packet *p = (connect_info_packet *) pkt; 1269 connect_info_packet *p = (connect_info_packet *)pkt;
1104 1270
1105 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1271 if (p->id > 0 && p->id <= vpn->conns.size ())
1106 1272 {
1107 connection *c = vpn->conns[p->id - 1]; 1273 connection *c = vpn->conns[p->id - 1];
1108 1274
1109 c->conf->protocols = p->protocols; 1275 c->conf->protocols = p->protocols;
1110 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1276 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1111 p->si.upgrade_protocol (protocol, c->conf); 1277 p->si.upgrade_protocol (protocol, c->conf);
1112 1278
1113 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1279 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1114 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1280 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1115 1281
1116 const sockinfo &dsi = forward_si (p->si); 1282 const sockinfo &dsi = forward_si (p->si);
1117 1283
1118 if (dsi.valid ()) 1284 if (dsi.valid ())
1119 c->send_auth_request (dsi, true); 1285 c->send_auth_request (dsi, true);
1286 }
1287 else
1288 slog (L_WARN,
1289 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1290 p->id);
1120 } 1291 }
1121 1292
1122 break; 1293 break;
1123 1294
1124 default: 1295 default:
1125 send_reset (rsi); 1296 send_reset (rsi);
1126 break; 1297 break;
1127 } 1298 }
1128} 1299}
1129 1300
1130void connection::keepalive_cb (time_watcher &w) 1301inline void
1302connection::keepalive_cb (ev::timer &w, int revents)
1131{ 1303{
1132 if (NOW >= last_activity + ::conf.keepalive + 30) 1304 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1133 { 1305 {
1134 reset_connection (); 1306 reset_connection ();
1135 establish_connection (); 1307 establish_connection ();
1136 } 1308 }
1137 else if (NOW < last_activity + ::conf.keepalive) 1309 else if (ev_now () < last_activity + ::conf.keepalive)
1138 w.start (last_activity + ::conf.keepalive); 1310 w.start (last_activity + ::conf.keepalive - ev::now ());
1139 else if (conf->connectmode != conf_node::C_ONDEMAND 1311 else if (conf->connectmode != conf_node::C_ONDEMAND
1140 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1312 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1141 { 1313 {
1142 send_ping (si); 1314 send_ping (si);
1143 w.start (NOW + 5); 1315 w.start (5);
1144 } 1316 }
1145 else if (NOW < last_activity + ::conf.keepalive + 10) 1317 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1146 // hold ondemand connections implicitly a few seconds longer 1318 // hold ondemand connections implicitly a few seconds longer
1147 // should delete octx, though, or something like that ;) 1319 // should delete octx, though, or something like that ;)
1148 w.start (last_activity + ::conf.keepalive + 10); 1320 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1149 else 1321 else
1150 reset_connection (); 1322 reset_connection ();
1151} 1323}
1152 1324
1153void connection::send_connect_request (int id) 1325void connection::send_connect_request (int id)
… …
1159 send_vpn_packet (p, si); 1331 send_vpn_packet (p, si);
1160 1332
1161 delete p; 1333 delete p;
1162} 1334}
1163 1335
1336void connection::script_init_env (const char *ext)
1337{
1338 char *env;
1339 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1340 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1341 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1342 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1343 conf->id & 0xff); putenv (env);
1344}
1345
1164void connection::script_node () 1346void connection::script_init_connect_env ()
1165{ 1347{
1166 vpn->script_if_up (); 1348 vpn->script_init_env ();
1167 1349
1168 char *env; 1350 char *env;
1169 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1351 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1170 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1352 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1171 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1353 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1172 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1354 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1173} 1355}
1174 1356
1357inline const char *
1175const char *connection::script_node_up () 1358connection::script_node_up ()
1176{ 1359{
1177 script_node (); 1360 script_init_connect_env ();
1178 1361
1179 putenv ("STATE=up"); 1362 putenv ((char *)"STATE=up");
1180 1363
1364 char *filename;
1365 asprintf (&filename,
1366 "%s/%s",
1367 confbase,
1181 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1368 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1182}
1183 1369
1370 return filename;
1371}
1372
1373inline const char *
1184const char *connection::script_node_down () 1374connection::script_node_down ()
1185{ 1375{
1186 script_node (); 1376 script_init_connect_env ();
1187 1377
1188 putenv ("STATE=down"); 1378 putenv ((char *)"STATE=down");
1189 1379
1190 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1380 char *filename;
1191} 1381 asprintf (&filename,
1382 "%s/%s",
1383 confbase,
1384 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1192 1385
1386 return filename;
1387}
1388
1193connection::connection(struct vpn *vpn_) 1389connection::connection (struct vpn *vpn, conf_node *conf)
1194: vpn(vpn_) 1390: vpn(vpn), conf(conf),
1195, rekey (this, &connection::rekey_cb) 1391#if ENABLE_DNS
1196, keepalive (this, &connection::keepalive_cb) 1392 dns (0),
1393#endif
1394 data_queue(conf->max_ttl, conf->max_queue + 1),
1395 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1396{
1397 rekey .set<connection, &connection::rekey_cb > (this);
1398 keepalive .set<connection, &connection::keepalive_cb > (this);
1197, establish_connection (this, &connection::establish_connection_cb) 1399 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1198{ 1400
1401 last_establish_attempt = 0.;
1199 octx = ictx = 0; 1402 octx = ictx = 0;
1200 retry_cnt = 0;
1201 1403
1202 connectmode = conf_node::C_ALWAYS; // initial setting 1404 if (!conf->protocols) // make sure some protocol is enabled
1405 conf->protocols = PROT_UDPv4;
1406
1407 connectmode = conf->connectmode;
1408
1409 // queue a dummy packet to force an initial connection attempt
1410 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1411 vpn_queue.put (new net_packet);
1412
1203 reset_connection (); 1413 reset_connection ();
1204} 1414}
1205 1415
1206connection::~connection () 1416connection::~connection ()
1207{ 1417{

Diff Legend

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