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.66 by pcg, Thu Dec 6 00:35:29 2007 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;
… …
153 } 206 }
154} 207}
155 208
156////////////////////////////////////////////////////////////////////////////// 209//////////////////////////////////////////////////////////////////////////////
157 210
158void pkt_queue::put (net_packet *p) 211pkt_queue::pkt_queue (double max_ttl, int max_queue)
212: max_ttl (max_ttl), max_queue (max_queue)
159{ 213{
160 if (queue[i]) 214 queue = new pkt [max_queue];
161 {
162 delete queue[i];
163 j = (j + 1) % QUEUEDEPTH;
164 }
165 215
166 queue[i] = p;
167
168 i = (i + 1) % QUEUEDEPTH;
169}
170
171net_packet *pkt_queue::get ()
172{
173 net_packet *p = queue[j];
174
175 if (p)
176 {
177 queue[j] = 0;
178 j = (j + 1) % QUEUEDEPTH;
179 }
180
181 return p;
182}
183
184pkt_queue::pkt_queue ()
185{
186 memset (queue, 0, sizeof (queue));
187 i = 0; 216 i = 0;
188 j = 0; 217 j = 0;
218
219 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
189} 220}
190 221
191pkt_queue::~pkt_queue () 222pkt_queue::~pkt_queue ()
192{ 223{
193 for (i = QUEUEDEPTH; --i > 0; ) 224 while (net_packet *p = get ())
225 delete p;
226
194 delete queue[i]; 227 delete [] queue;
228}
229
230void pkt_queue::expire_cb (ev::timer &w, int revents)
231{
232 ev_tstamp expire = ev_now () - max_ttl;
233
234 for (;;)
235 {
236 if (empty ())
237 break;
238
239 double diff = queue[j].tstamp - expire;
240
241 if (diff >= 0.)
242 {
243 w.start (diff > 0.5 ? diff : 0.5);
244 break;
245 }
246
247 delete get ();
248 }
249}
250
251void pkt_queue::put (net_packet *p)
252{
253 ev_tstamp now = ev_now ();
254
255 // start expiry timer
256 if (empty ())
257 expire.start (max_ttl);
258
259 int ni = i + 1 == max_queue ? 0 : i + 1;
260
261 if (ni == j)
262 delete get ();
263
264 queue[i].pkt = p;
265 queue[i].tstamp = now;
266
267 i = ni;
268}
269
270net_packet *pkt_queue::get ()
271{
272 if (empty ())
273 return 0;
274
275 net_packet *p = queue[j].pkt;
276 queue[j].pkt = 0;
277
278 j = j + 1 == max_queue ? 0 : j + 1;
279
280 return p;
195} 281}
196 282
197struct net_rateinfo 283struct net_rateinfo
198{ 284{
199 u32 host; 285 u32 host;
… …
590{ 676{
591 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx); 677 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
592 678
593 if (ictx && octx) 679 if (ictx && octx)
594 { 680 {
595 connectmode = conf->connectmode;
596
597 // make sure rekeying timeouts are slightly asymmetric 681 // make sure rekeying timeouts are slightly asymmetric
598 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0); 682 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
599 rekey.start (rekey_interval, rekey_interval); 683 rekey.start (rekey_interval, rekey_interval);
600 keepalive.start (::conf.keepalive); 684 keepalive.start (::conf.keepalive);
601 685
602 // send queued packets 686 // send queued packets
603 if (ictx && octx) 687 if (ictx && octx)
604 { 688 {
605 while (tap_packet *p = (tap_packet *)data_queue.get ()) 689 while (tap_packet *p = (tap_packet *)data_queue.get ())
606 { 690 {
607 send_data_packet (p); 691 if (p->len) send_data_packet (p);
608 delete p; 692 delete p;
609 } 693 }
610 694
611 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 695 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
612 { 696 {
613 send_vpn_packet (p, si, IPTOS_RELIABILITY); 697 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
614 delete p; 698 delete p;
615 } 699 }
616 } 700 }
617 } 701 }
618 else 702 else
… …
627void 711void
628connection::reset_si () 712connection::reset_si ()
629{ 713{
630 protocol = best_protocol (THISNODE->protocols & conf->protocols); 714 protocol = best_protocol (THISNODE->protocols & conf->protocols);
631 715
632 // mask out protocols we cannot establish 716 // mask out endpoints we can't connect to
633 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 717 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
634 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 718 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
635 if (!conf->dns_port) protocol &= ~PROT_DNSv4; 719 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
636 720
637 if (protocol 721 if (protocol
… …
658 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)"),
659 conf->nodename, r->conf->nodename, (const char *)r->si); 743 conf->nodename, r->conf->nodename, (const char *)r->si);
660 return r->si; 744 return r->si;
661 } 745 }
662 else 746 else
663 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 747 slog (L_DEBUG, _("%s: node unreachable, no common protocol, no router"),
664 conf->nodename); 748 conf->nodename);
665 } 749 }
666 750
667 return si; 751 return si;
668} 752}
… …
754 && conf != THISNODE 838 && conf != THISNODE
755 && connectmode != conf_node::C_NEVER 839 && connectmode != conf_node::C_NEVER
756 && connectmode != conf_node::C_DISABLED 840 && connectmode != conf_node::C_DISABLED
757 && !w.is_active ()) 841 && !w.is_active ())
758 { 842 {
843 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
844 // and stop trying. should probably be handled by a per-connection expire handler.
845 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
846 {
847 reset_connection ();
848 return;
849 }
850
851 last_establish_attempt = ev_now ();
852
759 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 853 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
760 ? (retry_cnt & 3) + 1 854 ? (retry_cnt & 3) + 1
761 : 1 << (retry_cnt >> 2)); 855 : 1 << (retry_cnt >> 2));
762 856
763 reset_si (); 857 reset_si ();
… …
786 else 880 else
787 send_ping (dsi, 0); 881 send_ping (dsi, 0);
788 } 882 }
789 } 883 }
790 884
791 retry_int *= slow ? 8. : 0.7; 885 retry_int *= slow ? 8. : 0.9;
792 886
793 if (retry_int < conf->max_retry) 887 if (retry_int < conf->max_retry)
794 retry_cnt++; 888 retry_cnt++;
795 else 889 else
796 retry_int = conf->max_retry; 890 retry_int = conf->max_retry;
… …
807 slog (L_INFO, _("%s(%s): connection lost"), 901 slog (L_INFO, _("%s(%s): connection lost"),
808 conf->nodename, (const char *)si); 902 conf->nodename, (const char *)si);
809 903
810 if (::conf.script_node_down) 904 if (::conf.script_node_down)
811 { 905 {
812 run_script_cb cb; 906 run_script_cb *cb = new run_script_cb;
813 cb.set<connection, &connection::script_node_down> (this); 907 cb->set<connection, &connection::script_node_down> (this);
814 if (!run_script (cb, false))
815 slog (L_WARN, _("node-down command execution failed, continuing.")); 908 run_script_queued (cb, _("node-down command execution failed, continuing."));
816 } 909 }
817 } 910 }
818 911
819 delete ictx; ictx = 0; 912 delete ictx; ictx = 0;
820 delete octx; octx = 0; 913 delete octx; octx = 0;
… …
866 if (oseqno > MAX_SEQNO) 959 if (oseqno > MAX_SEQNO)
867 rekey (); 960 rekey ();
868} 961}
869 962
870void 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
871connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 974connection::inject_data_packet (tap_packet *pkt)
872{ 975{
873 if (ictx && octx) 976 if (ictx && octx)
874 send_data_packet (pkt); 977 send_data_packet (pkt);
875 else 978 else
876 { 979 {
877 if (!broadcast)
878 data_queue.put (new tap_packet (*pkt)); 980 data_queue.put (new tap_packet (*pkt));
879 981 post_inject_queue ();
880 establish_connection ();
881 } 982 }
882} 983}
883 984
884void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 985void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
885{ 986{
886 if (ictx && octx) 987 if (ictx && octx)
887 send_vpn_packet (pkt, si, tos); 988 send_vpn_packet (pkt, si, tos);
888 else 989 else
889 { 990 {
890 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 991 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
891 992 post_inject_queue ();
892 establish_connection ();
893 } 993 }
894} 994}
895 995
896void 996void
897connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 997connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
… …
1046 conf->nodename, (const char *)rsi, 1146 conf->nodename, (const char *)rsi,
1047 p->prot_major, p->prot_minor); 1147 p->prot_major, p->prot_minor);
1048 1148
1049 if (::conf.script_node_up) 1149 if (::conf.script_node_up)
1050 { 1150 {
1051 run_script_cb cb; 1151 run_script_cb *cb = new run_script_cb;
1052 cb.set<connection, &connection::script_node_up> (this); 1152 cb->set<connection, &connection::script_node_up> (this);
1053 if (!run_script (cb, false))
1054 slog (L_WARN, _("node-up command execution failed, continuing.")); 1153 run_script_queued (cb, _("node-up command execution failed, continuing."));
1055 } 1154 }
1056 1155
1057 break; 1156 break;
1058 } 1157 }
1059 else 1158 else
… …
1265 1364
1266 return filename; 1365 return filename;
1267} 1366}
1268 1367
1269connection::connection (struct vpn *vpn, conf_node *conf) 1368connection::connection (struct vpn *vpn, conf_node *conf)
1270: vpn(vpn), conf(conf) 1369: vpn(vpn), conf(conf),
1271#if ENABLE_DNS 1370#if ENABLE_DNS
1272, dns (0) 1371 dns (0),
1273#endif 1372#endif
1373 data_queue(conf->max_ttl, conf->max_queue + 1),
1374 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1274{ 1375{
1275 rekey .set<connection, &connection::rekey_cb > (this); 1376 rekey .set<connection, &connection::rekey_cb > (this);
1276 keepalive .set<connection, &connection::keepalive_cb > (this); 1377 keepalive .set<connection, &connection::keepalive_cb > (this);
1277 establish_connection.set<connection, &connection::establish_connection_cb> (this); 1378 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1278 1379
1380 last_establish_attempt = 0.;
1279 octx = ictx = 0; 1381 octx = ictx = 0;
1280 retry_cnt = 0;
1281 1382
1282 if (!conf->protocols) // make sure some protocol is enabled 1383 if (!conf->protocols) // make sure some protocol is enabled
1283 conf->protocols = PROT_UDPv4; 1384 conf->protocols = PROT_UDPv4;
1284 1385
1285 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
1286 reset_connection (); 1392 reset_connection ();
1287} 1393}
1288 1394
1289connection::~connection () 1395connection::~connection ()
1290{ 1396{

Diff Legend

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