ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/connection.C
(Generate patch)

Comparing gvpe/src/connection.C (file contents):
Revision 1.62 by pcg, Sat Dec 1 23:35:31 2007 UTC vs.
Revision 1.74 by pcg, Sun Aug 10 02:49:21 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;
… …
82 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 135 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 136 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
84 EVP_MD_CTX_cleanup (&ctx); 137 EVP_MD_CTX_cleanup (&ctx);
85} 138}
86 139
87struct rsa_entry { 140struct rsa_entry
141{
88 tstamp expire; 142 tstamp expire;
89 rsaid id; 143 rsaid id;
90 rsachallenge chg; 144 rsachallenge chg;
91}; 145};
92 146
93struct rsa_cache : list<rsa_entry> 147struct rsa_cache : list<rsa_entry>
94{ 148{
95 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner; 149 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
96 150
97 bool find (const rsaid &id, rsachallenge &chg) 151 bool find (const rsaid &id, rsachallenge &chg)
98 { 152 {
99 for (iterator i = begin (); i != end (); ++i) 153 for (iterator i = begin (); i != end (); ++i)
100 { 154 {
… …
129 if (!cleaner.is_active ()) 183 if (!cleaner.is_active ())
130 cleaner.again (); 184 cleaner.again ();
131 } 185 }
132 186
133 rsa_cache () 187 rsa_cache ()
134 : cleaner (this, &rsa_cache::cleaner_cb)
135 { 188 {
189 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
136 cleaner.set (RSA_TTL, RSA_TTL); 190 cleaner.set (RSA_TTL, RSA_TTL);
137 } 191 }
138 192
139} rsa_cache; 193} rsa_cache;
140 194
… …
152 } 206 }
153} 207}
154 208
155////////////////////////////////////////////////////////////////////////////// 209//////////////////////////////////////////////////////////////////////////////
156 210
157void pkt_queue::put (net_packet *p) 211pkt_queue::pkt_queue (double max_ttl, int max_queue)
212: max_ttl (max_ttl), max_queue (max_queue)
158{ 213{
159 if (queue[i]) 214 queue = new pkt [max_queue];
160 {
161 delete queue[i];
162 j = (j + 1) % QUEUEDEPTH;
163 }
164 215
165 queue[i] = p;
166
167 i = (i + 1) % QUEUEDEPTH;
168}
169
170net_packet *pkt_queue::get ()
171{
172 net_packet *p = queue[j];
173
174 if (p)
175 {
176 queue[j] = 0;
177 j = (j + 1) % QUEUEDEPTH;
178 }
179
180 return p;
181}
182
183pkt_queue::pkt_queue ()
184{
185 memset (queue, 0, sizeof (queue));
186 i = 0; 216 i = 0;
187 j = 0; 217 j = 0;
218
219 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
188} 220}
189 221
190pkt_queue::~pkt_queue () 222pkt_queue::~pkt_queue ()
191{ 223{
192 for (i = QUEUEDEPTH; --i > 0; ) 224 while (net_packet *p = get ())
225 delete p;
226
193 delete queue[i]; 227 delete [] queue;
194} 228}
195 229
230void pkt_queue::expire_cb (ev::timer &w, int revents)
231{
232 ev_tstamp expire = ev_now () - max_ttl;
233
234 for (;;)
235 {
236 if (empty ())
237 break;
238
239 double diff = queue[j].tstamp - expire;
240
241 if (diff >= 0.)
242 {
243 w.start (diff > 0.5 ? diff : 0.5);
244 break;
245 }
246
247 delete get ();
248 }
249}
250
251void pkt_queue::put (net_packet *p)
252{
253 ev_tstamp now = ev_now ();
254
255 // start expiry timer
256 if (empty ())
257 expire.start (max_ttl);
258
259 int ni = i + 1 == max_queue ? 0 : i + 1;
260
261 if (ni == j)
262 delete get ();
263
264 queue[i].pkt = p;
265 queue[i].tstamp = now;
266
267 i = ni;
268}
269
270net_packet *pkt_queue::get ()
271{
272 if (empty ())
273 return 0;
274
275 net_packet *p = queue[j].pkt;
276 queue[j].pkt = 0;
277
278 j = j + 1 == max_queue ? 0 : j + 1;
279
280 return p;
281}
282
196struct net_rateinfo { 283struct net_rateinfo
284{
197 u32 host; 285 u32 host;
198 double pcnt, diff; 286 double pcnt, diff;
199 tstamp last; 287 tstamp last;
200}; 288};
201 289
… …
588{ 676{
589 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx); 677 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
590 678
591 if (ictx && octx) 679 if (ictx && octx)
592 { 680 {
593 connectmode = conf->connectmode;
594
595 // make sure rekeying timeouts are slightly asymmetric 681 // make sure rekeying timeouts are slightly asymmetric
596 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);
597 rekey.start (rekey_interval, rekey_interval); 683 rekey.start (rekey_interval, rekey_interval);
598 keepalive.start (::conf.keepalive); 684 keepalive.start (::conf.keepalive);
599 685
600 // send queued packets 686 // send queued packets
601 if (ictx && octx) 687 if (ictx && octx)
602 { 688 {
603 while (tap_packet *p = (tap_packet *)data_queue.get ()) 689 while (tap_packet *p = (tap_packet *)data_queue.get ())
604 { 690 {
605 send_data_packet (p); 691 if (p->len) send_data_packet (p);
606 delete p; 692 delete p;
607 } 693 }
608 694
609 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 695 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
610 { 696 {
611 send_vpn_packet (p, si, IPTOS_RELIABILITY); 697 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
612 delete p; 698 delete p;
613 } 699 }
614 } 700 }
701
702 vpn->connection_established (this);
615 } 703 }
616 else 704 else
617 { 705 {
618 retry_cnt = 0; 706 retry_cnt = 0;
619 establish_connection.start (5); 707 establish_connection.start (5);
… …
623} 711}
624 712
625void 713void
626connection::reset_si () 714connection::reset_si ()
627{ 715{
716 if (vpn->can_direct (THISNODE, conf))
628 protocol = best_protocol (THISNODE->protocols & conf->protocols); 717 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
629 718 else
630 // mask out protocols we cannot establish
631 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
632 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
633 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
634
635 if (protocol
636 && (!conf->can_direct (THISNODE)
637 || !THISNODE->can_direct (conf)))
638 { 719 {
639 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename); 720 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
640 protocol = 0; 721 protocol = 0;
641 } 722 }
642 723
643 si.set (conf, protocol); 724 si.set (conf, protocol);
725
726 is_direct = si.valid ();
644} 727}
645 728
646// ensure sockinfo is valid, forward if necessary 729// ensure sockinfo is valid, forward if necessary
647const sockinfo & 730const sockinfo &
648connection::forward_si (const sockinfo &si) const 731connection::forward_si (const sockinfo &si) const
649{ 732{
650 if (!si.valid ()) 733 if (!si.valid ())
651 { 734 {
652 connection *r = vpn->find_router (); 735 connection *r = vpn->find_router_for (this);
653 736
654 if (r) 737 if (r)
655 { 738 {
656 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."),
657 conf->nodename, r->conf->nodename, (const char *)r->si); 740 conf->nodename, r->conf->nodename);
658 return r->si; 741 return r->si;
659 } 742 }
660 else 743 else
661 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 744 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
662 conf->nodename); 745 conf->nodename);
663 } 746 }
664 747
665 return si; 748 return si;
666} 749}
… …
676connection::send_ping (const sockinfo &si, u8 pong) 759connection::send_ping (const sockinfo &si, u8 pong)
677{ 760{
678 ping_packet *pkt = new ping_packet; 761 ping_packet *pkt = new ping_packet;
679 762
680 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, ">>%d %s [%s]", conf->id, pong ? "PT_PONG" : "PT_PING", (const char *)si);
766
681 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 767 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
682 768
683 delete pkt; 769 delete pkt;
684} 770}
685 771
… …
743 send_vpn_packet (r, si); 829 send_vpn_packet (r, si);
744 830
745 delete r; 831 delete r;
746} 832}
747 833
748void 834inline void
749connection::establish_connection_cb (ev::timer &w, int revents) 835connection::establish_connection_cb (ev::timer &w, int revents)
750{ 836{
751 if (!ictx 837 if (!ictx
752 && conf != THISNODE 838 && conf != THISNODE
753 && connectmode != conf_node::C_NEVER 839 && connectmode != conf_node::C_NEVER
754 && connectmode != conf_node::C_DISABLED 840 && connectmode != conf_node::C_DISABLED
755 && !w.is_active ()) 841 && !w.is_active ())
756 { 842 {
843 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
844 // and stop trying. should probably be handled by a per-connection expire handler.
845 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
846 {
847 reset_connection ();
848 return;
849 }
850
851 last_establish_attempt = ev_now ();
852
757 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 853 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
758 ? (retry_cnt & 3) + 1 854 ? (retry_cnt & 3) + 1
759 : 1 << (retry_cnt >> 2)); 855 : 1 << (retry_cnt >> 2));
760 856
761 reset_si (); 857 reset_si ();
762 858
763 bool slow = si.prot & PROT_SLOW; 859 bool slow = si.prot & PROT_SLOW;
764 860
765 if (si.prot && !si.host) 861 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
766 { 862 {
767 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
768 /*TODO*/ /* start the timer so we don't recurse endlessly */ 863 /*TODO*/ /* start the timer so we don't recurse endlessly */
769 w.start (1); 864 w.start (1);
770 vpn->send_connect_request (conf->id); 865 vpn->send_connect_request (this);
771 } 866 }
772 else 867 else
773 { 868 {
774 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);
775 872
776 const sockinfo &dsi = forward_si (si); 873 const sockinfo &dsi = forward_si (si);
777 874
778 slow = slow || (dsi.prot & PROT_SLOW); 875 slow = slow || (dsi.prot & PROT_SLOW);
779 876
… …
784 else 881 else
785 send_ping (dsi, 0); 882 send_ping (dsi, 0);
786 } 883 }
787 } 884 }
788 885
789 retry_int *= slow ? 8. : 0.7; 886 retry_int *= slow ? 8. : 0.9;
790 887
791 if (retry_int < conf->max_retry) 888 if (retry_int < conf->max_retry)
792 retry_cnt++; 889 retry_cnt++;
793 else 890 else
794 retry_int = conf->max_retry; 891 retry_int = conf->max_retry;
… …
804 { 901 {
805 slog (L_INFO, _("%s(%s): connection lost"), 902 slog (L_INFO, _("%s(%s): connection lost"),
806 conf->nodename, (const char *)si); 903 conf->nodename, (const char *)si);
807 904
808 if (::conf.script_node_down) 905 if (::conf.script_node_down)
809 if (!run_script (run_script_cb (this, &connection::script_node_down), false)) 906 {
907 run_script_cb *cb = new run_script_cb;
908 cb->set<connection, &connection::script_node_down> (this);
810 slog (L_WARN, _("node-down command execution failed, continuing.")); 909 run_script_queued (cb, _("node-down command execution failed, continuing."));
910 }
811 } 911 }
812 912
813 delete ictx; ictx = 0; 913 delete ictx; ictx = 0;
814 delete octx; octx = 0; 914 delete octx; octx = 0;
815#if ENABLE_DNS 915#if ENABLE_DNS
816 dnsv4_reset_connection (); 916 dnsv4_reset_connection ();
817#endif 917#endif
818 918
819 si.host = 0; 919 si.host = 0;
820 920
821 last_activity = 0; 921 last_activity = 0.;
922 //last_si_change = 0.;
822 retry_cnt = 0; 923 retry_cnt = 0;
823 924
824 rekey.stop (); 925 rekey.stop ();
825 keepalive.stop (); 926 keepalive.stop ();
826 establish_connection.stop (); 927 establish_connection.stop ();
… …
833 send_reset (si); 934 send_reset (si);
834 935
835 reset_connection (); 936 reset_connection ();
836} 937}
837 938
838void 939// poor-man's rekeying
940inline void
839connection::rekey_cb (ev::timer &w, int revents) 941connection::rekey_cb (ev::timer &w, int revents)
840{ 942{
841 reset_connection (); 943 reset_connection ();
842 establish_connection (); 944 establish_connection ();
843} 945}
… …
860 if (oseqno > MAX_SEQNO) 962 if (oseqno > MAX_SEQNO)
861 rekey (); 963 rekey ();
862} 964}
863 965
864void 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
865connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 977connection::inject_data_packet (tap_packet *pkt)
866{ 978{
867 if (ictx && octx) 979 if (ictx && octx)
868 send_data_packet (pkt); 980 send_data_packet (pkt);
869 else 981 else
870 { 982 {
871 if (!broadcast)
872 data_queue.put (new tap_packet (*pkt)); 983 data_queue.put (new tap_packet (*pkt));
873 984 post_inject_queue ();
874 establish_connection ();
875 } 985 }
876} 986}
877 987
878void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 988void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
879{ 989{
880 if (ictx && octx) 990 if (ictx && octx)
881 send_vpn_packet (pkt, si, tos); 991 send_vpn_packet (pkt, si, tos);
882 else 992 else
883 { 993 {
884 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 994 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
885 995 post_inject_queue ();
886 establish_connection ();
887 } 996 }
888} 997}
889 998
890void 999void
891connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1000connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
892{ 1001{
893 last_activity = ev_now (); 1002 last_activity = ev_now ();
894 1003
895 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1004 slog (L_NOISE, "<<%d received packet type %d from %d to %d.",
896 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1005 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
897 1006
898 if (connectmode == conf_node::C_DISABLED) 1007 if (connectmode == conf_node::C_DISABLED)
899 return; 1008 return;
900 1009
… …
908 { 1017 {
909 if (auth_rate_limiter.can (rsi)) 1018 if (auth_rate_limiter.can (rsi))
910 send_auth_request (rsi, true); 1019 send_auth_request (rsi, true);
911 } 1020 }
912 else 1021 else
1022 // we would love to change thre socket address here, but ping's aren't
1023 // authenticated, so we best ignore it.
913 send_ping (rsi, 1); // pong 1024 send_ping (rsi, 1); // pong
914 1025
915 break; 1026 break;
916 1027
917 case vpn_packet::PT_PONG: 1028 case vpn_packet::PT_PONG:
… …
923 1034
924 config_packet *p = (config_packet *) pkt; 1035 config_packet *p = (config_packet *) pkt;
925 1036
926 if (!p->chk_config ()) 1037 if (!p->chk_config ())
927 { 1038 {
928 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1039 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
929 conf->nodename, (const char *)rsi); 1040 conf->nodename, (const char *)rsi);
930 connectmode = conf_node::C_DISABLED; 1041 connectmode = conf_node::C_DISABLED;
931 } 1042 }
932 else if (connectmode == conf_node::C_ALWAYS) 1043 else if (connectmode == conf_node::C_ALWAYS)
933 establish_connection (); 1044 establish_connection ();
… …
975 1086
976 break; 1087 break;
977 } 1088 }
978 } 1089 }
979 else 1090 else
980 slog (L_WARN, _("%s(%s): protocol mismatch"), 1091 slog (L_WARN, _("%s(%s): protocol mismatch."),
981 conf->nodename, (const char *)rsi); 1092 conf->nodename, (const char *)rsi);
982 1093
983 send_reset (rsi); 1094 send_reset (rsi);
984 } 1095 }
985 1096
… …
1000 1111
1001 rsachallenge chg; 1112 rsachallenge chg;
1002 1113
1003 if (!rsa_cache.find (p->id, chg)) 1114 if (!rsa_cache.find (p->id, chg))
1004 { 1115 {
1005 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1116 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
1006 conf->nodename, (const char *)rsi); 1117 conf->nodename, (const char *)rsi);
1007 break; 1118 break;
1008 } 1119 }
1009 else 1120 else
1010 { 1121 {
1011 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1122 crypto_ctx *cctx = new crypto_ctx (chg, 0);
1012 1123
1013 if (!p->hmac_chk (cctx)) 1124 if (!p->hmac_chk (cctx))
1014 { 1125 {
1015 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1126 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
1016 "could be an attack, or just corruption or a synchronization error"), 1127 "could be an attack, or just corruption or a synchronization error."),
1017 conf->nodename, (const char *)rsi); 1128 conf->nodename, (const char *)rsi);
1018 break; 1129 break;
1019 } 1130 }
1020 else 1131 else
1021 { 1132 {
… …
1032 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1143 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1033 1144
1034 si = rsi; 1145 si = rsi;
1035 protocol = rsi.prot; 1146 protocol = rsi.prot;
1036 1147
1037 connection_established ();
1038
1039 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1148 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d."),
1040 conf->nodename, (const char *)rsi, 1149 conf->nodename, (const char *)rsi,
1041 p->prot_major, p->prot_minor); 1150 p->prot_major, p->prot_minor);
1042 1151
1152 connection_established ();
1153
1043 if (::conf.script_node_up) 1154 if (::conf.script_node_up)
1044 if (!run_script (run_script_cb (this, &connection::script_node_up), false)) 1155 {
1156 run_script_cb *cb = new run_script_cb;
1157 cb->set<connection, &connection::script_node_up> (this);
1045 slog (L_WARN, _("node-up command execution failed, continuing.")); 1158 run_script_queued (cb, _("node-up command execution failed, continuing."));
1159 }
1046 1160
1047 break; 1161 break;
1048 } 1162 }
1049 else 1163 else
1050 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1164 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1051 conf->nodename, (const char *)rsi); 1165 conf->nodename, (const char *)rsi);
1052 } 1166 }
1053 1167
1054 delete cctx; 1168 delete cctx;
1055 } 1169 }
… …
1071 { 1185 {
1072 vpndata_packet *p = (vpndata_packet *)pkt; 1186 vpndata_packet *p = (vpndata_packet *)pkt;
1073 1187
1074 if (!p->hmac_chk (ictx)) 1188 if (!p->hmac_chk (ictx))
1075 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1189 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1076 "could be an attack, or just corruption or a synchronization error"), 1190 "could be an attack, or just corruption or a synchronization error."),
1077 conf->nodename, (const char *)rsi); 1191 conf->nodename, (const char *)rsi);
1078 else 1192 else
1079 { 1193 {
1080 u32 seqno; 1194 u32 seqno;
1081 tap_packet *d = p->unpack (this, seqno); 1195 tap_packet *d = p->unpack (this, seqno);
1196 int seqclass = iseqno.seqno_classify (seqno);
1082 1197
1083 if (iseqno.recv_ok (seqno)) 1198 if (seqclass == 0) // ok
1084 { 1199 {
1085 vpn->tap->send (d); 1200 vpn->tap->send (d);
1086 1201
1087 if (si != rsi) 1202 if (si != rsi)
1088 { 1203 {
1089 // fast re-sync on source address changes, useful especially for tcp/ip 1204 // fast re-sync on source address changes, useful especially for tcp/ip
1205 //if (last_si_change < ev_now () + 5.)
1206 // {
1090 si = rsi; 1207 si = rsi;
1091 1208
1092 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1209 slog (L_INFO, _("%s(%s): socket address changed to %s."),
1093 conf->nodename, (const char *)si, (const char *)rsi); 1210 conf->nodename, (const char *)si, (const char *)rsi);
1211 // }
1212 //else
1213 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1214 // conf->nodename, (const char *)si, (const char *)rsi);
1094 } 1215 }
1216 }
1217 else if (seqclass == 1) // silently ignore
1218 slog (L_ERR, _("received duplicate packet (received %08lx, expected %08lx)\n"
1219 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1220 else if (seqclass == 2) // reset
1221 {
1222 slog (L_ERR, _("received duplicate or out-of-sync packet (received %08lx, expected %08lx)\n"
1223 "possible replay attack, or just massive packet loss, resetting connection."), seqno, iseqno.seq + 1);
1224 send_reset (rsi);
1095 } 1225 }
1096 1226
1097 delete d; 1227 delete d;
1098 break; 1228 break;
1099 } 1229 }
… …
1166 send_reset (rsi); 1296 send_reset (rsi);
1167 break; 1297 break;
1168 } 1298 }
1169} 1299}
1170 1300
1301inline void
1171void connection::keepalive_cb (ev::timer &w, int revents) 1302connection::keepalive_cb (ev::timer &w, int revents)
1172{ 1303{
1173 if (ev_now () >= last_activity + ::conf.keepalive + 30) 1304 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1174 { 1305 {
1175 reset_connection (); 1306 reset_connection ();
1176 establish_connection (); 1307 establish_connection ();
… …
1221 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1352 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1222 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1353 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1223 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1354 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1224} 1355}
1225 1356
1357inline const char *
1226const char *connection::script_node_up () 1358connection::script_node_up ()
1227{ 1359{
1228 script_init_connect_env (); 1360 script_init_connect_env ();
1229 1361
1230 putenv ((char *)"STATE=up"); 1362 putenv ((char *)"STATE=up");
1231 1363
… …
1236 ::conf.script_node_up ? ::conf.script_node_up : "node-up"); 1368 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1237 1369
1238 return filename; 1370 return filename;
1239} 1371}
1240 1372
1373inline const char *
1241const char *connection::script_node_down () 1374connection::script_node_down ()
1242{ 1375{
1243 script_init_connect_env (); 1376 script_init_connect_env ();
1244 1377
1245 putenv ((char *)"STATE=down"); 1378 putenv ((char *)"STATE=down");
1246 1379
… …
1252 1385
1253 return filename; 1386 return filename;
1254} 1387}
1255 1388
1256connection::connection (struct vpn *vpn, conf_node *conf) 1389connection::connection (struct vpn *vpn, conf_node *conf)
1257: vpn(vpn), conf(conf) 1390: vpn(vpn), conf(conf),
1258, rekey (this, &connection::rekey_cb)
1259, keepalive (this, &connection::keepalive_cb)
1260, establish_connection (this, &connection::establish_connection_cb)
1261#if ENABLE_DNS 1391#if ENABLE_DNS
1262, dns (0) 1392 dns (0),
1263#endif 1393#endif
1394 data_queue(conf->max_ttl, conf->max_queue + 1),
1395 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1264{ 1396{
1397 rekey .set<connection, &connection::rekey_cb > (this);
1398 keepalive .set<connection, &connection::keepalive_cb > (this);
1399 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1400
1401 last_establish_attempt = 0.;
1265 octx = ictx = 0; 1402 octx = ictx = 0;
1266 retry_cnt = 0;
1267 1403
1268 if (!conf->protocols) // make sure some protocol is enabled 1404 if (!conf->protocols) // make sure some protocol is enabled
1269 conf->protocols = PROT_UDPv4; 1405 conf->protocols = PROT_UDPv4;
1270 1406
1271 connectmode = conf_node::C_ALWAYS; // initial setting 1407 connectmode = conf->connectmode;
1408
1409 // queue a dummy packet to force an initial connection attempt
1410 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1411 vpn_queue.put (new net_packet);
1412
1272 reset_connection (); 1413 reset_connection ();
1273} 1414}
1274 1415
1275connection::~connection () 1416connection::~connection ()
1276{ 1417{

Diff Legend

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