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.57 by pcg, Thu Jul 7 14:41:51 2005 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;
… …
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 (time_watcher &w); time_watcher 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 {
101 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 155 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
102 { 156 {
103 memcpy (&chg, &i->chg, sizeof chg); 157 memcpy (&chg, &i->chg, sizeof chg);
104 158
105 erase (i); 159 erase (i);
106 return true; 160 return true;
107 } 161 }
108 } 162 }
109 163
110 if (cleaner.at < NOW) 164 if (!cleaner.is_active ())
111 cleaner.start (NOW + RSA_TTL); 165 cleaner.again ();
112 166
113 return false; 167 return false;
114 } 168 }
115 169
116 void gen (rsaid &id, rsachallenge &chg) 170 void gen (rsaid &id, rsachallenge &chg)
… …
118 rsa_entry e; 172 rsa_entry e;
119 173
120 RAND_bytes ((unsigned char *)&id, sizeof id); 174 RAND_bytes ((unsigned char *)&id, sizeof id);
121 RAND_bytes ((unsigned char *)&chg, sizeof chg); 175 RAND_bytes ((unsigned char *)&chg, sizeof chg);
122 176
123 e.expire = NOW + RSA_TTL; 177 e.expire = ev_now () + RSA_TTL;
124 e.id = id; 178 e.id = id;
125 memcpy (&e.chg, &chg, sizeof chg); 179 memcpy (&e.chg, &chg, sizeof chg);
126 180
127 push_back (e); 181 push_back (e);
128 182
129 if (cleaner.at < NOW) 183 if (!cleaner.is_active ())
130 cleaner.start (NOW + RSA_TTL); 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);
190 cleaner.set (RSA_TTL, RSA_TTL);
191 }
136 192
137} rsa_cache; 193} rsa_cache;
138 194
139void rsa_cache::cleaner_cb (time_watcher &w) 195void rsa_cache::cleaner_cb (ev::timer &w, int revents)
140{ 196{
141 if (!empty ()) 197 if (empty ())
198 w.stop ();
199 else
142 { 200 {
143 w.start (NOW + RSA_TTL);
144
145 for (iterator i = begin (); i != end (); ) 201 for (iterator i = begin (); i != end (); )
146 if (i->expire <= NOW) 202 if (i->expire <= ev_now ())
147 i = erase (i); 203 i = erase (i);
148 else 204 else
149 ++i; 205 ++i;
150 } 206 }
151} 207}
152 208
153////////////////////////////////////////////////////////////////////////////// 209//////////////////////////////////////////////////////////////////////////////
154 210
155void 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)
156{ 213{
157 if (queue[i]) 214 queue = new pkt [max_queue];
158 {
159 delete queue[i];
160 j = (j + 1) % QUEUEDEPTH;
161 }
162 215
163 queue[i] = p;
164
165 i = (i + 1) % QUEUEDEPTH;
166}
167
168net_packet *pkt_queue::get ()
169{
170 net_packet *p = queue[j];
171
172 if (p)
173 {
174 queue[j] = 0;
175 j = (j + 1) % QUEUEDEPTH;
176 }
177
178 return p;
179}
180
181pkt_queue::pkt_queue ()
182{
183 memset (queue, 0, sizeof (queue));
184 i = 0; 216 i = 0;
185 j = 0; 217 j = 0;
218
219 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
186} 220}
187 221
188pkt_queue::~pkt_queue () 222pkt_queue::~pkt_queue ()
189{ 223{
190 for (i = QUEUEDEPTH; --i > 0; ) 224 while (net_packet *p = get ())
225 delete p;
226
191 delete queue[i]; 227 delete [] queue;
192} 228}
193 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
194struct net_rateinfo { 283struct net_rateinfo
284{
195 u32 host; 285 u32 host;
196 double pcnt, diff; 286 double pcnt, diff;
197 tstamp last; 287 tstamp last;
198}; 288};
199 289
… …
218 iterator i; 308 iterator i;
219 309
220 for (i = begin (); i != end (); ) 310 for (i = begin (); i != end (); )
221 if (i->host == host) 311 if (i->host == host)
222 break; 312 break;
223 else if (i->last < NOW - NRL_EXPIRE) 313 else if (i->last < ev_now () - NRL_EXPIRE)
224 i = erase (i); 314 i = erase (i);
225 else 315 else
226 i++; 316 i++;
227 317
228 if (i == end ()) 318 if (i == end ())
… …
230 net_rateinfo ri; 320 net_rateinfo ri;
231 321
232 ri.host = host; 322 ri.host = host;
233 ri.pcnt = 1.; 323 ri.pcnt = 1.;
234 ri.diff = NRL_MAXDIF; 324 ri.diff = NRL_MAXDIF;
235 ri.last = NOW; 325 ri.last = ev_now ();
236 326
237 push_front (ri); 327 push_front (ri);
238 328
239 return true; 329 return true;
240 } 330 }
… …
242 { 332 {
243 net_rateinfo ri (*i); 333 net_rateinfo ri (*i);
244 erase (i); 334 erase (i);
245 335
246 ri.pcnt = ri.pcnt * NRL_ALPHA; 336 ri.pcnt = ri.pcnt * NRL_ALPHA;
247 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last); 337 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
248 338
249 ri.last = NOW; 339 ri.last = ev_now ();
250 340
251 double dif = ri.diff / ri.pcnt; 341 double dif = ri.diff / ri.pcnt;
252 342
253 bool send = dif > NRL_CUTOFF; 343 bool send = dif > NRL_CUTOFF;
254 344
… …
463#if ENABLE_COMPRESSION 553#if ENABLE_COMPRESSION
464 f |= FEATURE_COMPRESSION; 554 f |= FEATURE_COMPRESSION;
465#endif 555#endif
466#if ENABLE_ROHC 556#if ENABLE_ROHC
467 f |= FEATURE_ROHC; 557 f |= FEATURE_ROHC;
558#endif
559#if ENABLE_BRIDGING
560 f |= FEATURE_BRIDGING;
468#endif 561#endif
469 return f; 562 return f;
470 } 563 }
471}; 564};
472 565
… …
579///////////////////////////////////////////////////////////////////////////// 672/////////////////////////////////////////////////////////////////////////////
580 673
581void 674void
582connection::connection_established () 675connection::connection_established ()
583{ 676{
677 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
678
584 if (ictx && octx) 679 if (ictx && octx)
585 { 680 {
586 connectmode = conf->connectmode;
587
588 // make sure rekeying timeouts are slightly asymmetric 681 // make sure rekeying timeouts are slightly asymmetric
589 rekey.start (NOW + ::conf.rekey 682 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
590 + (conf->id > THISNODE->id ? 10 : 0)); 683 rekey.start (rekey_interval, rekey_interval);
591 keepalive.start (NOW + ::conf.keepalive); 684 keepalive.start (::conf.keepalive);
592 685
593 // send queued packets 686 // send queued packets
594 if (ictx && octx) 687 if (ictx && octx)
595 { 688 {
596 while (tap_packet *p = (tap_packet *)data_queue.get ()) 689 while (tap_packet *p = (tap_packet *)data_queue.get ())
597 { 690 {
598 send_data_packet (p); 691 if (p->len) send_data_packet (p);
599 delete p; 692 delete p;
600 } 693 }
601 694
602 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 695 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
603 { 696 {
604 send_vpn_packet (p, si, IPTOS_RELIABILITY); 697 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
605 delete p; 698 delete p;
606 } 699 }
607 } 700 }
701
702 vpn->connection_established (this);
608 } 703 }
609 else 704 else
610 { 705 {
611 retry_cnt = 0; 706 retry_cnt = 0;
612 establish_connection.start (NOW + 5); 707 establish_connection.start (5);
613 keepalive.stop (); 708 keepalive.stop ();
614 rekey.stop (); 709 rekey.stop ();
615 } 710 }
616} 711}
617 712
618void 713void
619connection::reset_si () 714connection::reset_si ()
620{ 715{
716 if (vpn->can_direct (THISNODE, conf))
621 protocol = best_protocol (THISNODE->protocols & conf->protocols); 717 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
622 718 else
623 // mask out protocols we cannot establish 719 {
624 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 720 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
625 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 721 protocol = 0;
626 if (!conf->dns_port) protocol &= ~PROT_DNSv4; 722 }
627 723
628 si.set (conf, protocol); 724 si.set (conf, protocol);
725
726 is_direct = si.valid ();
629} 727}
630 728
631// ensure sockinfo is valid, forward if necessary 729// ensure sockinfo is valid, forward if necessary
632const sockinfo & 730const sockinfo &
633connection::forward_si (const sockinfo &si) const 731connection::forward_si (const sockinfo &si) const
634{ 732{
635 if (!si.valid ()) 733 if (!si.valid ())
636 { 734 {
637 connection *r = vpn->find_router (); 735 connection *r = vpn->find_router_for (this);
638 736
639 if (r) 737 if (r)
640 { 738 {
641 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."),
642 conf->nodename, r->conf->nodename, (const char *)r->si); 740 conf->nodename, r->conf->nodename);
643 return r->si; 741 return r->si;
644 } 742 }
645 else 743 else
646 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 744 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
647 conf->nodename); 745 conf->nodename);
648 } 746 }
649 747
650 return si; 748 return si;
651} 749}
… …
661connection::send_ping (const sockinfo &si, u8 pong) 759connection::send_ping (const sockinfo &si, u8 pong)
662{ 760{
663 ping_packet *pkt = new ping_packet; 761 ping_packet *pkt = new ping_packet;
664 762
665 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
666 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 767 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
667 768
668 delete pkt; 769 delete pkt;
669} 770}
670 771
… …
717} 818}
718 819
719void 820void
720connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 821connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
721{ 822{
722 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 823 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
723 conf->id, rid, (const char *)rsi); 824 conf->id, rid, (const char *)rsi);
724 825
725 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);
726 827
727 r->hmac_set (octx); 828 r->hmac_set (octx);
728 send_vpn_packet (r, si); 829 send_vpn_packet (r, si);
729 830
730 delete r; 831 delete r;
731} 832}
732 833
733void 834inline void
734connection::establish_connection_cb (time_watcher &w) 835connection::establish_connection_cb (ev::timer &w, int revents)
735{ 836{
736 if (!ictx 837 if (!ictx
737 && conf != THISNODE 838 && conf != THISNODE
738 && connectmode != conf_node::C_NEVER 839 && connectmode != conf_node::C_NEVER
739 && connectmode != conf_node::C_DISABLED 840 && connectmode != conf_node::C_DISABLED
740 && NOW > w.at) 841 && !w.is_active ())
741 { 842 {
742 w.at = TSTAMP_MAX; // first disable this watcher in case of recursion 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 }
743 850
744 double retry_int = double (retry_cnt & 3 851 last_establish_attempt = ev_now ();
852
853 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
745 ? (retry_cnt & 3) + 1 854 ? (retry_cnt & 3) + 1
746 : 1 << (retry_cnt >> 2)); 855 : 1 << (retry_cnt >> 2));
747 856
748 reset_si (); 857 reset_si ();
749 858
750 bool slow = si.prot & PROT_SLOW; 859 bool slow = si.prot & PROT_SLOW;
751 860
752 if (si.prot && !si.host) 861 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
862 {
863 /*TODO*/ /* start the timer so we don't recurse endlessly */
864 w.start (1);
753 vpn->send_connect_request (conf->id); 865 vpn->send_connect_request (conf->id);
866 }
754 else 867 else
755 { 868 {
869 if (si.valid ())
870 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
871 conf->nodename, (const char *)si);
872
756 const sockinfo &dsi = forward_si (si); 873 const sockinfo &dsi = forward_si (si);
757 874
758 slow = slow || (dsi.prot & PROT_SLOW); 875 slow = slow || (dsi.prot & PROT_SLOW);
759 876
760 if (dsi.valid () && auth_rate_limiter.can (dsi)) 877 if (dsi.valid () && auth_rate_limiter.can (dsi))
… …
764 else 881 else
765 send_ping (dsi, 0); 882 send_ping (dsi, 0);
766 } 883 }
767 } 884 }
768 885
769 retry_int *= slow ? 8. : 0.7; 886 retry_int *= slow ? 8. : 0.9;
770 887
771 if (retry_int < conf->max_retry) 888 if (retry_int < conf->max_retry)
772 retry_cnt++; 889 retry_cnt++;
773 else 890 else
774 retry_int = conf->max_retry; 891 retry_int = conf->max_retry;
775 892
776 w.start (NOW + retry_int); 893 w.start (retry_int);
777 } 894 }
778} 895}
779 896
780void 897void
781connection::reset_connection () 898connection::reset_connection ()
… …
784 { 901 {
785 slog (L_INFO, _("%s(%s): connection lost"), 902 slog (L_INFO, _("%s(%s): connection lost"),
786 conf->nodename, (const char *)si); 903 conf->nodename, (const char *)si);
787 904
788 if (::conf.script_node_down) 905 if (::conf.script_node_down)
789 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);
790 slog (L_WARN, _("node-down command execution failed, continuing.")); 909 run_script_queued (cb, _("node-down command execution failed, continuing."));
910 }
791 } 911 }
792 912
793 delete ictx; ictx = 0; 913 delete ictx; ictx = 0;
794 delete octx; octx = 0; 914 delete octx; octx = 0;
795#if ENABLE_DNS 915#if ENABLE_DNS
796 dnsv4_reset_connection (); 916 dnsv4_reset_connection ();
797#endif 917#endif
798 918
799 si.host = 0; 919 si.host = 0;
800 920
801 last_activity = 0; 921 last_activity = 0.;
922 //last_si_change = 0.;
802 retry_cnt = 0; 923 retry_cnt = 0;
803 924
804 rekey.stop (); 925 rekey.stop ();
805 keepalive.stop (); 926 keepalive.stop ();
806 establish_connection.stop (); 927 establish_connection.stop ();
… …
813 send_reset (si); 934 send_reset (si);
814 935
815 reset_connection (); 936 reset_connection ();
816} 937}
817 938
818void 939// poor-man's rekeying
819connection::rekey_cb (time_watcher &w) 940inline void
941connection::rekey_cb (ev::timer &w, int revents)
820{ 942{
821 reset_connection (); 943 reset_connection ();
822 establish_connection (); 944 establish_connection ();
823} 945}
824 946
… …
840 if (oseqno > MAX_SEQNO) 962 if (oseqno > MAX_SEQNO)
841 rekey (); 963 rekey ();
842} 964}
843 965
844void 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
845connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 977connection::inject_data_packet (tap_packet *pkt)
846{ 978{
847 if (ictx && octx) 979 if (ictx && octx)
848 send_data_packet (pkt); 980 send_data_packet (pkt);
849 else 981 else
850 { 982 {
851 if (!broadcast)
852 data_queue.put (new tap_packet (*pkt)); 983 data_queue.put (new tap_packet (*pkt));
853 984 post_inject_queue ();
854 establish_connection ();
855 } 985 }
856} 986}
857 987
858void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 988void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
859{ 989{
860 if (ictx && octx) 990 if (ictx && octx)
861 send_vpn_packet (pkt, si, tos); 991 send_vpn_packet (pkt, si, tos);
862 else 992 else
863 { 993 {
864 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 994 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
865 995 post_inject_queue ();
866 establish_connection ();
867 } 996 }
868} 997}
869 998
870void 999void
871connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1000connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
872{ 1001{
873 last_activity = NOW; 1002 last_activity = ev_now ();
874 1003
875 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.",
876 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1005 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
1006
1007 if (connectmode == conf_node::C_DISABLED)
1008 return;
877 1009
878 switch (pkt->typ ()) 1010 switch (pkt->typ ())
879 { 1011 {
880 case vpn_packet::PT_PING: 1012 case vpn_packet::PT_PING:
881 // we send pings instead of auth packets after some retries, 1013 // we send pings instead of auth packets after some retries,
… …
885 { 1017 {
886 if (auth_rate_limiter.can (rsi)) 1018 if (auth_rate_limiter.can (rsi))
887 send_auth_request (rsi, true); 1019 send_auth_request (rsi, true);
888 } 1020 }
889 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.
890 send_ping (rsi, 1); // pong 1024 send_ping (rsi, 1); // pong
891 1025
892 break; 1026 break;
893 1027
894 case vpn_packet::PT_PONG: 1028 case vpn_packet::PT_PONG:
… …
900 1034
901 config_packet *p = (config_packet *) pkt; 1035 config_packet *p = (config_packet *) pkt;
902 1036
903 if (!p->chk_config ()) 1037 if (!p->chk_config ())
904 { 1038 {
905 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1039 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
906 conf->nodename, (const char *)rsi); 1040 conf->nodename, (const char *)rsi);
907 connectmode = conf_node::C_DISABLED; 1041 connectmode = conf_node::C_DISABLED;
908 } 1042 }
909 else if (connectmode == conf_node::C_ALWAYS) 1043 else if (connectmode == conf_node::C_ALWAYS)
910 establish_connection (); 1044 establish_connection ();
… …
952 1086
953 break; 1087 break;
954 } 1088 }
955 } 1089 }
956 else 1090 else
957 slog (L_WARN, _("%s(%s): protocol mismatch"), 1091 slog (L_WARN, _("%s(%s): protocol mismatch."),
958 conf->nodename, (const char *)rsi); 1092 conf->nodename, (const char *)rsi);
959 1093
960 send_reset (rsi); 1094 send_reset (rsi);
961 } 1095 }
962 1096
… …
977 1111
978 rsachallenge chg; 1112 rsachallenge chg;
979 1113
980 if (!rsa_cache.find (p->id, chg)) 1114 if (!rsa_cache.find (p->id, chg))
981 { 1115 {
982 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1116 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
983 conf->nodename, (const char *)rsi); 1117 conf->nodename, (const char *)rsi);
984 break; 1118 break;
985 } 1119 }
986 else 1120 else
987 { 1121 {
988 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1122 crypto_ctx *cctx = new crypto_ctx (chg, 0);
989 1123
990 if (!p->hmac_chk (cctx)) 1124 if (!p->hmac_chk (cctx))
991 { 1125 {
992 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"
993 "could be an attack, or just corruption or a synchronization error"), 1127 "could be an attack, or just corruption or a synchronization error."),
994 conf->nodename, (const char *)rsi); 1128 conf->nodename, (const char *)rsi);
995 break; 1129 break;
996 } 1130 }
997 else 1131 else
998 { 1132 {
… …
1009 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
1010 1144
1011 si = rsi; 1145 si = rsi;
1012 protocol = rsi.prot; 1146 protocol = rsi.prot;
1013 1147
1014 connection_established ();
1015
1016 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1148 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d."),
1017 conf->nodename, (const char *)rsi, 1149 conf->nodename, (const char *)rsi,
1018 p->prot_major, p->prot_minor); 1150 p->prot_major, p->prot_minor);
1019 1151
1152 connection_established ();
1153
1020 if (::conf.script_node_up) 1154 if (::conf.script_node_up)
1021 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);
1022 slog (L_WARN, _("node-up command execution failed, continuing.")); 1158 run_script_queued (cb, _("node-up command execution failed, continuing."));
1159 }
1023 1160
1024 break; 1161 break;
1025 } 1162 }
1026 else 1163 else
1027 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."),
1028 conf->nodename, (const char *)rsi); 1165 conf->nodename, (const char *)rsi);
1029 } 1166 }
1030 1167
1031 delete cctx; 1168 delete cctx;
1032 } 1169 }
… …
1048 { 1185 {
1049 vpndata_packet *p = (vpndata_packet *)pkt; 1186 vpndata_packet *p = (vpndata_packet *)pkt;
1050 1187
1051 if (!p->hmac_chk (ictx)) 1188 if (!p->hmac_chk (ictx))
1052 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"
1053 "could be an attack, or just corruption or a synchronization error"), 1190 "could be an attack, or just corruption or a synchronization error."),
1054 conf->nodename, (const char *)rsi); 1191 conf->nodename, (const char *)rsi);
1055 else 1192 else
1056 { 1193 {
1057 u32 seqno; 1194 u32 seqno;
1058 tap_packet *d = p->unpack (this, seqno); 1195 tap_packet *d = p->unpack (this, seqno);
1196 int seqclass = iseqno.seqno_classify (seqno);
1059 1197
1060 if (iseqno.recv_ok (seqno)) 1198 if (seqclass == 0) // ok
1061 { 1199 {
1062 vpn->tap->send (d); 1200 vpn->tap->send (d);
1063 1201
1064 if (si != rsi) 1202 if (si != rsi)
1065 { 1203 {
1066 // 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 // {
1067 si = rsi; 1207 si = rsi;
1068 1208
1069 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1209 slog (L_INFO, _("%s(%s): socket address changed to %s."),
1070 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);
1071 } 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);
1072 } 1225 }
1073 1226
1074 delete d; 1227 delete d;
1075 break; 1228 break;
1076 } 1229 }
… …
1087 if (p->id > 0 && p->id <= vpn->conns.size ()) 1240 if (p->id > 0 && p->id <= vpn->conns.size ())
1088 { 1241 {
1089 connection *c = vpn->conns[p->id - 1]; 1242 connection *c = vpn->conns[p->id - 1];
1090 conf->protocols = p->protocols; 1243 conf->protocols = p->protocols;
1091 1244
1092 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n", 1245 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1093 conf->id, p->id, c->ictx && c->octx); 1246 conf->id, p->id, c->ictx && c->octx);
1094 1247
1095 if (c->ictx && c->octx) 1248 if (c->ictx && c->octx)
1096 { 1249 {
1097 // send connect_info packets to both sides, in case one is 1250 // send connect_info packets to both sides, in case one is
… …
1143 send_reset (rsi); 1296 send_reset (rsi);
1144 break; 1297 break;
1145 } 1298 }
1146} 1299}
1147 1300
1148void connection::keepalive_cb (time_watcher &w) 1301inline void
1302connection::keepalive_cb (ev::timer &w, int revents)
1149{ 1303{
1150 if (NOW >= last_activity + ::conf.keepalive + 30) 1304 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1151 { 1305 {
1152 reset_connection (); 1306 reset_connection ();
1153 establish_connection (); 1307 establish_connection ();
1154 } 1308 }
1155 else if (NOW < last_activity + ::conf.keepalive) 1309 else if (ev_now () < last_activity + ::conf.keepalive)
1156 w.start (last_activity + ::conf.keepalive); 1310 w.start (last_activity + ::conf.keepalive - ev::now ());
1157 else if (conf->connectmode != conf_node::C_ONDEMAND 1311 else if (conf->connectmode != conf_node::C_ONDEMAND
1158 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1312 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1159 { 1313 {
1160 send_ping (si); 1314 send_ping (si);
1161 w.start (NOW + 5); 1315 w.start (5);
1162 } 1316 }
1163 else if (NOW < last_activity + ::conf.keepalive + 10) 1317 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1164 // hold ondemand connections implicitly a few seconds longer 1318 // hold ondemand connections implicitly a few seconds longer
1165 // should delete octx, though, or something like that ;) 1319 // should delete octx, though, or something like that ;)
1166 w.start (last_activity + ::conf.keepalive + 10); 1320 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1167 else 1321 else
1168 reset_connection (); 1322 reset_connection ();
1169} 1323}
1170 1324
1171void connection::send_connect_request (int id) 1325void connection::send_connect_request (int id)
… …
1198 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1352 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1199 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1353 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1200 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1354 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1201} 1355}
1202 1356
1357inline const char *
1203const char *connection::script_node_up () 1358connection::script_node_up ()
1204{ 1359{
1205 script_init_connect_env (); 1360 script_init_connect_env ();
1206 1361
1207 putenv ("STATE=up"); 1362 putenv ((char *)"STATE=up");
1208 1363
1209 char *filename; 1364 char *filename;
1210 asprintf (&filename, 1365 asprintf (&filename,
1211 "%s/%s", 1366 "%s/%s",
1212 confbase, 1367 confbase,
1213 ::conf.script_node_up ? ::conf.script_node_up : "node-up"); 1368 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1214 1369
1215 return filename; 1370 return filename;
1216} 1371}
1217 1372
1373inline const char *
1218const char *connection::script_node_down () 1374connection::script_node_down ()
1219{ 1375{
1220 script_init_connect_env (); 1376 script_init_connect_env ();
1221 1377
1222 putenv ("STATE=down"); 1378 putenv ((char *)"STATE=down");
1223 1379
1224 char *filename; 1380 char *filename;
1225 asprintf (&filename, 1381 asprintf (&filename,
1226 "%s/%s", 1382 "%s/%s",
1227 confbase, 1383 confbase,
… …
1229 1385
1230 return filename; 1386 return filename;
1231} 1387}
1232 1388
1233connection::connection (struct vpn *vpn, conf_node *conf) 1389connection::connection (struct vpn *vpn, conf_node *conf)
1234: vpn(vpn), conf(conf) 1390: vpn(vpn), conf(conf),
1235, rekey (this, &connection::rekey_cb)
1236, keepalive (this, &connection::keepalive_cb)
1237, establish_connection (this, &connection::establish_connection_cb)
1238#if ENABLE_DNS 1391#if ENABLE_DNS
1239, dns (0) 1392 dns (0),
1240#endif 1393#endif
1394 data_queue(conf->max_ttl, conf->max_queue + 1),
1395 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1241{ 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.;
1242 octx = ictx = 0; 1402 octx = ictx = 0;
1243 retry_cnt = 0;
1244 1403
1245 if (!conf->protocols) // make sure some protocol is enabled 1404 if (!conf->protocols) // make sure some protocol is enabled
1246 conf->protocols = PROT_UDPv4; 1405 conf->protocols = PROT_UDPv4;
1247 1406
1248 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
1249 reset_connection (); 1413 reset_connection ();
1250} 1414}
1251 1415
1252connection::~connection () 1416connection::~connection ()
1253{ 1417{

Diff Legend

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