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.49 by pcg, Sat Mar 12 18:10:40 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. 59 Temple Place, Suite 330, Boston, MA 02111-1307 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
24#include <cassert>
25 33
26#include <list> 34#include <list>
27 35
28#include <openssl/rand.h> 36#include <openssl/rand.h>
29#include <openssl/evp.h> 37#include <openssl/evp.h>
30#include <openssl/rsa.h> 38#include <openssl/rsa.h>
31#include <openssl/err.h> 39#include <openssl/err.h>
32
33#include "gettext.h"
34 40
35#include "conf.h" 41#include "conf.h"
36#include "slog.h" 42#include "slog.h"
37#include "device.h" 43#include "device.h"
38#include "vpn.h" 44#include "vpn.h"
… …
86 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 92 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
87 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 93 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
88 EVP_MD_CTX_cleanup (&ctx); 94 EVP_MD_CTX_cleanup (&ctx);
89} 95}
90 96
91struct rsa_entry { 97struct rsa_entry
98{
92 tstamp expire; 99 tstamp expire;
93 rsaid id; 100 rsaid id;
94 rsachallenge chg; 101 rsachallenge chg;
95}; 102};
96 103
97struct rsa_cache : list<rsa_entry> 104struct rsa_cache : list<rsa_entry>
98{ 105{
99 void cleaner_cb (time_watcher &w); time_watcher cleaner; 106 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
100 107
101 bool find (const rsaid &id, rsachallenge &chg) 108 bool find (const rsaid &id, rsachallenge &chg)
102 { 109 {
103 for (iterator i = begin (); i != end (); ++i) 110 for (iterator i = begin (); i != end (); ++i)
104 { 111 {
105 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 112 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
106 { 113 {
107 memcpy (&chg, &i->chg, sizeof chg); 114 memcpy (&chg, &i->chg, sizeof chg);
108 115
109 erase (i); 116 erase (i);
110 return true; 117 return true;
111 } 118 }
112 } 119 }
113 120
114 if (cleaner.at < NOW) 121 if (!cleaner.is_active ())
115 cleaner.start (NOW + RSA_TTL); 122 cleaner.again ();
116 123
117 return false; 124 return false;
118 } 125 }
119 126
120 void gen (rsaid &id, rsachallenge &chg) 127 void gen (rsaid &id, rsachallenge &chg)
121 { 128 {
122 rsa_entry e; 129 rsa_entry e;
123 130
124 RAND_bytes ((unsigned char *)&id, sizeof id); 131 RAND_bytes ((unsigned char *)&id, sizeof id);
125 RAND_bytes ((unsigned char *)&chg, sizeof chg); 132 RAND_bytes ((unsigned char *)&chg, sizeof chg);
126 133
127 e.expire = NOW + RSA_TTL; 134 e.expire = ev_now () + RSA_TTL;
128 e.id = id; 135 e.id = id;
129 memcpy (&e.chg, &chg, sizeof chg); 136 memcpy (&e.chg, &chg, sizeof chg);
130 137
131 push_back (e); 138 push_back (e);
132 139
133 if (cleaner.at < NOW) 140 if (!cleaner.is_active ())
134 cleaner.start (NOW + RSA_TTL); 141 cleaner.again ();
135 } 142 }
136 143
137 rsa_cache () 144 rsa_cache ()
138 : cleaner (this, &rsa_cache::cleaner_cb) 145 {
139 { } 146 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
147 cleaner.set (RSA_TTL, RSA_TTL);
148 }
140 149
141} rsa_cache; 150} rsa_cache;
142 151
143void rsa_cache::cleaner_cb (time_watcher &w) 152void rsa_cache::cleaner_cb (ev::timer &w, int revents)
144{ 153{
145 if (!empty ()) 154 if (empty ())
155 w.stop ();
156 else
146 { 157 {
147 w.start (NOW + RSA_TTL);
148
149 for (iterator i = begin (); i != end (); ) 158 for (iterator i = begin (); i != end (); )
150 if (i->expire <= NOW) 159 if (i->expire <= ev_now ())
151 i = erase (i); 160 i = erase (i);
152 else 161 else
153 ++i; 162 ++i;
154 } 163 }
155} 164}
156 165
157////////////////////////////////////////////////////////////////////////////// 166//////////////////////////////////////////////////////////////////////////////
158 167
159void 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)
160{ 170{
161 if (queue[i]) 171 queue = new pkt [max_queue];
162 {
163 delete queue[i];
164 j = (j + 1) % QUEUEDEPTH;
165 }
166 172
167 queue[i] = p;
168
169 i = (i + 1) % QUEUEDEPTH;
170}
171
172net_packet *pkt_queue::get ()
173{
174 net_packet *p = queue[j];
175
176 if (p)
177 {
178 queue[j] = 0;
179 j = (j + 1) % QUEUEDEPTH;
180 }
181
182 return p;
183}
184
185pkt_queue::pkt_queue ()
186{
187 memset (queue, 0, sizeof (queue));
188 i = 0; 173 i = 0;
189 j = 0; 174 j = 0;
175
176 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
190} 177}
191 178
192pkt_queue::~pkt_queue () 179pkt_queue::~pkt_queue ()
193{ 180{
194 for (i = QUEUEDEPTH; --i > 0; ) 181 while (net_packet *p = get ())
182 delete p;
183
195 delete queue[i]; 184 delete [] queue;
196} 185}
197 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
198struct net_rateinfo { 240struct net_rateinfo
241{
199 u32 host; 242 u32 host;
200 double pcnt, diff; 243 double pcnt, diff;
201 tstamp last; 244 tstamp last;
202}; 245};
203 246
… …
222 iterator i; 265 iterator i;
223 266
224 for (i = begin (); i != end (); ) 267 for (i = begin (); i != end (); )
225 if (i->host == host) 268 if (i->host == host)
226 break; 269 break;
227 else if (i->last < NOW - NRL_EXPIRE) 270 else if (i->last < ev_now () - NRL_EXPIRE)
228 i = erase (i); 271 i = erase (i);
229 else 272 else
230 i++; 273 i++;
231 274
232 if (i == end ()) 275 if (i == end ())
… …
234 net_rateinfo ri; 277 net_rateinfo ri;
235 278
236 ri.host = host; 279 ri.host = host;
237 ri.pcnt = 1.; 280 ri.pcnt = 1.;
238 ri.diff = NRL_MAXDIF; 281 ri.diff = NRL_MAXDIF;
239 ri.last = NOW; 282 ri.last = ev_now ();
240 283
241 push_front (ri); 284 push_front (ri);
242 285
243 return true; 286 return true;
244 } 287 }
… …
246 { 289 {
247 net_rateinfo ri (*i); 290 net_rateinfo ri (*i);
248 erase (i); 291 erase (i);
249 292
250 ri.pcnt = ri.pcnt * NRL_ALPHA; 293 ri.pcnt = ri.pcnt * NRL_ALPHA;
251 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last); 294 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
252 295
253 ri.last = NOW; 296 ri.last = ev_now ();
254 297
255 double dif = ri.diff / ri.pcnt; 298 double dif = ri.diff / ri.pcnt;
256 299
257 bool send = dif > NRL_CUTOFF; 300 bool send = dif > NRL_CUTOFF;
258 301
… …
467#if ENABLE_COMPRESSION 510#if ENABLE_COMPRESSION
468 f |= FEATURE_COMPRESSION; 511 f |= FEATURE_COMPRESSION;
469#endif 512#endif
470#if ENABLE_ROHC 513#if ENABLE_ROHC
471 f |= FEATURE_ROHC; 514 f |= FEATURE_ROHC;
515#endif
516#if ENABLE_BRIDGING
517 f |= FEATURE_BRIDGING;
472#endif 518#endif
473 return f; 519 return f;
474 } 520 }
475}; 521};
476 522
… …
583///////////////////////////////////////////////////////////////////////////// 629/////////////////////////////////////////////////////////////////////////////
584 630
585void 631void
586connection::connection_established () 632connection::connection_established ()
587{ 633{
634 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
635
588 if (ictx && octx) 636 if (ictx && octx)
589 { 637 {
590 connectmode = conf->connectmode;
591
592 // make sure rekeying timeouts are slightly asymmetric 638 // make sure rekeying timeouts are slightly asymmetric
593 rekey.start (NOW + ::conf.rekey 639 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
594 + (conf->id > THISNODE->id ? 10 : 0)); 640 rekey.start (rekey_interval, rekey_interval);
595 keepalive.start (NOW + ::conf.keepalive); 641 keepalive.start (::conf.keepalive);
596 642
597 // send queued packets 643 // send queued packets
598 if (ictx && octx) 644 if (ictx && octx)
599 { 645 {
600 while (tap_packet *p = (tap_packet *)data_queue.get ()) 646 while (tap_packet *p = (tap_packet *)data_queue.get ())
601 { 647 {
602 send_data_packet (p); 648 if (p->len) send_data_packet (p);
603 delete p; 649 delete p;
604 } 650 }
605 651
606 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 652 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
607 { 653 {
608 send_vpn_packet (p, si, IPTOS_RELIABILITY); 654 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
609 delete p; 655 delete p;
610 } 656 }
611 } 657 }
612 } 658 }
613 else 659 else
614 { 660 {
615 retry_cnt = 0; 661 retry_cnt = 0;
616 establish_connection.start (NOW + 5); 662 establish_connection.start (5);
617 keepalive.stop (); 663 keepalive.stop ();
618 rekey.stop (); 664 rekey.stop ();
619 } 665 }
620} 666}
621 667
… …
626 672
627 // mask out protocols we cannot establish 673 // mask out protocols we cannot establish
628 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 674 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
629 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 675 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
630 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 }
631 685
632 si.set (conf, protocol); 686 si.set (conf, protocol);
633} 687}
634 688
635// ensure sockinfo is valid, forward if necessary 689// ensure sockinfo is valid, forward if necessary
… …
721} 775}
722 776
723void 777void
724connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 778connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
725{ 779{
726 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 780 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
727 conf->id, rid, (const char *)rsi); 781 conf->id, rid, (const char *)rsi);
728 782
729 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);
730 784
731 r->hmac_set (octx); 785 r->hmac_set (octx);
732 send_vpn_packet (r, si); 786 send_vpn_packet (r, si);
733 787
734 delete r; 788 delete r;
735} 789}
736 790
737void 791inline void
738connection::establish_connection_cb (time_watcher &w) 792connection::establish_connection_cb (ev::timer &w, int revents)
739{ 793{
740 if (!ictx 794 if (!ictx
741 && conf != THISNODE 795 && conf != THISNODE
742 && connectmode != conf_node::C_NEVER 796 && connectmode != conf_node::C_NEVER
743 && connectmode != conf_node::C_DISABLED 797 && connectmode != conf_node::C_DISABLED
744 && NOW > w.at) 798 && !w.is_active ())
745 { 799 {
746 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 }
747 807
748 double retry_int = double (retry_cnt & 3 808 last_establish_attempt = ev_now ();
809
810 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
749 ? (retry_cnt & 3) + 1 811 ? (retry_cnt & 3) + 1
750 : 1 << (retry_cnt >> 2)); 812 : 1 << (retry_cnt >> 2));
751 813
752 reset_si (); 814 reset_si ();
753 815
754 bool slow = si.prot & PROT_SLOW; 816 bool slow = si.prot & PROT_SLOW;
755 817
756 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);
757 vpn->send_connect_request (conf->id); 823 vpn->send_connect_request (conf->id);
824 }
758 else 825 else
759 { 826 {
827 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
828
760 const sockinfo &dsi = forward_si (si); 829 const sockinfo &dsi = forward_si (si);
761 830
762 slow = slow || (dsi.prot & PROT_SLOW); 831 slow = slow || (dsi.prot & PROT_SLOW);
763 832
764 if (dsi.valid () && auth_rate_limiter.can (dsi)) 833 if (dsi.valid () && auth_rate_limiter.can (dsi))
… …
768 else 837 else
769 send_ping (dsi, 0); 838 send_ping (dsi, 0);
770 } 839 }
771 } 840 }
772 841
773 retry_int *= slow ? 8. : 0.7; 842 retry_int *= slow ? 8. : 0.9;
774 843
775 if (retry_int < conf->max_retry) 844 if (retry_int < conf->max_retry)
776 retry_cnt++; 845 retry_cnt++;
777 else 846 else
778 retry_int = conf->max_retry; 847 retry_int = conf->max_retry;
779 848
780 w.start (NOW + retry_int); 849 w.start (retry_int);
781 } 850 }
782} 851}
783 852
784void 853void
785connection::reset_connection () 854connection::reset_connection ()
… …
788 { 857 {
789 slog (L_INFO, _("%s(%s): connection lost"), 858 slog (L_INFO, _("%s(%s): connection lost"),
790 conf->nodename, (const char *)si); 859 conf->nodename, (const char *)si);
791 860
792 if (::conf.script_node_down) 861 if (::conf.script_node_down)
793 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))
866 slog (L_WARN, _("node-down command execution failed, continuing."));
867 }
794 } 868 }
795 869
796 delete ictx; ictx = 0; 870 delete ictx; ictx = 0;
797 delete octx; octx = 0; 871 delete octx; octx = 0;
798#if ENABLE_DNS 872#if ENABLE_DNS
… …
816 send_reset (si); 890 send_reset (si);
817 891
818 reset_connection (); 892 reset_connection ();
819} 893}
820 894
821void 895inline void
822connection::rekey_cb (time_watcher &w) 896connection::rekey_cb (ev::timer &w, int revents)
823{ 897{
824 reset_connection (); 898 reset_connection ();
825 establish_connection (); 899 establish_connection ();
826} 900}
827 901
… …
843 if (oseqno > MAX_SEQNO) 917 if (oseqno > MAX_SEQNO)
844 rekey (); 918 rekey ();
845} 919}
846 920
847void 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
848connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 932connection::inject_data_packet (tap_packet *pkt)
849{ 933{
850 if (ictx && octx) 934 if (ictx && octx)
851 send_data_packet (pkt); 935 send_data_packet (pkt);
852 else 936 else
853 { 937 {
854 if (!broadcast)//DDDD
855 data_queue.put (new tap_packet (*pkt)); 938 data_queue.put (new tap_packet (*pkt));
856 939 post_inject_queue ();
857 establish_connection ();
858 } 940 }
859} 941}
860 942
861void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 943void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
862{ 944{
863 if (ictx && octx) 945 if (ictx && octx)
864 send_vpn_packet (pkt, si, tos); 946 send_vpn_packet (pkt, si, tos);
865 else 947 else
866 { 948 {
867 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 949 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
868 950 post_inject_queue ();
869 establish_connection ();
870 } 951 }
871} 952}
872 953
873void 954void
874connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 955connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
875{ 956{
876 last_activity = NOW; 957 last_activity = ev_now ();
877 958
878 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",
879 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;
880 964
881 switch (pkt->typ ()) 965 switch (pkt->typ ())
882 { 966 {
883 case vpn_packet::PT_PING: 967 case vpn_packet::PT_PING:
884 // we send pings instead of auth packets after some retries, 968 // we send pings instead of auth packets after some retries,
… …
1019 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1103 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1020 conf->nodename, (const char *)rsi, 1104 conf->nodename, (const char *)rsi,
1021 p->prot_major, p->prot_minor); 1105 p->prot_major, p->prot_minor);
1022 1106
1023 if (::conf.script_node_up) 1107 if (::conf.script_node_up)
1024 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))
1112 slog (L_WARN, _("node-up command execution failed, continuing."));
1113 }
1025 1114
1026 break; 1115 break;
1027 } 1116 }
1028 else 1117 else
1029 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"),
… …
1063 { 1152 {
1064 vpn->tap->send (d); 1153 vpn->tap->send (d);
1065 1154
1066 if (si != rsi) 1155 if (si != rsi)
1067 { 1156 {
1068 // fast re-sync on connection changes, useful especially for tcp/ip 1157 // fast re-sync on source address changes, useful especially for tcp/ip
1069 si = rsi; 1158 si = rsi;
1070 1159
1071 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1160 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1072 conf->nodename, (const char *)si, (const char *)rsi); 1161 conf->nodename, (const char *)si, (const char *)rsi);
1073 } 1162 }
… …
1084 case vpn_packet::PT_CONNECT_REQ: 1173 case vpn_packet::PT_CONNECT_REQ:
1085 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1174 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1086 { 1175 {
1087 connect_req_packet *p = (connect_req_packet *) pkt; 1176 connect_req_packet *p = (connect_req_packet *) pkt;
1088 1177
1089 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1178 if (p->id > 0 && p->id <= vpn->conns.size ())
1090 connection *c = vpn->conns[p->id - 1];
1091 conf->protocols = p->protocols;
1092
1093 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1094 conf->id, p->id, c->ictx && c->octx);
1095
1096 if (c->ictx && c->octx)
1097 { 1179 {
1180 connection *c = vpn->conns[p->id - 1];
1181 conf->protocols = p->protocols;
1182
1183 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1184 conf->id, p->id, c->ictx && c->octx);
1185
1186 if (c->ictx && c->octx)
1187 {
1098 // send connect_info packets to both sides, in case one is 1188 // send connect_info packets to both sides, in case one is
1099 // behind a nat firewall (or both ;) 1189 // behind a nat firewall (or both ;)
1100 c->send_connect_info (conf->id, si, conf->protocols); 1190 c->send_connect_info (conf->id, si, conf->protocols);
1101 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1191 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1192 }
1193 else
1194 c->establish_connection ();
1102 } 1195 }
1103 else 1196 else
1104 c->establish_connection (); 1197 slog (L_WARN,
1198 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1199 p->id);
1105 } 1200 }
1106 1201
1107 break; 1202 break;
1108 1203
1109 case vpn_packet::PT_CONNECT_INFO: 1204 case vpn_packet::PT_CONNECT_INFO:
1110 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1205 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1111 { 1206 {
1112 connect_info_packet *p = (connect_info_packet *)pkt; 1207 connect_info_packet *p = (connect_info_packet *)pkt;
1113 1208
1114 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything 1209 if (p->id > 0 && p->id <= vpn->conns.size ())
1115 { 1210 {
1116 connection *c = vpn->conns[p->id - 1]; 1211 connection *c = vpn->conns[p->id - 1];
1117 1212
1118 c->conf->protocols = p->protocols; 1213 c->conf->protocols = p->protocols;
1119 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1214 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
… …
1125 const sockinfo &dsi = forward_si (p->si); 1220 const sockinfo &dsi = forward_si (p->si);
1126 1221
1127 if (dsi.valid ()) 1222 if (dsi.valid ())
1128 c->send_auth_request (dsi, true); 1223 c->send_auth_request (dsi, true);
1129 } 1224 }
1225 else
1226 slog (L_WARN,
1227 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1228 p->id);
1130 } 1229 }
1131 1230
1132 break; 1231 break;
1133 1232
1134 default: 1233 default:
1135 send_reset (rsi); 1234 send_reset (rsi);
1136 break; 1235 break;
1137 } 1236 }
1138} 1237}
1139 1238
1140void connection::keepalive_cb (time_watcher &w) 1239inline void
1240connection::keepalive_cb (ev::timer &w, int revents)
1141{ 1241{
1142 if (NOW >= last_activity + ::conf.keepalive + 30) 1242 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1143 { 1243 {
1144 reset_connection (); 1244 reset_connection ();
1145 establish_connection (); 1245 establish_connection ();
1146 } 1246 }
1147 else if (NOW < last_activity + ::conf.keepalive) 1247 else if (ev_now () < last_activity + ::conf.keepalive)
1148 w.start (last_activity + ::conf.keepalive); 1248 w.start (last_activity + ::conf.keepalive - ev::now ());
1149 else if (conf->connectmode != conf_node::C_ONDEMAND 1249 else if (conf->connectmode != conf_node::C_ONDEMAND
1150 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1250 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1151 { 1251 {
1152 send_ping (si); 1252 send_ping (si);
1153 w.start (NOW + 5); 1253 w.start (5);
1154 } 1254 }
1155 else if (NOW < last_activity + ::conf.keepalive + 10) 1255 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1156 // hold ondemand connections implicitly a few seconds longer 1256 // hold ondemand connections implicitly a few seconds longer
1157 // should delete octx, though, or something like that ;) 1257 // should delete octx, though, or something like that ;)
1158 w.start (last_activity + ::conf.keepalive + 10); 1258 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1159 else 1259 else
1160 reset_connection (); 1260 reset_connection ();
1161} 1261}
1162 1262
1163void connection::send_connect_request (int id) 1263void connection::send_connect_request (int id)
… …
1169 send_vpn_packet (p, si); 1269 send_vpn_packet (p, si);
1170 1270
1171 delete p; 1271 delete p;
1172} 1272}
1173 1273
1274void connection::script_init_env (const char *ext)
1275{
1276 char *env;
1277 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1278 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1279 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1280 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1281 conf->id & 0xff); putenv (env);
1282}
1283
1174void connection::script_node () 1284void connection::script_init_connect_env ()
1175{ 1285{
1176 vpn->script_if_up (); 1286 vpn->script_init_env ();
1177 1287
1178 char *env; 1288 char *env;
1179 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1289 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1180 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1290 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1181 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1291 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1182 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1292 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1183} 1293}
1184 1294
1295inline const char *
1185const char *connection::script_node_up () 1296connection::script_node_up ()
1186{ 1297{
1187 script_node (); 1298 script_init_connect_env ();
1188 1299
1189 putenv ("STATE=up"); 1300 putenv ((char *)"STATE=up");
1190 1301
1302 char *filename;
1303 asprintf (&filename,
1304 "%s/%s",
1305 confbase,
1191 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1306 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1192}
1193 1307
1308 return filename;
1309}
1310
1311inline const char *
1194const char *connection::script_node_down () 1312connection::script_node_down ()
1195{ 1313{
1196 script_node (); 1314 script_init_connect_env ();
1197 1315
1198 putenv ("STATE=down"); 1316 putenv ((char *)"STATE=down");
1199 1317
1200 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1318 char *filename;
1319 asprintf (&filename,
1320 "%s/%s",
1321 confbase,
1322 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1323
1324 return filename;
1201} 1325}
1202 1326
1203connection::connection (struct vpn *vpn, conf_node *conf) 1327connection::connection (struct vpn *vpn, conf_node *conf)
1204: vpn(vpn), conf(conf) 1328: vpn(vpn), conf(conf),
1205, rekey (this, &connection::rekey_cb)
1206, keepalive (this, &connection::keepalive_cb)
1207, establish_connection (this, &connection::establish_connection_cb)
1208#if ENABLE_DNS 1329#if ENABLE_DNS
1209, dns (0) 1330 dns (0),
1210#endif 1331#endif
1332 data_queue(conf->max_ttl, conf->max_queue),
1333 vpn_queue(conf->max_ttl, conf->max_queue)
1211{ 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.;
1212 octx = ictx = 0; 1340 octx = ictx = 0;
1213 retry_cnt = 0;
1214 1341
1215 if (!conf->protocols) // make sure some protocol is enabled 1342 if (!conf->protocols) // make sure some protocol is enabled
1216 conf->protocols = PROT_UDPv4; 1343 conf->protocols = PROT_UDPv4;
1217 1344
1218 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
1219 reset_connection (); 1351 reset_connection ();
1220} 1352}
1221 1353
1222connection::~connection () 1354connection::~connection ()
1223{ 1355{

Diff Legend

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