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.62 by pcg, Sat Dec 1 23:35:31 2007 UTC vs.
Revision 1.88 by root, Thu Dec 2 07:15:14 2010 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,2010 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>
… …
38 50
39#if !HAVE_RAND_PSEUDO_BYTES 51#if !HAVE_RAND_PSEUDO_BYTES
40# define RAND_pseudo_bytes RAND_bytes 52# define RAND_pseudo_bytes RAND_bytes
41#endif 53#endif
42 54
43#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 55#define MAGIC_OLD "vped\xbd\xc6\xdb\x82" // 8 bytes of magic (still used in the protocol)
56#define MAGIC "gvpe\xbd\xc6\xdb\x82" // 8 bytes of magic (understood but not generated)
44 57
45#define ULTRA_FAST 1 58#define ULTRA_FAST 1
46#define HLOG 15 59#define HLOG 15
47#include "lzf/lzf.h" 60#include "lzf/lzf.h"
48#include "lzf/lzf_c.c" 61#include "lzf/lzf_c.c"
49#include "lzf/lzf_d.c" 62#include "lzf/lzf_d.c"
63
64//////////////////////////////////////////////////////////////////////////////
65
66static std::queue< std::pair<run_script_cb *, const char *> > rs_queue;
67static ev::child rs_child_ev;
68
69void // c++ requires external linkage here, apparently :(
70rs_child_cb (ev::child &w, int revents)
71{
72 w.stop ();
73
74 if (rs_queue.empty ())
75 return;
76
77 pid_t pid = run_script (*rs_queue.front ().first, false);
78 if (pid)
79 {
80 w.set (pid);
81 w.start ();
82 }
83 else
84 slog (L_WARN, rs_queue.front ().second);
85
86 delete rs_queue.front ().first;
87 rs_queue.pop ();
88}
89
90// despite the fancy name, this is quite a hack
91static void
92run_script_queued (run_script_cb *cb, const char *warnmsg)
93{
94 rs_queue.push (std::make_pair (cb, warnmsg));
95
96 if (!rs_child_ev.is_active ())
97 {
98 rs_child_ev.set<rs_child_cb> ();
99 rs_child_ev ();
100 }
101}
102
103//////////////////////////////////////////////////////////////////////////////
50 104
51struct crypto_ctx 105struct crypto_ctx
52{ 106{
53 EVP_CIPHER_CTX cctx; 107 EVP_CIPHER_CTX cctx;
54 HMAC_CTX hctx; 108 HMAC_CTX hctx;
… …
82 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 136 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 137 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
84 EVP_MD_CTX_cleanup (&ctx); 138 EVP_MD_CTX_cleanup (&ctx);
85} 139}
86 140
87struct rsa_entry { 141struct rsa_entry
142{
88 tstamp expire; 143 tstamp expire;
89 rsaid id; 144 rsaid id;
90 rsachallenge chg; 145 rsachallenge chg;
91}; 146};
92 147
93struct rsa_cache : list<rsa_entry> 148struct rsa_cache : list<rsa_entry>
94{ 149{
95 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner; 150 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
96 151
97 bool find (const rsaid &id, rsachallenge &chg) 152 bool find (const rsaid &id, rsachallenge &chg)
98 { 153 {
99 for (iterator i = begin (); i != end (); ++i) 154 for (iterator i = begin (); i != end (); ++i)
100 { 155 {
… …
129 if (!cleaner.is_active ()) 184 if (!cleaner.is_active ())
130 cleaner.again (); 185 cleaner.again ();
131 } 186 }
132 187
133 rsa_cache () 188 rsa_cache ()
134 : cleaner (this, &rsa_cache::cleaner_cb)
135 { 189 {
190 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
136 cleaner.set (RSA_TTL, RSA_TTL); 191 cleaner.set (RSA_TTL, RSA_TTL);
137 } 192 }
138 193
139} rsa_cache; 194} rsa_cache;
140 195
… …
152 } 207 }
153} 208}
154 209
155////////////////////////////////////////////////////////////////////////////// 210//////////////////////////////////////////////////////////////////////////////
156 211
157void pkt_queue::put (net_packet *p) 212pkt_queue::pkt_queue (double max_ttl, int max_queue)
213: max_ttl (max_ttl), max_queue (max_queue)
158{ 214{
159 if (queue[i]) 215 queue = new pkt [max_queue];
160 {
161 delete queue[i];
162 j = (j + 1) % QUEUEDEPTH;
163 }
164 216
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; 217 i = 0;
187 j = 0; 218 j = 0;
219
220 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
188} 221}
189 222
190pkt_queue::~pkt_queue () 223pkt_queue::~pkt_queue ()
191{ 224{
192 for (i = QUEUEDEPTH; --i > 0; ) 225 while (net_packet *p = get ())
226 delete p;
227
193 delete queue[i]; 228 delete [] queue;
194} 229}
195 230
231void pkt_queue::expire_cb (ev::timer &w, int revents)
232{
233 ev_tstamp expire = ev_now () - max_ttl;
234
235 for (;;)
236 {
237 if (empty ())
238 break;
239
240 double diff = queue[j].tstamp - expire;
241
242 if (diff >= 0.)
243 {
244 w.start (diff > 0.5 ? diff : 0.5);
245 break;
246 }
247
248 delete get ();
249 }
250}
251
252void pkt_queue::put (net_packet *p)
253{
254 ev_tstamp now = ev_now ();
255
256 // start expiry timer
257 if (empty ())
258 expire.start (max_ttl);
259
260 int ni = i + 1 == max_queue ? 0 : i + 1;
261
262 if (ni == j)
263 delete get ();
264
265 queue[i].pkt = p;
266 queue[i].tstamp = now;
267
268 i = ni;
269}
270
271net_packet *pkt_queue::get ()
272{
273 if (empty ())
274 return 0;
275
276 net_packet *p = queue[j].pkt;
277 queue[j].pkt = 0;
278
279 j = j + 1 == max_queue ? 0 : j + 1;
280
281 return p;
282}
283
196struct net_rateinfo { 284struct net_rateinfo
285{
197 u32 host; 286 u32 host;
198 double pcnt, diff; 287 double pcnt, diff;
199 tstamp last; 288 tstamp last;
200}; 289};
201 290
… …
336 ptype type = PT_DATA_UNCOMPRESSED; 425 ptype type = PT_DATA_UNCOMPRESSED;
337 426
338#if ENABLE_COMPRESSION 427#if ENABLE_COMPRESSION
339 u8 cdata[MAX_MTU]; 428 u8 cdata[MAX_MTU];
340 429
341 if (conn->features & ENABLE_COMPRESSION) 430 if (conn->features & FEATURE_COMPRESSION)
342 { 431 {
343 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 432 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
344 433
345 if (cl) 434 if (cl)
346 { 435 {
… …
525 rsaencrdata encr; 614 rsaencrdata encr;
526 615
527 auth_req_packet (int dst, bool initiate_, u8 protocols_) 616 auth_req_packet (int dst, bool initiate_, u8 protocols_)
528 { 617 {
529 config_packet::setup (PT_AUTH_REQ, dst); 618 config_packet::setup (PT_AUTH_REQ, dst);
530 strncpy (magic, MAGIC, 8); 619 strncpy (magic, MAGIC_OLD, 8);
531 initiate = !!initiate_; 620 initiate = !!initiate_;
532 protocols = protocols_; 621 protocols = protocols_;
533 622
534 len = sizeof (*this) - sizeof (net_packet); 623 len = sizeof (*this) - sizeof (net_packet);
535 } 624 }
… …
584///////////////////////////////////////////////////////////////////////////// 673/////////////////////////////////////////////////////////////////////////////
585 674
586void 675void
587connection::connection_established () 676connection::connection_established ()
588{ 677{
589 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx); 678 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
590 679
591 if (ictx && octx) 680 if (ictx && octx)
592 { 681 {
593 connectmode = conf->connectmode;
594
595 // make sure rekeying timeouts are slightly asymmetric 682 // make sure rekeying timeouts are slightly asymmetric
596 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0); 683 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
597 rekey.start (rekey_interval, rekey_interval); 684 rekey.start (rekey_interval, rekey_interval);
598 keepalive.start (::conf.keepalive); 685 keepalive.start (::conf.keepalive);
599 686
600 // send queued packets 687 // send queued packets
601 if (ictx && octx) 688 if (ictx && octx)
602 { 689 {
603 while (tap_packet *p = (tap_packet *)data_queue.get ()) 690 while (tap_packet *p = (tap_packet *)data_queue.get ())
604 { 691 {
605 send_data_packet (p); 692 if (p->len) send_data_packet (p);
606 delete p; 693 delete p;
607 } 694 }
608 695
609 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 696 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
610 { 697 {
611 send_vpn_packet (p, si, IPTOS_RELIABILITY); 698 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
612 delete p; 699 delete p;
613 } 700 }
614 } 701 }
702
703 vpn->connection_established (this);
615 } 704 }
616 else 705 else
617 { 706 {
618 retry_cnt = 0; 707 retry_cnt = 0;
619 establish_connection.start (5); 708 establish_connection.start (5);
… …
623} 712}
624 713
625void 714void
626connection::reset_si () 715connection::reset_si ()
627{ 716{
717 if (vpn->can_direct (THISNODE, conf))
628 protocol = best_protocol (THISNODE->protocols & conf->protocols); 718 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
629 719 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 { 720 {
639 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename); 721 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
640 protocol = 0; 722 protocol = 0;
641 } 723 }
642 724
643 si.set (conf, protocol); 725 si.set (conf, protocol);
726
727 is_direct = si.valid ();
644} 728}
645 729
646// ensure sockinfo is valid, forward if necessary 730// ensure sockinfo is valid, forward if necessary
647const sockinfo & 731const sockinfo &
648connection::forward_si (const sockinfo &si) const 732connection::forward_si (const sockinfo &si) const
649{ 733{
650 if (!si.valid ()) 734 if (!si.valid ())
651 { 735 {
652 connection *r = vpn->find_router (); 736 connection *r = vpn->find_router_for (this);
653 737
654 if (r) 738 if (r)
655 { 739 {
656 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"), 740 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
657 conf->nodename, r->conf->nodename, (const char *)r->si); 741 conf->nodename, r->conf->nodename);
658 return r->si; 742 return r->si;
659 } 743 }
660 else 744 else
661 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 745 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
662 conf->nodename); 746 conf->nodename);
663 } 747 }
664 748
665 return si; 749 return si;
666} 750}
… …
676connection::send_ping (const sockinfo &si, u8 pong) 760connection::send_ping (const sockinfo &si, u8 pong)
677{ 761{
678 ping_packet *pkt = new ping_packet; 762 ping_packet *pkt = new ping_packet;
679 763
680 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 764 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
765
766 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
767
681 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 768 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
682 769
683 delete pkt; 770 delete pkt;
684} 771}
685 772
… …
704 791
705 rsachallenge chg; 792 rsachallenge chg;
706 rsa_cache.gen (pkt->id, chg); 793 rsa_cache.gen (pkt->id, chg);
707 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 794 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
708 795
709 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 796 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
710 797
711 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 798 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
712 799
713 delete pkt; 800 delete pkt;
714} 801}
… …
722 809
723 rsa_hash (id, chg, pkt->response); 810 rsa_hash (id, chg, pkt->response);
724 811
725 pkt->hmac_set (octx); 812 pkt->hmac_set (octx);
726 813
727 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); 814 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
728 815
729 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 816 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
730 817
731 delete pkt; 818 delete pkt;
732} 819}
733 820
734void 821void
735connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 822connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
736{ 823{
737 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)", 824 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,
738 conf->id, rid, (const char *)rsi); 825 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
739 826
740 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 827 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
741 828
742 r->hmac_set (octx); 829 r->hmac_set (octx);
743 send_vpn_packet (r, si); 830 send_vpn_packet (r, si);
744 831
745 delete r; 832 delete r;
746} 833}
747 834
748void 835inline void
749connection::establish_connection_cb (ev::timer &w, int revents) 836connection::establish_connection_cb (ev::timer &w, int revents)
750{ 837{
751 if (!ictx 838 if (!ictx
752 && conf != THISNODE 839 && conf != THISNODE
753 && connectmode != conf_node::C_NEVER 840 && connectmode != conf_node::C_NEVER
754 && connectmode != conf_node::C_DISABLED 841 && connectmode != conf_node::C_DISABLED
755 && !w.is_active ()) 842 && !w.is_active ())
756 { 843 {
844 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
845 // and stop trying. should probably be handled by a per-connection expire handler.
846 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
847 {
848 reset_connection ();
849 return;
850 }
851
852 last_establish_attempt = ev_now ();
853
757 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 854 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
758 ? (retry_cnt & 3) + 1 855 ? (retry_cnt & 3) + 1
759 : 1 << (retry_cnt >> 2)); 856 : 1 << (retry_cnt >> 2));
760 857
761 reset_si (); 858 reset_si ();
762 859
763 bool slow = si.prot & PROT_SLOW; 860 bool slow = si.prot & PROT_SLOW;
764 861
765 if (si.prot && !si.host) 862 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
766 { 863 {
767 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
768 /*TODO*/ /* start the timer so we don't recurse endlessly */ 864 /*TODO*/ /* start the timer so we don't recurse endlessly */
769 w.start (1); 865 w.start (1);
770 vpn->send_connect_request (conf->id); 866 vpn->send_connect_request (this);
771 } 867 }
772 else 868 else
773 { 869 {
774 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx); 870 if (si.valid ())
871 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
872 conf->nodename, (const char *)si);
775 873
776 const sockinfo &dsi = forward_si (si); 874 const sockinfo &dsi = forward_si (si);
777 875
778 slow = slow || (dsi.prot & PROT_SLOW); 876 slow = slow || (dsi.prot & PROT_SLOW);
779 877
… …
784 else 882 else
785 send_ping (dsi, 0); 883 send_ping (dsi, 0);
786 } 884 }
787 } 885 }
788 886
789 retry_int *= slow ? 8. : 0.7; 887 retry_int *= slow ? 8. : 0.9;
790 888
791 if (retry_int < conf->max_retry) 889 if (retry_int < conf->max_retry)
792 retry_cnt++; 890 retry_cnt++;
793 else 891 else
794 retry_int = conf->max_retry; 892 retry_int = conf->max_retry;
… …
804 { 902 {
805 slog (L_INFO, _("%s(%s): connection lost"), 903 slog (L_INFO, _("%s(%s): connection lost"),
806 conf->nodename, (const char *)si); 904 conf->nodename, (const char *)si);
807 905
808 if (::conf.script_node_down) 906 if (::conf.script_node_down)
809 if (!run_script (run_script_cb (this, &connection::script_node_down), false)) 907 {
908 run_script_cb *cb = new run_script_cb;
909 cb->set<connection, &connection::script_node_down> (this);
810 slog (L_WARN, _("node-down command execution failed, continuing.")); 910 run_script_queued (cb, _("node-down command execution failed, continuing."));
911 }
811 } 912 }
812 913
813 delete ictx; ictx = 0; 914 delete ictx; ictx = 0;
814 delete octx; octx = 0; 915 delete octx; octx = 0;
815#if ENABLE_DNS 916#if ENABLE_DNS
816 dnsv4_reset_connection (); 917 dnsv4_reset_connection ();
817#endif 918#endif
818 919
819 si.host = 0; 920 si.host = 0;
820 921
821 last_activity = 0; 922 last_activity = 0.;
923 //last_si_change = 0.;
822 retry_cnt = 0; 924 retry_cnt = 0;
823 925
824 rekey.stop (); 926 rekey.stop ();
825 keepalive.stop (); 927 keepalive.stop ();
826 establish_connection.stop (); 928 establish_connection.stop ();
… …
833 send_reset (si); 935 send_reset (si);
834 936
835 reset_connection (); 937 reset_connection ();
836} 938}
837 939
838void 940// poor-man's rekeying
941inline void
839connection::rekey_cb (ev::timer &w, int revents) 942connection::rekey_cb (ev::timer &w, int revents)
840{ 943{
841 reset_connection (); 944 reset_connection ();
842 establish_connection (); 945 establish_connection ();
843} 946}
… …
860 if (oseqno > MAX_SEQNO) 963 if (oseqno > MAX_SEQNO)
861 rekey (); 964 rekey ();
862} 965}
863 966
864void 967void
968connection::post_inject_queue ()
969{
970 // force a connection every now and when when packets are sent (max 1/s)
971 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
972 establish_connection.stop ();
973
974 establish_connection ();
975}
976
977void
865connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 978connection::inject_data_packet (tap_packet *pkt)
866{ 979{
867 if (ictx && octx) 980 if (ictx && octx)
868 send_data_packet (pkt); 981 send_data_packet (pkt);
869 else 982 else
870 { 983 {
871 if (!broadcast)
872 data_queue.put (new tap_packet (*pkt)); 984 data_queue.put (new tap_packet (*pkt));
873 985 post_inject_queue ();
874 establish_connection ();
875 } 986 }
876} 987}
877 988
878void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 989void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
879{ 990{
880 if (ictx && octx) 991 if (ictx && octx)
881 send_vpn_packet (pkt, si, tos); 992 send_vpn_packet (pkt, si, tos);
882 else 993 else
883 { 994 {
884 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 995 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
885 996 post_inject_queue ();
886 establish_connection ();
887 } 997 }
888} 998}
889 999
890void 1000void
891connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1001connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
892{ 1002{
893 last_activity = ev_now (); 1003 last_activity = ev_now ();
894 1004
895 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1005 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
896 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1006 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
897 1007
898 if (connectmode == conf_node::C_DISABLED) 1008 if (connectmode == conf_node::C_DISABLED)
899 return; 1009 return;
900 1010
901 switch (pkt->typ ()) 1011 switch (pkt->typ ())
902 { 1012 {
903 case vpn_packet::PT_PING: 1013 case vpn_packet::PT_PING:
1014 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1015
904 // we send pings instead of auth packets after some retries, 1016 // we send pings instead of auth packets after some retries,
905 // so reset the retry counter and establish a connection 1017 // so reset the retry counter and establish a connection
906 // when we receive a ping. 1018 // when we receive a ping.
907 if (!ictx) 1019 if (!(ictx && octx))
908 { 1020 {
909 if (auth_rate_limiter.can (rsi)) 1021 if (auth_rate_limiter.can (rsi))
910 send_auth_request (rsi, true); 1022 send_auth_request (rsi, true);
911 } 1023 }
912 else 1024 else
1025 // we would love to change thre socket address here, but ping's aren't
1026 // authenticated, so we best ignore it.
913 send_ping (rsi, 1); // pong 1027 send_ping (rsi, 1); // pong
914 1028
915 break; 1029 break;
916 1030
917 case vpn_packet::PT_PONG: 1031 case vpn_packet::PT_PONG:
1032 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
918 break; 1033 break;
919 1034
920 case vpn_packet::PT_RESET: 1035 case vpn_packet::PT_RESET:
921 { 1036 {
922 reset_connection (); 1037 reset_connection ();
923 1038
924 config_packet *p = (config_packet *) pkt; 1039 config_packet *p = (config_packet *) pkt;
925 1040
926 if (!p->chk_config ()) 1041 if (!p->chk_config ())
927 { 1042 {
928 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1043 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
929 conf->nodename, (const char *)rsi); 1044 conf->nodename, (const char *)rsi);
930 connectmode = conf_node::C_DISABLED; 1045 connectmode = conf_node::C_DISABLED;
931 } 1046 }
932 else if (connectmode == conf_node::C_ALWAYS) 1047 else if (connectmode == conf_node::C_ALWAYS)
933 establish_connection (); 1048 establish_connection ();
… …
937 case vpn_packet::PT_AUTH_REQ: 1052 case vpn_packet::PT_AUTH_REQ:
938 if (auth_rate_limiter.can (rsi)) 1053 if (auth_rate_limiter.can (rsi))
939 { 1054 {
940 auth_req_packet *p = (auth_req_packet *) pkt; 1055 auth_req_packet *p = (auth_req_packet *) pkt;
941 1056
942 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1057 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s)", conf->nodename, p->initiate ? "initiate" : "reply");
943 1058
944 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1059 if (p->chk_config ()
1060 && (!strncmp (p->magic, MAGIC_OLD, 8) || !strncmp (p->magic, MAGIC, 8)))
945 { 1061 {
946 if (p->prot_minor != PROTOCOL_MINOR) 1062 if (p->prot_minor != PROTOCOL_MINOR)
947 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1063 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
948 conf->nodename, (const char *)rsi, 1064 conf->nodename, (const char *)rsi,
949 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1065 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
975 1091
976 break; 1092 break;
977 } 1093 }
978 } 1094 }
979 else 1095 else
980 slog (L_WARN, _("%s(%s): protocol mismatch"), 1096 slog (L_WARN, _("%s(%s): protocol mismatch."),
981 conf->nodename, (const char *)rsi); 1097 conf->nodename, (const char *)rsi);
982 1098
983 send_reset (rsi); 1099 send_reset (rsi);
984 } 1100 }
985 1101
986 break; 1102 break;
987 1103
988 case vpn_packet::PT_AUTH_RES: 1104 case vpn_packet::PT_AUTH_RES:
989 { 1105 {
990 auth_res_packet *p = (auth_res_packet *) pkt; 1106 auth_res_packet *p = (auth_res_packet *)pkt;
991 1107
992 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1108 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
993 1109
994 if (p->chk_config ()) 1110 if (p->chk_config ())
995 { 1111 {
996 if (p->prot_minor != PROTOCOL_MINOR) 1112 if (p->prot_minor != PROTOCOL_MINOR)
997 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1113 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
… …
1000 1116
1001 rsachallenge chg; 1117 rsachallenge chg;
1002 1118
1003 if (!rsa_cache.find (p->id, chg)) 1119 if (!rsa_cache.find (p->id, chg))
1004 { 1120 {
1005 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1121 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
1006 conf->nodename, (const char *)rsi); 1122 conf->nodename, (const char *)rsi);
1007 break; 1123 break;
1008 } 1124 }
1009 else 1125 else
1010 { 1126 {
1011 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1127 crypto_ctx *cctx = new crypto_ctx (chg, 0);
1012 1128
1013 if (!p->hmac_chk (cctx)) 1129 if (!p->hmac_chk (cctx))
1014 { 1130 {
1015 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1131 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"), 1132 "could be an attack, or just corruption or a synchronization error."),
1017 conf->nodename, (const char *)rsi); 1133 conf->nodename, (const char *)rsi);
1018 break; 1134 break;
1019 } 1135 }
1020 else 1136 else
1021 { 1137 {
… …
1032 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1148 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1033 1149
1034 si = rsi; 1150 si = rsi;
1035 protocol = rsi.prot; 1151 protocol = rsi.prot;
1036 1152
1153 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1154 conf->nodename, (const char *)rsi,
1155 is_direct ? "direct" : "forwarded",
1156 p->prot_major, p->prot_minor);
1157
1037 connection_established (); 1158 connection_established ();
1038 1159
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) 1160 if (::conf.script_node_up)
1044 if (!run_script (run_script_cb (this, &connection::script_node_up), false)) 1161 {
1162 run_script_cb *cb = new run_script_cb;
1163 cb->set<connection, &connection::script_node_up> (this);
1045 slog (L_WARN, _("node-up command execution failed, continuing.")); 1164 run_script_queued (cb, _("node-up command execution failed, continuing."));
1165 }
1046 1166
1047 break; 1167 break;
1048 } 1168 }
1049 else 1169 else
1050 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1170 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1051 conf->nodename, (const char *)rsi); 1171 conf->nodename, (const char *)rsi);
1052 } 1172 }
1053 1173
1054 delete cctx; 1174 delete cctx;
1055 } 1175 }
… …
1071 { 1191 {
1072 vpndata_packet *p = (vpndata_packet *)pkt; 1192 vpndata_packet *p = (vpndata_packet *)pkt;
1073 1193
1074 if (!p->hmac_chk (ictx)) 1194 if (!p->hmac_chk (ictx))
1075 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1195 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1076 "could be an attack, or just corruption or a synchronization error"), 1196 "could be an attack, or just corruption or a synchronization error."),
1077 conf->nodename, (const char *)rsi); 1197 conf->nodename, (const char *)rsi);
1078 else 1198 else
1079 { 1199 {
1080 u32 seqno; 1200 u32 seqno;
1081 tap_packet *d = p->unpack (this, seqno); 1201 tap_packet *d = p->unpack (this, seqno);
1202 int seqclass = iseqno.seqno_classify (seqno);
1082 1203
1083 if (iseqno.recv_ok (seqno)) 1204 if (seqclass == 0) // ok
1084 { 1205 {
1085 vpn->tap->send (d); 1206 vpn->tap->send (d);
1086 1207
1087 if (si != rsi) 1208 if (si != rsi)
1088 { 1209 {
1089 // fast re-sync on source address changes, useful especially for tcp/ip 1210 // fast re-sync on source address changes, useful especially for tcp/ip
1211 //if (last_si_change < ev_now () + 5.)
1090 si = rsi; 1212 // {
1091
1092 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1213 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1093 conf->nodename, (const char *)si, (const char *)rsi); 1214 conf->nodename, (const char *)si, (const char *)rsi);
1215
1216 si = rsi;
1217
1218 if (::conf.script_node_change)
1219 {
1220 run_script_cb *cb = new run_script_cb;
1221 cb->set<connection, &connection::script_node_change> (this);
1222 run_script_queued (cb, _("node-change command execution failed, continuing."));
1223 }
1224
1225 // }
1226 //else
1227 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1228 // conf->nodename, (const char *)si, (const char *)rsi);
1094 } 1229 }
1230 }
1231 else if (seqclass == 1) // far history
1232 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1233 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1234 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1235 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1236 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1237 else if (seqclass == 3) // reset
1238 {
1239 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1240 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1241 send_reset (rsi);
1095 } 1242 }
1096 1243
1097 delete d; 1244 delete d;
1098 break; 1245 break;
1099 } 1246 }
… …
1103 break; 1250 break;
1104 1251
1105 case vpn_packet::PT_CONNECT_REQ: 1252 case vpn_packet::PT_CONNECT_REQ:
1106 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1253 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1107 { 1254 {
1108 connect_req_packet *p = (connect_req_packet *) pkt; 1255 connect_req_packet *p = (connect_req_packet *)pkt;
1109 1256
1110 if (p->id > 0 && p->id <= vpn->conns.size ()) 1257 if (p->id > 0 && p->id <= vpn->conns.size ())
1111 { 1258 {
1112 connection *c = vpn->conns[p->id - 1]; 1259 connection *c = vpn->conns[p->id - 1];
1113 conf->protocols = p->protocols; 1260 conf->protocols = p->protocols;
1114 1261
1115 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]", 1262 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]",
1116 conf->id, p->id, c->ictx && c->octx); 1263 conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx);
1117 1264
1118 if (c->ictx && c->octx) 1265 if (c->ictx && c->octx)
1119 { 1266 {
1120 // send connect_info packets to both sides, in case one is 1267 // send connect_info packets to both sides, in case one is
1121 // behind a nat firewall (or both ;) 1268 // behind a nat firewall (or both ;)
… …
1144 1291
1145 c->conf->protocols = p->protocols; 1292 c->conf->protocols = p->protocols;
1146 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1293 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1147 p->si.upgrade_protocol (protocol, c->conf); 1294 p->si.upgrade_protocol (protocol, c->conf);
1148 1295
1149 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1296 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s) [%d]",
1297 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1150 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1298 (const char *)p->si, !c->ictx && !c->octx);
1151 1299
1152 const sockinfo &dsi = forward_si (p->si); 1300 const sockinfo &dsi = forward_si (p->si);
1153 1301
1154 if (dsi.valid ()) 1302 if (dsi.valid ())
1155 c->send_auth_request (dsi, true); 1303 c->send_auth_request (dsi, true);
… …
1166 send_reset (rsi); 1314 send_reset (rsi);
1167 break; 1315 break;
1168 } 1316 }
1169} 1317}
1170 1318
1319inline void
1171void connection::keepalive_cb (ev::timer &w, int revents) 1320connection::keepalive_cb (ev::timer &w, int revents)
1172{ 1321{
1173 if (ev_now () >= last_activity + ::conf.keepalive + 30) 1322 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1174 { 1323 {
1175 reset_connection (); 1324 reset_connection ();
1176 establish_connection (); 1325 establish_connection ();
1177 } 1326 }
1178 else if (ev_now () < last_activity + ::conf.keepalive) 1327 else if (ev_now () < last_activity + ::conf.keepalive)
1179 w.start (last_activity + ::conf.keepalive - ev::now ()); 1328 w.start (last_activity + ::conf.keepalive - ev::now ());
1180 else if (conf->connectmode != conf_node::C_ONDEMAND 1329 else if (conf->connectmode != conf_node::C_ONDEMAND
1181 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1330 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1182 { 1331 {
1183 send_ping (si); 1332 send_ping (si);
1184 w.start (5); 1333 w.start (3);
1185 } 1334 }
1186 else if (ev_now () < last_activity + ::conf.keepalive + 10) 1335 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1187 // hold ondemand connections implicitly a few seconds longer 1336 // hold ondemand connections implicitly a few seconds longer
1188 // should delete octx, though, or something like that ;) 1337 // should delete octx, though, or something like that ;)
1189 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1338 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
… …
1193 1342
1194void connection::send_connect_request (int id) 1343void connection::send_connect_request (int id)
1195{ 1344{
1196 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1345 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1197 1346
1198 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1347 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s)",
1348 conf->nodename, vpn->conns[id - 1]->conf->nodename);
1199 p->hmac_set (octx); 1349 p->hmac_set (octx);
1200 send_vpn_packet (p, si); 1350 send_vpn_packet (p, si);
1201 1351
1202 delete p; 1352 delete p;
1203} 1353}
1204 1354
1205void connection::script_init_env (const char *ext) 1355void connection::script_init_env (const char *ext)
1206{ 1356{
1207 char *env; 1357 char *env;
1208 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env); 1358 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1209 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1359 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1210 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1360 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1211 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1361 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1212 conf->id & 0xff); putenv (env); 1362 conf->id & 0xff); putenv (env);
1213} 1363}
1214 1364
1215void connection::script_init_connect_env () 1365void connection::script_init_connect_env ()
1216{ 1366{
1217 vpn->script_init_env (); 1367 vpn->script_init_env ();
1218 1368
1219 char *env; 1369 char *env;
1220 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1370 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1371 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1221 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1372 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1222 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1373 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1223 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1374 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1224} 1375}
1225 1376
1377inline const char *
1226const char *connection::script_node_up () 1378connection::script_node_up ()
1227{ 1379{
1228 script_init_connect_env (); 1380 script_init_connect_env ();
1229 1381
1230 putenv ((char *)"STATE=up"); 1382 putenv ((char *)"STATE=up");
1231 1383
… …
1236 ::conf.script_node_up ? ::conf.script_node_up : "node-up"); 1388 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1237 1389
1238 return filename; 1390 return filename;
1239} 1391}
1240 1392
1393inline const char *
1394connection::script_node_change ()
1395{
1396 script_init_connect_env ();
1397
1398 putenv ((char *)"STATE=change");
1399
1400 char *filename;
1401 asprintf (&filename,
1402 "%s/%s",
1403 confbase,
1404 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1405
1406 return filename;
1407}
1408
1409inline const char *
1241const char *connection::script_node_down () 1410connection::script_node_down ()
1242{ 1411{
1243 script_init_connect_env (); 1412 script_init_connect_env ();
1244 1413
1245 putenv ((char *)"STATE=down"); 1414 putenv ((char *)"STATE=down");
1246 1415
… …
1252 1421
1253 return filename; 1422 return filename;
1254} 1423}
1255 1424
1256connection::connection (struct vpn *vpn, conf_node *conf) 1425connection::connection (struct vpn *vpn, conf_node *conf)
1257: vpn(vpn), conf(conf) 1426: 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 1427#if ENABLE_DNS
1262, dns (0) 1428 dns (0),
1263#endif 1429#endif
1430 data_queue(conf->max_ttl, conf->max_queue + 1),
1431 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1264{ 1432{
1433 rekey .set<connection, &connection::rekey_cb > (this);
1434 keepalive .set<connection, &connection::keepalive_cb > (this);
1435 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1436
1437 last_establish_attempt = 0.;
1265 octx = ictx = 0; 1438 octx = ictx = 0;
1266 retry_cnt = 0;
1267 1439
1268 if (!conf->protocols) // make sure some protocol is enabled 1440 if (!conf->protocols) // make sure some protocol is enabled
1269 conf->protocols = PROT_UDPv4; 1441 conf->protocols = PROT_UDPv4;
1270 1442
1271 connectmode = conf_node::C_ALWAYS; // initial setting 1443 connectmode = conf->connectmode;
1444
1445 // queue a dummy packet to force an initial connection attempt
1446 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1447 vpn_queue.put (new net_packet);
1448
1272 reset_connection (); 1449 reset_connection ();
1273} 1450}
1274 1451
1275connection::~connection () 1452connection::~connection ()
1276{ 1453{

Diff Legend

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