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.72 by pcg, Fri Aug 8 16:48:00 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 }
608 } 701 }
609 else 702 else
610 { 703 {
611 retry_cnt = 0; 704 retry_cnt = 0;
612 establish_connection.start (NOW + 5); 705 establish_connection.start (5);
613 keepalive.stop (); 706 keepalive.stop ();
614 rekey.stop (); 707 rekey.stop ();
615 } 708 }
616} 709}
617 710
618void 711void
619connection::reset_si () 712connection::reset_si ()
620{ 713{
621 protocol = best_protocol (THISNODE->protocols & conf->protocols); 714 protocol = best_protocol (THISNODE->protocols & conf->protocols);
622 715
623 // mask out protocols we cannot establish 716 // mask out endpoints we can't connect to
624 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 717 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
625 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 718 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
626 if (!conf->dns_port) protocol &= ~PROT_DNSv4; 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 }
627 728
628 si.set (conf, protocol); 729 si.set (conf, protocol);
629} 730}
630 731
631// ensure sockinfo is valid, forward if necessary 732// ensure sockinfo is valid, forward if necessary
… …
641 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"), 742 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
642 conf->nodename, r->conf->nodename, (const char *)r->si); 743 conf->nodename, r->conf->nodename, (const char *)r->si);
643 return r->si; 744 return r->si;
644 } 745 }
645 else 746 else
646 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 747 slog (L_DEBUG, _("%s: node unreachable, no common protocol, no router"),
647 conf->nodename); 748 conf->nodename);
648 } 749 }
649 750
650 return si; 751 return si;
651} 752}
… …
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)
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);
753 vpn->send_connect_request (conf->id); 866 vpn->send_connect_request (conf->id);
867 }
754 else 868 else
755 { 869 {
870 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
871
756 const sockinfo &dsi = forward_si (si); 872 const sockinfo &dsi = forward_si (si);
757 873
758 slow = slow || (dsi.prot & PROT_SLOW); 874 slow = slow || (dsi.prot & PROT_SLOW);
759 875
760 if (dsi.valid () && auth_rate_limiter.can (dsi)) 876 if (dsi.valid () && auth_rate_limiter.can (dsi))
… …
764 else 880 else
765 send_ping (dsi, 0); 881 send_ping (dsi, 0);
766 } 882 }
767 } 883 }
768 884
769 retry_int *= slow ? 8. : 0.7; 885 retry_int *= slow ? 8. : 0.9;
770 886
771 if (retry_int < conf->max_retry) 887 if (retry_int < conf->max_retry)
772 retry_cnt++; 888 retry_cnt++;
773 else 889 else
774 retry_int = conf->max_retry; 890 retry_int = conf->max_retry;
775 891
776 w.start (NOW + retry_int); 892 w.start (retry_int);
777 } 893 }
778} 894}
779 895
780void 896void
781connection::reset_connection () 897connection::reset_connection ()
… …
784 { 900 {
785 slog (L_INFO, _("%s(%s): connection lost"), 901 slog (L_INFO, _("%s(%s): connection lost"),
786 conf->nodename, (const char *)si); 902 conf->nodename, (const char *)si);
787 903
788 if (::conf.script_node_down) 904 if (::conf.script_node_down)
789 if (!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);
790 slog (L_WARN, _("node-down command execution failed, continuing.")); 908 run_script_queued (cb, _("node-down command execution failed, continuing."));
909 }
791 } 910 }
792 911
793 delete ictx; ictx = 0; 912 delete ictx; ictx = 0;
794 delete octx; octx = 0; 913 delete octx; octx = 0;
795#if ENABLE_DNS 914#if ENABLE_DNS
… …
813 send_reset (si); 932 send_reset (si);
814 933
815 reset_connection (); 934 reset_connection ();
816} 935}
817 936
818void 937inline void
819connection::rekey_cb (time_watcher &w) 938connection::rekey_cb (ev::timer &w, int revents)
820{ 939{
821 reset_connection (); 940 reset_connection ();
822 establish_connection (); 941 establish_connection ();
823} 942}
824 943
… …
840 if (oseqno > MAX_SEQNO) 959 if (oseqno > MAX_SEQNO)
841 rekey (); 960 rekey ();
842} 961}
843 962
844void 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
845connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 974connection::inject_data_packet (tap_packet *pkt)
846{ 975{
847 if (ictx && octx) 976 if (ictx && octx)
848 send_data_packet (pkt); 977 send_data_packet (pkt);
849 else 978 else
850 { 979 {
851 if (!broadcast)
852 data_queue.put (new tap_packet (*pkt)); 980 data_queue.put (new tap_packet (*pkt));
853 981 post_inject_queue ();
854 establish_connection ();
855 } 982 }
856} 983}
857 984
858void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 985void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
859{ 986{
860 if (ictx && octx) 987 if (ictx && octx)
861 send_vpn_packet (pkt, si, tos); 988 send_vpn_packet (pkt, si, tos);
862 else 989 else
863 { 990 {
864 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 991 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
865 992 post_inject_queue ();
866 establish_connection ();
867 } 993 }
868} 994}
869 995
870void 996void
871connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 997connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
872{ 998{
873 last_activity = NOW; 999 last_activity = ev_now ();
874 1000
875 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",
876 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;
877 1006
878 switch (pkt->typ ()) 1007 switch (pkt->typ ())
879 { 1008 {
880 case vpn_packet::PT_PING: 1009 case vpn_packet::PT_PING:
881 // we send pings instead of auth packets after some retries, 1010 // we send pings instead of auth packets after some retries,
… …
1016 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1145 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1017 conf->nodename, (const char *)rsi, 1146 conf->nodename, (const char *)rsi,
1018 p->prot_major, p->prot_minor); 1147 p->prot_major, p->prot_minor);
1019 1148
1020 if (::conf.script_node_up) 1149 if (::conf.script_node_up)
1021 if (!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);
1022 slog (L_WARN, _("node-up command execution failed, continuing.")); 1153 run_script_queued (cb, _("node-up command execution failed, continuing."));
1154 }
1023 1155
1024 break; 1156 break;
1025 } 1157 }
1026 else 1158 else
1027 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"),
… …
1087 if (p->id > 0 && p->id <= vpn->conns.size ()) 1219 if (p->id > 0 && p->id <= vpn->conns.size ())
1088 { 1220 {
1089 connection *c = vpn->conns[p->id - 1]; 1221 connection *c = vpn->conns[p->id - 1];
1090 conf->protocols = p->protocols; 1222 conf->protocols = p->protocols;
1091 1223
1092 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n", 1224 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1093 conf->id, p->id, c->ictx && c->octx); 1225 conf->id, p->id, c->ictx && c->octx);
1094 1226
1095 if (c->ictx && c->octx) 1227 if (c->ictx && c->octx)
1096 { 1228 {
1097 // send connect_info packets to both sides, in case one is 1229 // send connect_info packets to both sides, in case one is
… …
1143 send_reset (rsi); 1275 send_reset (rsi);
1144 break; 1276 break;
1145 } 1277 }
1146} 1278}
1147 1279
1148void connection::keepalive_cb (time_watcher &w) 1280inline void
1281connection::keepalive_cb (ev::timer &w, int revents)
1149{ 1282{
1150 if (NOW >= last_activity + ::conf.keepalive + 30) 1283 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1151 { 1284 {
1152 reset_connection (); 1285 reset_connection ();
1153 establish_connection (); 1286 establish_connection ();
1154 } 1287 }
1155 else if (NOW < last_activity + ::conf.keepalive) 1288 else if (ev_now () < last_activity + ::conf.keepalive)
1156 w.start (last_activity + ::conf.keepalive); 1289 w.start (last_activity + ::conf.keepalive - ev::now ());
1157 else if (conf->connectmode != conf_node::C_ONDEMAND 1290 else if (conf->connectmode != conf_node::C_ONDEMAND
1158 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1291 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1159 { 1292 {
1160 send_ping (si); 1293 send_ping (si);
1161 w.start (NOW + 5); 1294 w.start (5);
1162 } 1295 }
1163 else if (NOW < last_activity + ::conf.keepalive + 10) 1296 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1164 // hold ondemand connections implicitly a few seconds longer 1297 // hold ondemand connections implicitly a few seconds longer
1165 // should delete octx, though, or something like that ;) 1298 // should delete octx, though, or something like that ;)
1166 w.start (last_activity + ::conf.keepalive + 10); 1299 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1167 else 1300 else
1168 reset_connection (); 1301 reset_connection ();
1169} 1302}
1170 1303
1171void connection::send_connect_request (int id) 1304void connection::send_connect_request (int id)
… …
1198 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1331 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1199 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1332 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1200 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1333 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1201} 1334}
1202 1335
1336inline const char *
1203const char *connection::script_node_up () 1337connection::script_node_up ()
1204{ 1338{
1205 script_init_connect_env (); 1339 script_init_connect_env ();
1206 1340
1207 putenv ("STATE=up"); 1341 putenv ((char *)"STATE=up");
1208 1342
1209 char *filename; 1343 char *filename;
1210 asprintf (&filename, 1344 asprintf (&filename,
1211 "%s/%s", 1345 "%s/%s",
1212 confbase, 1346 confbase,
1213 ::conf.script_node_up ? ::conf.script_node_up : "node-up"); 1347 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1214 1348
1215 return filename; 1349 return filename;
1216} 1350}
1217 1351
1352inline const char *
1218const char *connection::script_node_down () 1353connection::script_node_down ()
1219{ 1354{
1220 script_init_connect_env (); 1355 script_init_connect_env ();
1221 1356
1222 putenv ("STATE=down"); 1357 putenv ((char *)"STATE=down");
1223 1358
1224 char *filename; 1359 char *filename;
1225 asprintf (&filename, 1360 asprintf (&filename,
1226 "%s/%s", 1361 "%s/%s",
1227 confbase, 1362 confbase,
… …
1229 1364
1230 return filename; 1365 return filename;
1231} 1366}
1232 1367
1233connection::connection (struct vpn *vpn, conf_node *conf) 1368connection::connection (struct vpn *vpn, conf_node *conf)
1234: vpn(vpn), conf(conf) 1369: 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 1370#if ENABLE_DNS
1239, dns (0) 1371 dns (0),
1240#endif 1372#endif
1373 data_queue(conf->max_ttl, conf->max_queue + 1),
1374 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1241{ 1375{
1376 rekey .set<connection, &connection::rekey_cb > (this);
1377 keepalive .set<connection, &connection::keepalive_cb > (this);
1378 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1379
1380 last_establish_attempt = 0.;
1242 octx = ictx = 0; 1381 octx = ictx = 0;
1243 retry_cnt = 0;
1244 1382
1245 if (!conf->protocols) // make sure some protocol is enabled 1383 if (!conf->protocols) // make sure some protocol is enabled
1246 conf->protocols = PROT_UDPv4; 1384 conf->protocols = PROT_UDPv4;
1247 1385
1248 connectmode = conf_node::C_ALWAYS; // initial setting 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
1249 reset_connection (); 1392 reset_connection ();
1250} 1393}
1251 1394
1252connection::~connection () 1395connection::~connection ()
1253{ 1396{

Diff Legend

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