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.68 by pcg, Thu Aug 7 17:30:27 2008 UTC vs.
Revision 1.93 by root, Tue Feb 15 13:31:23 2011 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,2011 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
69namespace
70{
71 void // c++ requires external linkage here, apparently :(
72 rs_child_cb (ev::child &w, int revents)
73 {
74 w.stop ();
75
76 if (rs_queue.empty ())
77 return;
78
79 pid_t pid = run_script (*rs_queue.front ().first, false);
80 if (pid)
81 {
82 w.set (pid);
83 w.start ();
84 }
85 else
86 slog (L_WARN, rs_queue.front ().second);
87
88 delete rs_queue.front ().first;
89 rs_queue.pop ();
90 }
91};
92
93// despite the fancy name, this is quite a hack
94static void
95run_script_queued (run_script_cb *cb, const char *warnmsg)
96{
97 rs_queue.push (std::make_pair (cb, warnmsg));
98
99 if (!rs_child_ev.is_active ())
100 {
101 rs_child_ev.set<rs_child_cb> ();
102 rs_child_ev ();
103 }
104}
105
106//////////////////////////////////////////////////////////////////////////////
50 107
51struct crypto_ctx 108struct crypto_ctx
52{ 109{
53 EVP_CIPHER_CTX cctx; 110 EVP_CIPHER_CTX cctx;
54 HMAC_CTX hctx; 111 HMAC_CTX hctx;
… …
137 cleaner.set (RSA_TTL, RSA_TTL); 194 cleaner.set (RSA_TTL, RSA_TTL);
138 } 195 }
139 196
140} rsa_cache; 197} rsa_cache;
141 198
199void
142void rsa_cache::cleaner_cb (ev::timer &w, int revents) 200rsa_cache::cleaner_cb (ev::timer &w, int revents)
143{ 201{
144 if (empty ()) 202 if (empty ())
145 w.stop (); 203 w.stop ();
146 else 204 else
147 { 205 {
… …
172 delete p; 230 delete p;
173 231
174 delete [] queue; 232 delete [] queue;
175} 233}
176 234
235void
177void pkt_queue::expire_cb (ev::timer &w, int revents) 236pkt_queue::expire_cb (ev::timer &w, int revents)
178{ 237{
179 ev_tstamp expire = ev_now () - max_ttl; 238 ev_tstamp expire = ev_now () - max_ttl;
180 239
181 for (;;) 240 for (;;)
182 { 241 {
… …
193 252
194 delete get (); 253 delete get ();
195 } 254 }
196} 255}
197 256
257void
198void pkt_queue::put (net_packet *p) 258pkt_queue::put (net_packet *p)
199{ 259{
200 ev_tstamp now = ev_now (); 260 ev_tstamp now = ev_now ();
201 261
202 // start expiry timer 262 // start expiry timer
203 if (empty ()) 263 if (empty ())
… …
212 queue[i].tstamp = now; 272 queue[i].tstamp = now;
213 273
214 i = ni; 274 i = ni;
215} 275}
216 276
217net_packet *pkt_queue::get () 277net_packet *
278pkt_queue::get ()
218{ 279{
219 if (empty ()) 280 if (empty ())
220 return 0; 281 return 0;
221 282
222 net_packet *p = queue[j].pkt; 283 net_packet *p = queue[j].pkt;
… …
246 307
247 bool can (const sockinfo &si) { return can((u32)si.host); } 308 bool can (const sockinfo &si) { return can((u32)si.host); }
248 bool can (u32 host); 309 bool can (u32 host);
249}; 310};
250 311
251net_rate_limiter auth_rate_limiter, reset_rate_limiter; 312static net_rate_limiter auth_rate_limiter, reset_rate_limiter;
252 313
314bool
253bool net_rate_limiter::can (u32 host) 315net_rate_limiter::can (u32 host)
254{ 316{
255 iterator i; 317 iterator i;
256 318
257 for (i = begin (); i != end (); ) 319 for (i = begin (); i != end (); )
258 if (i->host == host) 320 if (i->host == host)
… …
305 367
306///////////////////////////////////////////////////////////////////////////// 368/////////////////////////////////////////////////////////////////////////////
307 369
308unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE]; 370unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE];
309 371
372void
310void hmac_packet::hmac_gen (crypto_ctx *ctx) 373hmac_packet::hmac_gen (crypto_ctx *ctx)
311{ 374{
312 unsigned int xlen; 375 unsigned int xlen;
313 376
314 HMAC_CTX *hctx = &ctx->hctx; 377 HMAC_CTX *hctx = &ctx->hctx;
315 378
… …
333 hmac_gen (ctx); 396 hmac_gen (ctx);
334 397
335 return !memcmp (hmac, hmac_digest, HMACLENGTH); 398 return !memcmp (hmac, hmac_digest, HMACLENGTH);
336} 399}
337 400
401void
338void vpn_packet::set_hdr (ptype type_, unsigned int dst) 402vpn_packet::set_hdr (ptype type_, unsigned int dst)
339{ 403{
340 type = type_; 404 type = type_;
341 405
342 int src = THISNODE->id; 406 int src = THISNODE->id;
343 407
… …
348 412
349#define MAXVPNDATA (MAX_MTU - 6 - 6) 413#define MAXVPNDATA (MAX_MTU - 6 - 6)
350#define DATAHDR (sizeof (u32) + RAND_SIZE) 414#define DATAHDR (sizeof (u32) + RAND_SIZE)
351 415
352struct vpndata_packet : vpn_packet 416struct vpndata_packet : vpn_packet
417{
418 u8 data[MAXVPNDATA + DATAHDR]; // seqno
419
420 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
421 tap_packet *unpack (connection *conn, u32 &seqno);
422
423private:
424 const u32 data_hdr_size () const
353 { 425 {
354 u8 data[MAXVPNDATA + DATAHDR]; // seqno
355
356 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
357 tap_packet *unpack (connection *conn, u32 &seqno);
358private:
359
360 const u32 data_hdr_size () const
361 {
362 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR; 426 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;
363 }
364 }; 427 }
428};
365 429
366void 430void
367vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno) 431vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno)
368{ 432{
369 EVP_CIPHER_CTX *cctx = &conn->octx->cctx; 433 EVP_CIPHER_CTX *cctx = &conn->octx->cctx;
… …
371 ptype type = PT_DATA_UNCOMPRESSED; 435 ptype type = PT_DATA_UNCOMPRESSED;
372 436
373#if ENABLE_COMPRESSION 437#if ENABLE_COMPRESSION
374 u8 cdata[MAX_MTU]; 438 u8 cdata[MAX_MTU];
375 439
376 if (conn->features & ENABLE_COMPRESSION) 440 if (conn->features & FEATURE_COMPRESSION)
377 { 441 {
378 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 442 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
379 443
380 if (cl) 444 if (cl)
381 { 445 {
… …
508#endif 572#endif
509 return f; 573 return f;
510 } 574 }
511}; 575};
512 576
577void
513void config_packet::setup (ptype type, int dst) 578config_packet::setup (ptype type, int dst)
514{ 579{
515 prot_major = PROTOCOL_MAJOR; 580 prot_major = PROTOCOL_MAJOR;
516 prot_minor = PROTOCOL_MINOR; 581 prot_minor = PROTOCOL_MINOR;
517 randsize = RAND_SIZE; 582 randsize = RAND_SIZE;
518 hmaclen = HMACLENGTH; 583 hmaclen = HMACLENGTH;
… …
526 591
527 len = sizeof (*this) - sizeof (net_packet); 592 len = sizeof (*this) - sizeof (net_packet);
528 set_hdr (type, dst); 593 set_hdr (type, dst);
529} 594}
530 595
596bool
531bool config_packet::chk_config () const 597config_packet::chk_config () const
532{ 598{
533 if (prot_major != PROTOCOL_MAJOR) 599 if (prot_major != PROTOCOL_MAJOR)
534 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 600 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
535 else if (randsize != RAND_SIZE) 601 else if (randsize != RAND_SIZE)
536 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 602 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
… …
560 rsaencrdata encr; 626 rsaencrdata encr;
561 627
562 auth_req_packet (int dst, bool initiate_, u8 protocols_) 628 auth_req_packet (int dst, bool initiate_, u8 protocols_)
563 { 629 {
564 config_packet::setup (PT_AUTH_REQ, dst); 630 config_packet::setup (PT_AUTH_REQ, dst);
565 strncpy (magic, MAGIC, 8); 631 strncpy (magic, MAGIC_OLD, 8);
566 initiate = !!initiate_; 632 initiate = !!initiate_;
567 protocols = protocols_; 633 protocols = protocols_;
568 634
569 len = sizeof (*this) - sizeof (net_packet); 635 len = sizeof (*this) - sizeof (net_packet);
570 } 636 }
… …
619///////////////////////////////////////////////////////////////////////////// 685/////////////////////////////////////////////////////////////////////////////
620 686
621void 687void
622connection::connection_established () 688connection::connection_established ()
623{ 689{
624 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx); 690 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
625 691
626 if (ictx && octx) 692 if (ictx && octx)
627 { 693 {
628 // make sure rekeying timeouts are slightly asymmetric 694 // make sure rekeying timeouts are slightly asymmetric
629 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0); 695 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
… …
643 { 709 {
644 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY); 710 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
645 delete p; 711 delete p;
646 } 712 }
647 } 713 }
714
715 vpn->connection_established (this);
648 } 716 }
649 else 717 else
650 { 718 {
651 retry_cnt = 0; 719 retry_cnt = 0;
652 establish_connection.start (5); 720 establish_connection.start (5);
… …
656} 724}
657 725
658void 726void
659connection::reset_si () 727connection::reset_si ()
660{ 728{
729 if (vpn->can_direct (THISNODE, conf))
661 protocol = best_protocol (THISNODE->protocols & conf->protocols); 730 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
662 731 else
663 // mask out protocols we cannot establish
664 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
665 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
666 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
667
668 if (protocol
669 && (!conf->can_direct (THISNODE)
670 || !THISNODE->can_direct (conf)))
671 { 732 {
672 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename); 733 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
673 protocol = 0; 734 protocol = 0;
674 } 735 }
675 736
676 si.set (conf, protocol); 737 si.set (conf, protocol);
738
739 is_direct = si.valid ();
677} 740}
678 741
679// ensure sockinfo is valid, forward if necessary 742// ensure sockinfo is valid, forward if necessary
680const sockinfo & 743const sockinfo &
681connection::forward_si (const sockinfo &si) const 744connection::forward_si (const sockinfo &si) const
682{ 745{
683 if (!si.valid ()) 746 if (!si.valid ())
684 { 747 {
685 connection *r = vpn->find_router (); 748 connection *r = vpn->find_router_for (this);
686 749
687 if (r) 750 if (r)
688 { 751 {
689 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"), 752 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
690 conf->nodename, r->conf->nodename, (const char *)r->si); 753 conf->nodename, r->conf->nodename);
691 return r->si; 754 return r->si;
692 } 755 }
693 else 756 else
694 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 757 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
695 conf->nodename); 758 conf->nodename);
696 } 759 }
697 760
698 return si; 761 return si;
699} 762}
… …
709connection::send_ping (const sockinfo &si, u8 pong) 772connection::send_ping (const sockinfo &si, u8 pong)
710{ 773{
711 ping_packet *pkt = new ping_packet; 774 ping_packet *pkt = new ping_packet;
712 775
713 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 776 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
777
778 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
779
714 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 780 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
715 781
716 delete pkt; 782 delete pkt;
717} 783}
718 784
… …
737 803
738 rsachallenge chg; 804 rsachallenge chg;
739 rsa_cache.gen (pkt->id, chg); 805 rsa_cache.gen (pkt->id, chg);
740 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 806 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
741 807
742 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 808 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
743 809
744 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 810 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
745 811
746 delete pkt; 812 delete pkt;
747} 813}
… …
755 821
756 rsa_hash (id, chg, pkt->response); 822 rsa_hash (id, chg, pkt->response);
757 823
758 pkt->hmac_set (octx); 824 pkt->hmac_set (octx);
759 825
760 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); 826 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
761 827
762 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 828 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
763 829
764 delete pkt; 830 delete pkt;
765} 831}
766 832
767void 833void
768connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 834connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
769{ 835{
770 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)", 836 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
771 conf->id, rid, (const char *)rsi); 837 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
838 conf->protocols);
772 839
773 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 840 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
774 841
775 r->hmac_set (octx); 842 r->hmac_set (octx);
776 send_vpn_packet (r, si); 843 send_vpn_packet (r, si);
… …
779} 846}
780 847
781inline void 848inline void
782connection::establish_connection_cb (ev::timer &w, int revents) 849connection::establish_connection_cb (ev::timer &w, int revents)
783{ 850{
784 if (!ictx 851 if (!(ictx && octx)
785 && conf != THISNODE 852 && conf != THISNODE
786 && connectmode != conf_node::C_NEVER 853 && connectmode != conf_node::C_NEVER
787 && connectmode != conf_node::C_DISABLED 854 && connectmode != conf_node::C_DISABLED
788 && !w.is_active ()) 855 && !w.is_active ())
789 { 856 {
… …
803 870
804 reset_si (); 871 reset_si ();
805 872
806 bool slow = si.prot & PROT_SLOW; 873 bool slow = si.prot & PROT_SLOW;
807 874
808 if (si.prot && !si.host) 875 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
809 { 876 {
810 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
811 /*TODO*/ /* start the timer so we don't recurse endlessly */ 877 /*TODO*/ /* start the timer so we don't recurse endlessly */
812 w.start (1); 878 w.start (1);
813 vpn->send_connect_request (conf->id); 879 vpn->send_connect_request (this);
814 } 880 }
815 else 881 else
816 { 882 {
817 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx); 883 if (si.valid ())
884 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
885 conf->nodename, (const char *)si);
818 886
819 const sockinfo &dsi = forward_si (si); 887 const sockinfo &dsi = forward_si (si);
820 888
821 slow = slow || (dsi.prot & PROT_SLOW); 889 slow = slow || (dsi.prot & PROT_SLOW);
822 890
… …
848 slog (L_INFO, _("%s(%s): connection lost"), 916 slog (L_INFO, _("%s(%s): connection lost"),
849 conf->nodename, (const char *)si); 917 conf->nodename, (const char *)si);
850 918
851 if (::conf.script_node_down) 919 if (::conf.script_node_down)
852 { 920 {
853 run_script_cb cb; 921 run_script_cb *cb = new run_script_cb;
854 cb.set<connection, &connection::script_node_down> (this); 922 cb->set<connection, &connection::script_node_down> (this);
855 if (!run_script (cb, false))
856 slog (L_WARN, _("node-down command execution failed, continuing.")); 923 run_script_queued (cb, _("node-down command execution failed, continuing."));
857 } 924 }
858 } 925 }
859 926
860 delete ictx; ictx = 0; 927 delete ictx; ictx = 0;
861 delete octx; octx = 0; 928 delete octx; octx = 0;
… …
863 dnsv4_reset_connection (); 930 dnsv4_reset_connection ();
864#endif 931#endif
865 932
866 si.host = 0; 933 si.host = 0;
867 934
868 last_activity = 0; 935 last_activity = 0.;
936 //last_si_change = 0.;
869 retry_cnt = 0; 937 retry_cnt = 0;
870 938
871 rekey.stop (); 939 rekey.stop ();
872 keepalive.stop (); 940 keepalive.stop ();
873 establish_connection.stop (); 941 establish_connection.stop ();
… …
880 send_reset (si); 948 send_reset (si);
881 949
882 reset_connection (); 950 reset_connection ();
883} 951}
884 952
953// poor-man's rekeying
885inline void 954inline void
886connection::rekey_cb (ev::timer &w, int revents) 955connection::rekey_cb (ev::timer &w, int revents)
887{ 956{
888 reset_connection (); 957 reset_connection ();
889 establish_connection (); 958 establish_connection ();
… …
928 data_queue.put (new tap_packet (*pkt)); 997 data_queue.put (new tap_packet (*pkt));
929 post_inject_queue (); 998 post_inject_queue ();
930 } 999 }
931} 1000}
932 1001
1002void
933void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1003connection::inject_vpn_packet (vpn_packet *pkt, int tos)
934{ 1004{
935 if (ictx && octx) 1005 if (ictx && octx)
936 send_vpn_packet (pkt, si, tos); 1006 send_vpn_packet (pkt, si, tos);
937 else 1007 else
938 { 1008 {
… …
944void 1014void
945connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1015connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
946{ 1016{
947 last_activity = ev_now (); 1017 last_activity = ev_now ();
948 1018
949 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1019 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
950 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1020 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
951 1021
952 if (connectmode == conf_node::C_DISABLED) 1022 if (connectmode == conf_node::C_DISABLED)
953 return; 1023 return;
954 1024
955 switch (pkt->typ ()) 1025 switch (pkt->typ ())
956 { 1026 {
957 case vpn_packet::PT_PING: 1027 case vpn_packet::PT_PING:
1028 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1029
958 // we send pings instead of auth packets after some retries, 1030 // we send pings instead of auth packets after some retries,
959 // so reset the retry counter and establish a connection 1031 // so reset the retry counter and establish a connection
960 // when we receive a ping. 1032 // when we receive a ping.
961 if (!ictx) 1033 if (!ictx)
962 { 1034 {
963 if (auth_rate_limiter.can (rsi)) 1035 if (auth_rate_limiter.can (rsi))
964 send_auth_request (rsi, true); 1036 send_auth_request (rsi, true);
965 } 1037 }
966 else 1038 else
1039 // we would love to change the socket address here, but ping's aren't
1040 // authenticated, so we best ignore it.
967 send_ping (rsi, 1); // pong 1041 send_ping (rsi, 1); // pong
968 1042
969 break; 1043 break;
970 1044
971 case vpn_packet::PT_PONG: 1045 case vpn_packet::PT_PONG:
1046 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
1047
1048 // a PONG might mean that the other side doesn't really know
1049 // about our desire for communication.
1050 establish_connection ();
972 break; 1051 break;
973 1052
974 case vpn_packet::PT_RESET: 1053 case vpn_packet::PT_RESET:
975 { 1054 {
976 reset_connection (); 1055 reset_connection ();
977 1056
978 config_packet *p = (config_packet *) pkt; 1057 config_packet *p = (config_packet *) pkt;
979 1058
980 if (!p->chk_config ()) 1059 if (!p->chk_config ())
981 { 1060 {
982 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1061 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
983 conf->nodename, (const char *)rsi); 1062 conf->nodename, (const char *)rsi);
984 connectmode = conf_node::C_DISABLED; 1063 connectmode = conf_node::C_DISABLED;
985 } 1064 }
986 else if (connectmode == conf_node::C_ALWAYS) 1065 else if (connectmode == conf_node::C_ALWAYS)
987 establish_connection (); 1066 establish_connection ();
… …
989 break; 1068 break;
990 1069
991 case vpn_packet::PT_AUTH_REQ: 1070 case vpn_packet::PT_AUTH_REQ:
992 if (auth_rate_limiter.can (rsi)) 1071 if (auth_rate_limiter.can (rsi))
993 { 1072 {
994 auth_req_packet *p = (auth_req_packet *) pkt; 1073 auth_req_packet *p = (auth_req_packet *)pkt;
995 1074
996 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1075 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s,p%02x,f%02x)",
1076 conf->nodename, p->initiate ? "initiate" : "reply",
1077 p->protocols, p->features);
997 1078
998 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1079 if (p->chk_config ()
1080 && (!memcmp (p->magic, MAGIC_OLD, 8) || !memcmp (p->magic, MAGIC, 8)))
999 { 1081 {
1000 if (p->prot_minor != PROTOCOL_MINOR) 1082 if (p->prot_minor != PROTOCOL_MINOR)
1001 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1083 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
1002 conf->nodename, (const char *)rsi, 1084 conf->nodename, (const char *)rsi,
1003 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1085 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
1029 1111
1030 break; 1112 break;
1031 } 1113 }
1032 } 1114 }
1033 else 1115 else
1034 slog (L_WARN, _("%s(%s): protocol mismatch"), 1116 slog (L_WARN, _("%s(%s): protocol mismatch."),
1035 conf->nodename, (const char *)rsi); 1117 conf->nodename, (const char *)rsi);
1036 1118
1037 send_reset (rsi); 1119 send_reset (rsi);
1038 } 1120 }
1039 1121
1040 break; 1122 break;
1041 1123
1042 case vpn_packet::PT_AUTH_RES: 1124 case vpn_packet::PT_AUTH_RES:
1043 { 1125 {
1044 auth_res_packet *p = (auth_res_packet *) pkt; 1126 auth_res_packet *p = (auth_res_packet *)pkt;
1045 1127
1046 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1128 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
1047 1129
1048 if (p->chk_config ()) 1130 if (p->chk_config ())
1049 { 1131 {
1050 if (p->prot_minor != PROTOCOL_MINOR) 1132 if (p->prot_minor != PROTOCOL_MINOR)
1051 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1133 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
… …
1054 1136
1055 rsachallenge chg; 1137 rsachallenge chg;
1056 1138
1057 if (!rsa_cache.find (p->id, chg)) 1139 if (!rsa_cache.find (p->id, chg))
1058 { 1140 {
1059 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1141 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
1060 conf->nodename, (const char *)rsi); 1142 conf->nodename, (const char *)rsi);
1061 break; 1143 break;
1062 } 1144 }
1063 else 1145 else
1064 { 1146 {
1065 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1147 crypto_ctx *cctx = new crypto_ctx (chg, 0);
1066 1148
1067 if (!p->hmac_chk (cctx)) 1149 if (!p->hmac_chk (cctx))
1068 { 1150 {
1069 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1151 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
1070 "could be an attack, or just corruption or a synchronization error"), 1152 "could be an attack, or just corruption or a synchronization error."),
1071 conf->nodename, (const char *)rsi); 1153 conf->nodename, (const char *)rsi);
1072 break; 1154 break;
1073 } 1155 }
1074 else 1156 else
1075 { 1157 {
… …
1086 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1168 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1087 1169
1088 si = rsi; 1170 si = rsi;
1089 protocol = rsi.prot; 1171 protocol = rsi.prot;
1090 1172
1173 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1174 conf->nodename, (const char *)rsi,
1175 is_direct ? "direct" : "forwarded",
1176 p->prot_major, p->prot_minor);
1177
1091 connection_established (); 1178 connection_established ();
1092
1093 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1094 conf->nodename, (const char *)rsi,
1095 p->prot_major, p->prot_minor);
1096 1179
1097 if (::conf.script_node_up) 1180 if (::conf.script_node_up)
1098 { 1181 {
1099 run_script_cb cb; 1182 run_script_cb *cb = new run_script_cb;
1100 cb.set<connection, &connection::script_node_up> (this); 1183 cb->set<connection, &connection::script_node_up> (this);
1101 if (!run_script (cb, false))
1102 slog (L_WARN, _("node-up command execution failed, continuing.")); 1184 run_script_queued (cb, _("node-up command execution failed, continuing."));
1103 } 1185 }
1104 1186
1105 break; 1187 break;
1106 } 1188 }
1107 else 1189 else
1108 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1190 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1109 conf->nodename, (const char *)rsi); 1191 conf->nodename, (const char *)rsi);
1110 } 1192 }
1111 1193
1112 delete cctx; 1194 delete cctx;
1113 } 1195 }
… …
1129 { 1211 {
1130 vpndata_packet *p = (vpndata_packet *)pkt; 1212 vpndata_packet *p = (vpndata_packet *)pkt;
1131 1213
1132 if (!p->hmac_chk (ictx)) 1214 if (!p->hmac_chk (ictx))
1133 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1215 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1134 "could be an attack, or just corruption or a synchronization error"), 1216 "could be an attack, or just corruption or a synchronization error."),
1135 conf->nodename, (const char *)rsi); 1217 conf->nodename, (const char *)rsi);
1136 else 1218 else
1137 { 1219 {
1138 u32 seqno; 1220 u32 seqno;
1139 tap_packet *d = p->unpack (this, seqno); 1221 tap_packet *d = p->unpack (this, seqno);
1222 int seqclass = iseqno.seqno_classify (seqno);
1140 1223
1141 if (iseqno.recv_ok (seqno)) 1224 if (seqclass == 0) // ok
1142 { 1225 {
1143 vpn->tap->send (d); 1226 vpn->tap->send (d);
1144 1227
1145 if (si != rsi) 1228 if (si != rsi)
1146 { 1229 {
1147 // fast re-sync on source address changes, useful especially for tcp/ip 1230 // fast re-sync on source address changes, useful especially for tcp/ip
1231 //if (last_si_change < ev_now () + 5.)
1148 si = rsi; 1232 // {
1149
1150 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1233 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1151 conf->nodename, (const char *)si, (const char *)rsi); 1234 conf->nodename, (const char *)si, (const char *)rsi);
1235
1236 si = rsi;
1237
1238 if (::conf.script_node_change)
1239 {
1240 run_script_cb *cb = new run_script_cb;
1241 cb->set<connection, &connection::script_node_change> (this);
1242 run_script_queued (cb, _("node-change command execution failed, continuing."));
1243 }
1244
1245 // }
1246 //else
1247 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1248 // conf->nodename, (const char *)si, (const char *)rsi);
1152 } 1249 }
1250 }
1251 else if (seqclass == 1) // far history
1252 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1253 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1254 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1255 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1256 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1257 else if (seqclass == 3) // reset
1258 {
1259 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1260 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1261 send_reset (rsi);
1153 } 1262 }
1154 1263
1155 delete d; 1264 delete d;
1156 break; 1265 break;
1157 } 1266 }
… …
1161 break; 1270 break;
1162 1271
1163 case vpn_packet::PT_CONNECT_REQ: 1272 case vpn_packet::PT_CONNECT_REQ:
1164 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1273 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1165 { 1274 {
1166 connect_req_packet *p = (connect_req_packet *) pkt; 1275 connect_req_packet *p = (connect_req_packet *)pkt;
1167 1276
1168 if (p->id > 0 && p->id <= vpn->conns.size ()) 1277 if (p->id > 0 && p->id <= vpn->conns.size ())
1169 { 1278 {
1170 connection *c = vpn->conns[p->id - 1]; 1279 connection *c = vpn->conns[p->id - 1];
1171 conf->protocols = p->protocols; 1280 conf->protocols = p->protocols;
1172 1281
1173 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]", 1282 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s,p%02x) [%d]",
1283 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1284 p->protocols,
1174 conf->id, p->id, c->ictx && c->octx); 1285 c->ictx && c->octx);
1175 1286
1176 if (c->ictx && c->octx) 1287 if (c->ictx && c->octx)
1177 { 1288 {
1178 // send connect_info packets to both sides, in case one is 1289 // send connect_info packets to both sides, in case one is
1179 // behind a nat firewall (or both ;) 1290 // behind a nat firewall (or both ;)
… …
1202 1313
1203 c->conf->protocols = p->protocols; 1314 c->conf->protocols = p->protocols;
1204 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1315 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1205 p->si.upgrade_protocol (protocol, c->conf); 1316 p->si.upgrade_protocol (protocol, c->conf);
1206 1317
1207 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1318 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s,p%02x) [%d]",
1208 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1319 conf->nodename,
1320 vpn->conns[p->id - 1]->conf->nodename,
1321 (const char *)p->si,
1322 p->protocols,
1323 !c->ictx && !c->octx);
1209 1324
1210 const sockinfo &dsi = forward_si (p->si); 1325 const sockinfo &dsi = forward_si (p->si);
1211 1326
1212 if (dsi.valid ()) 1327 if (dsi.valid ())
1213 c->send_auth_request (dsi, true); 1328 c->send_auth_request (dsi, true);
… …
1227} 1342}
1228 1343
1229inline void 1344inline void
1230connection::keepalive_cb (ev::timer &w, int revents) 1345connection::keepalive_cb (ev::timer &w, int revents)
1231{ 1346{
1232 if (ev_now () >= last_activity + ::conf.keepalive + 30) 1347 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1233 { 1348 {
1234 reset_connection (); 1349 reset_connection ();
1235 establish_connection (); 1350 establish_connection ();
1236 } 1351 }
1237 else if (ev_now () < last_activity + ::conf.keepalive) 1352 else if (ev_now () < last_activity + ::conf.keepalive)
1238 w.start (last_activity + ::conf.keepalive - ev::now ()); 1353 w.start (last_activity + ::conf.keepalive - ev::now ());
1239 else if (conf->connectmode != conf_node::C_ONDEMAND 1354 else if (conf->connectmode != conf_node::C_ONDEMAND
1240 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1355 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1241 { 1356 {
1242 send_ping (si); 1357 send_ping (si);
1243 w.start (5); 1358 w.start (3);
1244 } 1359 }
1245 else if (ev_now () < last_activity + ::conf.keepalive + 10) 1360 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1246 // hold ondemand connections implicitly a few seconds longer 1361 // hold ondemand connections implicitly a few seconds longer
1247 // should delete octx, though, or something like that ;) 1362 // should delete octx, though, or something like that ;)
1248 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1363 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1249 else 1364 else
1250 reset_connection (); 1365 reset_connection ();
1251} 1366}
1252 1367
1368void
1253void connection::send_connect_request (int id) 1369connection::send_connect_request (int id)
1254{ 1370{
1255 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1371 connect_req_packet *p = new connect_req_packet (conf->id, id, THISNODE->protocols);
1256 1372
1257 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1373 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s,p%02x)",
1374 conf->nodename, vpn->conns[id - 1]->conf->nodename,
1375 THISNODE->protocols);
1258 p->hmac_set (octx); 1376 p->hmac_set (octx);
1259 send_vpn_packet (p, si); 1377 send_vpn_packet (p, si);
1260 1378
1261 delete p; 1379 delete p;
1262} 1380}
1263 1381
1382void
1264void connection::script_init_env (const char *ext) 1383connection::script_init_env (const char *ext)
1265{ 1384{
1266 char *env; 1385 char *env;
1267 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env); 1386 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1268 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1387 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1269 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1388 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1270 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1389 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1271 conf->id & 0xff); putenv (env); 1390 conf->id & 0xff); putenv (env);
1272} 1391}
1273 1392
1393void
1274void connection::script_init_connect_env () 1394connection::script_init_connect_env ()
1275{ 1395{
1276 vpn->script_init_env (); 1396 vpn->script_init_env ();
1277 1397
1278 char *env; 1398 char *env;
1279 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1399 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1400 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1280 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1401 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1281 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1402 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1282 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1403 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1283} 1404}
1284 1405
1285inline const char * 1406inline const char *
1286connection::script_node_up () 1407connection::script_node_up ()
1287{ 1408{
… …
1297 1418
1298 return filename; 1419 return filename;
1299} 1420}
1300 1421
1301inline const char * 1422inline const char *
1423connection::script_node_change ()
1424{
1425 script_init_connect_env ();
1426
1427 putenv ((char *)"STATE=change");
1428
1429 char *filename;
1430 asprintf (&filename,
1431 "%s/%s",
1432 confbase,
1433 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1434
1435 return filename;
1436}
1437
1438inline const char *
1302connection::script_node_down () 1439connection::script_node_down ()
1303{ 1440{
1304 script_init_connect_env (); 1441 script_init_connect_env ();
1305 1442
1306 putenv ((char *)"STATE=down"); 1443 putenv ((char *)"STATE=down");
… …
1317connection::connection (struct vpn *vpn, conf_node *conf) 1454connection::connection (struct vpn *vpn, conf_node *conf)
1318: vpn(vpn), conf(conf), 1455: vpn(vpn), conf(conf),
1319#if ENABLE_DNS 1456#if ENABLE_DNS
1320 dns (0), 1457 dns (0),
1321#endif 1458#endif
1322 data_queue(conf->max_ttl, conf->max_queue), 1459 data_queue(conf->max_ttl, conf->max_queue + 1),
1323 vpn_queue(conf->max_ttl, conf->max_queue) 1460 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1324{ 1461{
1325 rekey .set<connection, &connection::rekey_cb > (this); 1462 rekey .set<connection, &connection::rekey_cb > (this);
1326 keepalive .set<connection, &connection::keepalive_cb > (this); 1463 keepalive .set<connection, &connection::keepalive_cb > (this);
1327 establish_connection.set<connection, &connection::establish_connection_cb> (this); 1464 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1328 1465
1329 last_establish_attempt = 0.; 1466 last_establish_attempt = 0.;
1330 octx = ictx = 0; 1467 octx = ictx = 0;
1331 1468
1332 if (!conf->protocols) // make sure some protocol is enabled
1333 conf->protocols = PROT_UDPv4;
1334
1335 connectmode = conf->connectmode; 1469 connectmode = conf->connectmode;
1336 1470
1337 // queue a dummy packet to force an initial connection attempt 1471 // queue a dummy packet to force an initial connection attempt
1338 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED) 1472 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1339 vpn_queue.put (new net_packet); 1473 vpn_queue.put (new net_packet);
… …
1344connection::~connection () 1478connection::~connection ()
1345{ 1479{
1346 shutdown (); 1480 shutdown ();
1347} 1481}
1348 1482
1483void
1349void connection_init () 1484connection_init ()
1350{ 1485{
1351 auth_rate_limiter.clear (); 1486 auth_rate_limiter.clear ();
1352 reset_rate_limiter.clear (); 1487 reset_rate_limiter.clear ();
1353} 1488}
1354 1489

Diff Legend

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