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.59 by pcg, Mon Dec 5 12:58:09 2005 UTC vs.
Revision 1.82 by pcg, Fri Aug 15 18:35:24 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. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
20*/ 30*/
21 31
22#include "config.h" 32#include "config.h"
23 33
24#include <list> 34#include <list>
35#include <queue>
36#include <utility>
25 37
26#include <openssl/rand.h> 38#include <openssl/rand.h>
27#include <openssl/evp.h> 39#include <openssl/evp.h>
28#include <openssl/rsa.h> 40#include <openssl/rsa.h>
29#include <openssl/err.h> 41#include <openssl/err.h>
… …
45#define ULTRA_FAST 1 57#define ULTRA_FAST 1
46#define HLOG 15 58#define HLOG 15
47#include "lzf/lzf.h" 59#include "lzf/lzf.h"
48#include "lzf/lzf_c.c" 60#include "lzf/lzf_c.c"
49#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//////////////////////////////////////////////////////////////////////////////
50 103
51struct crypto_ctx 104struct crypto_ctx
52{ 105{
53 EVP_CIPHER_CTX cctx; 106 EVP_CIPHER_CTX cctx;
54 HMAC_CTX hctx; 107 HMAC_CTX hctx;
… …
82 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 135 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 136 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
84 EVP_MD_CTX_cleanup (&ctx); 137 EVP_MD_CTX_cleanup (&ctx);
85} 138}
86 139
87struct rsa_entry { 140struct rsa_entry
141{
88 tstamp expire; 142 tstamp expire;
89 rsaid id; 143 rsaid id;
90 rsachallenge chg; 144 rsachallenge chg;
91}; 145};
92 146
93struct rsa_cache : list<rsa_entry> 147struct rsa_cache : list<rsa_entry>
94{ 148{
95 void cleaner_cb (time_watcher &w); time_watcher cleaner; 149 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
96 150
97 bool find (const rsaid &id, rsachallenge &chg) 151 bool find (const rsaid &id, rsachallenge &chg)
98 { 152 {
99 for (iterator i = begin (); i != end (); ++i) 153 for (iterator i = begin (); i != end (); ++i)
100 { 154 {
101 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 155 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
102 { 156 {
103 memcpy (&chg, &i->chg, sizeof chg); 157 memcpy (&chg, &i->chg, sizeof chg);
104 158
105 erase (i); 159 erase (i);
106 return true; 160 return true;
107 } 161 }
108 } 162 }
109 163
110 if (cleaner.at < NOW) 164 if (!cleaner.is_active ())
111 cleaner.start (NOW + RSA_TTL); 165 cleaner.again ();
112 166
113 return false; 167 return false;
114 } 168 }
115 169
116 void gen (rsaid &id, rsachallenge &chg) 170 void gen (rsaid &id, rsachallenge &chg)
… …
118 rsa_entry e; 172 rsa_entry e;
119 173
120 RAND_bytes ((unsigned char *)&id, sizeof id); 174 RAND_bytes ((unsigned char *)&id, sizeof id);
121 RAND_bytes ((unsigned char *)&chg, sizeof chg); 175 RAND_bytes ((unsigned char *)&chg, sizeof chg);
122 176
123 e.expire = NOW + RSA_TTL; 177 e.expire = ev_now () + RSA_TTL;
124 e.id = id; 178 e.id = id;
125 memcpy (&e.chg, &chg, sizeof chg); 179 memcpy (&e.chg, &chg, sizeof chg);
126 180
127 push_back (e); 181 push_back (e);
128 182
129 if (cleaner.at < NOW) 183 if (!cleaner.is_active ())
130 cleaner.start (NOW + RSA_TTL); 184 cleaner.again ();
131 } 185 }
132 186
133 rsa_cache () 187 rsa_cache ()
134 : cleaner (this, &rsa_cache::cleaner_cb)
135 { } 188 {
189 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
190 cleaner.set (RSA_TTL, RSA_TTL);
191 }
136 192
137} rsa_cache; 193} rsa_cache;
138 194
139void rsa_cache::cleaner_cb (time_watcher &w) 195void rsa_cache::cleaner_cb (ev::timer &w, int revents)
140{ 196{
141 if (!empty ()) 197 if (empty ())
198 w.stop ();
199 else
142 { 200 {
143 w.start (NOW + RSA_TTL);
144
145 for (iterator i = begin (); i != end (); ) 201 for (iterator i = begin (); i != end (); )
146 if (i->expire <= NOW) 202 if (i->expire <= ev_now ())
147 i = erase (i); 203 i = erase (i);
148 else 204 else
149 ++i; 205 ++i;
150 } 206 }
151} 207}
152 208
153////////////////////////////////////////////////////////////////////////////// 209//////////////////////////////////////////////////////////////////////////////
154 210
155void 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)
156{ 213{
157 if (queue[i]) 214 queue = new pkt [max_queue];
158 {
159 delete queue[i];
160 j = (j + 1) % QUEUEDEPTH;
161 }
162 215
163 queue[i] = p;
164
165 i = (i + 1) % QUEUEDEPTH;
166}
167
168net_packet *pkt_queue::get ()
169{
170 net_packet *p = queue[j];
171
172 if (p)
173 {
174 queue[j] = 0;
175 j = (j + 1) % QUEUEDEPTH;
176 }
177
178 return p;
179}
180
181pkt_queue::pkt_queue ()
182{
183 memset (queue, 0, sizeof (queue));
184 i = 0; 216 i = 0;
185 j = 0; 217 j = 0;
218
219 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
186} 220}
187 221
188pkt_queue::~pkt_queue () 222pkt_queue::~pkt_queue ()
189{ 223{
190 for (i = QUEUEDEPTH; --i > 0; ) 224 while (net_packet *p = get ())
225 delete p;
226
191 delete queue[i]; 227 delete [] queue;
192} 228}
193 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
194struct net_rateinfo { 283struct net_rateinfo
284{
195 u32 host; 285 u32 host;
196 double pcnt, diff; 286 double pcnt, diff;
197 tstamp last; 287 tstamp last;
198}; 288};
199 289
… …
218 iterator i; 308 iterator i;
219 309
220 for (i = begin (); i != end (); ) 310 for (i = begin (); i != end (); )
221 if (i->host == host) 311 if (i->host == host)
222 break; 312 break;
223 else if (i->last < NOW - NRL_EXPIRE) 313 else if (i->last < ev_now () - NRL_EXPIRE)
224 i = erase (i); 314 i = erase (i);
225 else 315 else
226 i++; 316 i++;
227 317
228 if (i == end ()) 318 if (i == end ())
… …
230 net_rateinfo ri; 320 net_rateinfo ri;
231 321
232 ri.host = host; 322 ri.host = host;
233 ri.pcnt = 1.; 323 ri.pcnt = 1.;
234 ri.diff = NRL_MAXDIF; 324 ri.diff = NRL_MAXDIF;
235 ri.last = NOW; 325 ri.last = ev_now ();
236 326
237 push_front (ri); 327 push_front (ri);
238 328
239 return true; 329 return true;
240 } 330 }
… …
242 { 332 {
243 net_rateinfo ri (*i); 333 net_rateinfo ri (*i);
244 erase (i); 334 erase (i);
245 335
246 ri.pcnt = ri.pcnt * NRL_ALPHA; 336 ri.pcnt = ri.pcnt * NRL_ALPHA;
247 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last); 337 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
248 338
249 ri.last = NOW; 339 ri.last = ev_now ();
250 340
251 double dif = ri.diff / ri.pcnt; 341 double dif = ri.diff / ri.pcnt;
252 342
253 bool send = dif > NRL_CUTOFF; 343 bool send = dif > NRL_CUTOFF;
254 344
… …
582///////////////////////////////////////////////////////////////////////////// 672/////////////////////////////////////////////////////////////////////////////
583 673
584void 674void
585connection::connection_established () 675connection::connection_established ()
586{ 676{
677 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
678
587 if (ictx && octx) 679 if (ictx && octx)
588 { 680 {
589 connectmode = conf->connectmode;
590
591 // make sure rekeying timeouts are slightly asymmetric 681 // make sure rekeying timeouts are slightly asymmetric
592 rekey.start (NOW + ::conf.rekey 682 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
593 + (conf->id > THISNODE->id ? 10 : 0)); 683 rekey.start (rekey_interval, rekey_interval);
594 keepalive.start (NOW + ::conf.keepalive); 684 keepalive.start (::conf.keepalive);
595 685
596 // send queued packets 686 // send queued packets
597 if (ictx && octx) 687 if (ictx && octx)
598 { 688 {
599 while (tap_packet *p = (tap_packet *)data_queue.get ()) 689 while (tap_packet *p = (tap_packet *)data_queue.get ())
600 { 690 {
601 send_data_packet (p); 691 if (p->len) send_data_packet (p);
602 delete p; 692 delete p;
603 } 693 }
604 694
605 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 695 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
606 { 696 {
607 send_vpn_packet (p, si, IPTOS_RELIABILITY); 697 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
608 delete p; 698 delete p;
609 } 699 }
610 } 700 }
701
702 vpn->connection_established (this);
611 } 703 }
612 else 704 else
613 { 705 {
614 retry_cnt = 0; 706 retry_cnt = 0;
615 establish_connection.start (NOW + 5); 707 establish_connection.start (5);
616 keepalive.stop (); 708 keepalive.stop ();
617 rekey.stop (); 709 rekey.stop ();
618 } 710 }
619} 711}
620 712
621void 713void
622connection::reset_si () 714connection::reset_si ()
623{ 715{
716 if (vpn->can_direct (THISNODE, conf))
624 protocol = best_protocol (THISNODE->protocols & conf->protocols); 717 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
625 718 else
626 // mask out protocols we cannot establish
627 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
628 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
629 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
630
631 if (protocol
632 && (!conf->can_direct (THISNODE)
633 || !THISNODE->can_direct (conf)))
634 { 719 {
635 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename); 720 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
636 protocol = 0; 721 protocol = 0;
637 } 722 }
638 723
639 si.set (conf, protocol); 724 si.set (conf, protocol);
725
726 is_direct = si.valid ();
640} 727}
641 728
642// ensure sockinfo is valid, forward if necessary 729// ensure sockinfo is valid, forward if necessary
643const sockinfo & 730const sockinfo &
644connection::forward_si (const sockinfo &si) const 731connection::forward_si (const sockinfo &si) const
645{ 732{
646 if (!si.valid ()) 733 if (!si.valid ())
647 { 734 {
648 connection *r = vpn->find_router (); 735 connection *r = vpn->find_router_for (this);
649 736
650 if (r) 737 if (r)
651 { 738 {
652 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."),
653 conf->nodename, r->conf->nodename, (const char *)r->si); 740 conf->nodename, r->conf->nodename);
654 return r->si; 741 return r->si;
655 } 742 }
656 else 743 else
657 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 744 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
658 conf->nodename); 745 conf->nodename);
659 } 746 }
660 747
661 return si; 748 return si;
662} 749}
… …
672connection::send_ping (const sockinfo &si, u8 pong) 759connection::send_ping (const sockinfo &si, u8 pong)
673{ 760{
674 ping_packet *pkt = new ping_packet; 761 ping_packet *pkt = new ping_packet;
675 762
676 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
677 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 767 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
678 768
679 delete pkt; 769 delete pkt;
680} 770}
681 771
… …
700 790
701 rsachallenge chg; 791 rsachallenge chg;
702 rsa_cache.gen (pkt->id, chg); 792 rsa_cache.gen (pkt->id, chg);
703 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 793 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
704 794
705 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);
706 796
707 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
708 798
709 delete pkt; 799 delete pkt;
710} 800}
… …
718 808
719 rsa_hash (id, chg, pkt->response); 809 rsa_hash (id, chg, pkt->response);
720 810
721 pkt->hmac_set (octx); 811 pkt->hmac_set (octx);
722 812
723 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);
724 814
725 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
726 816
727 delete pkt; 817 delete pkt;
728} 818}
729 819
730void 820void
731connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 821connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
732{ 822{
733 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)", 823 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,
734 conf->id, rid, (const char *)rsi); 824 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
735 825
736 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);
737 827
738 r->hmac_set (octx); 828 r->hmac_set (octx);
739 send_vpn_packet (r, si); 829 send_vpn_packet (r, si);
740 830
741 delete r; 831 delete r;
742} 832}
743 833
744void 834inline void
745connection::establish_connection_cb (time_watcher &w) 835connection::establish_connection_cb (ev::timer &w, int revents)
746{ 836{
747 if (!ictx 837 if (!ictx
748 && conf != THISNODE 838 && conf != THISNODE
749 && connectmode != conf_node::C_NEVER 839 && connectmode != conf_node::C_NEVER
750 && connectmode != conf_node::C_DISABLED 840 && connectmode != conf_node::C_DISABLED
751 && NOW > w.at) 841 && !w.is_active ())
752 { 842 {
753 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 }
754 850
755 double retry_int = double (retry_cnt & 3 851 last_establish_attempt = ev_now ();
852
853 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
756 ? (retry_cnt & 3) + 1 854 ? (retry_cnt & 3) + 1
757 : 1 << (retry_cnt >> 2)); 855 : 1 << (retry_cnt >> 2));
758 856
759 reset_si (); 857 reset_si ();
760 858
761 bool slow = si.prot & PROT_SLOW; 859 bool slow = si.prot & PROT_SLOW;
762 860
763 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);
764 vpn->send_connect_request (conf->id); 865 vpn->send_connect_request (this);
866 }
765 else 867 else
766 { 868 {
869 if (si.valid ())
870 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
871 conf->nodename, (const char *)si);
872
767 const sockinfo &dsi = forward_si (si); 873 const sockinfo &dsi = forward_si (si);
768 874
769 slow = slow || (dsi.prot & PROT_SLOW); 875 slow = slow || (dsi.prot & PROT_SLOW);
770 876
771 if (dsi.valid () && auth_rate_limiter.can (dsi)) 877 if (dsi.valid () && auth_rate_limiter.can (dsi))
… …
775 else 881 else
776 send_ping (dsi, 0); 882 send_ping (dsi, 0);
777 } 883 }
778 } 884 }
779 885
780 retry_int *= slow ? 8. : 0.7; 886 retry_int *= slow ? 8. : 0.9;
781 887
782 if (retry_int < conf->max_retry) 888 if (retry_int < conf->max_retry)
783 retry_cnt++; 889 retry_cnt++;
784 else 890 else
785 retry_int = conf->max_retry; 891 retry_int = conf->max_retry;
786 892
787 w.start (NOW + retry_int); 893 w.start (retry_int);
788 } 894 }
789} 895}
790 896
791void 897void
792connection::reset_connection () 898connection::reset_connection ()
… …
795 { 901 {
796 slog (L_INFO, _("%s(%s): connection lost"), 902 slog (L_INFO, _("%s(%s): connection lost"),
797 conf->nodename, (const char *)si); 903 conf->nodename, (const char *)si);
798 904
799 if (::conf.script_node_down) 905 if (::conf.script_node_down)
800 if (!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);
801 slog (L_WARN, _("node-down command execution failed, continuing.")); 909 run_script_queued (cb, _("node-down command execution failed, continuing."));
910 }
802 } 911 }
803 912
804 delete ictx; ictx = 0; 913 delete ictx; ictx = 0;
805 delete octx; octx = 0; 914 delete octx; octx = 0;
806#if ENABLE_DNS 915#if ENABLE_DNS
807 dnsv4_reset_connection (); 916 dnsv4_reset_connection ();
808#endif 917#endif
809 918
810 si.host = 0; 919 si.host = 0;
811 920
812 last_activity = 0; 921 last_activity = 0.;
922 //last_si_change = 0.;
813 retry_cnt = 0; 923 retry_cnt = 0;
814 924
815 rekey.stop (); 925 rekey.stop ();
816 keepalive.stop (); 926 keepalive.stop ();
817 establish_connection.stop (); 927 establish_connection.stop ();
… …
824 send_reset (si); 934 send_reset (si);
825 935
826 reset_connection (); 936 reset_connection ();
827} 937}
828 938
829void 939// poor-man's rekeying
830connection::rekey_cb (time_watcher &w) 940inline void
941connection::rekey_cb (ev::timer &w, int revents)
831{ 942{
832 reset_connection (); 943 reset_connection ();
833 establish_connection (); 944 establish_connection ();
834} 945}
835 946
… …
851 if (oseqno > MAX_SEQNO) 962 if (oseqno > MAX_SEQNO)
852 rekey (); 963 rekey ();
853} 964}
854 965
855void 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
856connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 977connection::inject_data_packet (tap_packet *pkt)
857{ 978{
858 if (ictx && octx) 979 if (ictx && octx)
859 send_data_packet (pkt); 980 send_data_packet (pkt);
860 else 981 else
861 { 982 {
862 if (!broadcast)
863 data_queue.put (new tap_packet (*pkt)); 983 data_queue.put (new tap_packet (*pkt));
864 984 post_inject_queue ();
865 establish_connection ();
866 } 985 }
867} 986}
868 987
869void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 988void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
870{ 989{
871 if (ictx && octx) 990 if (ictx && octx)
872 send_vpn_packet (pkt, si, tos); 991 send_vpn_packet (pkt, si, tos);
873 else 992 else
874 { 993 {
875 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 994 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
876 995 post_inject_queue ();
877 establish_connection ();
878 } 996 }
879} 997}
880 998
881void 999void
882connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1000connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
883{ 1001{
884 last_activity = NOW; 1002 last_activity = ev_now ();
885 1003
886 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.",
887 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;
888 1009
889 switch (pkt->typ ()) 1010 switch (pkt->typ ())
890 { 1011 {
891 case vpn_packet::PT_PING: 1012 case vpn_packet::PT_PING:
1013 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1014
892 // we send pings instead of auth packets after some retries, 1015 // we send pings instead of auth packets after some retries,
893 // so reset the retry counter and establish a connection 1016 // so reset the retry counter and establish a connection
894 // when we receive a ping. 1017 // when we receive a ping.
895 if (!ictx) 1018 if (!ictx)
896 { 1019 {
897 if (auth_rate_limiter.can (rsi)) 1020 if (auth_rate_limiter.can (rsi))
898 send_auth_request (rsi, true); 1021 send_auth_request (rsi, true);
899 } 1022 }
900 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.
901 send_ping (rsi, 1); // pong 1026 send_ping (rsi, 1); // pong
902 1027
903 break; 1028 break;
904 1029
905 case vpn_packet::PT_PONG: 1030 case vpn_packet::PT_PONG:
1031 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
906 break; 1032 break;
907 1033
908 case vpn_packet::PT_RESET: 1034 case vpn_packet::PT_RESET:
909 { 1035 {
910 reset_connection (); 1036 reset_connection ();
911 1037
912 config_packet *p = (config_packet *) pkt; 1038 config_packet *p = (config_packet *) pkt;
913 1039
914 if (!p->chk_config ()) 1040 if (!p->chk_config ())
915 { 1041 {
916 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1042 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
917 conf->nodename, (const char *)rsi); 1043 conf->nodename, (const char *)rsi);
918 connectmode = conf_node::C_DISABLED; 1044 connectmode = conf_node::C_DISABLED;
919 } 1045 }
920 else if (connectmode == conf_node::C_ALWAYS) 1046 else if (connectmode == conf_node::C_ALWAYS)
921 establish_connection (); 1047 establish_connection ();
… …
925 case vpn_packet::PT_AUTH_REQ: 1051 case vpn_packet::PT_AUTH_REQ:
926 if (auth_rate_limiter.can (rsi)) 1052 if (auth_rate_limiter.can (rsi))
927 { 1053 {
928 auth_req_packet *p = (auth_req_packet *) pkt; 1054 auth_req_packet *p = (auth_req_packet *) pkt;
929 1055
930 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");
931 1057
932 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1058 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8))
933 { 1059 {
934 if (p->prot_minor != PROTOCOL_MINOR) 1060 if (p->prot_minor != PROTOCOL_MINOR)
935 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."),
… …
963 1089
964 break; 1090 break;
965 } 1091 }
966 } 1092 }
967 else 1093 else
968 slog (L_WARN, _("%s(%s): protocol mismatch"), 1094 slog (L_WARN, _("%s(%s): protocol mismatch."),
969 conf->nodename, (const char *)rsi); 1095 conf->nodename, (const char *)rsi);
970 1096
971 send_reset (rsi); 1097 send_reset (rsi);
972 } 1098 }
973 1099
974 break; 1100 break;
975 1101
976 case vpn_packet::PT_AUTH_RES: 1102 case vpn_packet::PT_AUTH_RES:
977 { 1103 {
978 auth_res_packet *p = (auth_res_packet *) pkt; 1104 auth_res_packet *p = (auth_res_packet *)pkt;
979 1105
980 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1106 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
981 1107
982 if (p->chk_config ()) 1108 if (p->chk_config ())
983 { 1109 {
984 if (p->prot_minor != PROTOCOL_MINOR) 1110 if (p->prot_minor != PROTOCOL_MINOR)
985 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."),
… …
988 1114
989 rsachallenge chg; 1115 rsachallenge chg;
990 1116
991 if (!rsa_cache.find (p->id, chg)) 1117 if (!rsa_cache.find (p->id, chg))
992 { 1118 {
993 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1119 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
994 conf->nodename, (const char *)rsi); 1120 conf->nodename, (const char *)rsi);
995 break; 1121 break;
996 } 1122 }
997 else 1123 else
998 { 1124 {
999 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1125 crypto_ctx *cctx = new crypto_ctx (chg, 0);
1000 1126
1001 if (!p->hmac_chk (cctx)) 1127 if (!p->hmac_chk (cctx))
1002 { 1128 {
1003 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"
1004 "could be an attack, or just corruption or a synchronization error"), 1130 "could be an attack, or just corruption or a synchronization error."),
1005 conf->nodename, (const char *)rsi); 1131 conf->nodename, (const char *)rsi);
1006 break; 1132 break;
1007 } 1133 }
1008 else 1134 else
1009 { 1135 {
… …
1020 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
1021 1147
1022 si = rsi; 1148 si = rsi;
1023 protocol = rsi.prot; 1149 protocol = rsi.prot;
1024 1150
1151 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1152 conf->nodename, (const char *)rsi,
1153 is_direct ? "direct" : "forwarded",
1154 p->prot_major, p->prot_minor);
1155
1025 connection_established (); 1156 connection_established ();
1026 1157
1027 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1028 conf->nodename, (const char *)rsi,
1029 p->prot_major, p->prot_minor);
1030
1031 if (::conf.script_node_up) 1158 if (::conf.script_node_up)
1032 if (!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);
1033 slog (L_WARN, _("node-up command execution failed, continuing.")); 1162 run_script_queued (cb, _("node-up command execution failed, continuing."));
1163 }
1034 1164
1035 break; 1165 break;
1036 } 1166 }
1037 else 1167 else
1038 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."),
1039 conf->nodename, (const char *)rsi); 1169 conf->nodename, (const char *)rsi);
1040 } 1170 }
1041 1171
1042 delete cctx; 1172 delete cctx;
1043 } 1173 }
… …
1059 { 1189 {
1060 vpndata_packet *p = (vpndata_packet *)pkt; 1190 vpndata_packet *p = (vpndata_packet *)pkt;
1061 1191
1062 if (!p->hmac_chk (ictx)) 1192 if (!p->hmac_chk (ictx))
1063 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"
1064 "could be an attack, or just corruption or a synchronization error"), 1194 "could be an attack, or just corruption or a synchronization error."),
1065 conf->nodename, (const char *)rsi); 1195 conf->nodename, (const char *)rsi);
1066 else 1196 else
1067 { 1197 {
1068 u32 seqno; 1198 u32 seqno;
1069 tap_packet *d = p->unpack (this, seqno); 1199 tap_packet *d = p->unpack (this, seqno);
1200 int seqclass = iseqno.seqno_classify (seqno);
1070 1201
1071 if (iseqno.recv_ok (seqno)) 1202 if (seqclass == 0) // ok
1072 { 1203 {
1073 vpn->tap->send (d); 1204 vpn->tap->send (d);
1074 1205
1075 if (si != rsi) 1206 if (si != rsi)
1076 { 1207 {
1077 // fast re-sync on source address 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.)
1078 si = rsi; 1210 // {
1079
1080 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1211 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1081 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);
1082 } 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);
1083 } 1232 }
1084 1233
1085 delete d; 1234 delete d;
1086 break; 1235 break;
1087 } 1236 }
… …
1098 if (p->id > 0 && p->id <= vpn->conns.size ()) 1247 if (p->id > 0 && p->id <= vpn->conns.size ())
1099 { 1248 {
1100 connection *c = vpn->conns[p->id - 1]; 1249 connection *c = vpn->conns[p->id - 1];
1101 conf->protocols = p->protocols; 1250 conf->protocols = p->protocols;
1102 1251
1103 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]", 1252 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]",
1104 conf->id, p->id, c->ictx && c->octx); 1253 conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx);
1105 1254
1106 if (c->ictx && c->octx) 1255 if (c->ictx && c->octx)
1107 { 1256 {
1108 // send connect_info packets to both sides, in case one is 1257 // send connect_info packets to both sides, in case one is
1109 // behind a nat firewall (or both ;) 1258 // behind a nat firewall (or both ;)
… …
1132 1281
1133 c->conf->protocols = p->protocols; 1282 c->conf->protocols = p->protocols;
1134 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));
1135 p->si.upgrade_protocol (protocol, c->conf); 1284 p->si.upgrade_protocol (protocol, c->conf);
1136 1285
1137 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,
1138 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1288 (const char *)p->si, !c->ictx && !c->octx);
1139 1289
1140 const sockinfo &dsi = forward_si (p->si); 1290 const sockinfo &dsi = forward_si (p->si);
1141 1291
1142 if (dsi.valid ()) 1292 if (dsi.valid ())
1143 c->send_auth_request (dsi, true); 1293 c->send_auth_request (dsi, true);
… …
1154 send_reset (rsi); 1304 send_reset (rsi);
1155 break; 1305 break;
1156 } 1306 }
1157} 1307}
1158 1308
1159void connection::keepalive_cb (time_watcher &w) 1309inline void
1310connection::keepalive_cb (ev::timer &w, int revents)
1160{ 1311{
1161 if (NOW >= last_activity + ::conf.keepalive + 30) 1312 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1162 { 1313 {
1163 reset_connection (); 1314 reset_connection ();
1164 establish_connection (); 1315 establish_connection ();
1165 } 1316 }
1166 else if (NOW < last_activity + ::conf.keepalive) 1317 else if (ev_now () < last_activity + ::conf.keepalive)
1167 w.start (last_activity + ::conf.keepalive); 1318 w.start (last_activity + ::conf.keepalive - ev::now ());
1168 else if (conf->connectmode != conf_node::C_ONDEMAND 1319 else if (conf->connectmode != conf_node::C_ONDEMAND
1169 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1320 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1170 { 1321 {
1171 send_ping (si); 1322 send_ping (si);
1172 w.start (NOW + 5); 1323 w.start (5);
1173 } 1324 }
1174 else if (NOW < last_activity + ::conf.keepalive + 10) 1325 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1175 // hold ondemand connections implicitly a few seconds longer 1326 // hold ondemand connections implicitly a few seconds longer
1176 // should delete octx, though, or something like that ;) 1327 // should delete octx, though, or something like that ;)
1177 w.start (last_activity + ::conf.keepalive + 10); 1328 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1178 else 1329 else
1179 reset_connection (); 1330 reset_connection ();
1180} 1331}
1181 1332
1182void connection::send_connect_request (int id) 1333void connection::send_connect_request (int id)
1183{ 1334{
1184 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);
1185 1336
1186 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);
1187 p->hmac_set (octx); 1339 p->hmac_set (octx);
1188 send_vpn_packet (p, si); 1340 send_vpn_packet (p, si);
1189 1341
1190 delete p; 1342 delete p;
1191} 1343}
… …
1209 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1361 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1210 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1362 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1211 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1363 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1212} 1364}
1213 1365
1366inline const char *
1214const char *connection::script_node_up () 1367connection::script_node_up ()
1215{ 1368{
1216 script_init_connect_env (); 1369 script_init_connect_env ();
1217 1370
1218 putenv ("STATE=up"); 1371 putenv ((char *)"STATE=up");
1219 1372
1220 char *filename; 1373 char *filename;
1221 asprintf (&filename, 1374 asprintf (&filename,
1222 "%s/%s", 1375 "%s/%s",
1223 confbase, 1376 confbase,
1224 ::conf.script_node_up ? ::conf.script_node_up : "node-up"); 1377 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1225 1378
1226 return filename; 1379 return filename;
1227} 1380}
1228 1381
1382inline const char *
1229const char *connection::script_node_down () 1383connection::script_node_down ()
1230{ 1384{
1231 script_init_connect_env (); 1385 script_init_connect_env ();
1232 1386
1233 putenv ("STATE=down"); 1387 putenv ((char *)"STATE=down");
1234 1388
1235 char *filename; 1389 char *filename;
1236 asprintf (&filename, 1390 asprintf (&filename,
1237 "%s/%s", 1391 "%s/%s",
1238 confbase, 1392 confbase,
… …
1240 1394
1241 return filename; 1395 return filename;
1242} 1396}
1243 1397
1244connection::connection (struct vpn *vpn, conf_node *conf) 1398connection::connection (struct vpn *vpn, conf_node *conf)
1245: vpn(vpn), conf(conf) 1399: vpn(vpn), conf(conf),
1246, rekey (this, &connection::rekey_cb)
1247, keepalive (this, &connection::keepalive_cb)
1248, establish_connection (this, &connection::establish_connection_cb)
1249#if ENABLE_DNS 1400#if ENABLE_DNS
1250, dns (0) 1401 dns (0),
1251#endif 1402#endif
1403 data_queue(conf->max_ttl, conf->max_queue + 1),
1404 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1252{ 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.;
1253 octx = ictx = 0; 1411 octx = ictx = 0;
1254 retry_cnt = 0;
1255 1412
1256 if (!conf->protocols) // make sure some protocol is enabled 1413 if (!conf->protocols) // make sure some protocol is enabled
1257 conf->protocols = PROT_UDPv4; 1414 conf->protocols = PROT_UDPv4;
1258 1415
1259 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
1260 reset_connection (); 1422 reset_connection ();
1261} 1423}
1262 1424
1263connection::~connection () 1425connection::~connection ()
1264{ 1426{

Diff Legend

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