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.65 by pcg, Tue Dec 4 17:17:20 2007 UTC vs.
Revision 1.73 by pcg, Sun Aug 10 01:34:36 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;
… …
91 rsachallenge chg; 144 rsachallenge chg;
92}; 145};
93 146
94struct rsa_cache : list<rsa_entry> 147struct rsa_cache : list<rsa_entry>
95{ 148{
96 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner; 149 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
97 150
98 bool find (const rsaid &id, rsachallenge &chg) 151 bool find (const rsaid &id, rsachallenge &chg)
99 { 152 {
100 for (iterator i = begin (); i != end (); ++i) 153 for (iterator i = begin (); i != end (); ++i)
101 { 154 {
… …
153 } 206 }
154} 207}
155 208
156////////////////////////////////////////////////////////////////////////////// 209//////////////////////////////////////////////////////////////////////////////
157 210
158void 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)
159{ 213{
160 if (queue[i]) 214 queue = new pkt [max_queue];
161 {
162 delete queue[i];
163 j = (j + 1) % QUEUEDEPTH;
164 }
165 215
166 queue[i] = p;
167
168 i = (i + 1) % QUEUEDEPTH;
169}
170
171net_packet *pkt_queue::get ()
172{
173 net_packet *p = queue[j];
174
175 if (p)
176 {
177 queue[j] = 0;
178 j = (j + 1) % QUEUEDEPTH;
179 }
180
181 return p;
182}
183
184pkt_queue::pkt_queue ()
185{
186 memset (queue, 0, sizeof (queue));
187 i = 0; 216 i = 0;
188 j = 0; 217 j = 0;
218
219 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
189} 220}
190 221
191pkt_queue::~pkt_queue () 222pkt_queue::~pkt_queue ()
192{ 223{
193 for (i = QUEUEDEPTH; --i > 0; ) 224 while (net_packet *p = get ())
225 delete p;
226
194 delete queue[i]; 227 delete [] queue;
228}
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;
195} 281}
196 282
197struct net_rateinfo 283struct net_rateinfo
198{ 284{
199 u32 host; 285 u32 host;
… …
590{ 676{
591 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);
592 678
593 if (ictx && octx) 679 if (ictx && octx)
594 { 680 {
595 connectmode = conf->connectmode;
596
597 // make sure rekeying timeouts are slightly asymmetric 681 // make sure rekeying timeouts are slightly asymmetric
598 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);
599 rekey.start (rekey_interval, rekey_interval); 683 rekey.start (rekey_interval, rekey_interval);
600 keepalive.start (::conf.keepalive); 684 keepalive.start (::conf.keepalive);
601 685
602 // send queued packets 686 // send queued packets
603 if (ictx && octx) 687 if (ictx && octx)
604 { 688 {
605 while (tap_packet *p = (tap_packet *)data_queue.get ()) 689 while (tap_packet *p = (tap_packet *)data_queue.get ())
606 { 690 {
607 send_data_packet (p); 691 if (p->len) send_data_packet (p);
608 delete p; 692 delete p;
609 } 693 }
610 694
611 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 695 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
612 { 696 {
613 send_vpn_packet (p, si, IPTOS_RELIABILITY); 697 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
614 delete p; 698 delete p;
615 } 699 }
616 } 700 }
701
702 vpn->connection_established (this);
617 } 703 }
618 else 704 else
619 { 705 {
620 retry_cnt = 0; 706 retry_cnt = 0;
621 establish_connection.start (5); 707 establish_connection.start (5);
… …
625} 711}
626 712
627void 713void
628connection::reset_si () 714connection::reset_si ()
629{ 715{
716 if (vpn->can_direct (THISNODE, conf))
630 protocol = best_protocol (THISNODE->protocols & conf->protocols); 717 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
631 718 else
632 // mask out protocols we cannot establish
633 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
634 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
635 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
636
637 if (protocol
638 && (!conf->can_direct (THISNODE)
639 || !THISNODE->can_direct (conf)))
640 { 719 {
641 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename); 720 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
642 protocol = 0; 721 protocol = 0;
643 } 722 }
644 723
645 si.set (conf, protocol); 724 si.set (conf, protocol);
725
726 is_direct = si.valid ();
646} 727}
647 728
648// ensure sockinfo is valid, forward if necessary 729// ensure sockinfo is valid, forward if necessary
649const sockinfo & 730const sockinfo &
650connection::forward_si (const sockinfo &si) const 731connection::forward_si (const sockinfo &si) const
651{ 732{
652 if (!si.valid ()) 733 if (!si.valid ())
653 { 734 {
654 connection *r = vpn->find_router (); 735 connection *r = vpn->find_router_for (this);
655 736
656 if (r) 737 if (r)
657 { 738 {
658 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."),
659 conf->nodename, r->conf->nodename, (const char *)r->si); 740 conf->nodename, r->conf->nodename);
660 return r->si; 741 return r->si;
661 } 742 }
662 else 743 else
663 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 744 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
664 conf->nodename); 745 conf->nodename);
665 } 746 }
666 747
667 return si; 748 return si;
668} 749}
… …
678connection::send_ping (const sockinfo &si, u8 pong) 759connection::send_ping (const sockinfo &si, u8 pong)
679{ 760{
680 ping_packet *pkt = new ping_packet; 761 ping_packet *pkt = new ping_packet;
681 762
682 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
683 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 767 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
684 768
685 delete pkt; 769 delete pkt;
686} 770}
687 771
… …
745 send_vpn_packet (r, si); 829 send_vpn_packet (r, si);
746 830
747 delete r; 831 delete r;
748} 832}
749 833
750void 834inline void
751connection::establish_connection_cb (ev::timer &w, int revents) 835connection::establish_connection_cb (ev::timer &w, int revents)
752{ 836{
753 if (!ictx 837 if (!ictx
754 && conf != THISNODE 838 && conf != THISNODE
755 && connectmode != conf_node::C_NEVER 839 && connectmode != conf_node::C_NEVER
756 && connectmode != conf_node::C_DISABLED 840 && connectmode != conf_node::C_DISABLED
757 && !w.is_active ()) 841 && !w.is_active ())
758 { 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
759 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 853 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
760 ? (retry_cnt & 3) + 1 854 ? (retry_cnt & 3) + 1
761 : 1 << (retry_cnt >> 2)); 855 : 1 << (retry_cnt >> 2));
762 856
763 reset_si (); 857 reset_si ();
764 858
765 bool slow = si.prot & PROT_SLOW; 859 bool slow = si.prot & PROT_SLOW;
766 860
767 if (si.prot && !si.host) 861 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
768 { 862 {
769 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
770 /*TODO*/ /* start the timer so we don't recurse endlessly */ 863 /*TODO*/ /* start the timer so we don't recurse endlessly */
771 w.start (1); 864 w.start (1);
772 vpn->send_connect_request (conf->id); 865 vpn->send_connect_request (conf->id);
773 } 866 }
774 else 867 else
775 { 868 {
776 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);
777 872
778 const sockinfo &dsi = forward_si (si); 873 const sockinfo &dsi = forward_si (si);
779 874
780 slow = slow || (dsi.prot & PROT_SLOW); 875 slow = slow || (dsi.prot & PROT_SLOW);
781 876
… …
786 else 881 else
787 send_ping (dsi, 0); 882 send_ping (dsi, 0);
788 } 883 }
789 } 884 }
790 885
791 retry_int *= slow ? 8. : 0.7; 886 retry_int *= slow ? 8. : 0.9;
792 887
793 if (retry_int < conf->max_retry) 888 if (retry_int < conf->max_retry)
794 retry_cnt++; 889 retry_cnt++;
795 else 890 else
796 retry_int = conf->max_retry; 891 retry_int = conf->max_retry;
… …
807 slog (L_INFO, _("%s(%s): connection lost"), 902 slog (L_INFO, _("%s(%s): connection lost"),
808 conf->nodename, (const char *)si); 903 conf->nodename, (const char *)si);
809 904
810 if (::conf.script_node_down) 905 if (::conf.script_node_down)
811 { 906 {
812 run_script_cb cb; 907 run_script_cb *cb = new run_script_cb;
813 cb.set<connection, &connection::script_node_down> (this); 908 cb->set<connection, &connection::script_node_down> (this);
814 if (!run_script (cb, false))
815 slog (L_WARN, _("node-down command execution failed, continuing.")); 909 run_script_queued (cb, _("node-down command execution failed, continuing."));
816 } 910 }
817 } 911 }
818 912
819 delete ictx; ictx = 0; 913 delete ictx; ictx = 0;
820 delete octx; octx = 0; 914 delete octx; octx = 0;
… …
822 dnsv4_reset_connection (); 916 dnsv4_reset_connection ();
823#endif 917#endif
824 918
825 si.host = 0; 919 si.host = 0;
826 920
827 last_activity = 0; 921 last_activity = 0.;
922 //last_si_change = 0.;
828 retry_cnt = 0; 923 retry_cnt = 0;
829 924
830 rekey.stop (); 925 rekey.stop ();
831 keepalive.stop (); 926 keepalive.stop ();
832 establish_connection.stop (); 927 establish_connection.stop ();
… …
839 send_reset (si); 934 send_reset (si);
840 935
841 reset_connection (); 936 reset_connection ();
842} 937}
843 938
844void 939// poor-man's rekeying
940inline void
845connection::rekey_cb (ev::timer &w, int revents) 941connection::rekey_cb (ev::timer &w, int revents)
846{ 942{
847 reset_connection (); 943 reset_connection ();
848 establish_connection (); 944 establish_connection ();
849} 945}
… …
866 if (oseqno > MAX_SEQNO) 962 if (oseqno > MAX_SEQNO)
867 rekey (); 963 rekey ();
868} 964}
869 965
870void 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
871connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 977connection::inject_data_packet (tap_packet *pkt)
872{ 978{
873 if (ictx && octx) 979 if (ictx && octx)
874 send_data_packet (pkt); 980 send_data_packet (pkt);
875 else 981 else
876 { 982 {
877 if (!broadcast)
878 data_queue.put (new tap_packet (*pkt)); 983 data_queue.put (new tap_packet (*pkt));
879 984 post_inject_queue ();
880 establish_connection ();
881 } 985 }
882} 986}
883 987
884void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 988void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
885{ 989{
886 if (ictx && octx) 990 if (ictx && octx)
887 send_vpn_packet (pkt, si, tos); 991 send_vpn_packet (pkt, si, tos);
888 else 992 else
889 { 993 {
890 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 994 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
891 995 post_inject_queue ();
892 establish_connection ();
893 } 996 }
894} 997}
895 998
896void 999void
897connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1000connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
898{ 1001{
899 last_activity = ev_now (); 1002 last_activity = ev_now ();
900 1003
901 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.",
902 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1005 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
903 1006
904 if (connectmode == conf_node::C_DISABLED) 1007 if (connectmode == conf_node::C_DISABLED)
905 return; 1008 return;
906 1009
… …
914 { 1017 {
915 if (auth_rate_limiter.can (rsi)) 1018 if (auth_rate_limiter.can (rsi))
916 send_auth_request (rsi, true); 1019 send_auth_request (rsi, true);
917 } 1020 }
918 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.
919 send_ping (rsi, 1); // pong 1024 send_ping (rsi, 1); // pong
920 1025
921 break; 1026 break;
922 1027
923 case vpn_packet::PT_PONG: 1028 case vpn_packet::PT_PONG:
… …
929 1034
930 config_packet *p = (config_packet *) pkt; 1035 config_packet *p = (config_packet *) pkt;
931 1036
932 if (!p->chk_config ()) 1037 if (!p->chk_config ())
933 { 1038 {
934 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1039 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
935 conf->nodename, (const char *)rsi); 1040 conf->nodename, (const char *)rsi);
936 connectmode = conf_node::C_DISABLED; 1041 connectmode = conf_node::C_DISABLED;
937 } 1042 }
938 else if (connectmode == conf_node::C_ALWAYS) 1043 else if (connectmode == conf_node::C_ALWAYS)
939 establish_connection (); 1044 establish_connection ();
… …
981 1086
982 break; 1087 break;
983 } 1088 }
984 } 1089 }
985 else 1090 else
986 slog (L_WARN, _("%s(%s): protocol mismatch"), 1091 slog (L_WARN, _("%s(%s): protocol mismatch."),
987 conf->nodename, (const char *)rsi); 1092 conf->nodename, (const char *)rsi);
988 1093
989 send_reset (rsi); 1094 send_reset (rsi);
990 } 1095 }
991 1096
… …
1006 1111
1007 rsachallenge chg; 1112 rsachallenge chg;
1008 1113
1009 if (!rsa_cache.find (p->id, chg)) 1114 if (!rsa_cache.find (p->id, chg))
1010 { 1115 {
1011 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1116 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
1012 conf->nodename, (const char *)rsi); 1117 conf->nodename, (const char *)rsi);
1013 break; 1118 break;
1014 } 1119 }
1015 else 1120 else
1016 { 1121 {
1017 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1122 crypto_ctx *cctx = new crypto_ctx (chg, 0);
1018 1123
1019 if (!p->hmac_chk (cctx)) 1124 if (!p->hmac_chk (cctx))
1020 { 1125 {
1021 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"
1022 "could be an attack, or just corruption or a synchronization error"), 1127 "could be an attack, or just corruption or a synchronization error."),
1023 conf->nodename, (const char *)rsi); 1128 conf->nodename, (const char *)rsi);
1024 break; 1129 break;
1025 } 1130 }
1026 else 1131 else
1027 { 1132 {
… …
1038 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
1039 1144
1040 si = rsi; 1145 si = rsi;
1041 protocol = rsi.prot; 1146 protocol = rsi.prot;
1042 1147
1043 connection_established ();
1044
1045 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1148 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d."),
1046 conf->nodename, (const char *)rsi, 1149 conf->nodename, (const char *)rsi,
1047 p->prot_major, p->prot_minor); 1150 p->prot_major, p->prot_minor);
1048 1151
1152 connection_established ();
1153
1049 if (::conf.script_node_up) 1154 if (::conf.script_node_up)
1050 { 1155 {
1051 run_script_cb cb; 1156 run_script_cb *cb = new run_script_cb;
1052 cb.set<connection, &connection::script_node_up> (this); 1157 cb->set<connection, &connection::script_node_up> (this);
1053 if (!run_script (cb, false))
1054 slog (L_WARN, _("node-up command execution failed, continuing.")); 1158 run_script_queued (cb, _("node-up command execution failed, continuing."));
1055 } 1159 }
1056 1160
1057 break; 1161 break;
1058 } 1162 }
1059 else 1163 else
1060 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."),
1061 conf->nodename, (const char *)rsi); 1165 conf->nodename, (const char *)rsi);
1062 } 1166 }
1063 1167
1064 delete cctx; 1168 delete cctx;
1065 } 1169 }
… …
1081 { 1185 {
1082 vpndata_packet *p = (vpndata_packet *)pkt; 1186 vpndata_packet *p = (vpndata_packet *)pkt;
1083 1187
1084 if (!p->hmac_chk (ictx)) 1188 if (!p->hmac_chk (ictx))
1085 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"
1086 "could be an attack, or just corruption or a synchronization error"), 1190 "could be an attack, or just corruption or a synchronization error."),
1087 conf->nodename, (const char *)rsi); 1191 conf->nodename, (const char *)rsi);
1088 else 1192 else
1089 { 1193 {
1090 u32 seqno; 1194 u32 seqno;
1091 tap_packet *d = p->unpack (this, seqno); 1195 tap_packet *d = p->unpack (this, seqno);
1196 int seqclass = iseqno.seqno_classify (seqno);
1092 1197
1093 if (iseqno.recv_ok (seqno)) 1198 if (seqclass == 0) // ok
1094 { 1199 {
1095 vpn->tap->send (d); 1200 vpn->tap->send (d);
1096 1201
1097 if (si != rsi) 1202 if (si != rsi)
1098 { 1203 {
1099 // 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 // {
1100 si = rsi; 1207 si = rsi;
1101 1208
1102 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1209 slog (L_INFO, _("%s(%s): socket address changed to %s."),
1103 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);
1104 } 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);
1105 } 1225 }
1106 1226
1107 delete d; 1227 delete d;
1108 break; 1228 break;
1109 } 1229 }
… …
1176 send_reset (rsi); 1296 send_reset (rsi);
1177 break; 1297 break;
1178 } 1298 }
1179} 1299}
1180 1300
1301inline void
1181void connection::keepalive_cb (ev::timer &w, int revents) 1302connection::keepalive_cb (ev::timer &w, int revents)
1182{ 1303{
1183 if (ev_now () >= last_activity + ::conf.keepalive + 30) 1304 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1184 { 1305 {
1185 reset_connection (); 1306 reset_connection ();
1186 establish_connection (); 1307 establish_connection ();
… …
1231 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1352 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1232 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1353 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1233 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1354 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1234} 1355}
1235 1356
1357inline const char *
1236const char *connection::script_node_up () 1358connection::script_node_up ()
1237{ 1359{
1238 script_init_connect_env (); 1360 script_init_connect_env ();
1239 1361
1240 putenv ((char *)"STATE=up"); 1362 putenv ((char *)"STATE=up");
1241 1363
… …
1246 ::conf.script_node_up ? ::conf.script_node_up : "node-up"); 1368 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1247 1369
1248 return filename; 1370 return filename;
1249} 1371}
1250 1372
1373inline const char *
1251const char *connection::script_node_down () 1374connection::script_node_down ()
1252{ 1375{
1253 script_init_connect_env (); 1376 script_init_connect_env ();
1254 1377
1255 putenv ((char *)"STATE=down"); 1378 putenv ((char *)"STATE=down");
1256 1379
… …
1262 1385
1263 return filename; 1386 return filename;
1264} 1387}
1265 1388
1266connection::connection (struct vpn *vpn, conf_node *conf) 1389connection::connection (struct vpn *vpn, conf_node *conf)
1267: vpn(vpn), conf(conf) 1390: vpn(vpn), conf(conf),
1268#if ENABLE_DNS 1391#if ENABLE_DNS
1269, dns (0) 1392 dns (0),
1270#endif 1393#endif
1394 data_queue(conf->max_ttl, conf->max_queue + 1),
1395 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1271{ 1396{
1272 rekey .set<connection, &connection::rekey_cb > (this); 1397 rekey .set<connection, &connection::rekey_cb > (this);
1273 keepalive .set<connection, &connection::keepalive_cb > (this); 1398 keepalive .set<connection, &connection::keepalive_cb > (this);
1274 establish_connection.set<connection, &connection::establish_connection_cb> (this); 1399 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1275 1400
1401 last_establish_attempt = 0.;
1276 octx = ictx = 0; 1402 octx = ictx = 0;
1277 retry_cnt = 0;
1278 1403
1279 if (!conf->protocols) // make sure some protocol is enabled 1404 if (!conf->protocols) // make sure some protocol is enabled
1280 conf->protocols = PROT_UDPv4; 1405 conf->protocols = PROT_UDPv4;
1281 1406
1282 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
1283 reset_connection (); 1413 reset_connection ();
1284} 1414}
1285 1415
1286connection::~connection () 1416connection::~connection ()
1287{ 1417{

Diff Legend

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