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.50 by pcg, Fri Mar 18 01:53:05 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>
… …
84 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 92 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
85 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 93 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
86 EVP_MD_CTX_cleanup (&ctx); 94 EVP_MD_CTX_cleanup (&ctx);
87} 95}
88 96
89struct rsa_entry { 97struct rsa_entry
98{
90 tstamp expire; 99 tstamp expire;
91 rsaid id; 100 rsaid id;
92 rsachallenge chg; 101 rsachallenge chg;
93}; 102};
94 103
95struct rsa_cache : list<rsa_entry> 104struct rsa_cache : list<rsa_entry>
96{ 105{
97 void cleaner_cb (time_watcher &w); time_watcher cleaner; 106 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
98 107
99 bool find (const rsaid &id, rsachallenge &chg) 108 bool find (const rsaid &id, rsachallenge &chg)
100 { 109 {
101 for (iterator i = begin (); i != end (); ++i) 110 for (iterator i = begin (); i != end (); ++i)
102 { 111 {
103 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 112 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
104 { 113 {
105 memcpy (&chg, &i->chg, sizeof chg); 114 memcpy (&chg, &i->chg, sizeof chg);
106 115
107 erase (i); 116 erase (i);
108 return true; 117 return true;
109 } 118 }
110 } 119 }
111 120
112 if (cleaner.at < NOW) 121 if (!cleaner.is_active ())
113 cleaner.start (NOW + RSA_TTL); 122 cleaner.again ();
114 123
115 return false; 124 return false;
116 } 125 }
117 126
118 void gen (rsaid &id, rsachallenge &chg) 127 void gen (rsaid &id, rsachallenge &chg)
119 { 128 {
120 rsa_entry e; 129 rsa_entry e;
121 130
122 RAND_bytes ((unsigned char *)&id, sizeof id); 131 RAND_bytes ((unsigned char *)&id, sizeof id);
123 RAND_bytes ((unsigned char *)&chg, sizeof chg); 132 RAND_bytes ((unsigned char *)&chg, sizeof chg);
124 133
125 e.expire = NOW + RSA_TTL; 134 e.expire = ev_now () + RSA_TTL;
126 e.id = id; 135 e.id = id;
127 memcpy (&e.chg, &chg, sizeof chg); 136 memcpy (&e.chg, &chg, sizeof chg);
128 137
129 push_back (e); 138 push_back (e);
130 139
131 if (cleaner.at < NOW) 140 if (!cleaner.is_active ())
132 cleaner.start (NOW + RSA_TTL); 141 cleaner.again ();
133 } 142 }
134 143
135 rsa_cache () 144 rsa_cache ()
136 : cleaner (this, &rsa_cache::cleaner_cb) 145 {
137 { } 146 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
147 cleaner.set (RSA_TTL, RSA_TTL);
148 }
138 149
139} rsa_cache; 150} rsa_cache;
140 151
141void rsa_cache::cleaner_cb (time_watcher &w) 152void rsa_cache::cleaner_cb (ev::timer &w, int revents)
142{ 153{
143 if (!empty ()) 154 if (empty ())
155 w.stop ();
156 else
144 { 157 {
145 w.start (NOW + RSA_TTL);
146
147 for (iterator i = begin (); i != end (); ) 158 for (iterator i = begin (); i != end (); )
148 if (i->expire <= 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 < 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 = 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 + (NOW - ri.last); 294 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
250 295
251 ri.last = 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
… …
465#if ENABLE_COMPRESSION 510#if ENABLE_COMPRESSION
466 f |= FEATURE_COMPRESSION; 511 f |= FEATURE_COMPRESSION;
467#endif 512#endif
468#if ENABLE_ROHC 513#if ENABLE_ROHC
469 f |= FEATURE_ROHC; 514 f |= FEATURE_ROHC;
515#endif
516#if ENABLE_BRIDGING
517 f |= FEATURE_BRIDGING;
470#endif 518#endif
471 return f; 519 return f;
472 } 520 }
473}; 521};
474 522
… …
581///////////////////////////////////////////////////////////////////////////// 629/////////////////////////////////////////////////////////////////////////////
582 630
583void 631void
584connection::connection_established () 632connection::connection_established ()
585{ 633{
634 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
635
586 if (ictx && octx) 636 if (ictx && octx)
587 { 637 {
588 connectmode = conf->connectmode;
589
590 // make sure rekeying timeouts are slightly asymmetric 638 // make sure rekeying timeouts are slightly asymmetric
591 rekey.start (NOW + ::conf.rekey 639 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
592 + (conf->id > THISNODE->id ? 10 : 0)); 640 rekey.start (rekey_interval, rekey_interval);
593 keepalive.start (NOW + ::conf.keepalive); 641 keepalive.start (::conf.keepalive);
594 642
595 // send queued packets 643 // send queued packets
596 if (ictx && octx) 644 if (ictx && octx)
597 { 645 {
598 while (tap_packet *p = (tap_packet *)data_queue.get ()) 646 while (tap_packet *p = (tap_packet *)data_queue.get ())
599 { 647 {
600 send_data_packet (p); 648 if (p->len) send_data_packet (p);
601 delete p; 649 delete p;
602 } 650 }
603 651
604 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 652 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
605 { 653 {
606 send_vpn_packet (p, si, IPTOS_RELIABILITY); 654 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
607 delete p; 655 delete p;
608 } 656 }
609 } 657 }
610 } 658 }
611 else 659 else
612 { 660 {
613 retry_cnt = 0; 661 retry_cnt = 0;
614 establish_connection.start (NOW + 5); 662 establish_connection.start (5);
615 keepalive.stop (); 663 keepalive.stop ();
616 rekey.stop (); 664 rekey.stop ();
617 } 665 }
618} 666}
619 667
… …
624 672
625 // mask out protocols we cannot establish 673 // mask out protocols we cannot establish
626 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 674 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
627 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 675 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
628 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 }
629 685
630 si.set (conf, protocol); 686 si.set (conf, protocol);
631} 687}
632 688
633// ensure sockinfo is valid, forward if necessary 689// ensure sockinfo is valid, forward if necessary
… …
719} 775}
720 776
721void 777void
722connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 778connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
723{ 779{
724 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 780 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
725 conf->id, rid, (const char *)rsi); 781 conf->id, rid, (const char *)rsi);
726 782
727 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);
728 784
729 r->hmac_set (octx); 785 r->hmac_set (octx);
730 send_vpn_packet (r, si); 786 send_vpn_packet (r, si);
731 787
732 delete r; 788 delete r;
733} 789}
734 790
735void 791inline void
736connection::establish_connection_cb (time_watcher &w) 792connection::establish_connection_cb (ev::timer &w, int revents)
737{ 793{
738 if (!ictx 794 if (!ictx
739 && conf != THISNODE 795 && conf != THISNODE
740 && connectmode != conf_node::C_NEVER 796 && connectmode != conf_node::C_NEVER
741 && connectmode != conf_node::C_DISABLED 797 && connectmode != conf_node::C_DISABLED
742 && NOW > w.at) 798 && !w.is_active ())
743 { 799 {
744 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 }
745 807
746 double retry_int = double (retry_cnt & 3 808 last_establish_attempt = ev_now ();
809
810 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
747 ? (retry_cnt & 3) + 1 811 ? (retry_cnt & 3) + 1
748 : 1 << (retry_cnt >> 2)); 812 : 1 << (retry_cnt >> 2));
749 813
750 reset_si (); 814 reset_si ();
751 815
752 bool slow = si.prot & PROT_SLOW; 816 bool slow = si.prot & PROT_SLOW;
753 817
754 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);
755 vpn->send_connect_request (conf->id); 823 vpn->send_connect_request (conf->id);
824 }
756 else 825 else
757 { 826 {
827 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
828
758 const sockinfo &dsi = forward_si (si); 829 const sockinfo &dsi = forward_si (si);
759 830
760 slow = slow || (dsi.prot & PROT_SLOW); 831 slow = slow || (dsi.prot & PROT_SLOW);
761 832
762 if (dsi.valid () && auth_rate_limiter.can (dsi)) 833 if (dsi.valid () && auth_rate_limiter.can (dsi))
… …
766 else 837 else
767 send_ping (dsi, 0); 838 send_ping (dsi, 0);
768 } 839 }
769 } 840 }
770 841
771 retry_int *= slow ? 8. : 0.7; 842 retry_int *= slow ? 8. : 0.9;
772 843
773 if (retry_int < conf->max_retry) 844 if (retry_int < conf->max_retry)
774 retry_cnt++; 845 retry_cnt++;
775 else 846 else
776 retry_int = conf->max_retry; 847 retry_int = conf->max_retry;
777 848
778 w.start (NOW + retry_int); 849 w.start (retry_int);
779 } 850 }
780} 851}
781 852
782void 853void
783connection::reset_connection () 854connection::reset_connection ()
… …
786 { 857 {
787 slog (L_INFO, _("%s(%s): connection lost"), 858 slog (L_INFO, _("%s(%s): connection lost"),
788 conf->nodename, (const char *)si); 859 conf->nodename, (const char *)si);
789 860
790 if (::conf.script_node_down) 861 if (::conf.script_node_down)
791 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 }
792 } 868 }
793 869
794 delete ictx; ictx = 0; 870 delete ictx; ictx = 0;
795 delete octx; octx = 0; 871 delete octx; octx = 0;
796#if ENABLE_DNS 872#if ENABLE_DNS
… …
814 send_reset (si); 890 send_reset (si);
815 891
816 reset_connection (); 892 reset_connection ();
817} 893}
818 894
819void 895inline void
820connection::rekey_cb (time_watcher &w) 896connection::rekey_cb (ev::timer &w, int revents)
821{ 897{
822 reset_connection (); 898 reset_connection ();
823 establish_connection (); 899 establish_connection ();
824} 900}
825 901
… …
841 if (oseqno > MAX_SEQNO) 917 if (oseqno > MAX_SEQNO)
842 rekey (); 918 rekey ();
843} 919}
844 920
845void 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
846connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 932connection::inject_data_packet (tap_packet *pkt)
847{ 933{
848 if (ictx && octx) 934 if (ictx && octx)
849 send_data_packet (pkt); 935 send_data_packet (pkt);
850 else 936 else
851 { 937 {
852 if (!broadcast)//DDDD
853 data_queue.put (new tap_packet (*pkt)); 938 data_queue.put (new tap_packet (*pkt));
854 939 post_inject_queue ();
855 establish_connection ();
856 } 940 }
857} 941}
858 942
859void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 943void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
860{ 944{
861 if (ictx && octx) 945 if (ictx && octx)
862 send_vpn_packet (pkt, si, tos); 946 send_vpn_packet (pkt, si, tos);
863 else 947 else
864 { 948 {
865 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 949 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
866 950 post_inject_queue ();
867 establish_connection ();
868 } 951 }
869} 952}
870 953
871void 954void
872connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 955connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
873{ 956{
874 last_activity = NOW; 957 last_activity = ev_now ();
875 958
876 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",
877 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;
878 964
879 switch (pkt->typ ()) 965 switch (pkt->typ ())
880 { 966 {
881 case vpn_packet::PT_PING: 967 case vpn_packet::PT_PING:
882 // we send pings instead of auth packets after some retries, 968 // we send pings instead of auth packets after some retries,
… …
1017 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1103 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1018 conf->nodename, (const char *)rsi, 1104 conf->nodename, (const char *)rsi,
1019 p->prot_major, p->prot_minor); 1105 p->prot_major, p->prot_minor);
1020 1106
1021 if (::conf.script_node_up) 1107 if (::conf.script_node_up)
1022 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 }
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"),
… …
1061 { 1152 {
1062 vpn->tap->send (d); 1153 vpn->tap->send (d);
1063 1154
1064 if (si != rsi) 1155 if (si != rsi)
1065 { 1156 {
1066 // fast re-sync on connection changes, useful especially for tcp/ip 1157 // fast re-sync on source address changes, useful especially for tcp/ip
1067 si = rsi; 1158 si = rsi;
1068 1159
1069 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1160 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1070 conf->nodename, (const char *)si, (const char *)rsi); 1161 conf->nodename, (const char *)si, (const char *)rsi);
1071 } 1162 }
… …
1082 case vpn_packet::PT_CONNECT_REQ: 1173 case vpn_packet::PT_CONNECT_REQ:
1083 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1174 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1084 { 1175 {
1085 connect_req_packet *p = (connect_req_packet *) pkt; 1176 connect_req_packet *p = (connect_req_packet *) pkt;
1086 1177
1087 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 ())
1088 connection *c = vpn->conns[p->id - 1];
1089 conf->protocols = p->protocols;
1090
1091 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1092 conf->id, p->id, c->ictx && c->octx);
1093
1094 if (c->ictx && c->octx)
1095 { 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 {
1096 // send connect_info packets to both sides, in case one is 1188 // send connect_info packets to both sides, in case one is
1097 // behind a nat firewall (or both ;) 1189 // behind a nat firewall (or both ;)
1098 c->send_connect_info (conf->id, si, conf->protocols); 1190 c->send_connect_info (conf->id, si, conf->protocols);
1099 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 ();
1100 } 1195 }
1101 else 1196 else
1102 c->establish_connection (); 1197 slog (L_WARN,
1198 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1199 p->id);
1103 } 1200 }
1104 1201
1105 break; 1202 break;
1106 1203
1107 case vpn_packet::PT_CONNECT_INFO: 1204 case vpn_packet::PT_CONNECT_INFO:
1108 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1205 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1109 { 1206 {
1110 connect_info_packet *p = (connect_info_packet *)pkt; 1207 connect_info_packet *p = (connect_info_packet *)pkt;
1111 1208
1112 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 ())
1113 { 1210 {
1114 connection *c = vpn->conns[p->id - 1]; 1211 connection *c = vpn->conns[p->id - 1];
1115 1212
1116 c->conf->protocols = p->protocols; 1213 c->conf->protocols = p->protocols;
1117 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));
… …
1123 const sockinfo &dsi = forward_si (p->si); 1220 const sockinfo &dsi = forward_si (p->si);
1124 1221
1125 if (dsi.valid ()) 1222 if (dsi.valid ())
1126 c->send_auth_request (dsi, true); 1223 c->send_auth_request (dsi, true);
1127 } 1224 }
1225 else
1226 slog (L_WARN,
1227 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1228 p->id);
1128 } 1229 }
1129 1230
1130 break; 1231 break;
1131 1232
1132 default: 1233 default:
1133 send_reset (rsi); 1234 send_reset (rsi);
1134 break; 1235 break;
1135 } 1236 }
1136} 1237}
1137 1238
1138void connection::keepalive_cb (time_watcher &w) 1239inline void
1240connection::keepalive_cb (ev::timer &w, int revents)
1139{ 1241{
1140 if (NOW >= last_activity + ::conf.keepalive + 30) 1242 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1141 { 1243 {
1142 reset_connection (); 1244 reset_connection ();
1143 establish_connection (); 1245 establish_connection ();
1144 } 1246 }
1145 else if (NOW < last_activity + ::conf.keepalive) 1247 else if (ev_now () < last_activity + ::conf.keepalive)
1146 w.start (last_activity + ::conf.keepalive); 1248 w.start (last_activity + ::conf.keepalive - ev::now ());
1147 else if (conf->connectmode != conf_node::C_ONDEMAND 1249 else if (conf->connectmode != conf_node::C_ONDEMAND
1148 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1250 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1149 { 1251 {
1150 send_ping (si); 1252 send_ping (si);
1151 w.start (NOW + 5); 1253 w.start (5);
1152 } 1254 }
1153 else if (NOW < last_activity + ::conf.keepalive + 10) 1255 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1154 // hold ondemand connections implicitly a few seconds longer 1256 // hold ondemand connections implicitly a few seconds longer
1155 // should delete octx, though, or something like that ;) 1257 // should delete octx, though, or something like that ;)
1156 w.start (last_activity + ::conf.keepalive + 10); 1258 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1157 else 1259 else
1158 reset_connection (); 1260 reset_connection ();
1159} 1261}
1160 1262
1161void connection::send_connect_request (int id) 1263void connection::send_connect_request (int id)
… …
1167 send_vpn_packet (p, si); 1269 send_vpn_packet (p, si);
1168 1270
1169 delete p; 1271 delete p;
1170} 1272}
1171 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
1172void connection::script_node () 1284void connection::script_init_connect_env ()
1173{ 1285{
1174 vpn->script_if_up (); 1286 vpn->script_init_env ();
1175 1287
1176 char *env; 1288 char *env;
1177 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1289 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1178 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1290 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1179 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1291 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1180 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1292 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1181} 1293}
1182 1294
1295inline const char *
1183const char *connection::script_node_up () 1296connection::script_node_up ()
1184{ 1297{
1185 script_node (); 1298 script_init_connect_env ();
1186 1299
1187 putenv ("STATE=up"); 1300 putenv ((char *)"STATE=up");
1188 1301
1302 char *filename;
1303 asprintf (&filename,
1304 "%s/%s",
1305 confbase,
1189 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1306 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1190}
1191 1307
1308 return filename;
1309}
1310
1311inline const char *
1192const char *connection::script_node_down () 1312connection::script_node_down ()
1193{ 1313{
1194 script_node (); 1314 script_init_connect_env ();
1195 1315
1196 putenv ("STATE=down"); 1316 putenv ((char *)"STATE=down");
1197 1317
1198 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;
1199} 1325}
1200 1326
1201connection::connection (struct vpn *vpn, conf_node *conf) 1327connection::connection (struct vpn *vpn, conf_node *conf)
1202: vpn(vpn), conf(conf) 1328: vpn(vpn), conf(conf),
1203, rekey (this, &connection::rekey_cb)
1204, keepalive (this, &connection::keepalive_cb)
1205, establish_connection (this, &connection::establish_connection_cb)
1206#if ENABLE_DNS 1329#if ENABLE_DNS
1207, dns (0) 1330 dns (0),
1208#endif 1331#endif
1332 data_queue(conf->max_ttl, conf->max_queue),
1333 vpn_queue(conf->max_ttl, conf->max_queue)
1209{ 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.;
1210 octx = ictx = 0; 1340 octx = ictx = 0;
1211 retry_cnt = 0;
1212 1341
1213 if (!conf->protocols) // make sure some protocol is enabled 1342 if (!conf->protocols) // make sure some protocol is enabled
1214 conf->protocols = PROT_UDPv4; 1343 conf->protocols = PROT_UDPv4;
1215 1344
1216 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
1217 reset_connection (); 1351 reset_connection ();
1218} 1352}
1219 1353
1220connection::~connection () 1354connection::~connection ()
1221{ 1355{

Diff Legend

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