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.39 by pcg, Tue Oct 12 12:06:06 2004 UTC vs.
Revision 1.70 by pcg, Thu Aug 7 19:07:02 2008 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
6 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
7 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
8 (at your option) any later version. 10 option) any later version.
9 11
10 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
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
13 GNU General Public License for more details. 15 Public License for more details.
14 16
15 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
16 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 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.
18*/ 30*/
19 31
20#include "config.h" 32#include "config.h"
21 33
22#include <cassert>
23
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>
30
31#include "gettext.h"
32 42
33#include "conf.h" 43#include "conf.h"
34#include "slog.h" 44#include "slog.h"
35#include "device.h" 45#include "device.h"
36#include "vpn.h" 46#include "vpn.h"
… …
47#define ULTRA_FAST 1 57#define ULTRA_FAST 1
48#define HLOG 15 58#define HLOG 15
49#include "lzf/lzf.h" 59#include "lzf/lzf.h"
50#include "lzf/lzf_c.c" 60#include "lzf/lzf_c.c"
51#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//////////////////////////////////////////////////////////////////////////////
52 103
53struct crypto_ctx 104struct crypto_ctx
54{ 105{
55 EVP_CIPHER_CTX cctx; 106 EVP_CIPHER_CTX cctx;
56 HMAC_CTX hctx; 107 HMAC_CTX hctx;
… …
84 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 135 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
85 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 136 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
86 EVP_MD_CTX_cleanup (&ctx); 137 EVP_MD_CTX_cleanup (&ctx);
87} 138}
88 139
89struct rsa_entry { 140struct rsa_entry
141{
90 tstamp expire; 142 tstamp expire;
91 rsaid id; 143 rsaid id;
92 rsachallenge chg; 144 rsachallenge chg;
93}; 145};
94 146
95struct rsa_cache : list<rsa_entry> 147struct rsa_cache : list<rsa_entry>
96{ 148{
97 void cleaner_cb (time_watcher &w); time_watcher cleaner; 149 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
98 150
99 bool find (const rsaid &id, rsachallenge &chg) 151 bool find (const rsaid &id, rsachallenge &chg)
100 { 152 {
101 for (iterator i = begin (); i != end (); ++i) 153 for (iterator i = begin (); i != end (); ++i)
102 { 154 {
103 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 155 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
104 { 156 {
105 memcpy (&chg, &i->chg, sizeof chg); 157 memcpy (&chg, &i->chg, sizeof chg);
106 158
107 erase (i); 159 erase (i);
108 return true; 160 return true;
109 } 161 }
110 } 162 }
111 163
112 if (cleaner.at < NOW) 164 if (!cleaner.is_active ())
113 cleaner.start (NOW + RSA_TTL); 165 cleaner.again ();
114 166
115 return false; 167 return false;
116 } 168 }
117 169
118 void gen (rsaid &id, rsachallenge &chg) 170 void gen (rsaid &id, rsachallenge &chg)
119 { 171 {
120 rsa_entry e; 172 rsa_entry e;
121 173
122 RAND_bytes ((unsigned char *)&id, sizeof id); 174 RAND_bytes ((unsigned char *)&id, sizeof id);
123 RAND_bytes ((unsigned char *)&chg, sizeof chg); 175 RAND_bytes ((unsigned char *)&chg, sizeof chg);
124 176
125 e.expire = NOW + RSA_TTL; 177 e.expire = ev_now () + RSA_TTL;
126 e.id = id; 178 e.id = id;
127 memcpy (&e.chg, &chg, sizeof chg); 179 memcpy (&e.chg, &chg, sizeof chg);
128 180
129 push_back (e); 181 push_back (e);
130 182
131 if (cleaner.at < NOW) 183 if (!cleaner.is_active ())
132 cleaner.start (NOW + RSA_TTL); 184 cleaner.again ();
133 } 185 }
134 186
135 rsa_cache () 187 rsa_cache ()
136 : cleaner (this, &rsa_cache::cleaner_cb) 188 {
137 { } 189 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
190 cleaner.set (RSA_TTL, RSA_TTL);
191 }
138 192
139} rsa_cache; 193} rsa_cache;
140 194
141void rsa_cache::cleaner_cb (time_watcher &w) 195void rsa_cache::cleaner_cb (ev::timer &w, int revents)
142{ 196{
143 if (!empty ()) 197 if (empty ())
198 w.stop ();
199 else
144 { 200 {
145 w.start (NOW + RSA_TTL);
146
147 for (iterator i = begin (); i != end (); ) 201 for (iterator i = begin (); i != end (); )
148 if (i->expire <= NOW) 202 if (i->expire <= ev_now ())
149 i = erase (i); 203 i = erase (i);
150 else 204 else
151 ++i; 205 ++i;
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
… …
220 iterator i; 308 iterator i;
221 309
222 for (i = begin (); i != end (); ) 310 for (i = begin (); i != end (); )
223 if (i->host == host) 311 if (i->host == host)
224 break; 312 break;
225 else if (i->last < NOW - NRL_EXPIRE) 313 else if (i->last < ev_now () - NRL_EXPIRE)
226 i = erase (i); 314 i = erase (i);
227 else 315 else
228 i++; 316 i++;
229 317
230 if (i == end ()) 318 if (i == end ())
… …
232 net_rateinfo ri; 320 net_rateinfo ri;
233 321
234 ri.host = host; 322 ri.host = host;
235 ri.pcnt = 1.; 323 ri.pcnt = 1.;
236 ri.diff = NRL_MAXDIF; 324 ri.diff = NRL_MAXDIF;
237 ri.last = NOW; 325 ri.last = ev_now ();
238 326
239 push_front (ri); 327 push_front (ri);
240 328
241 return true; 329 return true;
242 } 330 }
… …
244 { 332 {
245 net_rateinfo ri (*i); 333 net_rateinfo ri (*i);
246 erase (i); 334 erase (i);
247 335
248 ri.pcnt = ri.pcnt * NRL_ALPHA; 336 ri.pcnt = ri.pcnt * NRL_ALPHA;
249 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last); 337 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
250 338
251 ri.last = NOW; 339 ri.last = ev_now ();
252 340
253 double dif = ri.diff / ri.pcnt; 341 double dif = ri.diff / ri.pcnt;
254 342
255 bool send = dif > NRL_CUTOFF; 343 bool send = dif > NRL_CUTOFF;
256 344
… …
466 f |= FEATURE_COMPRESSION; 554 f |= FEATURE_COMPRESSION;
467#endif 555#endif
468#if ENABLE_ROHC 556#if ENABLE_ROHC
469 f |= FEATURE_ROHC; 557 f |= FEATURE_ROHC;
470#endif 558#endif
559#if ENABLE_BRIDGING
560 f |= FEATURE_BRIDGING;
561#endif
471 return f; 562 return f;
472 } 563 }
473}; 564};
474 565
475void config_packet::setup (ptype type, int dst) 566void config_packet::setup (ptype type, int dst)
476{ 567{
477 prot_major = PROTOCOL_MAJOR; 568 prot_major = PROTOCOL_MAJOR;
478 prot_minor = PROTOCOL_MINOR; 569 prot_minor = PROTOCOL_MINOR;
479 randsize = RAND_SIZE; 570 randsize = RAND_SIZE;
480 hmaclen = HMACLENGTH; 571 hmaclen = HMACLENGTH;
481 flags = ENABLE_COMPRESSION ? 0x81 : 0x80; 572 flags = 0;
482 challengelen = sizeof (rsachallenge); 573 challengelen = sizeof (rsachallenge);
483 features = get_features (); 574 features = get_features ();
484 575
485 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 576 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
486 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 577 digest_nid = htonl (EVP_MD_type (RSA_HASH));
… …
496 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 587 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
497 else if (randsize != RAND_SIZE) 588 else if (randsize != RAND_SIZE)
498 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 589 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
499 else if (hmaclen != HMACLENGTH) 590 else if (hmaclen != HMACLENGTH)
500 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH); 591 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
501#if 0 // this implementation should handle all flag settings
502 else if (flags != curflags ())
503 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
504#endif
505 else if (challengelen != sizeof (rsachallenge)) 592 else if (challengelen != sizeof (rsachallenge))
506 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 593 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
507 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 594 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
508 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 595 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
509 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 596 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
585///////////////////////////////////////////////////////////////////////////// 672/////////////////////////////////////////////////////////////////////////////
586 673
587void 674void
588connection::connection_established () 675connection::connection_established ()
589{ 676{
677 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
678
590 if (ictx && octx) 679 if (ictx && octx)
591 { 680 {
592 connectmode = conf->connectmode;
593
594 // make sure rekeying timeouts are slightly asymmetric 681 // make sure rekeying timeouts are slightly asymmetric
595 rekey.start (NOW + ::conf.rekey 682 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
596 + (conf->id > THISNODE->id ? 10 : 0)); 683 rekey.start (rekey_interval, rekey_interval);
597 keepalive.start (NOW + ::conf.keepalive); 684 keepalive.start (::conf.keepalive);
598 685
599 // send queued packets 686 // send queued packets
600 if (ictx && octx) 687 if (ictx && octx)
601 { 688 {
602 while (tap_packet *p = (tap_packet *)data_queue.get ()) 689 while (tap_packet *p = (tap_packet *)data_queue.get ())
603 { 690 {
604 send_data_packet (p); 691 if (p->len) send_data_packet (p);
605 delete p; 692 delete p;
606 } 693 }
607 694
608 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 695 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
609 { 696 {
610 send_vpn_packet (p, si, IPTOS_RELIABILITY); 697 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
611 delete p; 698 delete p;
612 } 699 }
613 } 700 }
614 } 701 }
615 else 702 else
616 { 703 {
617 retry_cnt = 0; 704 retry_cnt = 0;
618 establish_connection.start (NOW + 5); 705 establish_connection.start (5);
619 keepalive.stop (); 706 keepalive.stop ();
620 rekey.stop (); 707 rekey.stop ();
621 } 708 }
622} 709}
623 710
… …
627 protocol = best_protocol (THISNODE->protocols & conf->protocols); 714 protocol = best_protocol (THISNODE->protocols & conf->protocols);
628 715
629 // mask out protocols we cannot establish 716 // mask out protocols we cannot establish
630 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 717 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
631 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 718 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
719 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
720
721 if (protocol
722 && (!conf->can_direct (THISNODE)
723 || !THISNODE->can_direct (conf)))
724 {
725 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename);
726 protocol = 0;
727 }
632 728
633 si.set (conf, protocol); 729 si.set (conf, protocol);
634} 730}
635 731
636// ensure sockinfo is valid, forward if necessary 732// ensure sockinfo is valid, forward if necessary
… …
641 { 737 {
642 connection *r = vpn->find_router (); 738 connection *r = vpn->find_router ();
643 739
644 if (r) 740 if (r)
645 { 741 {
646 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 742 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
647 conf->nodename, r->conf->nodename); 743 conf->nodename, r->conf->nodename, (const char *)r->si);
648 return r->si; 744 return r->si;
649 } 745 }
650 else 746 else
651 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 747 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
652 conf->nodename); 748 conf->nodename);
… …
722} 818}
723 819
724void 820void
725connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 821connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
726{ 822{
727 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 823 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
728 conf->id, rid, (const char *)rsi); 824 conf->id, rid, (const char *)rsi);
729 825
730 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);
731 827
732 r->hmac_set (octx); 828 r->hmac_set (octx);
733 send_vpn_packet (r, si); 829 send_vpn_packet (r, si);
734 830
735 delete r; 831 delete r;
736} 832}
737 833
738void 834inline void
739connection::establish_connection_cb (time_watcher &w) 835connection::establish_connection_cb (ev::timer &w, int revents)
740{ 836{
741 if (!ictx 837 if (!ictx
742 && conf != THISNODE 838 && conf != THISNODE
743 && connectmode != conf_node::C_NEVER 839 && connectmode != conf_node::C_NEVER
744 && connectmode != conf_node::C_DISABLED 840 && connectmode != conf_node::C_DISABLED
745 && NOW > w.at) 841 && !w.is_active ())
746 { 842 {
747 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 843 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
748 844 // and stop trying. should probably be handled by a per-connection expire handler.
749 if (retry_int < conf->max_retry) 845 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
846 {
847 reset_connection ();
750 retry_cnt++; 848 return;
751 else 849 }
752 retry_int = conf->max_retry;
753 850
754 w.start (NOW + retry_int); 851 last_establish_attempt = ev_now ();
852
853 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
854 ? (retry_cnt & 3) + 1
855 : 1 << (retry_cnt >> 2));
755 856
756 reset_si (); 857 reset_si ();
757 858
859 bool slow = si.prot & PROT_SLOW;
860
758 if (si.prot && !si.host) 861 if (si.prot && !si.host)
862 {
863 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
864 /*TODO*/ /* start the timer so we don't recurse endlessly */
865 w.start (1);
759 vpn->send_connect_request (conf->id); 866 vpn->send_connect_request (conf->id);
867 }
760 else 868 else
761 { 869 {
870 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
871
762 const sockinfo &dsi = forward_si (si); 872 const sockinfo &dsi = forward_si (si);
873
874 slow = slow || (dsi.prot & PROT_SLOW);
763 875
764 if (dsi.valid () && auth_rate_limiter.can (dsi)) 876 if (dsi.valid () && auth_rate_limiter.can (dsi))
765 { 877 {
766 if (retry_cnt < 4) 878 if (retry_cnt < 4)
767 send_auth_request (dsi, true); 879 send_auth_request (dsi, true);
768 else 880 else
769 send_ping (dsi, 0); 881 send_ping (dsi, 0);
770 } 882 }
771 } 883 }
884
885 retry_int *= slow ? 8. : 0.9;
886
887 if (retry_int < conf->max_retry)
888 retry_cnt++;
889 else
890 retry_int = conf->max_retry;
891
892 w.start (retry_int);
772 } 893 }
773} 894}
774 895
775void 896void
776connection::reset_connection () 897connection::reset_connection ()
… …
779 { 900 {
780 slog (L_INFO, _("%s(%s): connection lost"), 901 slog (L_INFO, _("%s(%s): connection lost"),
781 conf->nodename, (const char *)si); 902 conf->nodename, (const char *)si);
782 903
783 if (::conf.script_node_down) 904 if (::conf.script_node_down)
784 run_script (run_script_cb (this, &connection::script_node_down), false); 905 {
906 run_script_cb *cb = new run_script_cb;
907 cb->set<connection, &connection::script_node_down> (this);
908 run_script_queued (cb, _("node-down command execution failed, continuing."));
909 }
785 } 910 }
786 911
787 delete ictx; ictx = 0; 912 delete ictx; ictx = 0;
788 delete octx; octx = 0; 913 delete octx; octx = 0;
914#if ENABLE_DNS
915 dnsv4_reset_connection ();
916#endif
789 917
790 si.host = 0; 918 si.host = 0;
791 919
792 last_activity = 0; 920 last_activity = 0;
793 retry_cnt = 0; 921 retry_cnt = 0;
… …
804 send_reset (si); 932 send_reset (si);
805 933
806 reset_connection (); 934 reset_connection ();
807} 935}
808 936
809void 937inline void
810connection::rekey_cb (time_watcher &w) 938connection::rekey_cb (ev::timer &w, int revents)
811{ 939{
812 reset_connection (); 940 reset_connection ();
813 establish_connection (); 941 establish_connection ();
814} 942}
815 943
… …
831 if (oseqno > MAX_SEQNO) 959 if (oseqno > MAX_SEQNO)
832 rekey (); 960 rekey ();
833} 961}
834 962
835void 963void
964connection::post_inject_queue ()
965{
966 // force a connection every now and when when packets are sent (max 1/s)
967 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
968 establish_connection.stop ();
969
970 establish_connection ();
971}
972
973void
836connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 974connection::inject_data_packet (tap_packet *pkt)
837{ 975{
838 if (ictx && octx) 976 if (ictx && octx)
839 send_data_packet (pkt); 977 send_data_packet (pkt);
840 else 978 else
841 { 979 {
842 if (!broadcast)//DDDD
843 data_queue.put (new tap_packet (*pkt)); 980 data_queue.put (new tap_packet (*pkt));
844 981 post_inject_queue ();
845 establish_connection ();
846 } 982 }
847} 983}
848 984
849void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 985void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
850{ 986{
851 if (ictx && octx) 987 if (ictx && octx)
852 send_vpn_packet (pkt, si, tos); 988 send_vpn_packet (pkt, si, tos);
853 else 989 else
854 { 990 {
855 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 991 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
856 992 post_inject_queue ();
857 establish_connection ();
858 } 993 }
859} 994}
860 995
861void 996void
862connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 997connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
863{ 998{
864 last_activity = NOW; 999 last_activity = ev_now ();
865 1000
866 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1001 slog (L_NOISE, "<<%d received packet type %d from %d to %d",
867 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1002 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
1003
1004 if (connectmode == conf_node::C_DISABLED)
1005 return;
868 1006
869 switch (pkt->typ ()) 1007 switch (pkt->typ ())
870 { 1008 {
871 case vpn_packet::PT_PING: 1009 case vpn_packet::PT_PING:
872 // we send pings instead of auth packets after some retries, 1010 // we send pings instead of auth packets after some retries,
… …
932 delete octx; 1070 delete octx;
933 1071
934 octx = new crypto_ctx (k, 1); 1072 octx = new crypto_ctx (k, 1);
935 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1073 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
936 1074
937 // compatibility code, remove when no longer required
938 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
939
940 conf->protocols = p->protocols; 1075 conf->protocols = p->protocols;
941 features = p->features & config_packet::get_features (); 1076 features = p->features & config_packet::get_features ();
942 1077
943 send_auth_response (rsi, p->id, k); 1078 send_auth_response (rsi, p->id, k);
944 1079
… …
1010 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1145 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1011 conf->nodename, (const char *)rsi, 1146 conf->nodename, (const char *)rsi,
1012 p->prot_major, p->prot_minor); 1147 p->prot_major, p->prot_minor);
1013 1148
1014 if (::conf.script_node_up) 1149 if (::conf.script_node_up)
1015 run_script (run_script_cb (this, &connection::script_node_up), false); 1150 {
1151 run_script_cb *cb = new run_script_cb;
1152 cb->set<connection, &connection::script_node_up> (this);
1153 run_script_queued (cb, _("node-up command execution failed, continuing."));
1154 }
1016 1155
1017 break; 1156 break;
1018 } 1157 }
1019 else 1158 else
1020 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1159 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
… …
1054 { 1193 {
1055 vpn->tap->send (d); 1194 vpn->tap->send (d);
1056 1195
1057 if (si != rsi) 1196 if (si != rsi)
1058 { 1197 {
1059 // fast re-sync on connection changes, useful especially for tcp/ip 1198 // fast re-sync on source address changes, useful especially for tcp/ip
1060 si = rsi; 1199 si = rsi;
1061 1200
1062 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1201 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1063 conf->nodename, (const char *)si, (const char *)rsi); 1202 conf->nodename, (const char *)si, (const char *)rsi);
1064 } 1203 }
… …
1075 case vpn_packet::PT_CONNECT_REQ: 1214 case vpn_packet::PT_CONNECT_REQ:
1076 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1215 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1077 { 1216 {
1078 connect_req_packet *p = (connect_req_packet *) pkt; 1217 connect_req_packet *p = (connect_req_packet *) pkt;
1079 1218
1080 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1219 if (p->id > 0 && p->id <= vpn->conns.size ())
1081 connection *c = vpn->conns[p->id - 1];
1082 conf->protocols = p->protocols;
1083
1084 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1085 conf->id, p->id, c->ictx && c->octx);
1086
1087 if (c->ictx && c->octx)
1088 { 1220 {
1221 connection *c = vpn->conns[p->id - 1];
1222 conf->protocols = p->protocols;
1223
1224 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1225 conf->id, p->id, c->ictx && c->octx);
1226
1227 if (c->ictx && c->octx)
1228 {
1089 // send connect_info packets to both sides, in case one is 1229 // send connect_info packets to both sides, in case one is
1090 // behind a nat firewall (or both ;) 1230 // behind a nat firewall (or both ;)
1091 c->send_connect_info (conf->id, si, conf->protocols); 1231 c->send_connect_info (conf->id, si, conf->protocols);
1092 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1232 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1233 }
1234 else
1235 c->establish_connection ();
1093 } 1236 }
1094 else 1237 else
1095 c->establish_connection (); 1238 slog (L_WARN,
1239 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1240 p->id);
1096 } 1241 }
1097 1242
1098 break; 1243 break;
1099 1244
1100 case vpn_packet::PT_CONNECT_INFO: 1245 case vpn_packet::PT_CONNECT_INFO:
1101 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1246 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1102 { 1247 {
1103 connect_info_packet *p = (connect_info_packet *)pkt; 1248 connect_info_packet *p = (connect_info_packet *)pkt;
1104 1249
1105 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything 1250 if (p->id > 0 && p->id <= vpn->conns.size ())
1106 { 1251 {
1107 connection *c = vpn->conns[p->id - 1]; 1252 connection *c = vpn->conns[p->id - 1];
1108 1253
1109 c->conf->protocols = p->protocols; 1254 c->conf->protocols = p->protocols;
1110 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1255 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
… …
1116 const sockinfo &dsi = forward_si (p->si); 1261 const sockinfo &dsi = forward_si (p->si);
1117 1262
1118 if (dsi.valid ()) 1263 if (dsi.valid ())
1119 c->send_auth_request (dsi, true); 1264 c->send_auth_request (dsi, true);
1120 } 1265 }
1266 else
1267 slog (L_WARN,
1268 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1269 p->id);
1121 } 1270 }
1122 1271
1123 break; 1272 break;
1124 1273
1125 default: 1274 default:
1126 send_reset (rsi); 1275 send_reset (rsi);
1127 break; 1276 break;
1128 } 1277 }
1129} 1278}
1130 1279
1131void connection::keepalive_cb (time_watcher &w) 1280inline void
1281connection::keepalive_cb (ev::timer &w, int revents)
1132{ 1282{
1133 if (NOW >= last_activity + ::conf.keepalive + 30) 1283 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1134 { 1284 {
1135 reset_connection (); 1285 reset_connection ();
1136 establish_connection (); 1286 establish_connection ();
1137 } 1287 }
1138 else if (NOW < last_activity + ::conf.keepalive) 1288 else if (ev_now () < last_activity + ::conf.keepalive)
1139 w.start (last_activity + ::conf.keepalive); 1289 w.start (last_activity + ::conf.keepalive - ev::now ());
1140 else if (conf->connectmode != conf_node::C_ONDEMAND 1290 else if (conf->connectmode != conf_node::C_ONDEMAND
1141 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1291 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1142 { 1292 {
1143 send_ping (si); 1293 send_ping (si);
1144 w.start (NOW + 5); 1294 w.start (5);
1145 } 1295 }
1146 else if (NOW < last_activity + ::conf.keepalive + 10) 1296 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1147 // hold ondemand connections implicitly a few seconds longer 1297 // hold ondemand connections implicitly a few seconds longer
1148 // should delete octx, though, or something like that ;) 1298 // should delete octx, though, or something like that ;)
1149 w.start (last_activity + ::conf.keepalive + 10); 1299 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1150 else 1300 else
1151 reset_connection (); 1301 reset_connection ();
1152} 1302}
1153 1303
1154void connection::send_connect_request (int id) 1304void connection::send_connect_request (int id)
… …
1160 send_vpn_packet (p, si); 1310 send_vpn_packet (p, si);
1161 1311
1162 delete p; 1312 delete p;
1163} 1313}
1164 1314
1315void connection::script_init_env (const char *ext)
1316{
1317 char *env;
1318 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1319 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1320 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1321 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1322 conf->id & 0xff); putenv (env);
1323}
1324
1165void connection::script_node () 1325void connection::script_init_connect_env ()
1166{ 1326{
1167 vpn->script_if_up (); 1327 vpn->script_init_env ();
1168 1328
1169 char *env; 1329 char *env;
1170 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1330 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1171 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1331 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1172 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1332 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1173 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1333 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1174} 1334}
1175 1335
1336inline const char *
1176const char *connection::script_node_up () 1337connection::script_node_up ()
1177{ 1338{
1178 script_node (); 1339 script_init_connect_env ();
1179 1340
1180 putenv ("STATE=up"); 1341 putenv ((char *)"STATE=up");
1181 1342
1343 char *filename;
1344 asprintf (&filename,
1345 "%s/%s",
1346 confbase,
1182 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1347 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1183}
1184 1348
1349 return filename;
1350}
1351
1352inline const char *
1185const char *connection::script_node_down () 1353connection::script_node_down ()
1186{ 1354{
1187 script_node (); 1355 script_init_connect_env ();
1188 1356
1189 putenv ("STATE=down"); 1357 putenv ((char *)"STATE=down");
1190 1358
1191 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1359 char *filename;
1192} 1360 asprintf (&filename,
1361 "%s/%s",
1362 confbase,
1363 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1193 1364
1365 return filename;
1366}
1367
1194connection::connection(struct vpn *vpn_) 1368connection::connection (struct vpn *vpn, conf_node *conf)
1195: vpn(vpn_) 1369: vpn(vpn), conf(conf),
1196, rekey (this, &connection::rekey_cb) 1370#if ENABLE_DNS
1197, keepalive (this, &connection::keepalive_cb) 1371 dns (0),
1372#endif
1373 data_queue(conf->max_ttl, conf->max_queue),
1374 vpn_queue(conf->max_ttl, conf->max_queue)
1375{
1376 rekey .set<connection, &connection::rekey_cb > (this);
1377 keepalive .set<connection, &connection::keepalive_cb > (this);
1198, establish_connection (this, &connection::establish_connection_cb) 1378 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1199{ 1379
1380 last_establish_attempt = 0.;
1200 octx = ictx = 0; 1381 octx = ictx = 0;
1201 retry_cnt = 0;
1202 1382
1203 connectmode = conf_node::C_ALWAYS; // initial setting 1383 if (!conf->protocols) // make sure some protocol is enabled
1384 conf->protocols = PROT_UDPv4;
1385
1386 connectmode = conf->connectmode;
1387
1388 // queue a dummy packet to force an initial connection attempt
1389 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1390 vpn_queue.put (new net_packet);
1391
1204 reset_connection (); 1392 reset_connection ();
1205} 1393}
1206 1394
1207connection::~connection () 1395connection::~connection ()
1208{ 1396{

Diff Legend

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