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.67 by pcg, Thu Aug 7 16:34:21 2008 UTC vs.
Revision 1.85 by pcg, Tue Jul 28 00:42:14 2009 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>
… …
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;
… …
560 rsaencrdata encr; 614 rsaencrdata encr;
561 615
562 auth_req_packet (int dst, bool initiate_, u8 protocols_) 616 auth_req_packet (int dst, bool initiate_, u8 protocols_)
563 { 617 {
564 config_packet::setup (PT_AUTH_REQ, dst); 618 config_packet::setup (PT_AUTH_REQ, dst);
565 strncpy (magic, MAGIC, 8); 619 strncpy (magic, MAGIC_OLD, 8);
566 initiate = !!initiate_; 620 initiate = !!initiate_;
567 protocols = protocols_; 621 protocols = protocols_;
568 622
569 len = sizeof (*this) - sizeof (net_packet); 623 len = sizeof (*this) - sizeof (net_packet);
570 } 624 }
… …
619///////////////////////////////////////////////////////////////////////////// 673/////////////////////////////////////////////////////////////////////////////
620 674
621void 675void
622connection::connection_established () 676connection::connection_established ()
623{ 677{
624 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);
625 679
626 if (ictx && octx) 680 if (ictx && octx)
627 { 681 {
628 // make sure rekeying timeouts are slightly asymmetric 682 // make sure rekeying timeouts are slightly asymmetric
629 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);
… …
643 { 697 {
644 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY); 698 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
645 delete p; 699 delete p;
646 } 700 }
647 } 701 }
702
703 vpn->connection_established (this);
648 } 704 }
649 else 705 else
650 { 706 {
651 retry_cnt = 0; 707 retry_cnt = 0;
652 establish_connection.start (5); 708 establish_connection.start (5);
… …
656} 712}
657 713
658void 714void
659connection::reset_si () 715connection::reset_si ()
660{ 716{
717 if (vpn->can_direct (THISNODE, conf))
661 protocol = best_protocol (THISNODE->protocols & conf->protocols); 718 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
662 719 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 { 720 {
672 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename); 721 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
673 protocol = 0; 722 protocol = 0;
674 } 723 }
675 724
676 si.set (conf, protocol); 725 si.set (conf, protocol);
726
727 is_direct = si.valid ();
677} 728}
678 729
679// ensure sockinfo is valid, forward if necessary 730// ensure sockinfo is valid, forward if necessary
680const sockinfo & 731const sockinfo &
681connection::forward_si (const sockinfo &si) const 732connection::forward_si (const sockinfo &si) const
682{ 733{
683 if (!si.valid ()) 734 if (!si.valid ())
684 { 735 {
685 connection *r = vpn->find_router (); 736 connection *r = vpn->find_router_for (this);
686 737
687 if (r) 738 if (r)
688 { 739 {
689 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."),
690 conf->nodename, r->conf->nodename, (const char *)r->si); 741 conf->nodename, r->conf->nodename);
691 return r->si; 742 return r->si;
692 } 743 }
693 else 744 else
694 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 745 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
695 conf->nodename); 746 conf->nodename);
696 } 747 }
697 748
698 return si; 749 return si;
699} 750}
… …
709connection::send_ping (const sockinfo &si, u8 pong) 760connection::send_ping (const sockinfo &si, u8 pong)
710{ 761{
711 ping_packet *pkt = new ping_packet; 762 ping_packet *pkt = new ping_packet;
712 763
713 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
714 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 768 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
715 769
716 delete pkt; 770 delete pkt;
717} 771}
718 772
… …
737 791
738 rsachallenge chg; 792 rsachallenge chg;
739 rsa_cache.gen (pkt->id, chg); 793 rsa_cache.gen (pkt->id, chg);
740 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 794 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
741 795
742 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);
743 797
744 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
745 799
746 delete pkt; 800 delete pkt;
747} 801}
… …
755 809
756 rsa_hash (id, chg, pkt->response); 810 rsa_hash (id, chg, pkt->response);
757 811
758 pkt->hmac_set (octx); 812 pkt->hmac_set (octx);
759 813
760 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);
761 815
762 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
763 817
764 delete pkt; 818 delete pkt;
765} 819}
766 820
767void 821void
768connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 822connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
769{ 823{
770 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)", 824 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,
771 conf->id, rid, (const char *)rsi); 825 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
772 826
773 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);
774 828
775 r->hmac_set (octx); 829 r->hmac_set (octx);
776 send_vpn_packet (r, si); 830 send_vpn_packet (r, si);
… …
793 { 847 {
794 reset_connection (); 848 reset_connection ();
795 return; 849 return;
796 } 850 }
797 851
852 last_establish_attempt = ev_now ();
853
798 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 854 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
799 ? (retry_cnt & 3) + 1 855 ? (retry_cnt & 3) + 1
800 : 1 << (retry_cnt >> 2)); 856 : 1 << (retry_cnt >> 2));
801 857
802 reset_si (); 858 reset_si ();
803 859
804 bool slow = si.prot & PROT_SLOW; 860 bool slow = si.prot & PROT_SLOW;
805 861
806 if (si.prot && !si.host) 862 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
807 { 863 {
808 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
809 /*TODO*/ /* start the timer so we don't recurse endlessly */ 864 /*TODO*/ /* start the timer so we don't recurse endlessly */
810 w.start (1); 865 w.start (1);
811 vpn->send_connect_request (conf->id); 866 vpn->send_connect_request (this);
812 } 867 }
813 else 868 else
814 { 869 {
815 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);
816 873
817 const sockinfo &dsi = forward_si (si); 874 const sockinfo &dsi = forward_si (si);
818 875
819 slow = slow || (dsi.prot & PROT_SLOW); 876 slow = slow || (dsi.prot & PROT_SLOW);
820 877
… …
825 else 882 else
826 send_ping (dsi, 0); 883 send_ping (dsi, 0);
827 } 884 }
828 } 885 }
829 886
830 retry_int *= slow ? 8. : 0.7; 887 retry_int *= slow ? 8. : 0.9;
831 888
832 if (retry_int < conf->max_retry) 889 if (retry_int < conf->max_retry)
833 retry_cnt++; 890 retry_cnt++;
834 else 891 else
835 retry_int = conf->max_retry; 892 retry_int = conf->max_retry;
… …
846 slog (L_INFO, _("%s(%s): connection lost"), 903 slog (L_INFO, _("%s(%s): connection lost"),
847 conf->nodename, (const char *)si); 904 conf->nodename, (const char *)si);
848 905
849 if (::conf.script_node_down) 906 if (::conf.script_node_down)
850 { 907 {
851 run_script_cb cb; 908 run_script_cb *cb = new run_script_cb;
852 cb.set<connection, &connection::script_node_down> (this); 909 cb->set<connection, &connection::script_node_down> (this);
853 if (!run_script (cb, false))
854 slog (L_WARN, _("node-down command execution failed, continuing.")); 910 run_script_queued (cb, _("node-down command execution failed, continuing."));
855 } 911 }
856 } 912 }
857 913
858 delete ictx; ictx = 0; 914 delete ictx; ictx = 0;
859 delete octx; octx = 0; 915 delete octx; octx = 0;
… …
861 dnsv4_reset_connection (); 917 dnsv4_reset_connection ();
862#endif 918#endif
863 919
864 si.host = 0; 920 si.host = 0;
865 921
866 last_activity = 0; 922 last_activity = 0.;
923 //last_si_change = 0.;
867 retry_cnt = 0; 924 retry_cnt = 0;
868 925
869 rekey.stop (); 926 rekey.stop ();
870 keepalive.stop (); 927 keepalive.stop ();
871 establish_connection.stop (); 928 establish_connection.stop ();
… …
878 send_reset (si); 935 send_reset (si);
879 936
880 reset_connection (); 937 reset_connection ();
881} 938}
882 939
940// poor-man's rekeying
883inline void 941inline void
884connection::rekey_cb (ev::timer &w, int revents) 942connection::rekey_cb (ev::timer &w, int revents)
885{ 943{
886 reset_connection (); 944 reset_connection ();
887 establish_connection (); 945 establish_connection ();
… …
905 if (oseqno > MAX_SEQNO) 963 if (oseqno > MAX_SEQNO)
906 rekey (); 964 rekey ();
907} 965}
908 966
909void 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
910connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 978connection::inject_data_packet (tap_packet *pkt)
911{ 979{
912 if (ictx && octx) 980 if (ictx && octx)
913 send_data_packet (pkt); 981 send_data_packet (pkt);
914 else 982 else
915 { 983 {
916 if (!broadcast)
917 data_queue.put (new tap_packet (*pkt)); 984 data_queue.put (new tap_packet (*pkt));
918 985 post_inject_queue ();
919 establish_connection ();
920 } 986 }
921} 987}
922 988
923void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 989void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
924{ 990{
925 if (ictx && octx) 991 if (ictx && octx)
926 send_vpn_packet (pkt, si, tos); 992 send_vpn_packet (pkt, si, tos);
927 else 993 else
928 { 994 {
929 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 995 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
930 996 post_inject_queue ();
931 establish_connection ();
932 } 997 }
933} 998}
934 999
935void 1000void
936connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1001connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
937{ 1002{
938 last_activity = ev_now (); 1003 last_activity = ev_now ();
939 1004
940 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.",
941 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1006 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
942 1007
943 if (connectmode == conf_node::C_DISABLED) 1008 if (connectmode == conf_node::C_DISABLED)
944 return; 1009 return;
945 1010
946 switch (pkt->typ ()) 1011 switch (pkt->typ ())
947 { 1012 {
948 case vpn_packet::PT_PING: 1013 case vpn_packet::PT_PING:
1014 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1015
949 // we send pings instead of auth packets after some retries, 1016 // we send pings instead of auth packets after some retries,
950 // so reset the retry counter and establish a connection 1017 // so reset the retry counter and establish a connection
951 // when we receive a ping. 1018 // when we receive a ping.
952 if (!ictx) 1019 if (!ictx)
953 { 1020 {
954 if (auth_rate_limiter.can (rsi)) 1021 if (auth_rate_limiter.can (rsi))
955 send_auth_request (rsi, true); 1022 send_auth_request (rsi, true);
956 } 1023 }
957 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.
958 send_ping (rsi, 1); // pong 1027 send_ping (rsi, 1); // pong
959 1028
960 break; 1029 break;
961 1030
962 case vpn_packet::PT_PONG: 1031 case vpn_packet::PT_PONG:
1032 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
963 break; 1033 break;
964 1034
965 case vpn_packet::PT_RESET: 1035 case vpn_packet::PT_RESET:
966 { 1036 {
967 reset_connection (); 1037 reset_connection ();
968 1038
969 config_packet *p = (config_packet *) pkt; 1039 config_packet *p = (config_packet *) pkt;
970 1040
971 if (!p->chk_config ()) 1041 if (!p->chk_config ())
972 { 1042 {
973 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1043 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
974 conf->nodename, (const char *)rsi); 1044 conf->nodename, (const char *)rsi);
975 connectmode = conf_node::C_DISABLED; 1045 connectmode = conf_node::C_DISABLED;
976 } 1046 }
977 else if (connectmode == conf_node::C_ALWAYS) 1047 else if (connectmode == conf_node::C_ALWAYS)
978 establish_connection (); 1048 establish_connection ();
… …
982 case vpn_packet::PT_AUTH_REQ: 1052 case vpn_packet::PT_AUTH_REQ:
983 if (auth_rate_limiter.can (rsi)) 1053 if (auth_rate_limiter.can (rsi))
984 { 1054 {
985 auth_req_packet *p = (auth_req_packet *) pkt; 1055 auth_req_packet *p = (auth_req_packet *) pkt;
986 1056
987 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");
988 1058
989 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)))
990 { 1061 {
991 if (p->prot_minor != PROTOCOL_MINOR) 1062 if (p->prot_minor != PROTOCOL_MINOR)
992 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."),
993 conf->nodename, (const char *)rsi, 1064 conf->nodename, (const char *)rsi,
994 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1065 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
1020 1091
1021 break; 1092 break;
1022 } 1093 }
1023 } 1094 }
1024 else 1095 else
1025 slog (L_WARN, _("%s(%s): protocol mismatch"), 1096 slog (L_WARN, _("%s(%s): protocol mismatch."),
1026 conf->nodename, (const char *)rsi); 1097 conf->nodename, (const char *)rsi);
1027 1098
1028 send_reset (rsi); 1099 send_reset (rsi);
1029 } 1100 }
1030 1101
1031 break; 1102 break;
1032 1103
1033 case vpn_packet::PT_AUTH_RES: 1104 case vpn_packet::PT_AUTH_RES:
1034 { 1105 {
1035 auth_res_packet *p = (auth_res_packet *) pkt; 1106 auth_res_packet *p = (auth_res_packet *)pkt;
1036 1107
1037 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1108 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
1038 1109
1039 if (p->chk_config ()) 1110 if (p->chk_config ())
1040 { 1111 {
1041 if (p->prot_minor != PROTOCOL_MINOR) 1112 if (p->prot_minor != PROTOCOL_MINOR)
1042 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."),
… …
1045 1116
1046 rsachallenge chg; 1117 rsachallenge chg;
1047 1118
1048 if (!rsa_cache.find (p->id, chg)) 1119 if (!rsa_cache.find (p->id, chg))
1049 { 1120 {
1050 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1121 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
1051 conf->nodename, (const char *)rsi); 1122 conf->nodename, (const char *)rsi);
1052 break; 1123 break;
1053 } 1124 }
1054 else 1125 else
1055 { 1126 {
1056 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1127 crypto_ctx *cctx = new crypto_ctx (chg, 0);
1057 1128
1058 if (!p->hmac_chk (cctx)) 1129 if (!p->hmac_chk (cctx))
1059 { 1130 {
1060 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"
1061 "could be an attack, or just corruption or a synchronization error"), 1132 "could be an attack, or just corruption or a synchronization error."),
1062 conf->nodename, (const char *)rsi); 1133 conf->nodename, (const char *)rsi);
1063 break; 1134 break;
1064 } 1135 }
1065 else 1136 else
1066 { 1137 {
… …
1077 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
1078 1149
1079 si = rsi; 1150 si = rsi;
1080 protocol = rsi.prot; 1151 protocol = rsi.prot;
1081 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
1082 connection_established (); 1158 connection_established ();
1083
1084 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1085 conf->nodename, (const char *)rsi,
1086 p->prot_major, p->prot_minor);
1087 1159
1088 if (::conf.script_node_up) 1160 if (::conf.script_node_up)
1089 { 1161 {
1090 run_script_cb cb; 1162 run_script_cb *cb = new run_script_cb;
1091 cb.set<connection, &connection::script_node_up> (this); 1163 cb->set<connection, &connection::script_node_up> (this);
1092 if (!run_script (cb, false))
1093 slog (L_WARN, _("node-up command execution failed, continuing.")); 1164 run_script_queued (cb, _("node-up command execution failed, continuing."));
1094 } 1165 }
1095 1166
1096 break; 1167 break;
1097 } 1168 }
1098 else 1169 else
1099 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."),
1100 conf->nodename, (const char *)rsi); 1171 conf->nodename, (const char *)rsi);
1101 } 1172 }
1102 1173
1103 delete cctx; 1174 delete cctx;
1104 } 1175 }
… …
1120 { 1191 {
1121 vpndata_packet *p = (vpndata_packet *)pkt; 1192 vpndata_packet *p = (vpndata_packet *)pkt;
1122 1193
1123 if (!p->hmac_chk (ictx)) 1194 if (!p->hmac_chk (ictx))
1124 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"
1125 "could be an attack, or just corruption or a synchronization error"), 1196 "could be an attack, or just corruption or a synchronization error."),
1126 conf->nodename, (const char *)rsi); 1197 conf->nodename, (const char *)rsi);
1127 else 1198 else
1128 { 1199 {
1129 u32 seqno; 1200 u32 seqno;
1130 tap_packet *d = p->unpack (this, seqno); 1201 tap_packet *d = p->unpack (this, seqno);
1202 int seqclass = iseqno.seqno_classify (seqno);
1131 1203
1132 if (iseqno.recv_ok (seqno)) 1204 if (seqclass == 0) // ok
1133 { 1205 {
1134 vpn->tap->send (d); 1206 vpn->tap->send (d);
1135 1207
1136 if (si != rsi) 1208 if (si != rsi)
1137 { 1209 {
1138 // 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.)
1139 si = rsi; 1212 // {
1140
1141 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1213 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1142 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);
1143 } 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);
1144 } 1242 }
1145 1243
1146 delete d; 1244 delete d;
1147 break; 1245 break;
1148 } 1246 }
… …
1152 break; 1250 break;
1153 1251
1154 case vpn_packet::PT_CONNECT_REQ: 1252 case vpn_packet::PT_CONNECT_REQ:
1155 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1253 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1156 { 1254 {
1157 connect_req_packet *p = (connect_req_packet *) pkt; 1255 connect_req_packet *p = (connect_req_packet *)pkt;
1158 1256
1159 if (p->id > 0 && p->id <= vpn->conns.size ()) 1257 if (p->id > 0 && p->id <= vpn->conns.size ())
1160 { 1258 {
1161 connection *c = vpn->conns[p->id - 1]; 1259 connection *c = vpn->conns[p->id - 1];
1162 conf->protocols = p->protocols; 1260 conf->protocols = p->protocols;
1163 1261
1164 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]", 1262 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]",
1165 conf->id, p->id, c->ictx && c->octx); 1263 conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx);
1166 1264
1167 if (c->ictx && c->octx) 1265 if (c->ictx && c->octx)
1168 { 1266 {
1169 // send connect_info packets to both sides, in case one is 1267 // send connect_info packets to both sides, in case one is
1170 // behind a nat firewall (or both ;) 1268 // behind a nat firewall (or both ;)
… …
1193 1291
1194 c->conf->protocols = p->protocols; 1292 c->conf->protocols = p->protocols;
1195 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));
1196 p->si.upgrade_protocol (protocol, c->conf); 1294 p->si.upgrade_protocol (protocol, c->conf);
1197 1295
1198 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,
1199 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1298 (const char *)p->si, !c->ictx && !c->octx);
1200 1299
1201 const sockinfo &dsi = forward_si (p->si); 1300 const sockinfo &dsi = forward_si (p->si);
1202 1301
1203 if (dsi.valid ()) 1302 if (dsi.valid ())
1204 c->send_auth_request (dsi, true); 1303 c->send_auth_request (dsi, true);
… …
1218} 1317}
1219 1318
1220inline void 1319inline void
1221connection::keepalive_cb (ev::timer &w, int revents) 1320connection::keepalive_cb (ev::timer &w, int revents)
1222{ 1321{
1223 if (ev_now () >= last_activity + ::conf.keepalive + 30) 1322 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1224 { 1323 {
1225 reset_connection (); 1324 reset_connection ();
1226 establish_connection (); 1325 establish_connection ();
1227 } 1326 }
1228 else if (ev_now () < last_activity + ::conf.keepalive) 1327 else if (ev_now () < last_activity + ::conf.keepalive)
1229 w.start (last_activity + ::conf.keepalive - ev::now ()); 1328 w.start (last_activity + ::conf.keepalive - ev::now ());
1230 else if (conf->connectmode != conf_node::C_ONDEMAND 1329 else if (conf->connectmode != conf_node::C_ONDEMAND
1231 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1330 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1232 { 1331 {
1233 send_ping (si); 1332 send_ping (si);
1234 w.start (5); 1333 w.start (3);
1235 } 1334 }
1236 else if (ev_now () < last_activity + ::conf.keepalive + 10) 1335 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1237 // hold ondemand connections implicitly a few seconds longer 1336 // hold ondemand connections implicitly a few seconds longer
1238 // should delete octx, though, or something like that ;) 1337 // should delete octx, though, or something like that ;)
1239 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1338 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
… …
1243 1342
1244void connection::send_connect_request (int id) 1343void connection::send_connect_request (int id)
1245{ 1344{
1246 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);
1247 1346
1248 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);
1249 p->hmac_set (octx); 1349 p->hmac_set (octx);
1250 send_vpn_packet (p, si); 1350 send_vpn_packet (p, si);
1251 1351
1252 delete p; 1352 delete p;
1253} 1353}
1254 1354
1255void connection::script_init_env (const char *ext) 1355void connection::script_init_env (const char *ext)
1256{ 1356{
1257 char *env; 1357 char *env;
1258 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);
1259 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1359 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1260 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1360 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1261 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1361 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1262 conf->id & 0xff); putenv (env); 1362 conf->id & 0xff); putenv (env);
1263} 1363}
1264 1364
1265void connection::script_init_connect_env () 1365void connection::script_init_connect_env ()
1266{ 1366{
1267 vpn->script_init_env (); 1367 vpn->script_init_env ();
1268 1368
1269 char *env; 1369 char *env;
1270 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);
1271 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1372 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1272 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1373 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1273 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1374 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1274} 1375}
1275 1376
1276inline const char * 1377inline const char *
1277connection::script_node_up () 1378connection::script_node_up ()
1278{ 1379{
… …
1288 1389
1289 return filename; 1390 return filename;
1290} 1391}
1291 1392
1292inline const char * 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 *
1293connection::script_node_down () 1410connection::script_node_down ()
1294{ 1411{
1295 script_init_connect_env (); 1412 script_init_connect_env ();
1296 1413
1297 putenv ((char *)"STATE=down"); 1414 putenv ((char *)"STATE=down");
… …
1308connection::connection (struct vpn *vpn, conf_node *conf) 1425connection::connection (struct vpn *vpn, conf_node *conf)
1309: vpn(vpn), conf(conf), 1426: vpn(vpn), conf(conf),
1310#if ENABLE_DNS 1427#if ENABLE_DNS
1311 dns (0), 1428 dns (0),
1312#endif 1429#endif
1313 data_queue(conf->max_ttl, conf->max_queue), 1430 data_queue(conf->max_ttl, conf->max_queue + 1),
1314 vpn_queue(conf->max_ttl, conf->max_queue) 1431 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1315{ 1432{
1316 rekey .set<connection, &connection::rekey_cb > (this); 1433 rekey .set<connection, &connection::rekey_cb > (this);
1317 keepalive .set<connection, &connection::keepalive_cb > (this); 1434 keepalive .set<connection, &connection::keepalive_cb > (this);
1318 establish_connection.set<connection, &connection::establish_connection_cb> (this); 1435 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1319 1436
1437 last_establish_attempt = 0.;
1320 octx = ictx = 0; 1438 octx = ictx = 0;
1321 retry_cnt = 0;
1322 1439
1323 if (!conf->protocols) // make sure some protocol is enabled 1440 if (!conf->protocols) // make sure some protocol is enabled
1324 conf->protocols = PROT_UDPv4; 1441 conf->protocols = PROT_UDPv4;
1325 1442
1326 connectmode = conf->connectmode; 1443 connectmode = conf->connectmode;
1327 1444
1328 // queue a dummy packet to force an initial connection attempt 1445 // queue a dummy packet to force an initial connection attempt
1329 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED) 1446 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1330 { 1447 vpn_queue.put (new net_packet);
1331 net_packet *p = new net_packet;
1332 p->len = 0;
1333 vpn_queue.put (p);
1334 }
1335 1448
1336 reset_connection (); 1449 reset_connection ();
1337} 1450}
1338 1451
1339connection::~connection () 1452connection::~connection ()

Diff Legend

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