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.60 by pcg, Sat Nov 10 05:14:22 2007 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-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 (ev::timer &w, int revents); ev::timer 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 > ev::ev_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;
… …
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 = ev::ev_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.is_active ()) 183 if (!cleaner.is_active ())
130 cleaner.again (); 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);
136 cleaner.set (RSA_TTL, RSA_TTL); 190 cleaner.set (RSA_TTL, RSA_TTL);
137 } 191 }
138 192
139} rsa_cache; 193} rsa_cache;
140 194
… …
143 if (empty ()) 197 if (empty ())
144 w.stop (); 198 w.stop ();
145 else 199 else
146 { 200 {
147 for (iterator i = begin (); i != end (); ) 201 for (iterator i = begin (); i != end (); )
148 if (i->expire <= ev::ev_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 < ev::ev_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 = ev::ev_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 + (ev::ev_now () - ri.last); 337 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
250 338
251 ri.last = ev::ev_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
… …
584///////////////////////////////////////////////////////////////////////////// 672/////////////////////////////////////////////////////////////////////////////
585 673
586void 674void
587connection::connection_established () 675connection::connection_established ()
588{ 676{
677 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
678
589 if (ictx && octx) 679 if (ictx && octx)
590 { 680 {
591 connectmode = conf->connectmode;
592
593 // make sure rekeying timeouts are slightly asymmetric 681 // make sure rekeying timeouts are slightly asymmetric
594 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);
595 rekey.start (rekey_interval, rekey_interval); 683 rekey.start (rekey_interval, rekey_interval);
596 keepalive.start (::conf.keepalive); 684 keepalive.start (::conf.keepalive);
597 685
598 // send queued packets 686 // send queued packets
599 if (ictx && octx) 687 if (ictx && octx)
600 { 688 {
601 while (tap_packet *p = (tap_packet *)data_queue.get ()) 689 while (tap_packet *p = (tap_packet *)data_queue.get ())
602 { 690 {
603 send_data_packet (p); 691 if (p->len) send_data_packet (p);
604 delete p; 692 delete p;
605 } 693 }
606 694
607 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 695 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
608 { 696 {
609 send_vpn_packet (p, si, IPTOS_RELIABILITY); 697 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
610 delete p; 698 delete p;
611 } 699 }
612 } 700 }
613 } 701 }
614 else 702 else
… …
741 send_vpn_packet (r, si); 829 send_vpn_packet (r, si);
742 830
743 delete r; 831 delete r;
744} 832}
745 833
746void 834inline void
747connection::establish_connection_cb (ev::timer &w, int revents) 835connection::establish_connection_cb (ev::timer &w, int revents)
748{ 836{
749 if (!ictx 837 if (!ictx
750 && conf != THISNODE 838 && conf != THISNODE
751 && connectmode != conf_node::C_NEVER 839 && connectmode != conf_node::C_NEVER
752 && connectmode != conf_node::C_DISABLED 840 && connectmode != conf_node::C_DISABLED
753 && !w.is_active ()) 841 && !w.is_active ())
754 { 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
755 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 853 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
756 ? (retry_cnt & 3) + 1 854 ? (retry_cnt & 3) + 1
757 : 1 << (retry_cnt >> 2)); 855 : 1 << (retry_cnt >> 2));
758 856
759 reset_si (); 857 reset_si ();
760 858
761 bool slow = si.prot & PROT_SLOW; 859 bool slow = si.prot & PROT_SLOW;
762 860
763 if (si.prot && !si.host) 861 if (si.prot && !si.host)
764 { 862 {
863 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
765 /*TODO*/ /* start the timer so we don't recurse endlessly */ 864 /*TODO*/ /* start the timer so we don't recurse endlessly */
766 w.start (1); 865 w.start (1);
767 vpn->send_connect_request (conf->id); 866 vpn->send_connect_request (conf->id);
768 } 867 }
769 else 868 else
770 { 869 {
870 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
871
771 const sockinfo &dsi = forward_si (si); 872 const sockinfo &dsi = forward_si (si);
772 873
773 slow = slow || (dsi.prot & PROT_SLOW); 874 slow = slow || (dsi.prot & PROT_SLOW);
774 875
775 if (dsi.valid () && auth_rate_limiter.can (dsi)) 876 if (dsi.valid () && auth_rate_limiter.can (dsi))
… …
779 else 880 else
780 send_ping (dsi, 0); 881 send_ping (dsi, 0);
781 } 882 }
782 } 883 }
783 884
784 retry_int *= slow ? 8. : 0.7; 885 retry_int *= slow ? 8. : 0.9;
785 886
786 if (retry_int < conf->max_retry) 887 if (retry_int < conf->max_retry)
787 retry_cnt++; 888 retry_cnt++;
788 else 889 else
789 retry_int = conf->max_retry; 890 retry_int = conf->max_retry;
… …
799 { 900 {
800 slog (L_INFO, _("%s(%s): connection lost"), 901 slog (L_INFO, _("%s(%s): connection lost"),
801 conf->nodename, (const char *)si); 902 conf->nodename, (const char *)si);
802 903
803 if (::conf.script_node_down) 904 if (::conf.script_node_down)
804 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);
805 slog (L_WARN, _("node-down command execution failed, continuing.")); 908 run_script_queued (cb, _("node-down command execution failed, continuing."));
909 }
806 } 910 }
807 911
808 delete ictx; ictx = 0; 912 delete ictx; ictx = 0;
809 delete octx; octx = 0; 913 delete octx; octx = 0;
810#if ENABLE_DNS 914#if ENABLE_DNS
… …
828 send_reset (si); 932 send_reset (si);
829 933
830 reset_connection (); 934 reset_connection ();
831} 935}
832 936
833void 937inline void
834connection::rekey_cb (ev::timer &w, int revents) 938connection::rekey_cb (ev::timer &w, int revents)
835{ 939{
836 reset_connection (); 940 reset_connection ();
837 establish_connection (); 941 establish_connection ();
838} 942}
… …
855 if (oseqno > MAX_SEQNO) 959 if (oseqno > MAX_SEQNO)
856 rekey (); 960 rekey ();
857} 961}
858 962
859void 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
860connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 974connection::inject_data_packet (tap_packet *pkt)
861{ 975{
862 if (ictx && octx) 976 if (ictx && octx)
863 send_data_packet (pkt); 977 send_data_packet (pkt);
864 else 978 else
865 { 979 {
866 if (!broadcast)
867 data_queue.put (new tap_packet (*pkt)); 980 data_queue.put (new tap_packet (*pkt));
868 981 post_inject_queue ();
869 establish_connection ();
870 } 982 }
871} 983}
872 984
873void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 985void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
874{ 986{
875 if (ictx && octx) 987 if (ictx && octx)
876 send_vpn_packet (pkt, si, tos); 988 send_vpn_packet (pkt, si, tos);
877 else 989 else
878 { 990 {
879 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 991 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
880 992 post_inject_queue ();
881 establish_connection ();
882 } 993 }
883} 994}
884 995
885void 996void
886connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 997connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
887{ 998{
888 last_activity = ev::ev_now (); 999 last_activity = ev_now ();
889 1000
890 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",
891 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;
892 1006
893 switch (pkt->typ ()) 1007 switch (pkt->typ ())
894 { 1008 {
895 case vpn_packet::PT_PING: 1009 case vpn_packet::PT_PING:
896 // we send pings instead of auth packets after some retries, 1010 // we send pings instead of auth packets after some retries,
… …
1031 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1145 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1032 conf->nodename, (const char *)rsi, 1146 conf->nodename, (const char *)rsi,
1033 p->prot_major, p->prot_minor); 1147 p->prot_major, p->prot_minor);
1034 1148
1035 if (::conf.script_node_up) 1149 if (::conf.script_node_up)
1036 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);
1037 slog (L_WARN, _("node-up command execution failed, continuing.")); 1153 run_script_queued (cb, _("node-up command execution failed, continuing."));
1154 }
1038 1155
1039 break; 1156 break;
1040 } 1157 }
1041 else 1158 else
1042 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"),
… …
1158 send_reset (rsi); 1275 send_reset (rsi);
1159 break; 1276 break;
1160 } 1277 }
1161} 1278}
1162 1279
1280inline void
1163void connection::keepalive_cb (ev::timer &w, int revents) 1281connection::keepalive_cb (ev::timer &w, int revents)
1164{ 1282{
1165 if (ev::ev_now () >= last_activity + ::conf.keepalive + 30) 1283 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1166 { 1284 {
1167 reset_connection (); 1285 reset_connection ();
1168 establish_connection (); 1286 establish_connection ();
1169 } 1287 }
1170 else if (ev::ev_now () < last_activity + ::conf.keepalive) 1288 else if (ev_now () < last_activity + ::conf.keepalive)
1171 w.start (last_activity + ::conf.keepalive - ev::now ()); 1289 w.start (last_activity + ::conf.keepalive - ev::now ());
1172 else if (conf->connectmode != conf_node::C_ONDEMAND 1290 else if (conf->connectmode != conf_node::C_ONDEMAND
1173 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1291 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1174 { 1292 {
1175 send_ping (si); 1293 send_ping (si);
1176 w.start (5); 1294 w.start (5);
1177 } 1295 }
1178 else if (ev::ev_now () < last_activity + ::conf.keepalive + 10) 1296 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1179 // hold ondemand connections implicitly a few seconds longer 1297 // hold ondemand connections implicitly a few seconds longer
1180 // should delete octx, though, or something like that ;) 1298 // should delete octx, though, or something like that ;)
1181 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1299 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1182 else 1300 else
1183 reset_connection (); 1301 reset_connection ();
… …
1213 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1331 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1214 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1332 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1215 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1333 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1216} 1334}
1217 1335
1336inline const char *
1218const char *connection::script_node_up () 1337connection::script_node_up ()
1219{ 1338{
1220 script_init_connect_env (); 1339 script_init_connect_env ();
1221 1340
1222 putenv ((char *)"STATE=up"); 1341 putenv ((char *)"STATE=up");
1223 1342
… …
1228 ::conf.script_node_up ? ::conf.script_node_up : "node-up"); 1347 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1229 1348
1230 return filename; 1349 return filename;
1231} 1350}
1232 1351
1352inline const char *
1233const char *connection::script_node_down () 1353connection::script_node_down ()
1234{ 1354{
1235 script_init_connect_env (); 1355 script_init_connect_env ();
1236 1356
1237 putenv ((char *)"STATE=down"); 1357 putenv ((char *)"STATE=down");
1238 1358
… …
1244 1364
1245 return filename; 1365 return filename;
1246} 1366}
1247 1367
1248connection::connection (struct vpn *vpn, conf_node *conf) 1368connection::connection (struct vpn *vpn, conf_node *conf)
1249: vpn(vpn), conf(conf) 1369: vpn(vpn), conf(conf),
1250, rekey (this, &connection::rekey_cb)
1251, keepalive (this, &connection::keepalive_cb)
1252, establish_connection (this, &connection::establish_connection_cb)
1253#if ENABLE_DNS 1370#if ENABLE_DNS
1254, dns (0) 1371 dns (0),
1255#endif 1372#endif
1373 data_queue(conf->max_ttl, conf->max_queue),
1374 vpn_queue(conf->max_ttl, conf->max_queue)
1256{ 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.;
1257 octx = ictx = 0; 1381 octx = ictx = 0;
1258 retry_cnt = 0;
1259 1382
1260 if (!conf->protocols) // make sure some protocol is enabled 1383 if (!conf->protocols) // make sure some protocol is enabled
1261 conf->protocols = PROT_UDPv4; 1384 conf->protocols = PROT_UDPv4;
1262 1385
1263 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
1264 reset_connection (); 1392 reset_connection ();
1265} 1393}
1266 1394
1267connection::~connection () 1395connection::~connection ()
1268{ 1396{

Diff Legend

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