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.82 by pcg, Fri Aug 15 18:35:24 2008 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
10 (at your option) any later version. 10 option) any later version.
11 11
12 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15 GNU General Public License for more details. 15 Public License for more details.
16 16
17 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License along
18 along with gvpe; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
20*/ 30*/
21 31
22#include "config.h" 32#include "config.h"
23 33
24#include <list> 34#include <list>
35#include <queue>
36#include <utility>
25 37
26#include <openssl/rand.h> 38#include <openssl/rand.h>
27#include <openssl/evp.h> 39#include <openssl/evp.h>
28#include <openssl/rsa.h> 40#include <openssl/rsa.h>
29#include <openssl/err.h> 41#include <openssl/err.h>
… …
45#define ULTRA_FAST 1 57#define ULTRA_FAST 1
46#define HLOG 15 58#define HLOG 15
47#include "lzf/lzf.h" 59#include "lzf/lzf.h"
48#include "lzf/lzf_c.c" 60#include "lzf/lzf_c.c"
49#include "lzf/lzf_d.c" 61#include "lzf/lzf_d.c"
62
63//////////////////////////////////////////////////////////////////////////////
64
65static std::queue< std::pair<run_script_cb *, const char *> > rs_queue;
66static ev::child rs_child_ev;
67
68void // c++ requires external linkage here, apparently :(
69rs_child_cb (ev::child &w, int revents)
70{
71 w.stop ();
72
73 if (rs_queue.empty ())
74 return;
75
76 pid_t pid = run_script (*rs_queue.front ().first, false);
77 if (pid)
78 {
79 w.set (pid);
80 w.start ();
81 }
82 else
83 slog (L_WARN, rs_queue.front ().second);
84
85 delete rs_queue.front ().first;
86 rs_queue.pop ();
87}
88
89// despite the fancy name, this is quite a hack
90static void
91run_script_queued (run_script_cb *cb, const char *warnmsg)
92{
93 rs_queue.push (std::make_pair (cb, warnmsg));
94
95 if (!rs_child_ev.is_active ())
96 {
97 rs_child_ev.set<rs_child_cb> ();
98 rs_child_ev ();
99 }
100}
101
102//////////////////////////////////////////////////////////////////////////////
50 103
51struct crypto_ctx 104struct crypto_ctx
52{ 105{
53 EVP_CIPHER_CTX cctx; 106 EVP_CIPHER_CTX cctx;
54 HMAC_CTX hctx; 107 HMAC_CTX hctx;
… …
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);
… …
803 856
804 reset_si (); 857 reset_si ();
805 858
806 bool slow = si.prot & PROT_SLOW; 859 bool slow = si.prot & PROT_SLOW;
807 860
808 if (si.prot && !si.host) 861 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
809 { 862 {
810 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
811 /*TODO*/ /* start the timer so we don't recurse endlessly */ 863 /*TODO*/ /* start the timer so we don't recurse endlessly */
812 w.start (1); 864 w.start (1);
813 vpn->send_connect_request (conf->id); 865 vpn->send_connect_request (this);
814 } 866 }
815 else 867 else
816 { 868 {
817 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);
818 872
819 const sockinfo &dsi = forward_si (si); 873 const sockinfo &dsi = forward_si (si);
820 874
821 slow = slow || (dsi.prot & PROT_SLOW); 875 slow = slow || (dsi.prot & PROT_SLOW);
822 876
… …
848 slog (L_INFO, _("%s(%s): connection lost"), 902 slog (L_INFO, _("%s(%s): connection lost"),
849 conf->nodename, (const char *)si); 903 conf->nodename, (const char *)si);
850 904
851 if (::conf.script_node_down) 905 if (::conf.script_node_down)
852 { 906 {
853 run_script_cb cb; 907 run_script_cb *cb = new run_script_cb;
854 cb.set<connection, &connection::script_node_down> (this); 908 cb->set<connection, &connection::script_node_down> (this);
855 if (!run_script (cb, false))
856 slog (L_WARN, _("node-down command execution failed, continuing.")); 909 run_script_queued (cb, _("node-down command execution failed, continuing."));
857 } 910 }
858 } 911 }
859 912
860 delete ictx; ictx = 0; 913 delete ictx; ictx = 0;
861 delete octx; octx = 0; 914 delete octx; octx = 0;
… …
863 dnsv4_reset_connection (); 916 dnsv4_reset_connection ();
864#endif 917#endif
865 918
866 si.host = 0; 919 si.host = 0;
867 920
868 last_activity = 0; 921 last_activity = 0.;
922 //last_si_change = 0.;
869 retry_cnt = 0; 923 retry_cnt = 0;
870 924
871 rekey.stop (); 925 rekey.stop ();
872 keepalive.stop (); 926 keepalive.stop ();
873 establish_connection.stop (); 927 establish_connection.stop ();
… …
880 send_reset (si); 934 send_reset (si);
881 935
882 reset_connection (); 936 reset_connection ();
883} 937}
884 938
939// poor-man's rekeying
885inline void 940inline void
886connection::rekey_cb (ev::timer &w, int revents) 941connection::rekey_cb (ev::timer &w, int revents)
887{ 942{
888 reset_connection (); 943 reset_connection ();
889 establish_connection (); 944 establish_connection ();
… …
944void 999void
945connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1000connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
946{ 1001{
947 last_activity = ev_now (); 1002 last_activity = ev_now ();
948 1003
949 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.",
950 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1005 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
951 1006
952 if (connectmode == conf_node::C_DISABLED) 1007 if (connectmode == conf_node::C_DISABLED)
953 return; 1008 return;
954 1009
955 switch (pkt->typ ()) 1010 switch (pkt->typ ())
956 { 1011 {
957 case vpn_packet::PT_PING: 1012 case vpn_packet::PT_PING:
1013 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1014
958 // we send pings instead of auth packets after some retries, 1015 // we send pings instead of auth packets after some retries,
959 // so reset the retry counter and establish a connection 1016 // so reset the retry counter and establish a connection
960 // when we receive a ping. 1017 // when we receive a ping.
961 if (!ictx) 1018 if (!ictx)
962 { 1019 {
963 if (auth_rate_limiter.can (rsi)) 1020 if (auth_rate_limiter.can (rsi))
964 send_auth_request (rsi, true); 1021 send_auth_request (rsi, true);
965 } 1022 }
966 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.
967 send_ping (rsi, 1); // pong 1026 send_ping (rsi, 1); // pong
968 1027
969 break; 1028 break;
970 1029
971 case vpn_packet::PT_PONG: 1030 case vpn_packet::PT_PONG:
1031 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
972 break; 1032 break;
973 1033
974 case vpn_packet::PT_RESET: 1034 case vpn_packet::PT_RESET:
975 { 1035 {
976 reset_connection (); 1036 reset_connection ();
977 1037
978 config_packet *p = (config_packet *) pkt; 1038 config_packet *p = (config_packet *) pkt;
979 1039
980 if (!p->chk_config ()) 1040 if (!p->chk_config ())
981 { 1041 {
982 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1042 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
983 conf->nodename, (const char *)rsi); 1043 conf->nodename, (const char *)rsi);
984 connectmode = conf_node::C_DISABLED; 1044 connectmode = conf_node::C_DISABLED;
985 } 1045 }
986 else if (connectmode == conf_node::C_ALWAYS) 1046 else if (connectmode == conf_node::C_ALWAYS)
987 establish_connection (); 1047 establish_connection ();
… …
991 case vpn_packet::PT_AUTH_REQ: 1051 case vpn_packet::PT_AUTH_REQ:
992 if (auth_rate_limiter.can (rsi)) 1052 if (auth_rate_limiter.can (rsi))
993 { 1053 {
994 auth_req_packet *p = (auth_req_packet *) pkt; 1054 auth_req_packet *p = (auth_req_packet *) pkt;
995 1055
996 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");
997 1057
998 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1058 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8))
999 { 1059 {
1000 if (p->prot_minor != PROTOCOL_MINOR) 1060 if (p->prot_minor != PROTOCOL_MINOR)
1001 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."),
… …
1029 1089
1030 break; 1090 break;
1031 } 1091 }
1032 } 1092 }
1033 else 1093 else
1034 slog (L_WARN, _("%s(%s): protocol mismatch"), 1094 slog (L_WARN, _("%s(%s): protocol mismatch."),
1035 conf->nodename, (const char *)rsi); 1095 conf->nodename, (const char *)rsi);
1036 1096
1037 send_reset (rsi); 1097 send_reset (rsi);
1038 } 1098 }
1039 1099
1040 break; 1100 break;
1041 1101
1042 case vpn_packet::PT_AUTH_RES: 1102 case vpn_packet::PT_AUTH_RES:
1043 { 1103 {
1044 auth_res_packet *p = (auth_res_packet *) pkt; 1104 auth_res_packet *p = (auth_res_packet *)pkt;
1045 1105
1046 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1106 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
1047 1107
1048 if (p->chk_config ()) 1108 if (p->chk_config ())
1049 { 1109 {
1050 if (p->prot_minor != PROTOCOL_MINOR) 1110 if (p->prot_minor != PROTOCOL_MINOR)
1051 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."),
… …
1054 1114
1055 rsachallenge chg; 1115 rsachallenge chg;
1056 1116
1057 if (!rsa_cache.find (p->id, chg)) 1117 if (!rsa_cache.find (p->id, chg))
1058 { 1118 {
1059 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1119 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
1060 conf->nodename, (const char *)rsi); 1120 conf->nodename, (const char *)rsi);
1061 break; 1121 break;
1062 } 1122 }
1063 else 1123 else
1064 { 1124 {
1065 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1125 crypto_ctx *cctx = new crypto_ctx (chg, 0);
1066 1126
1067 if (!p->hmac_chk (cctx)) 1127 if (!p->hmac_chk (cctx))
1068 { 1128 {
1069 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"
1070 "could be an attack, or just corruption or a synchronization error"), 1130 "could be an attack, or just corruption or a synchronization error."),
1071 conf->nodename, (const char *)rsi); 1131 conf->nodename, (const char *)rsi);
1072 break; 1132 break;
1073 } 1133 }
1074 else 1134 else
1075 { 1135 {
… …
1086 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
1087 1147
1088 si = rsi; 1148 si = rsi;
1089 protocol = rsi.prot; 1149 protocol = rsi.prot;
1090 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
1091 connection_established (); 1156 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 1157
1097 if (::conf.script_node_up) 1158 if (::conf.script_node_up)
1098 { 1159 {
1099 run_script_cb cb; 1160 run_script_cb *cb = new run_script_cb;
1100 cb.set<connection, &connection::script_node_up> (this); 1161 cb->set<connection, &connection::script_node_up> (this);
1101 if (!run_script (cb, false))
1102 slog (L_WARN, _("node-up command execution failed, continuing.")); 1162 run_script_queued (cb, _("node-up command execution failed, continuing."));
1103 } 1163 }
1104 1164
1105 break; 1165 break;
1106 } 1166 }
1107 else 1167 else
1108 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."),
1109 conf->nodename, (const char *)rsi); 1169 conf->nodename, (const char *)rsi);
1110 } 1170 }
1111 1171
1112 delete cctx; 1172 delete cctx;
1113 } 1173 }
… …
1129 { 1189 {
1130 vpndata_packet *p = (vpndata_packet *)pkt; 1190 vpndata_packet *p = (vpndata_packet *)pkt;
1131 1191
1132 if (!p->hmac_chk (ictx)) 1192 if (!p->hmac_chk (ictx))
1133 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"
1134 "could be an attack, or just corruption or a synchronization error"), 1194 "could be an attack, or just corruption or a synchronization error."),
1135 conf->nodename, (const char *)rsi); 1195 conf->nodename, (const char *)rsi);
1136 else 1196 else
1137 { 1197 {
1138 u32 seqno; 1198 u32 seqno;
1139 tap_packet *d = p->unpack (this, seqno); 1199 tap_packet *d = p->unpack (this, seqno);
1200 int seqclass = iseqno.seqno_classify (seqno);
1140 1201
1141 if (iseqno.recv_ok (seqno)) 1202 if (seqclass == 0) // ok
1142 { 1203 {
1143 vpn->tap->send (d); 1204 vpn->tap->send (d);
1144 1205
1145 if (si != rsi) 1206 if (si != rsi)
1146 { 1207 {
1147 // 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.)
1148 si = rsi; 1210 // {
1149
1150 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1211 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1151 conf->nodename, (const char *)si, (const char *)rsi); 1212 conf->nodename, (const char *)si, (const char *)rsi);
1213
1214 si = rsi;
1215 // }
1216 //else
1217 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1218 // conf->nodename, (const char *)si, (const char *)rsi);
1152 } 1219 }
1220 }
1221 else if (seqclass == 1) // far history
1222 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1223 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1224 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1225 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1226 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1227 else if (seqclass == 3) // reset
1228 {
1229 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1230 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1231 send_reset (rsi);
1153 } 1232 }
1154 1233
1155 delete d; 1234 delete d;
1156 break; 1235 break;
1157 } 1236 }
… …
1168 if (p->id > 0 && p->id <= vpn->conns.size ()) 1247 if (p->id > 0 && p->id <= vpn->conns.size ())
1169 { 1248 {
1170 connection *c = vpn->conns[p->id - 1]; 1249 connection *c = vpn->conns[p->id - 1];
1171 conf->protocols = p->protocols; 1250 conf->protocols = p->protocols;
1172 1251
1173 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]", 1252 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]",
1174 conf->id, p->id, c->ictx && c->octx); 1253 conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx);
1175 1254
1176 if (c->ictx && c->octx) 1255 if (c->ictx && c->octx)
1177 { 1256 {
1178 // send connect_info packets to both sides, in case one is 1257 // send connect_info packets to both sides, in case one is
1179 // behind a nat firewall (or both ;) 1258 // behind a nat firewall (or both ;)
… …
1202 1281
1203 c->conf->protocols = p->protocols; 1282 c->conf->protocols = p->protocols;
1204 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1283 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1205 p->si.upgrade_protocol (protocol, c->conf); 1284 p->si.upgrade_protocol (protocol, c->conf);
1206 1285
1207 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1286 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s) [%d]",
1287 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1208 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1288 (const char *)p->si, !c->ictx && !c->octx);
1209 1289
1210 const sockinfo &dsi = forward_si (p->si); 1290 const sockinfo &dsi = forward_si (p->si);
1211 1291
1212 if (dsi.valid ()) 1292 if (dsi.valid ())
1213 c->send_auth_request (dsi, true); 1293 c->send_auth_request (dsi, true);
… …
1252 1332
1253void connection::send_connect_request (int id) 1333void connection::send_connect_request (int id)
1254{ 1334{
1255 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1335 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1256 1336
1257 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1337 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s)",
1338 conf->nodename, vpn->conns[id - 1]->conf->nodename);
1258 p->hmac_set (octx); 1339 p->hmac_set (octx);
1259 send_vpn_packet (p, si); 1340 send_vpn_packet (p, si);
1260 1341
1261 delete p; 1342 delete p;
1262} 1343}
… …
1317connection::connection (struct vpn *vpn, conf_node *conf) 1398connection::connection (struct vpn *vpn, conf_node *conf)
1318: vpn(vpn), conf(conf), 1399: vpn(vpn), conf(conf),
1319#if ENABLE_DNS 1400#if ENABLE_DNS
1320 dns (0), 1401 dns (0),
1321#endif 1402#endif
1322 data_queue(conf->max_ttl, conf->max_queue), 1403 data_queue(conf->max_ttl, conf->max_queue + 1),
1323 vpn_queue(conf->max_ttl, conf->max_queue) 1404 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1324{ 1405{
1325 rekey .set<connection, &connection::rekey_cb > (this); 1406 rekey .set<connection, &connection::rekey_cb > (this);
1326 keepalive .set<connection, &connection::keepalive_cb > (this); 1407 keepalive .set<connection, &connection::keepalive_cb > (this);
1327 establish_connection.set<connection, &connection::establish_connection_cb> (this); 1408 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1328 1409

Diff Legend

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