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.61 by pcg, Sat Nov 10 19:43:37 2007 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 (ev::timer &w, int revents); ev::timer 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 > ev::ev_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;
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 = ev::ev_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.is_active ()) 183 if (!cleaner.is_active ())
130 cleaner.again (); 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);
136 cleaner.set (RSA_TTL, RSA_TTL); 190 cleaner.set (RSA_TTL, RSA_TTL);
137 } 191 }
138 192
139} rsa_cache; 193} rsa_cache;
140 194
143 if (empty ()) 197 if (empty ())
144 w.stop (); 198 w.stop ();
145 else 199 else
146 { 200 {
147 for (iterator i = begin (); i != end (); ) 201 for (iterator i = begin (); i != end (); )
148 if (i->expire <= ev::ev_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 < ev::ev_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 = ev::ev_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 + (ev::ev_now () - ri.last); 337 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
250 338
251 ri.last = ev::ev_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
584///////////////////////////////////////////////////////////////////////////// 672/////////////////////////////////////////////////////////////////////////////
585 673
586void 674void
587connection::connection_established () 675connection::connection_established ()
588{ 676{
589 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx); 677 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
590 678
591 if (ictx && octx) 679 if (ictx && octx)
592 { 680 {
593 connectmode = conf->connectmode;
594
595 // make sure rekeying timeouts are slightly asymmetric 681 // make sure rekeying timeouts are slightly asymmetric
596 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0); 682 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
597 rekey.start (rekey_interval, rekey_interval); 683 rekey.start (rekey_interval, rekey_interval);
598 keepalive.start (::conf.keepalive); 684 keepalive.start (::conf.keepalive);
599 685
600 // send queued packets 686 // send queued packets
601 if (ictx && octx) 687 if (ictx && octx)
602 { 688 {
603 while (tap_packet *p = (tap_packet *)data_queue.get ()) 689 while (tap_packet *p = (tap_packet *)data_queue.get ())
604 { 690 {
605 send_data_packet (p); 691 if (p->len) send_data_packet (p);
606 delete p; 692 delete p;
607 } 693 }
608 694
609 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 695 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
610 { 696 {
611 send_vpn_packet (p, si, IPTOS_RELIABILITY); 697 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
612 delete p; 698 delete p;
613 } 699 }
614 } 700 }
701
702 vpn->connection_established (this);
615 } 703 }
616 else 704 else
617 { 705 {
618 retry_cnt = 0; 706 retry_cnt = 0;
619 establish_connection.start (5); 707 establish_connection.start (5);
623} 711}
624 712
625void 713void
626connection::reset_si () 714connection::reset_si ()
627{ 715{
716 if (vpn->can_direct (THISNODE, conf))
628 protocol = best_protocol (THISNODE->protocols & conf->protocols); 717 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
629 718 else
630 // mask out protocols we cannot establish
631 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
632 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
633 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
634
635 if (protocol
636 && (!conf->can_direct (THISNODE)
637 || !THISNODE->can_direct (conf)))
638 { 719 {
639 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename); 720 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
640 protocol = 0; 721 protocol = 0;
641 } 722 }
642 723
643 si.set (conf, protocol); 724 si.set (conf, protocol);
725
726 is_direct = si.valid ();
644} 727}
645 728
646// ensure sockinfo is valid, forward if necessary 729// ensure sockinfo is valid, forward if necessary
647const sockinfo & 730const sockinfo &
648connection::forward_si (const sockinfo &si) const 731connection::forward_si (const sockinfo &si) const
649{ 732{
650 if (!si.valid ()) 733 if (!si.valid ())
651 { 734 {
652 connection *r = vpn->find_router (); 735 connection *r = vpn->find_router_for (this);
653 736
654 if (r) 737 if (r)
655 { 738 {
656 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."),
657 conf->nodename, r->conf->nodename, (const char *)r->si); 740 conf->nodename, r->conf->nodename);
658 return r->si; 741 return r->si;
659 } 742 }
660 else 743 else
661 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 744 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
662 conf->nodename); 745 conf->nodename);
663 } 746 }
664 747
665 return si; 748 return si;
666} 749}
676connection::send_ping (const sockinfo &si, u8 pong) 759connection::send_ping (const sockinfo &si, u8 pong)
677{ 760{
678 ping_packet *pkt = new ping_packet; 761 ping_packet *pkt = new ping_packet;
679 762
680 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
681 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 767 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
682 768
683 delete pkt; 769 delete pkt;
684} 770}
685 771
704 790
705 rsachallenge chg; 791 rsachallenge chg;
706 rsa_cache.gen (pkt->id, chg); 792 rsa_cache.gen (pkt->id, chg);
707 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 793 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
708 794
709 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);
710 796
711 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
712 798
713 delete pkt; 799 delete pkt;
714} 800}
722 808
723 rsa_hash (id, chg, pkt->response); 809 rsa_hash (id, chg, pkt->response);
724 810
725 pkt->hmac_set (octx); 811 pkt->hmac_set (octx);
726 812
727 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);
728 814
729 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
730 816
731 delete pkt; 817 delete pkt;
732} 818}
733 819
734void 820void
735connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 821connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
736{ 822{
737 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)", 823 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,
738 conf->id, rid, (const char *)rsi); 824 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
739 825
740 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);
741 827
742 r->hmac_set (octx); 828 r->hmac_set (octx);
743 send_vpn_packet (r, si); 829 send_vpn_packet (r, si);
744 830
745 delete r; 831 delete r;
746} 832}
747 833
748void 834inline void
749connection::establish_connection_cb (ev::timer &w, int revents) 835connection::establish_connection_cb (ev::timer &w, int revents)
750{ 836{
751 if (!ictx 837 if (!ictx
752 && conf != THISNODE 838 && conf != THISNODE
753 && connectmode != conf_node::C_NEVER 839 && connectmode != conf_node::C_NEVER
754 && connectmode != conf_node::C_DISABLED 840 && connectmode != conf_node::C_DISABLED
755 && !w.is_active ()) 841 && !w.is_active ())
756 { 842 {
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 }
850
851 last_establish_attempt = ev_now ();
852
757 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 853 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
758 ? (retry_cnt & 3) + 1 854 ? (retry_cnt & 3) + 1
759 : 1 << (retry_cnt >> 2)); 855 : 1 << (retry_cnt >> 2));
760 856
761 reset_si (); 857 reset_si ();
762 858
763 bool slow = si.prot & PROT_SLOW; 859 bool slow = si.prot & PROT_SLOW;
764 860
765 if (si.prot && !si.host) 861 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
766 { 862 {
767 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
768 /*TODO*/ /* start the timer so we don't recurse endlessly */ 863 /*TODO*/ /* start the timer so we don't recurse endlessly */
769 w.start (1); 864 w.start (1);
770 vpn->send_connect_request (conf->id); 865 vpn->send_connect_request (this);
771 } 866 }
772 else 867 else
773 { 868 {
774 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx); 869 if (si.valid ())
870 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
871 conf->nodename, (const char *)si);
775 872
776 const sockinfo &dsi = forward_si (si); 873 const sockinfo &dsi = forward_si (si);
777 874
778 slow = slow || (dsi.prot & PROT_SLOW); 875 slow = slow || (dsi.prot & PROT_SLOW);
779 876
784 else 881 else
785 send_ping (dsi, 0); 882 send_ping (dsi, 0);
786 } 883 }
787 } 884 }
788 885
789 retry_int *= slow ? 8. : 0.7; 886 retry_int *= slow ? 8. : 0.9;
790 887
791 if (retry_int < conf->max_retry) 888 if (retry_int < conf->max_retry)
792 retry_cnt++; 889 retry_cnt++;
793 else 890 else
794 retry_int = conf->max_retry; 891 retry_int = conf->max_retry;
804 { 901 {
805 slog (L_INFO, _("%s(%s): connection lost"), 902 slog (L_INFO, _("%s(%s): connection lost"),
806 conf->nodename, (const char *)si); 903 conf->nodename, (const char *)si);
807 904
808 if (::conf.script_node_down) 905 if (::conf.script_node_down)
809 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);
810 slog (L_WARN, _("node-down command execution failed, continuing.")); 909 run_script_queued (cb, _("node-down command execution failed, continuing."));
910 }
811 } 911 }
812 912
813 delete ictx; ictx = 0; 913 delete ictx; ictx = 0;
814 delete octx; octx = 0; 914 delete octx; octx = 0;
815#if ENABLE_DNS 915#if ENABLE_DNS
816 dnsv4_reset_connection (); 916 dnsv4_reset_connection ();
817#endif 917#endif
818 918
819 si.host = 0; 919 si.host = 0;
820 920
821 last_activity = 0; 921 last_activity = 0.;
922 //last_si_change = 0.;
822 retry_cnt = 0; 923 retry_cnt = 0;
823 924
824 rekey.stop (); 925 rekey.stop ();
825 keepalive.stop (); 926 keepalive.stop ();
826 establish_connection.stop (); 927 establish_connection.stop ();
833 send_reset (si); 934 send_reset (si);
834 935
835 reset_connection (); 936 reset_connection ();
836} 937}
837 938
838void 939// poor-man's rekeying
940inline void
839connection::rekey_cb (ev::timer &w, int revents) 941connection::rekey_cb (ev::timer &w, int revents)
840{ 942{
841 reset_connection (); 943 reset_connection ();
842 establish_connection (); 944 establish_connection ();
843} 945}
860 if (oseqno > MAX_SEQNO) 962 if (oseqno > MAX_SEQNO)
861 rekey (); 963 rekey ();
862} 964}
863 965
864void 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
865connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 977connection::inject_data_packet (tap_packet *pkt)
866{ 978{
867 if (ictx && octx) 979 if (ictx && octx)
868 send_data_packet (pkt); 980 send_data_packet (pkt);
869 else 981 else
870 { 982 {
871 if (!broadcast)
872 data_queue.put (new tap_packet (*pkt)); 983 data_queue.put (new tap_packet (*pkt));
873 984 post_inject_queue ();
874 establish_connection ();
875 } 985 }
876} 986}
877 987
878void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 988void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
879{ 989{
880 if (ictx && octx) 990 if (ictx && octx)
881 send_vpn_packet (pkt, si, tos); 991 send_vpn_packet (pkt, si, tos);
882 else 992 else
883 { 993 {
884 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 994 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
885 995 post_inject_queue ();
886 establish_connection ();
887 } 996 }
888} 997}
889 998
890void 999void
891connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1000connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
892{ 1001{
893 last_activity = ev::ev_now (); 1002 last_activity = ev_now ();
894 1003
895 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.",
896 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1005 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
897 1006
898 if (connectmode == conf_node::C_DISABLED) 1007 if (connectmode == conf_node::C_DISABLED)
899 return; 1008 return;
900 1009
901 switch (pkt->typ ()) 1010 switch (pkt->typ ())
902 { 1011 {
903 case vpn_packet::PT_PING: 1012 case vpn_packet::PT_PING:
1013 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1014
904 // we send pings instead of auth packets after some retries, 1015 // we send pings instead of auth packets after some retries,
905 // so reset the retry counter and establish a connection 1016 // so reset the retry counter and establish a connection
906 // when we receive a ping. 1017 // when we receive a ping.
907 if (!ictx) 1018 if (!ictx)
908 { 1019 {
909 if (auth_rate_limiter.can (rsi)) 1020 if (auth_rate_limiter.can (rsi))
910 send_auth_request (rsi, true); 1021 send_auth_request (rsi, true);
911 } 1022 }
912 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.
913 send_ping (rsi, 1); // pong 1026 send_ping (rsi, 1); // pong
914 1027
915 break; 1028 break;
916 1029
917 case vpn_packet::PT_PONG: 1030 case vpn_packet::PT_PONG:
1031 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
918 break; 1032 break;
919 1033
920 case vpn_packet::PT_RESET: 1034 case vpn_packet::PT_RESET:
921 { 1035 {
922 reset_connection (); 1036 reset_connection ();
923 1037
924 config_packet *p = (config_packet *) pkt; 1038 config_packet *p = (config_packet *) pkt;
925 1039
926 if (!p->chk_config ()) 1040 if (!p->chk_config ())
927 { 1041 {
928 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1042 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
929 conf->nodename, (const char *)rsi); 1043 conf->nodename, (const char *)rsi);
930 connectmode = conf_node::C_DISABLED; 1044 connectmode = conf_node::C_DISABLED;
931 } 1045 }
932 else if (connectmode == conf_node::C_ALWAYS) 1046 else if (connectmode == conf_node::C_ALWAYS)
933 establish_connection (); 1047 establish_connection ();
937 case vpn_packet::PT_AUTH_REQ: 1051 case vpn_packet::PT_AUTH_REQ:
938 if (auth_rate_limiter.can (rsi)) 1052 if (auth_rate_limiter.can (rsi))
939 { 1053 {
940 auth_req_packet *p = (auth_req_packet *) pkt; 1054 auth_req_packet *p = (auth_req_packet *) pkt;
941 1055
942 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");
943 1057
944 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1058 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8))
945 { 1059 {
946 if (p->prot_minor != PROTOCOL_MINOR) 1060 if (p->prot_minor != PROTOCOL_MINOR)
947 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."),
975 1089
976 break; 1090 break;
977 } 1091 }
978 } 1092 }
979 else 1093 else
980 slog (L_WARN, _("%s(%s): protocol mismatch"), 1094 slog (L_WARN, _("%s(%s): protocol mismatch."),
981 conf->nodename, (const char *)rsi); 1095 conf->nodename, (const char *)rsi);
982 1096
983 send_reset (rsi); 1097 send_reset (rsi);
984 } 1098 }
985 1099
986 break; 1100 break;
987 1101
988 case vpn_packet::PT_AUTH_RES: 1102 case vpn_packet::PT_AUTH_RES:
989 { 1103 {
990 auth_res_packet *p = (auth_res_packet *) pkt; 1104 auth_res_packet *p = (auth_res_packet *)pkt;
991 1105
992 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1106 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
993 1107
994 if (p->chk_config ()) 1108 if (p->chk_config ())
995 { 1109 {
996 if (p->prot_minor != PROTOCOL_MINOR) 1110 if (p->prot_minor != PROTOCOL_MINOR)
997 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."),
1000 1114
1001 rsachallenge chg; 1115 rsachallenge chg;
1002 1116
1003 if (!rsa_cache.find (p->id, chg)) 1117 if (!rsa_cache.find (p->id, chg))
1004 { 1118 {
1005 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1119 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
1006 conf->nodename, (const char *)rsi); 1120 conf->nodename, (const char *)rsi);
1007 break; 1121 break;
1008 } 1122 }
1009 else 1123 else
1010 { 1124 {
1011 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1125 crypto_ctx *cctx = new crypto_ctx (chg, 0);
1012 1126
1013 if (!p->hmac_chk (cctx)) 1127 if (!p->hmac_chk (cctx))
1014 { 1128 {
1015 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"
1016 "could be an attack, or just corruption or a synchronization error"), 1130 "could be an attack, or just corruption or a synchronization error."),
1017 conf->nodename, (const char *)rsi); 1131 conf->nodename, (const char *)rsi);
1018 break; 1132 break;
1019 } 1133 }
1020 else 1134 else
1021 { 1135 {
1032 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
1033 1147
1034 si = rsi; 1148 si = rsi;
1035 protocol = rsi.prot; 1149 protocol = rsi.prot;
1036 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
1037 connection_established (); 1156 connection_established ();
1038 1157
1039 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1040 conf->nodename, (const char *)rsi,
1041 p->prot_major, p->prot_minor);
1042
1043 if (::conf.script_node_up) 1158 if (::conf.script_node_up)
1044 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);
1045 slog (L_WARN, _("node-up command execution failed, continuing.")); 1162 run_script_queued (cb, _("node-up command execution failed, continuing."));
1163 }
1046 1164
1047 break; 1165 break;
1048 } 1166 }
1049 else 1167 else
1050 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."),
1051 conf->nodename, (const char *)rsi); 1169 conf->nodename, (const char *)rsi);
1052 } 1170 }
1053 1171
1054 delete cctx; 1172 delete cctx;
1055 } 1173 }
1071 { 1189 {
1072 vpndata_packet *p = (vpndata_packet *)pkt; 1190 vpndata_packet *p = (vpndata_packet *)pkt;
1073 1191
1074 if (!p->hmac_chk (ictx)) 1192 if (!p->hmac_chk (ictx))
1075 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"
1076 "could be an attack, or just corruption or a synchronization error"), 1194 "could be an attack, or just corruption or a synchronization error."),
1077 conf->nodename, (const char *)rsi); 1195 conf->nodename, (const char *)rsi);
1078 else 1196 else
1079 { 1197 {
1080 u32 seqno; 1198 u32 seqno;
1081 tap_packet *d = p->unpack (this, seqno); 1199 tap_packet *d = p->unpack (this, seqno);
1200 int seqclass = iseqno.seqno_classify (seqno);
1082 1201
1083 if (iseqno.recv_ok (seqno)) 1202 if (seqclass == 0) // ok
1084 { 1203 {
1085 vpn->tap->send (d); 1204 vpn->tap->send (d);
1086 1205
1087 if (si != rsi) 1206 if (si != rsi)
1088 { 1207 {
1089 // 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.)
1090 si = rsi; 1210 // {
1091
1092 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1211 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1093 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);
1094 } 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);
1095 } 1232 }
1096 1233
1097 delete d; 1234 delete d;
1098 break; 1235 break;
1099 } 1236 }
1110 if (p->id > 0 && p->id <= vpn->conns.size ()) 1247 if (p->id > 0 && p->id <= vpn->conns.size ())
1111 { 1248 {
1112 connection *c = vpn->conns[p->id - 1]; 1249 connection *c = vpn->conns[p->id - 1];
1113 conf->protocols = p->protocols; 1250 conf->protocols = p->protocols;
1114 1251
1115 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]", 1252 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]",
1116 conf->id, p->id, c->ictx && c->octx); 1253 conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx);
1117 1254
1118 if (c->ictx && c->octx) 1255 if (c->ictx && c->octx)
1119 { 1256 {
1120 // send connect_info packets to both sides, in case one is 1257 // send connect_info packets to both sides, in case one is
1121 // behind a nat firewall (or both ;) 1258 // behind a nat firewall (or both ;)
1144 1281
1145 c->conf->protocols = p->protocols; 1282 c->conf->protocols = p->protocols;
1146 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));
1147 p->si.upgrade_protocol (protocol, c->conf); 1284 p->si.upgrade_protocol (protocol, c->conf);
1148 1285
1149 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,
1150 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1288 (const char *)p->si, !c->ictx && !c->octx);
1151 1289
1152 const sockinfo &dsi = forward_si (p->si); 1290 const sockinfo &dsi = forward_si (p->si);
1153 1291
1154 if (dsi.valid ()) 1292 if (dsi.valid ())
1155 c->send_auth_request (dsi, true); 1293 c->send_auth_request (dsi, true);
1166 send_reset (rsi); 1304 send_reset (rsi);
1167 break; 1305 break;
1168 } 1306 }
1169} 1307}
1170 1308
1309inline void
1171void connection::keepalive_cb (ev::timer &w, int revents) 1310connection::keepalive_cb (ev::timer &w, int revents)
1172{ 1311{
1173 if (ev::ev_now () >= last_activity + ::conf.keepalive + 30) 1312 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1174 { 1313 {
1175 reset_connection (); 1314 reset_connection ();
1176 establish_connection (); 1315 establish_connection ();
1177 } 1316 }
1178 else if (ev::ev_now () < last_activity + ::conf.keepalive) 1317 else if (ev_now () < last_activity + ::conf.keepalive)
1179 w.start (last_activity + ::conf.keepalive - ev::now ()); 1318 w.start (last_activity + ::conf.keepalive - ev::now ());
1180 else if (conf->connectmode != conf_node::C_ONDEMAND 1319 else if (conf->connectmode != conf_node::C_ONDEMAND
1181 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1320 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1182 { 1321 {
1183 send_ping (si); 1322 send_ping (si);
1184 w.start (5); 1323 w.start (5);
1185 } 1324 }
1186 else if (ev::ev_now () < last_activity + ::conf.keepalive + 10) 1325 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1187 // hold ondemand connections implicitly a few seconds longer 1326 // hold ondemand connections implicitly a few seconds longer
1188 // should delete octx, though, or something like that ;) 1327 // should delete octx, though, or something like that ;)
1189 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1328 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1190 else 1329 else
1191 reset_connection (); 1330 reset_connection ();
1193 1332
1194void connection::send_connect_request (int id) 1333void connection::send_connect_request (int id)
1195{ 1334{
1196 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);
1197 1336
1198 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);
1199 p->hmac_set (octx); 1339 p->hmac_set (octx);
1200 send_vpn_packet (p, si); 1340 send_vpn_packet (p, si);
1201 1341
1202 delete p; 1342 delete p;
1203} 1343}
1221 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1361 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1222 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1362 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1223 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1363 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1224} 1364}
1225 1365
1366inline const char *
1226const char *connection::script_node_up () 1367connection::script_node_up ()
1227{ 1368{
1228 script_init_connect_env (); 1369 script_init_connect_env ();
1229 1370
1230 putenv ((char *)"STATE=up"); 1371 putenv ((char *)"STATE=up");
1231 1372
1236 ::conf.script_node_up ? ::conf.script_node_up : "node-up"); 1377 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1237 1378
1238 return filename; 1379 return filename;
1239} 1380}
1240 1381
1382inline const char *
1241const char *connection::script_node_down () 1383connection::script_node_down ()
1242{ 1384{
1243 script_init_connect_env (); 1385 script_init_connect_env ();
1244 1386
1245 putenv ((char *)"STATE=down"); 1387 putenv ((char *)"STATE=down");
1246 1388
1252 1394
1253 return filename; 1395 return filename;
1254} 1396}
1255 1397
1256connection::connection (struct vpn *vpn, conf_node *conf) 1398connection::connection (struct vpn *vpn, conf_node *conf)
1257: vpn(vpn), conf(conf) 1399: vpn(vpn), conf(conf),
1258, rekey (this, &connection::rekey_cb)
1259, keepalive (this, &connection::keepalive_cb)
1260, establish_connection (this, &connection::establish_connection_cb)
1261#if ENABLE_DNS 1400#if ENABLE_DNS
1262, dns (0) 1401 dns (0),
1263#endif 1402#endif
1403 data_queue(conf->max_ttl, conf->max_queue + 1),
1404 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1264{ 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.;
1265 octx = ictx = 0; 1411 octx = ictx = 0;
1266 retry_cnt = 0;
1267 1412
1268 if (!conf->protocols) // make sure some protocol is enabled 1413 if (!conf->protocols) // make sure some protocol is enabled
1269 conf->protocols = PROT_UDPv4; 1414 conf->protocols = PROT_UDPv4;
1270 1415
1271 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
1272 reset_connection (); 1422 reset_connection ();
1273} 1423}
1274 1424
1275connection::~connection () 1425connection::~connection ()
1276{ 1426{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines