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.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 (time_watcher &w); time_watcher 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 > 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;
107 } 118 }
108 } 119 }
109 120
110 if (cleaner.at < NOW) 121 if (!cleaner.is_active ())
111 cleaner.start (NOW + RSA_TTL); 122 cleaner.again ();
112 123
113 return false; 124 return false;
114 } 125 }
115 126
116 void gen (rsaid &id, rsachallenge &chg) 127 void gen (rsaid &id, rsachallenge &chg)
… …
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 = 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.at < NOW) 140 if (!cleaner.is_active ())
130 cleaner.start (NOW + RSA_TTL); 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);
147 cleaner.set (RSA_TTL, RSA_TTL);
148 }
136 149
137} rsa_cache; 150} rsa_cache;
138 151
139void rsa_cache::cleaner_cb (time_watcher &w) 152void rsa_cache::cleaner_cb (ev::timer &w, int revents)
140{ 153{
141 if (!empty ()) 154 if (empty ())
155 w.stop ();
156 else
142 { 157 {
143 w.start (NOW + RSA_TTL);
144
145 for (iterator i = begin (); i != end (); ) 158 for (iterator i = begin (); i != end (); )
146 if (i->expire <= NOW) 159 if (i->expire <= ev_now ())
147 i = erase (i); 160 i = erase (i);
148 else 161 else
149 ++i; 162 ++i;
150 } 163 }
151} 164}
152 165
153////////////////////////////////////////////////////////////////////////////// 166//////////////////////////////////////////////////////////////////////////////
154 167
155void 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)
156{ 170{
157 if (queue[i]) 171 queue = new pkt [max_queue];
158 {
159 delete queue[i];
160 j = (j + 1) % QUEUEDEPTH;
161 }
162 172
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; 173 i = 0;
185 j = 0; 174 j = 0;
175
176 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
186} 177}
187 178
188pkt_queue::~pkt_queue () 179pkt_queue::~pkt_queue ()
189{ 180{
190 for (i = QUEUEDEPTH; --i > 0; ) 181 while (net_packet *p = get ())
182 delete p;
183
191 delete queue[i]; 184 delete [] queue;
192} 185}
193 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
194struct net_rateinfo { 240struct net_rateinfo
241{
195 u32 host; 242 u32 host;
196 double pcnt, diff; 243 double pcnt, diff;
197 tstamp last; 244 tstamp last;
198}; 245};
199 246
… …
218 iterator i; 265 iterator i;
219 266
220 for (i = begin (); i != end (); ) 267 for (i = begin (); i != end (); )
221 if (i->host == host) 268 if (i->host == host)
222 break; 269 break;
223 else if (i->last < NOW - NRL_EXPIRE) 270 else if (i->last < ev_now () - NRL_EXPIRE)
224 i = erase (i); 271 i = erase (i);
225 else 272 else
226 i++; 273 i++;
227 274
228 if (i == end ()) 275 if (i == end ())
… …
230 net_rateinfo ri; 277 net_rateinfo ri;
231 278
232 ri.host = host; 279 ri.host = host;
233 ri.pcnt = 1.; 280 ri.pcnt = 1.;
234 ri.diff = NRL_MAXDIF; 281 ri.diff = NRL_MAXDIF;
235 ri.last = NOW; 282 ri.last = ev_now ();
236 283
237 push_front (ri); 284 push_front (ri);
238 285
239 return true; 286 return true;
240 } 287 }
… …
242 { 289 {
243 net_rateinfo ri (*i); 290 net_rateinfo ri (*i);
244 erase (i); 291 erase (i);
245 292
246 ri.pcnt = ri.pcnt * NRL_ALPHA; 293 ri.pcnt = ri.pcnt * NRL_ALPHA;
247 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last); 294 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
248 295
249 ri.last = NOW; 296 ri.last = ev_now ();
250 297
251 double dif = ri.diff / ri.pcnt; 298 double dif = ri.diff / ri.pcnt;
252 299
253 bool send = dif > NRL_CUTOFF; 300 bool send = dif > NRL_CUTOFF;
254 301
… …
463#if ENABLE_COMPRESSION 510#if ENABLE_COMPRESSION
464 f |= FEATURE_COMPRESSION; 511 f |= FEATURE_COMPRESSION;
465#endif 512#endif
466#if ENABLE_ROHC 513#if ENABLE_ROHC
467 f |= FEATURE_ROHC; 514 f |= FEATURE_ROHC;
515#endif
516#if ENABLE_BRIDGING
517 f |= FEATURE_BRIDGING;
468#endif 518#endif
469 return f; 519 return f;
470 } 520 }
471}; 521};
472 522
… …
579///////////////////////////////////////////////////////////////////////////// 629/////////////////////////////////////////////////////////////////////////////
580 630
581void 631void
582connection::connection_established () 632connection::connection_established ()
583{ 633{
634 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
635
584 if (ictx && octx) 636 if (ictx && octx)
585 { 637 {
586 connectmode = conf->connectmode;
587
588 // make sure rekeying timeouts are slightly asymmetric 638 // make sure rekeying timeouts are slightly asymmetric
589 rekey.start (NOW + ::conf.rekey 639 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
590 + (conf->id > THISNODE->id ? 10 : 0)); 640 rekey.start (rekey_interval, rekey_interval);
591 keepalive.start (NOW + ::conf.keepalive); 641 keepalive.start (::conf.keepalive);
592 642
593 // send queued packets 643 // send queued packets
594 if (ictx && octx) 644 if (ictx && octx)
595 { 645 {
596 while (tap_packet *p = (tap_packet *)data_queue.get ()) 646 while (tap_packet *p = (tap_packet *)data_queue.get ())
597 { 647 {
598 send_data_packet (p); 648 if (p->len) send_data_packet (p);
599 delete p; 649 delete p;
600 } 650 }
601 651
602 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 652 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
603 { 653 {
604 send_vpn_packet (p, si, IPTOS_RELIABILITY); 654 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
605 delete p; 655 delete p;
606 } 656 }
607 } 657 }
608 } 658 }
609 else 659 else
610 { 660 {
611 retry_cnt = 0; 661 retry_cnt = 0;
612 establish_connection.start (NOW + 5); 662 establish_connection.start (5);
613 keepalive.stop (); 663 keepalive.stop ();
614 rekey.stop (); 664 rekey.stop ();
615 } 665 }
616} 666}
617 667
… …
622 672
623 // mask out protocols we cannot establish 673 // mask out protocols we cannot establish
624 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 674 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
625 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 675 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
626 if (!conf->dns_port) protocol &= ~PROT_DNSv4; 676 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
677
678 if (protocol
679 && (!conf->can_direct (THISNODE)
680 || !THISNODE->can_direct (conf)))
681 {
682 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename);
683 protocol = 0;
684 }
627 685
628 si.set (conf, protocol); 686 si.set (conf, protocol);
629} 687}
630 688
631// ensure sockinfo is valid, forward if necessary 689// ensure sockinfo is valid, forward if necessary
… …
717} 775}
718 776
719void 777void
720connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 778connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
721{ 779{
722 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 780 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
723 conf->id, rid, (const char *)rsi); 781 conf->id, rid, (const char *)rsi);
724 782
725 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 783 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
726 784
727 r->hmac_set (octx); 785 r->hmac_set (octx);
728 send_vpn_packet (r, si); 786 send_vpn_packet (r, si);
729 787
730 delete r; 788 delete r;
731} 789}
732 790
733void 791inline void
734connection::establish_connection_cb (time_watcher &w) 792connection::establish_connection_cb (ev::timer &w, int revents)
735{ 793{
736 if (!ictx 794 if (!ictx
737 && conf != THISNODE 795 && conf != THISNODE
738 && connectmode != conf_node::C_NEVER 796 && connectmode != conf_node::C_NEVER
739 && connectmode != conf_node::C_DISABLED 797 && connectmode != conf_node::C_DISABLED
740 && NOW > w.at) 798 && !w.is_active ())
741 { 799 {
742 w.at = TSTAMP_MAX; // first disable this watcher in case of recursion 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 }
743 807
744 double retry_int = double (retry_cnt & 3 808 last_establish_attempt = ev_now ();
809
810 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
745 ? (retry_cnt & 3) + 1 811 ? (retry_cnt & 3) + 1
746 : 1 << (retry_cnt >> 2)); 812 : 1 << (retry_cnt >> 2));
747 813
748 reset_si (); 814 reset_si ();
749 815
750 bool slow = si.prot & PROT_SLOW; 816 bool slow = si.prot & PROT_SLOW;
751 817
752 if (si.prot && !si.host) 818 if (si.prot && !si.host)
819 {
820 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
821 /*TODO*/ /* start the timer so we don't recurse endlessly */
822 w.start (1);
753 vpn->send_connect_request (conf->id); 823 vpn->send_connect_request (conf->id);
824 }
754 else 825 else
755 { 826 {
827 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
828
756 const sockinfo &dsi = forward_si (si); 829 const sockinfo &dsi = forward_si (si);
757 830
758 slow = slow || (dsi.prot & PROT_SLOW); 831 slow = slow || (dsi.prot & PROT_SLOW);
759 832
760 if (dsi.valid () && auth_rate_limiter.can (dsi)) 833 if (dsi.valid () && auth_rate_limiter.can (dsi))
… …
764 else 837 else
765 send_ping (dsi, 0); 838 send_ping (dsi, 0);
766 } 839 }
767 } 840 }
768 841
769 retry_int *= slow ? 8. : 0.7; 842 retry_int *= slow ? 8. : 0.9;
770 843
771 if (retry_int < conf->max_retry) 844 if (retry_int < conf->max_retry)
772 retry_cnt++; 845 retry_cnt++;
773 else 846 else
774 retry_int = conf->max_retry; 847 retry_int = conf->max_retry;
775 848
776 w.start (NOW + retry_int); 849 w.start (retry_int);
777 } 850 }
778} 851}
779 852
780void 853void
781connection::reset_connection () 854connection::reset_connection ()
… …
784 { 857 {
785 slog (L_INFO, _("%s(%s): connection lost"), 858 slog (L_INFO, _("%s(%s): connection lost"),
786 conf->nodename, (const char *)si); 859 conf->nodename, (const char *)si);
787 860
788 if (::conf.script_node_down) 861 if (::conf.script_node_down)
789 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))
790 slog (L_WARN, _("node-down command execution failed, continuing.")); 866 slog (L_WARN, _("node-down command execution failed, continuing."));
867 }
791 } 868 }
792 869
793 delete ictx; ictx = 0; 870 delete ictx; ictx = 0;
794 delete octx; octx = 0; 871 delete octx; octx = 0;
795#if ENABLE_DNS 872#if ENABLE_DNS
… …
813 send_reset (si); 890 send_reset (si);
814 891
815 reset_connection (); 892 reset_connection ();
816} 893}
817 894
818void 895inline void
819connection::rekey_cb (time_watcher &w) 896connection::rekey_cb (ev::timer &w, int revents)
820{ 897{
821 reset_connection (); 898 reset_connection ();
822 establish_connection (); 899 establish_connection ();
823} 900}
824 901
… …
840 if (oseqno > MAX_SEQNO) 917 if (oseqno > MAX_SEQNO)
841 rekey (); 918 rekey ();
842} 919}
843 920
844void 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
845connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 932connection::inject_data_packet (tap_packet *pkt)
846{ 933{
847 if (ictx && octx) 934 if (ictx && octx)
848 send_data_packet (pkt); 935 send_data_packet (pkt);
849 else 936 else
850 { 937 {
851 if (!broadcast)
852 data_queue.put (new tap_packet (*pkt)); 938 data_queue.put (new tap_packet (*pkt));
853 939 post_inject_queue ();
854 establish_connection ();
855 } 940 }
856} 941}
857 942
858void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 943void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
859{ 944{
860 if (ictx && octx) 945 if (ictx && octx)
861 send_vpn_packet (pkt, si, tos); 946 send_vpn_packet (pkt, si, tos);
862 else 947 else
863 { 948 {
864 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 949 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
865 950 post_inject_queue ();
866 establish_connection ();
867 } 951 }
868} 952}
869 953
870void 954void
871connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 955connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
872{ 956{
873 last_activity = NOW; 957 last_activity = ev_now ();
874 958
875 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",
876 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;
877 964
878 switch (pkt->typ ()) 965 switch (pkt->typ ())
879 { 966 {
880 case vpn_packet::PT_PING: 967 case vpn_packet::PT_PING:
881 // we send pings instead of auth packets after some retries, 968 // we send pings instead of auth packets after some retries,
… …
1016 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1103 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1017 conf->nodename, (const char *)rsi, 1104 conf->nodename, (const char *)rsi,
1018 p->prot_major, p->prot_minor); 1105 p->prot_major, p->prot_minor);
1019 1106
1020 if (::conf.script_node_up) 1107 if (::conf.script_node_up)
1021 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))
1022 slog (L_WARN, _("node-up command execution failed, continuing.")); 1112 slog (L_WARN, _("node-up command execution failed, continuing."));
1113 }
1023 1114
1024 break; 1115 break;
1025 } 1116 }
1026 else 1117 else
1027 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"),
… …
1087 if (p->id > 0 && p->id <= vpn->conns.size ()) 1178 if (p->id > 0 && p->id <= vpn->conns.size ())
1088 { 1179 {
1089 connection *c = vpn->conns[p->id - 1]; 1180 connection *c = vpn->conns[p->id - 1];
1090 conf->protocols = p->protocols; 1181 conf->protocols = p->protocols;
1091 1182
1092 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n", 1183 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1093 conf->id, p->id, c->ictx && c->octx); 1184 conf->id, p->id, c->ictx && c->octx);
1094 1185
1095 if (c->ictx && c->octx) 1186 if (c->ictx && c->octx)
1096 { 1187 {
1097 // send connect_info packets to both sides, in case one is 1188 // send connect_info packets to both sides, in case one is
… …
1143 send_reset (rsi); 1234 send_reset (rsi);
1144 break; 1235 break;
1145 } 1236 }
1146} 1237}
1147 1238
1148void connection::keepalive_cb (time_watcher &w) 1239inline void
1240connection::keepalive_cb (ev::timer &w, int revents)
1149{ 1241{
1150 if (NOW >= last_activity + ::conf.keepalive + 30) 1242 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1151 { 1243 {
1152 reset_connection (); 1244 reset_connection ();
1153 establish_connection (); 1245 establish_connection ();
1154 } 1246 }
1155 else if (NOW < last_activity + ::conf.keepalive) 1247 else if (ev_now () < last_activity + ::conf.keepalive)
1156 w.start (last_activity + ::conf.keepalive); 1248 w.start (last_activity + ::conf.keepalive - ev::now ());
1157 else if (conf->connectmode != conf_node::C_ONDEMAND 1249 else if (conf->connectmode != conf_node::C_ONDEMAND
1158 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1250 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1159 { 1251 {
1160 send_ping (si); 1252 send_ping (si);
1161 w.start (NOW + 5); 1253 w.start (5);
1162 } 1254 }
1163 else if (NOW < last_activity + ::conf.keepalive + 10) 1255 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1164 // hold ondemand connections implicitly a few seconds longer 1256 // hold ondemand connections implicitly a few seconds longer
1165 // should delete octx, though, or something like that ;) 1257 // should delete octx, though, or something like that ;)
1166 w.start (last_activity + ::conf.keepalive + 10); 1258 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1167 else 1259 else
1168 reset_connection (); 1260 reset_connection ();
1169} 1261}
1170 1262
1171void connection::send_connect_request (int id) 1263void connection::send_connect_request (int id)
… …
1198 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1290 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1199 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1291 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1200 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1292 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1201} 1293}
1202 1294
1295inline const char *
1203const char *connection::script_node_up () 1296connection::script_node_up ()
1204{ 1297{
1205 script_init_connect_env (); 1298 script_init_connect_env ();
1206 1299
1207 putenv ("STATE=up"); 1300 putenv ((char *)"STATE=up");
1208 1301
1209 char *filename; 1302 char *filename;
1210 asprintf (&filename, 1303 asprintf (&filename,
1211 "%s/%s", 1304 "%s/%s",
1212 confbase, 1305 confbase,
1213 ::conf.script_node_up ? ::conf.script_node_up : "node-up"); 1306 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1214 1307
1215 return filename; 1308 return filename;
1216} 1309}
1217 1310
1311inline const char *
1218const char *connection::script_node_down () 1312connection::script_node_down ()
1219{ 1313{
1220 script_init_connect_env (); 1314 script_init_connect_env ();
1221 1315
1222 putenv ("STATE=down"); 1316 putenv ((char *)"STATE=down");
1223 1317
1224 char *filename; 1318 char *filename;
1225 asprintf (&filename, 1319 asprintf (&filename,
1226 "%s/%s", 1320 "%s/%s",
1227 confbase, 1321 confbase,
… …
1229 1323
1230 return filename; 1324 return filename;
1231} 1325}
1232 1326
1233connection::connection (struct vpn *vpn, conf_node *conf) 1327connection::connection (struct vpn *vpn, conf_node *conf)
1234: vpn(vpn), conf(conf) 1328: 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 1329#if ENABLE_DNS
1239, dns (0) 1330 dns (0),
1240#endif 1331#endif
1332 data_queue(conf->max_ttl, conf->max_queue),
1333 vpn_queue(conf->max_ttl, conf->max_queue)
1241{ 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.;
1242 octx = ictx = 0; 1340 octx = ictx = 0;
1243 retry_cnt = 0;
1244 1341
1245 if (!conf->protocols) // make sure some protocol is enabled 1342 if (!conf->protocols) // make sure some protocol is enabled
1246 conf->protocols = PROT_UDPv4; 1343 conf->protocols = PROT_UDPv4;
1247 1344
1248 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
1249 reset_connection (); 1351 reset_connection ();
1250} 1352}
1251 1353
1252connection::~connection () 1354connection::~connection ()
1253{ 1355{

Diff Legend

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