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.84 by pcg, Sat Jul 18 05:59:16 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>
… …
45#define ULTRA_FAST 1 57#define ULTRA_FAST 1
46#define HLOG 15 58#define HLOG 15
47#include "lzf/lzf.h" 59#include "lzf/lzf.h"
48#include "lzf/lzf_c.c" 60#include "lzf/lzf_c.c"
49#include "lzf/lzf_d.c" 61#include "lzf/lzf_d.c"
62
63//////////////////////////////////////////////////////////////////////////////
64
65static std::queue< std::pair<run_script_cb *, const char *> > rs_queue;
66static ev::child rs_child_ev;
67
68void // c++ requires external linkage here, apparently :(
69rs_child_cb (ev::child &w, int revents)
70{
71 w.stop ();
72
73 if (rs_queue.empty ())
74 return;
75
76 pid_t pid = run_script (*rs_queue.front ().first, false);
77 if (pid)
78 {
79 w.set (pid);
80 w.start ();
81 }
82 else
83 slog (L_WARN, rs_queue.front ().second);
84
85 delete rs_queue.front ().first;
86 rs_queue.pop ();
87}
88
89// despite the fancy name, this is quite a hack
90static void
91run_script_queued (run_script_cb *cb, const char *warnmsg)
92{
93 rs_queue.push (std::make_pair (cb, warnmsg));
94
95 if (!rs_child_ev.is_active ())
96 {
97 rs_child_ev.set<rs_child_cb> ();
98 rs_child_ev ();
99 }
100}
101
102//////////////////////////////////////////////////////////////////////////////
50 103
51struct crypto_ctx 104struct crypto_ctx
52{ 105{
53 EVP_CIPHER_CTX cctx; 106 EVP_CIPHER_CTX cctx;
54 HMAC_CTX hctx; 107 HMAC_CTX hctx;
… …
619///////////////////////////////////////////////////////////////////////////// 672/////////////////////////////////////////////////////////////////////////////
620 673
621void 674void
622connection::connection_established () 675connection::connection_established ()
623{ 676{
624 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx); 677 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
625 678
626 if (ictx && octx) 679 if (ictx && octx)
627 { 680 {
628 // make sure rekeying timeouts are slightly asymmetric 681 // make sure rekeying timeouts are slightly asymmetric
629 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0); 682 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
… …
643 { 696 {
644 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY); 697 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
645 delete p; 698 delete p;
646 } 699 }
647 } 700 }
701
702 vpn->connection_established (this);
648 } 703 }
649 else 704 else
650 { 705 {
651 retry_cnt = 0; 706 retry_cnt = 0;
652 establish_connection.start (5); 707 establish_connection.start (5);
… …
656} 711}
657 712
658void 713void
659connection::reset_si () 714connection::reset_si ()
660{ 715{
716 if (vpn->can_direct (THISNODE, conf))
661 protocol = best_protocol (THISNODE->protocols & conf->protocols); 717 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
662 718 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 { 719 {
672 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename); 720 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
673 protocol = 0; 721 protocol = 0;
674 } 722 }
675 723
676 si.set (conf, protocol); 724 si.set (conf, protocol);
725
726 is_direct = si.valid ();
677} 727}
678 728
679// ensure sockinfo is valid, forward if necessary 729// ensure sockinfo is valid, forward if necessary
680const sockinfo & 730const sockinfo &
681connection::forward_si (const sockinfo &si) const 731connection::forward_si (const sockinfo &si) const
682{ 732{
683 if (!si.valid ()) 733 if (!si.valid ())
684 { 734 {
685 connection *r = vpn->find_router (); 735 connection *r = vpn->find_router_for (this);
686 736
687 if (r) 737 if (r)
688 { 738 {
689 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"), 739 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
690 conf->nodename, r->conf->nodename, (const char *)r->si); 740 conf->nodename, r->conf->nodename);
691 return r->si; 741 return r->si;
692 } 742 }
693 else 743 else
694 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 744 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
695 conf->nodename); 745 conf->nodename);
696 } 746 }
697 747
698 return si; 748 return si;
699} 749}
… …
709connection::send_ping (const sockinfo &si, u8 pong) 759connection::send_ping (const sockinfo &si, u8 pong)
710{ 760{
711 ping_packet *pkt = new ping_packet; 761 ping_packet *pkt = new ping_packet;
712 762
713 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 763 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
764
765 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
766
714 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 767 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
715 768
716 delete pkt; 769 delete pkt;
717} 770}
718 771
… …
737 790
738 rsachallenge chg; 791 rsachallenge chg;
739 rsa_cache.gen (pkt->id, chg); 792 rsa_cache.gen (pkt->id, chg);
740 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 793 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
741 794
742 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 795 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
743 796
744 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 797 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
745 798
746 delete pkt; 799 delete pkt;
747} 800}
… …
755 808
756 rsa_hash (id, chg, pkt->response); 809 rsa_hash (id, chg, pkt->response);
757 810
758 pkt->hmac_set (octx); 811 pkt->hmac_set (octx);
759 812
760 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); 813 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
761 814
762 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 815 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
763 816
764 delete pkt; 817 delete pkt;
765} 818}
766 819
767void 820void
768connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 821connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
769{ 822{
770 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)", 823 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,
771 conf->id, rid, (const char *)rsi); 824 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
772 825
773 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 826 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
774 827
775 r->hmac_set (octx); 828 r->hmac_set (octx);
776 send_vpn_packet (r, si); 829 send_vpn_packet (r, si);
… …
793 { 846 {
794 reset_connection (); 847 reset_connection ();
795 return; 848 return;
796 } 849 }
797 850
851 last_establish_attempt = ev_now ();
852
798 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 853 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
799 ? (retry_cnt & 3) + 1 854 ? (retry_cnt & 3) + 1
800 : 1 << (retry_cnt >> 2)); 855 : 1 << (retry_cnt >> 2));
801 856
802 reset_si (); 857 reset_si ();
803 858
804 bool slow = si.prot & PROT_SLOW; 859 bool slow = si.prot & PROT_SLOW;
805 860
806 if (si.prot && !si.host) 861 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
807 { 862 {
808 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
809 /*TODO*/ /* start the timer so we don't recurse endlessly */ 863 /*TODO*/ /* start the timer so we don't recurse endlessly */
810 w.start (1); 864 w.start (1);
811 vpn->send_connect_request (conf->id); 865 vpn->send_connect_request (this);
812 } 866 }
813 else 867 else
814 { 868 {
815 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx); 869 if (si.valid ())
870 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
871 conf->nodename, (const char *)si);
816 872
817 const sockinfo &dsi = forward_si (si); 873 const sockinfo &dsi = forward_si (si);
818 874
819 slow = slow || (dsi.prot & PROT_SLOW); 875 slow = slow || (dsi.prot & PROT_SLOW);
820 876
… …
825 else 881 else
826 send_ping (dsi, 0); 882 send_ping (dsi, 0);
827 } 883 }
828 } 884 }
829 885
830 retry_int *= slow ? 8. : 0.7; 886 retry_int *= slow ? 8. : 0.9;
831 887
832 if (retry_int < conf->max_retry) 888 if (retry_int < conf->max_retry)
833 retry_cnt++; 889 retry_cnt++;
834 else 890 else
835 retry_int = conf->max_retry; 891 retry_int = conf->max_retry;
… …
846 slog (L_INFO, _("%s(%s): connection lost"), 902 slog (L_INFO, _("%s(%s): connection lost"),
847 conf->nodename, (const char *)si); 903 conf->nodename, (const char *)si);
848 904
849 if (::conf.script_node_down) 905 if (::conf.script_node_down)
850 { 906 {
851 run_script_cb cb; 907 run_script_cb *cb = new run_script_cb;
852 cb.set<connection, &connection::script_node_down> (this); 908 cb->set<connection, &connection::script_node_down> (this);
853 if (!run_script (cb, false))
854 slog (L_WARN, _("node-down command execution failed, continuing.")); 909 run_script_queued (cb, _("node-down command execution failed, continuing."));
855 } 910 }
856 } 911 }
857 912
858 delete ictx; ictx = 0; 913 delete ictx; ictx = 0;
859 delete octx; octx = 0; 914 delete octx; octx = 0;
… …
861 dnsv4_reset_connection (); 916 dnsv4_reset_connection ();
862#endif 917#endif
863 918
864 si.host = 0; 919 si.host = 0;
865 920
866 last_activity = 0; 921 last_activity = 0.;
922 //last_si_change = 0.;
867 retry_cnt = 0; 923 retry_cnt = 0;
868 924
869 rekey.stop (); 925 rekey.stop ();
870 keepalive.stop (); 926 keepalive.stop ();
871 establish_connection.stop (); 927 establish_connection.stop ();
… …
878 send_reset (si); 934 send_reset (si);
879 935
880 reset_connection (); 936 reset_connection ();
881} 937}
882 938
939// poor-man's rekeying
883inline void 940inline void
884connection::rekey_cb (ev::timer &w, int revents) 941connection::rekey_cb (ev::timer &w, int revents)
885{ 942{
886 reset_connection (); 943 reset_connection ();
887 establish_connection (); 944 establish_connection ();
… …
905 if (oseqno > MAX_SEQNO) 962 if (oseqno > MAX_SEQNO)
906 rekey (); 963 rekey ();
907} 964}
908 965
909void 966void
967connection::post_inject_queue ()
968{
969 // force a connection every now and when when packets are sent (max 1/s)
970 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
971 establish_connection.stop ();
972
973 establish_connection ();
974}
975
976void
910connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 977connection::inject_data_packet (tap_packet *pkt)
911{ 978{
912 if (ictx && octx) 979 if (ictx && octx)
913 send_data_packet (pkt); 980 send_data_packet (pkt);
914 else 981 else
915 { 982 {
916 if (!broadcast)
917 data_queue.put (new tap_packet (*pkt)); 983 data_queue.put (new tap_packet (*pkt));
918 984 post_inject_queue ();
919 establish_connection ();
920 } 985 }
921} 986}
922 987
923void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 988void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
924{ 989{
925 if (ictx && octx) 990 if (ictx && octx)
926 send_vpn_packet (pkt, si, tos); 991 send_vpn_packet (pkt, si, tos);
927 else 992 else
928 { 993 {
929 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 994 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
930 995 post_inject_queue ();
931 establish_connection ();
932 } 996 }
933} 997}
934 998
935void 999void
936connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1000connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
937{ 1001{
938 last_activity = ev_now (); 1002 last_activity = ev_now ();
939 1003
940 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1004 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
941 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1005 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
942 1006
943 if (connectmode == conf_node::C_DISABLED) 1007 if (connectmode == conf_node::C_DISABLED)
944 return; 1008 return;
945 1009
946 switch (pkt->typ ()) 1010 switch (pkt->typ ())
947 { 1011 {
948 case vpn_packet::PT_PING: 1012 case vpn_packet::PT_PING:
1013 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1014
949 // we send pings instead of auth packets after some retries, 1015 // we send pings instead of auth packets after some retries,
950 // so reset the retry counter and establish a connection 1016 // so reset the retry counter and establish a connection
951 // when we receive a ping. 1017 // when we receive a ping.
952 if (!ictx) 1018 if (!ictx)
953 { 1019 {
954 if (auth_rate_limiter.can (rsi)) 1020 if (auth_rate_limiter.can (rsi))
955 send_auth_request (rsi, true); 1021 send_auth_request (rsi, true);
956 } 1022 }
957 else 1023 else
1024 // we would love to change thre socket address here, but ping's aren't
1025 // authenticated, so we best ignore it.
958 send_ping (rsi, 1); // pong 1026 send_ping (rsi, 1); // pong
959 1027
960 break; 1028 break;
961 1029
962 case vpn_packet::PT_PONG: 1030 case vpn_packet::PT_PONG:
1031 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
963 break; 1032 break;
964 1033
965 case vpn_packet::PT_RESET: 1034 case vpn_packet::PT_RESET:
966 { 1035 {
967 reset_connection (); 1036 reset_connection ();
968 1037
969 config_packet *p = (config_packet *) pkt; 1038 config_packet *p = (config_packet *) pkt;
970 1039
971 if (!p->chk_config ()) 1040 if (!p->chk_config ())
972 { 1041 {
973 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1042 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
974 conf->nodename, (const char *)rsi); 1043 conf->nodename, (const char *)rsi);
975 connectmode = conf_node::C_DISABLED; 1044 connectmode = conf_node::C_DISABLED;
976 } 1045 }
977 else if (connectmode == conf_node::C_ALWAYS) 1046 else if (connectmode == conf_node::C_ALWAYS)
978 establish_connection (); 1047 establish_connection ();
… …
982 case vpn_packet::PT_AUTH_REQ: 1051 case vpn_packet::PT_AUTH_REQ:
983 if (auth_rate_limiter.can (rsi)) 1052 if (auth_rate_limiter.can (rsi))
984 { 1053 {
985 auth_req_packet *p = (auth_req_packet *) pkt; 1054 auth_req_packet *p = (auth_req_packet *) pkt;
986 1055
987 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1056 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s)", conf->nodename, p->initiate ? "initiate" : "reply");
988 1057
989 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1058 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8))
990 { 1059 {
991 if (p->prot_minor != PROTOCOL_MINOR) 1060 if (p->prot_minor != PROTOCOL_MINOR)
992 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1061 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
… …
1020 1089
1021 break; 1090 break;
1022 } 1091 }
1023 } 1092 }
1024 else 1093 else
1025 slog (L_WARN, _("%s(%s): protocol mismatch"), 1094 slog (L_WARN, _("%s(%s): protocol mismatch."),
1026 conf->nodename, (const char *)rsi); 1095 conf->nodename, (const char *)rsi);
1027 1096
1028 send_reset (rsi); 1097 send_reset (rsi);
1029 } 1098 }
1030 1099
1031 break; 1100 break;
1032 1101
1033 case vpn_packet::PT_AUTH_RES: 1102 case vpn_packet::PT_AUTH_RES:
1034 { 1103 {
1035 auth_res_packet *p = (auth_res_packet *) pkt; 1104 auth_res_packet *p = (auth_res_packet *)pkt;
1036 1105
1037 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1106 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
1038 1107
1039 if (p->chk_config ()) 1108 if (p->chk_config ())
1040 { 1109 {
1041 if (p->prot_minor != PROTOCOL_MINOR) 1110 if (p->prot_minor != PROTOCOL_MINOR)
1042 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1111 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
… …
1045 1114
1046 rsachallenge chg; 1115 rsachallenge chg;
1047 1116
1048 if (!rsa_cache.find (p->id, chg)) 1117 if (!rsa_cache.find (p->id, chg))
1049 { 1118 {
1050 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1119 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
1051 conf->nodename, (const char *)rsi); 1120 conf->nodename, (const char *)rsi);
1052 break; 1121 break;
1053 } 1122 }
1054 else 1123 else
1055 { 1124 {
1056 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1125 crypto_ctx *cctx = new crypto_ctx (chg, 0);
1057 1126
1058 if (!p->hmac_chk (cctx)) 1127 if (!p->hmac_chk (cctx))
1059 { 1128 {
1060 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1129 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
1061 "could be an attack, or just corruption or a synchronization error"), 1130 "could be an attack, or just corruption or a synchronization error."),
1062 conf->nodename, (const char *)rsi); 1131 conf->nodename, (const char *)rsi);
1063 break; 1132 break;
1064 } 1133 }
1065 else 1134 else
1066 { 1135 {
… …
1077 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1146 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1078 1147
1079 si = rsi; 1148 si = rsi;
1080 protocol = rsi.prot; 1149 protocol = rsi.prot;
1081 1150
1151 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1152 conf->nodename, (const char *)rsi,
1153 is_direct ? "direct" : "forwarded",
1154 p->prot_major, p->prot_minor);
1155
1082 connection_established (); 1156 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 1157
1088 if (::conf.script_node_up) 1158 if (::conf.script_node_up)
1089 { 1159 {
1090 run_script_cb cb; 1160 run_script_cb *cb = new run_script_cb;
1091 cb.set<connection, &connection::script_node_up> (this); 1161 cb->set<connection, &connection::script_node_up> (this);
1092 if (!run_script (cb, false))
1093 slog (L_WARN, _("node-up command execution failed, continuing.")); 1162 run_script_queued (cb, _("node-up command execution failed, continuing."));
1094 } 1163 }
1095 1164
1096 break; 1165 break;
1097 } 1166 }
1098 else 1167 else
1099 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1168 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1100 conf->nodename, (const char *)rsi); 1169 conf->nodename, (const char *)rsi);
1101 } 1170 }
1102 1171
1103 delete cctx; 1172 delete cctx;
1104 } 1173 }
… …
1120 { 1189 {
1121 vpndata_packet *p = (vpndata_packet *)pkt; 1190 vpndata_packet *p = (vpndata_packet *)pkt;
1122 1191
1123 if (!p->hmac_chk (ictx)) 1192 if (!p->hmac_chk (ictx))
1124 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1193 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1125 "could be an attack, or just corruption or a synchronization error"), 1194 "could be an attack, or just corruption or a synchronization error."),
1126 conf->nodename, (const char *)rsi); 1195 conf->nodename, (const char *)rsi);
1127 else 1196 else
1128 { 1197 {
1129 u32 seqno; 1198 u32 seqno;
1130 tap_packet *d = p->unpack (this, seqno); 1199 tap_packet *d = p->unpack (this, seqno);
1200 int seqclass = iseqno.seqno_classify (seqno);
1131 1201
1132 if (iseqno.recv_ok (seqno)) 1202 if (seqclass == 0) // ok
1133 { 1203 {
1134 vpn->tap->send (d); 1204 vpn->tap->send (d);
1135 1205
1136 if (si != rsi) 1206 if (si != rsi)
1137 { 1207 {
1138 // fast re-sync on source address changes, useful especially for tcp/ip 1208 // fast re-sync on source address changes, useful especially for tcp/ip
1209 //if (last_si_change < ev_now () + 5.)
1139 si = rsi; 1210 // {
1140
1141 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1211 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1142 conf->nodename, (const char *)si, (const char *)rsi); 1212 conf->nodename, (const char *)si, (const char *)rsi);
1213
1214 si = rsi;
1215
1216 if (::conf.script_node_change)
1217 {
1218 run_script_cb *cb = new run_script_cb;
1219 cb->set<connection, &connection::script_node_change> (this);
1220 run_script_queued (cb, _("node-change command execution failed, continuing."));
1221 }
1222
1223 // }
1224 //else
1225 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1226 // conf->nodename, (const char *)si, (const char *)rsi);
1143 } 1227 }
1228 }
1229 else if (seqclass == 1) // far history
1230 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1231 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1232 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1233 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1234 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1235 else if (seqclass == 3) // reset
1236 {
1237 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1238 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1239 send_reset (rsi);
1144 } 1240 }
1145 1241
1146 delete d; 1242 delete d;
1147 break; 1243 break;
1148 } 1244 }
… …
1152 break; 1248 break;
1153 1249
1154 case vpn_packet::PT_CONNECT_REQ: 1250 case vpn_packet::PT_CONNECT_REQ:
1155 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1251 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1156 { 1252 {
1157 connect_req_packet *p = (connect_req_packet *) pkt; 1253 connect_req_packet *p = (connect_req_packet *)pkt;
1158 1254
1159 if (p->id > 0 && p->id <= vpn->conns.size ()) 1255 if (p->id > 0 && p->id <= vpn->conns.size ())
1160 { 1256 {
1161 connection *c = vpn->conns[p->id - 1]; 1257 connection *c = vpn->conns[p->id - 1];
1162 conf->protocols = p->protocols; 1258 conf->protocols = p->protocols;
1163 1259
1164 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]", 1260 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]",
1165 conf->id, p->id, c->ictx && c->octx); 1261 conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx);
1166 1262
1167 if (c->ictx && c->octx) 1263 if (c->ictx && c->octx)
1168 { 1264 {
1169 // send connect_info packets to both sides, in case one is 1265 // send connect_info packets to both sides, in case one is
1170 // behind a nat firewall (or both ;) 1266 // behind a nat firewall (or both ;)
… …
1193 1289
1194 c->conf->protocols = p->protocols; 1290 c->conf->protocols = p->protocols;
1195 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1291 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1196 p->si.upgrade_protocol (protocol, c->conf); 1292 p->si.upgrade_protocol (protocol, c->conf);
1197 1293
1198 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1294 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s) [%d]",
1295 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1199 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1296 (const char *)p->si, !c->ictx && !c->octx);
1200 1297
1201 const sockinfo &dsi = forward_si (p->si); 1298 const sockinfo &dsi = forward_si (p->si);
1202 1299
1203 if (dsi.valid ()) 1300 if (dsi.valid ())
1204 c->send_auth_request (dsi, true); 1301 c->send_auth_request (dsi, true);
… …
1218} 1315}
1219 1316
1220inline void 1317inline void
1221connection::keepalive_cb (ev::timer &w, int revents) 1318connection::keepalive_cb (ev::timer &w, int revents)
1222{ 1319{
1223 if (ev_now () >= last_activity + ::conf.keepalive + 30) 1320 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1224 { 1321 {
1225 reset_connection (); 1322 reset_connection ();
1226 establish_connection (); 1323 establish_connection ();
1227 } 1324 }
1228 else if (ev_now () < last_activity + ::conf.keepalive) 1325 else if (ev_now () < last_activity + ::conf.keepalive)
1229 w.start (last_activity + ::conf.keepalive - ev::now ()); 1326 w.start (last_activity + ::conf.keepalive - ev::now ());
1230 else if (conf->connectmode != conf_node::C_ONDEMAND 1327 else if (conf->connectmode != conf_node::C_ONDEMAND
1231 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1328 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1232 { 1329 {
1233 send_ping (si); 1330 send_ping (si);
1234 w.start (5); 1331 w.start (3);
1235 } 1332 }
1236 else if (ev_now () < last_activity + ::conf.keepalive + 10) 1333 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1237 // hold ondemand connections implicitly a few seconds longer 1334 // hold ondemand connections implicitly a few seconds longer
1238 // should delete octx, though, or something like that ;) 1335 // should delete octx, though, or something like that ;)
1239 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1336 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
… …
1243 1340
1244void connection::send_connect_request (int id) 1341void connection::send_connect_request (int id)
1245{ 1342{
1246 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1343 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1247 1344
1248 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1345 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s)",
1346 conf->nodename, vpn->conns[id - 1]->conf->nodename);
1249 p->hmac_set (octx); 1347 p->hmac_set (octx);
1250 send_vpn_packet (p, si); 1348 send_vpn_packet (p, si);
1251 1349
1252 delete p; 1350 delete p;
1253} 1351}
1254 1352
1255void connection::script_init_env (const char *ext) 1353void connection::script_init_env (const char *ext)
1256{ 1354{
1257 char *env; 1355 char *env;
1258 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env); 1356 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1259 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1357 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1260 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1358 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1261 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1359 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1262 conf->id & 0xff); putenv (env); 1360 conf->id & 0xff); putenv (env);
1263} 1361}
1264 1362
1265void connection::script_init_connect_env () 1363void connection::script_init_connect_env ()
1266{ 1364{
1267 vpn->script_init_env (); 1365 vpn->script_init_env ();
1268 1366
1269 char *env; 1367 char *env;
1270 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1368 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1369 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1271 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1370 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1272 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1371 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1273 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1372 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1274} 1373}
1275 1374
1276inline const char * 1375inline const char *
1277connection::script_node_up () 1376connection::script_node_up ()
1278{ 1377{
… …
1288 1387
1289 return filename; 1388 return filename;
1290} 1389}
1291 1390
1292inline const char * 1391inline const char *
1392connection::script_node_change ()
1393{
1394 script_init_connect_env ();
1395
1396 putenv ((char *)"STATE=change");
1397
1398 char *filename;
1399 asprintf (&filename,
1400 "%s/%s",
1401 confbase,
1402 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1403
1404 return filename;
1405}
1406
1407inline const char *
1293connection::script_node_down () 1408connection::script_node_down ()
1294{ 1409{
1295 script_init_connect_env (); 1410 script_init_connect_env ();
1296 1411
1297 putenv ((char *)"STATE=down"); 1412 putenv ((char *)"STATE=down");
… …
1308connection::connection (struct vpn *vpn, conf_node *conf) 1423connection::connection (struct vpn *vpn, conf_node *conf)
1309: vpn(vpn), conf(conf), 1424: vpn(vpn), conf(conf),
1310#if ENABLE_DNS 1425#if ENABLE_DNS
1311 dns (0), 1426 dns (0),
1312#endif 1427#endif
1313 data_queue(conf->max_ttl, conf->max_queue), 1428 data_queue(conf->max_ttl, conf->max_queue + 1),
1314 vpn_queue(conf->max_ttl, conf->max_queue) 1429 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1315{ 1430{
1316 rekey .set<connection, &connection::rekey_cb > (this); 1431 rekey .set<connection, &connection::rekey_cb > (this);
1317 keepalive .set<connection, &connection::keepalive_cb > (this); 1432 keepalive .set<connection, &connection::keepalive_cb > (this);
1318 establish_connection.set<connection, &connection::establish_connection_cb> (this); 1433 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1319 1434
1435 last_establish_attempt = 0.;
1320 octx = ictx = 0; 1436 octx = ictx = 0;
1321 retry_cnt = 0;
1322 1437
1323 if (!conf->protocols) // make sure some protocol is enabled 1438 if (!conf->protocols) // make sure some protocol is enabled
1324 conf->protocols = PROT_UDPv4; 1439 conf->protocols = PROT_UDPv4;
1325 1440
1326 connectmode = conf->connectmode; 1441 connectmode = conf->connectmode;
1327 1442
1328 // queue a dummy packet to force an initial connection attempt 1443 // queue a dummy packet to force an initial connection attempt
1329 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED) 1444 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1330 { 1445 vpn_queue.put (new net_packet);
1331 net_packet *p = new net_packet;
1332 p->len = 0;
1333 vpn_queue.put (p);
1334 }
1335 1446
1336 reset_connection (); 1447 reset_connection ();
1337} 1448}
1338 1449
1339connection::~connection () 1450connection::~connection ()

Diff Legend

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