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.69 by pcg, Thu Aug 7 17:54:26 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>
… …
82 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 92 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 93 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
84 EVP_MD_CTX_cleanup (&ctx); 94 EVP_MD_CTX_cleanup (&ctx);
85} 95}
86 96
87struct rsa_entry { 97struct rsa_entry
98{
88 tstamp expire; 99 tstamp expire;
89 rsaid id; 100 rsaid id;
90 rsachallenge chg; 101 rsachallenge chg;
91}; 102};
92 103
93struct rsa_cache : list<rsa_entry> 104struct rsa_cache : list<rsa_entry>
94{ 105{
95 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner; 106 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
96 107
97 bool find (const rsaid &id, rsachallenge &chg) 108 bool find (const rsaid &id, rsachallenge &chg)
98 { 109 {
99 for (iterator i = begin (); i != end (); ++i) 110 for (iterator i = begin (); i != end (); ++i)
100 { 111 {
101 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev::ev_now ()) 112 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
102 { 113 {
103 memcpy (&chg, &i->chg, sizeof chg); 114 memcpy (&chg, &i->chg, sizeof chg);
104 115
105 erase (i); 116 erase (i);
106 return true; 117 return true;
… …
118 rsa_entry e; 129 rsa_entry e;
119 130
120 RAND_bytes ((unsigned char *)&id, sizeof id); 131 RAND_bytes ((unsigned char *)&id, sizeof id);
121 RAND_bytes ((unsigned char *)&chg, sizeof chg); 132 RAND_bytes ((unsigned char *)&chg, sizeof chg);
122 133
123 e.expire = ev::ev_now () + RSA_TTL; 134 e.expire = ev_now () + RSA_TTL;
124 e.id = id; 135 e.id = id;
125 memcpy (&e.chg, &chg, sizeof chg); 136 memcpy (&e.chg, &chg, sizeof chg);
126 137
127 push_back (e); 138 push_back (e);
128 139
129 if (!cleaner.is_active ()) 140 if (!cleaner.is_active ())
130 cleaner.again (); 141 cleaner.again ();
131 } 142 }
132 143
133 rsa_cache () 144 rsa_cache ()
134 : cleaner (this, &rsa_cache::cleaner_cb)
135 { 145 {
146 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
136 cleaner.set (RSA_TTL, RSA_TTL); 147 cleaner.set (RSA_TTL, RSA_TTL);
137 } 148 }
138 149
139} rsa_cache; 150} rsa_cache;
140 151
… …
143 if (empty ()) 154 if (empty ())
144 w.stop (); 155 w.stop ();
145 else 156 else
146 { 157 {
147 for (iterator i = begin (); i != end (); ) 158 for (iterator i = begin (); i != end (); )
148 if (i->expire <= ev::ev_now ()) 159 if (i->expire <= ev_now ())
149 i = erase (i); 160 i = erase (i);
150 else 161 else
151 ++i; 162 ++i;
152 } 163 }
153} 164}
154 165
155////////////////////////////////////////////////////////////////////////////// 166//////////////////////////////////////////////////////////////////////////////
156 167
157void pkt_queue::put (net_packet *p) 168pkt_queue::pkt_queue (double max_ttl, int max_queue)
169: max_ttl (max_ttl), max_queue (max_queue)
158{ 170{
159 if (queue[i]) 171 queue = new pkt [max_queue];
160 {
161 delete queue[i];
162 j = (j + 1) % QUEUEDEPTH;
163 }
164 172
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; 173 i = 0;
187 j = 0; 174 j = 0;
175
176 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
188} 177}
189 178
190pkt_queue::~pkt_queue () 179pkt_queue::~pkt_queue ()
191{ 180{
192 for (i = QUEUEDEPTH; --i > 0; ) 181 while (net_packet *p = get ())
182 delete p;
183
193 delete queue[i]; 184 delete [] queue;
194} 185}
195 186
187void pkt_queue::expire_cb (ev::timer &w, int revents)
188{
189 ev_tstamp expire = ev_now () - max_ttl;
190
191 for (;;)
192 {
193 if (empty ())
194 break;
195
196 double diff = queue[j].tstamp - expire;
197
198 if (diff >= 0.)
199 {
200 w.start (diff > 0.5 ? diff : 0.5);
201 break;
202 }
203
204 delete get ();
205 }
206}
207
208void pkt_queue::put (net_packet *p)
209{
210 ev_tstamp now = ev_now ();
211
212 // start expiry timer
213 if (empty ())
214 expire.start (max_ttl);
215
216 int ni = i + 1 == max_queue ? 0 : i + 1;
217
218 if (ni == j)
219 delete get ();
220
221 queue[i].pkt = p;
222 queue[i].tstamp = now;
223
224 i = ni;
225}
226
227net_packet *pkt_queue::get ()
228{
229 if (empty ())
230 return 0;
231
232 net_packet *p = queue[j].pkt;
233 queue[j].pkt = 0;
234
235 j = j + 1 == max_queue ? 0 : j + 1;
236
237 return p;
238}
239
196struct net_rateinfo { 240struct net_rateinfo
241{
197 u32 host; 242 u32 host;
198 double pcnt, diff; 243 double pcnt, diff;
199 tstamp last; 244 tstamp last;
200}; 245};
201 246
… …
220 iterator i; 265 iterator i;
221 266
222 for (i = begin (); i != end (); ) 267 for (i = begin (); i != end (); )
223 if (i->host == host) 268 if (i->host == host)
224 break; 269 break;
225 else if (i->last < ev::ev_now () - NRL_EXPIRE) 270 else if (i->last < ev_now () - NRL_EXPIRE)
226 i = erase (i); 271 i = erase (i);
227 else 272 else
228 i++; 273 i++;
229 274
230 if (i == end ()) 275 if (i == end ())
… …
232 net_rateinfo ri; 277 net_rateinfo ri;
233 278
234 ri.host = host; 279 ri.host = host;
235 ri.pcnt = 1.; 280 ri.pcnt = 1.;
236 ri.diff = NRL_MAXDIF; 281 ri.diff = NRL_MAXDIF;
237 ri.last = ev::ev_now (); 282 ri.last = ev_now ();
238 283
239 push_front (ri); 284 push_front (ri);
240 285
241 return true; 286 return true;
242 } 287 }
… …
244 { 289 {
245 net_rateinfo ri (*i); 290 net_rateinfo ri (*i);
246 erase (i); 291 erase (i);
247 292
248 ri.pcnt = ri.pcnt * NRL_ALPHA; 293 ri.pcnt = ri.pcnt * NRL_ALPHA;
249 ri.diff = ri.diff * NRL_ALPHA + (ev::ev_now () - ri.last); 294 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
250 295
251 ri.last = ev::ev_now (); 296 ri.last = ev_now ();
252 297
253 double dif = ri.diff / ri.pcnt; 298 double dif = ri.diff / ri.pcnt;
254 299
255 bool send = dif > NRL_CUTOFF; 300 bool send = dif > NRL_CUTOFF;
256 301
… …
584///////////////////////////////////////////////////////////////////////////// 629/////////////////////////////////////////////////////////////////////////////
585 630
586void 631void
587connection::connection_established () 632connection::connection_established ()
588{ 633{
634 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
635
589 if (ictx && octx) 636 if (ictx && octx)
590 { 637 {
591 connectmode = conf->connectmode;
592
593 // make sure rekeying timeouts are slightly asymmetric 638 // make sure rekeying timeouts are slightly asymmetric
594 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0); 639 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
595 rekey.start (rekey_interval, rekey_interval); 640 rekey.start (rekey_interval, rekey_interval);
596 keepalive.start (::conf.keepalive); 641 keepalive.start (::conf.keepalive);
597 642
598 // send queued packets 643 // send queued packets
599 if (ictx && octx) 644 if (ictx && octx)
600 { 645 {
601 while (tap_packet *p = (tap_packet *)data_queue.get ()) 646 while (tap_packet *p = (tap_packet *)data_queue.get ())
602 { 647 {
603 send_data_packet (p); 648 if (p->len) send_data_packet (p);
604 delete p; 649 delete p;
605 } 650 }
606 651
607 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 652 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
608 { 653 {
609 send_vpn_packet (p, si, IPTOS_RELIABILITY); 654 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
610 delete p; 655 delete p;
611 } 656 }
612 } 657 }
613 } 658 }
614 else 659 else
… …
741 send_vpn_packet (r, si); 786 send_vpn_packet (r, si);
742 787
743 delete r; 788 delete r;
744} 789}
745 790
746void 791inline void
747connection::establish_connection_cb (ev::timer &w, int revents) 792connection::establish_connection_cb (ev::timer &w, int revents)
748{ 793{
749 if (!ictx 794 if (!ictx
750 && conf != THISNODE 795 && conf != THISNODE
751 && connectmode != conf_node::C_NEVER 796 && connectmode != conf_node::C_NEVER
752 && connectmode != conf_node::C_DISABLED 797 && connectmode != conf_node::C_DISABLED
753 && !w.is_active ()) 798 && !w.is_active ())
754 { 799 {
800 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
801 // and stop trying. should probably be handled by a per-connection expire handler.
802 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
803 {
804 reset_connection ();
805 return;
806 }
807
808 last_establish_attempt = ev_now ();
809
755 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 810 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
756 ? (retry_cnt & 3) + 1 811 ? (retry_cnt & 3) + 1
757 : 1 << (retry_cnt >> 2)); 812 : 1 << (retry_cnt >> 2));
758 813
759 reset_si (); 814 reset_si ();
760 815
761 bool slow = si.prot & PROT_SLOW; 816 bool slow = si.prot & PROT_SLOW;
762 817
763 if (si.prot && !si.host) 818 if (si.prot && !si.host)
764 { 819 {
820 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
765 /*TODO*/ /* start the timer so we don't recurse endlessly */ 821 /*TODO*/ /* start the timer so we don't recurse endlessly */
766 w.start (1); 822 w.start (1);
767 vpn->send_connect_request (conf->id); 823 vpn->send_connect_request (conf->id);
768 } 824 }
769 else 825 else
770 { 826 {
827 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
828
771 const sockinfo &dsi = forward_si (si); 829 const sockinfo &dsi = forward_si (si);
772 830
773 slow = slow || (dsi.prot & PROT_SLOW); 831 slow = slow || (dsi.prot & PROT_SLOW);
774 832
775 if (dsi.valid () && auth_rate_limiter.can (dsi)) 833 if (dsi.valid () && auth_rate_limiter.can (dsi))
… …
779 else 837 else
780 send_ping (dsi, 0); 838 send_ping (dsi, 0);
781 } 839 }
782 } 840 }
783 841
784 retry_int *= slow ? 8. : 0.7; 842 retry_int *= slow ? 8. : 0.9;
785 843
786 if (retry_int < conf->max_retry) 844 if (retry_int < conf->max_retry)
787 retry_cnt++; 845 retry_cnt++;
788 else 846 else
789 retry_int = conf->max_retry; 847 retry_int = conf->max_retry;
… …
799 { 857 {
800 slog (L_INFO, _("%s(%s): connection lost"), 858 slog (L_INFO, _("%s(%s): connection lost"),
801 conf->nodename, (const char *)si); 859 conf->nodename, (const char *)si);
802 860
803 if (::conf.script_node_down) 861 if (::conf.script_node_down)
804 if (!run_script (run_script_cb (this, &connection::script_node_down), false)) 862 {
863 run_script_cb cb;
864 cb.set<connection, &connection::script_node_down> (this);
865 if (!run_script (cb, false))
805 slog (L_WARN, _("node-down command execution failed, continuing.")); 866 slog (L_WARN, _("node-down command execution failed, continuing."));
867 }
806 } 868 }
807 869
808 delete ictx; ictx = 0; 870 delete ictx; ictx = 0;
809 delete octx; octx = 0; 871 delete octx; octx = 0;
810#if ENABLE_DNS 872#if ENABLE_DNS
… …
828 send_reset (si); 890 send_reset (si);
829 891
830 reset_connection (); 892 reset_connection ();
831} 893}
832 894
833void 895inline void
834connection::rekey_cb (ev::timer &w, int revents) 896connection::rekey_cb (ev::timer &w, int revents)
835{ 897{
836 reset_connection (); 898 reset_connection ();
837 establish_connection (); 899 establish_connection ();
838} 900}
… …
855 if (oseqno > MAX_SEQNO) 917 if (oseqno > MAX_SEQNO)
856 rekey (); 918 rekey ();
857} 919}
858 920
859void 921void
922connection::post_inject_queue ()
923{
924 // force a connection every now and when when packets are sent (max 1/s)
925 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
926 establish_connection.stop ();
927
928 establish_connection ();
929}
930
931void
860connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 932connection::inject_data_packet (tap_packet *pkt)
861{ 933{
862 if (ictx && octx) 934 if (ictx && octx)
863 send_data_packet (pkt); 935 send_data_packet (pkt);
864 else 936 else
865 { 937 {
866 if (!broadcast)
867 data_queue.put (new tap_packet (*pkt)); 938 data_queue.put (new tap_packet (*pkt));
868 939 post_inject_queue ();
869 establish_connection ();
870 } 940 }
871} 941}
872 942
873void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 943void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
874{ 944{
875 if (ictx && octx) 945 if (ictx && octx)
876 send_vpn_packet (pkt, si, tos); 946 send_vpn_packet (pkt, si, tos);
877 else 947 else
878 { 948 {
879 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 949 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
880 950 post_inject_queue ();
881 establish_connection ();
882 } 951 }
883} 952}
884 953
885void 954void
886connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 955connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
887{ 956{
888 last_activity = ev::ev_now (); 957 last_activity = ev_now ();
889 958
890 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 959 slog (L_NOISE, "<<%d received packet type %d from %d to %d",
891 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 960 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
961
962 if (connectmode == conf_node::C_DISABLED)
963 return;
892 964
893 switch (pkt->typ ()) 965 switch (pkt->typ ())
894 { 966 {
895 case vpn_packet::PT_PING: 967 case vpn_packet::PT_PING:
896 // we send pings instead of auth packets after some retries, 968 // we send pings instead of auth packets after some retries,
… …
1031 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1103 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1032 conf->nodename, (const char *)rsi, 1104 conf->nodename, (const char *)rsi,
1033 p->prot_major, p->prot_minor); 1105 p->prot_major, p->prot_minor);
1034 1106
1035 if (::conf.script_node_up) 1107 if (::conf.script_node_up)
1036 if (!run_script (run_script_cb (this, &connection::script_node_up), false)) 1108 {
1109 run_script_cb cb;
1110 cb.set<connection, &connection::script_node_up> (this);
1111 if (!run_script (cb, false))
1037 slog (L_WARN, _("node-up command execution failed, continuing.")); 1112 slog (L_WARN, _("node-up command execution failed, continuing."));
1113 }
1038 1114
1039 break; 1115 break;
1040 } 1116 }
1041 else 1117 else
1042 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1118 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
… …
1158 send_reset (rsi); 1234 send_reset (rsi);
1159 break; 1235 break;
1160 } 1236 }
1161} 1237}
1162 1238
1239inline void
1163void connection::keepalive_cb (ev::timer &w, int revents) 1240connection::keepalive_cb (ev::timer &w, int revents)
1164{ 1241{
1165 if (ev::ev_now () >= last_activity + ::conf.keepalive + 30) 1242 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1166 { 1243 {
1167 reset_connection (); 1244 reset_connection ();
1168 establish_connection (); 1245 establish_connection ();
1169 } 1246 }
1170 else if (ev::ev_now () < last_activity + ::conf.keepalive) 1247 else if (ev_now () < last_activity + ::conf.keepalive)
1171 w.start (last_activity + ::conf.keepalive - ev::now ()); 1248 w.start (last_activity + ::conf.keepalive - ev::now ());
1172 else if (conf->connectmode != conf_node::C_ONDEMAND 1249 else if (conf->connectmode != conf_node::C_ONDEMAND
1173 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1250 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1174 { 1251 {
1175 send_ping (si); 1252 send_ping (si);
1176 w.start (5); 1253 w.start (5);
1177 } 1254 }
1178 else if (ev::ev_now () < last_activity + ::conf.keepalive + 10) 1255 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1179 // hold ondemand connections implicitly a few seconds longer 1256 // hold ondemand connections implicitly a few seconds longer
1180 // should delete octx, though, or something like that ;) 1257 // should delete octx, though, or something like that ;)
1181 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1258 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1182 else 1259 else
1183 reset_connection (); 1260 reset_connection ();
… …
1213 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1290 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1214 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1291 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1215 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1292 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1216} 1293}
1217 1294
1295inline const char *
1218const char *connection::script_node_up () 1296connection::script_node_up ()
1219{ 1297{
1220 script_init_connect_env (); 1298 script_init_connect_env ();
1221 1299
1222 putenv ((char *)"STATE=up"); 1300 putenv ((char *)"STATE=up");
1223 1301
… …
1228 ::conf.script_node_up ? ::conf.script_node_up : "node-up"); 1306 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1229 1307
1230 return filename; 1308 return filename;
1231} 1309}
1232 1310
1311inline const char *
1233const char *connection::script_node_down () 1312connection::script_node_down ()
1234{ 1313{
1235 script_init_connect_env (); 1314 script_init_connect_env ();
1236 1315
1237 putenv ((char *)"STATE=down"); 1316 putenv ((char *)"STATE=down");
1238 1317
… …
1244 1323
1245 return filename; 1324 return filename;
1246} 1325}
1247 1326
1248connection::connection (struct vpn *vpn, conf_node *conf) 1327connection::connection (struct vpn *vpn, conf_node *conf)
1249: vpn(vpn), conf(conf) 1328: 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 1329#if ENABLE_DNS
1254, dns (0) 1330 dns (0),
1255#endif 1331#endif
1332 data_queue(conf->max_ttl, conf->max_queue),
1333 vpn_queue(conf->max_ttl, conf->max_queue)
1256{ 1334{
1335 rekey .set<connection, &connection::rekey_cb > (this);
1336 keepalive .set<connection, &connection::keepalive_cb > (this);
1337 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1338
1339 last_establish_attempt = 0.;
1257 octx = ictx = 0; 1340 octx = ictx = 0;
1258 retry_cnt = 0;
1259 1341
1260 if (!conf->protocols) // make sure some protocol is enabled 1342 if (!conf->protocols) // make sure some protocol is enabled
1261 conf->protocols = PROT_UDPv4; 1343 conf->protocols = PROT_UDPv4;
1262 1344
1263 connectmode = conf_node::C_ALWAYS; // initial setting 1345 connectmode = conf->connectmode;
1346
1347 // queue a dummy packet to force an initial connection attempt
1348 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1349 vpn_queue.put (new net_packet);
1350
1264 reset_connection (); 1351 reset_connection ();
1265} 1352}
1266 1353
1267connection::~connection () 1354connection::~connection ()
1268{ 1355{

Diff Legend

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