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.46 by pcg, Sat Mar 5 19:13:15 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
… …
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;
472#endif 515#endif
516#if ENABLE_BRIDGING
517 f |= FEATURE_BRIDGING;
518#endif
473 return f; 519 return f;
474 } 520 }
475}; 521};
476 522
477void config_packet::setup (ptype type, int dst) 523void config_packet::setup (ptype type, int dst)
478{ 524{
479 prot_major = PROTOCOL_MAJOR; 525 prot_major = PROTOCOL_MAJOR;
480 prot_minor = PROTOCOL_MINOR; 526 prot_minor = PROTOCOL_MINOR;
481 randsize = RAND_SIZE; 527 randsize = RAND_SIZE;
482 hmaclen = HMACLENGTH; 528 hmaclen = HMACLENGTH;
483 flags = ENABLE_COMPRESSION ? 0x81 : 0x80; 529 flags = 0;
484 challengelen = sizeof (rsachallenge); 530 challengelen = sizeof (rsachallenge);
485 features = get_features (); 531 features = get_features ();
486 532
487 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 533 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
488 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 534 digest_nid = htonl (EVP_MD_type (RSA_HASH));
… …
498 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 544 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
499 else if (randsize != RAND_SIZE) 545 else if (randsize != RAND_SIZE)
500 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 546 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
501 else if (hmaclen != HMACLENGTH) 547 else if (hmaclen != HMACLENGTH)
502 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH); 548 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
503#if 0 // this implementation should handle all flag settings
504 else if (flags != curflags ())
505 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
506#endif
507 else if (challengelen != sizeof (rsachallenge)) 549 else if (challengelen != sizeof (rsachallenge))
508 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 550 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
509 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 551 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
510 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 552 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
511 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 553 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
587///////////////////////////////////////////////////////////////////////////// 629/////////////////////////////////////////////////////////////////////////////
588 630
589void 631void
590connection::connection_established () 632connection::connection_established ()
591{ 633{
634 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
635
592 if (ictx && octx) 636 if (ictx && octx)
593 { 637 {
594 connectmode = conf->connectmode;
595
596 // make sure rekeying timeouts are slightly asymmetric 638 // make sure rekeying timeouts are slightly asymmetric
597 rekey.start (NOW + ::conf.rekey 639 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
598 + (conf->id > THISNODE->id ? 10 : 0)); 640 rekey.start (rekey_interval, rekey_interval);
599 keepalive.start (NOW + ::conf.keepalive); 641 keepalive.start (::conf.keepalive);
600 642
601 // send queued packets 643 // send queued packets
602 if (ictx && octx) 644 if (ictx && octx)
603 { 645 {
604 while (tap_packet *p = (tap_packet *)data_queue.get ()) 646 while (tap_packet *p = (tap_packet *)data_queue.get ())
605 { 647 {
606 send_data_packet (p); 648 if (p->len) send_data_packet (p);
607 delete p; 649 delete p;
608 } 650 }
609 651
610 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 652 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
611 { 653 {
612 send_vpn_packet (p, si, IPTOS_RELIABILITY); 654 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
613 delete p; 655 delete p;
614 } 656 }
615 } 657 }
616 } 658 }
617 else 659 else
618 { 660 {
619 retry_cnt = 0; 661 retry_cnt = 0;
620 establish_connection.start (NOW + 5); 662 establish_connection.start (5);
621 keepalive.stop (); 663 keepalive.stop ();
622 rekey.stop (); 664 rekey.stop ();
623 } 665 }
624} 666}
625 667
… …
630 672
631 // mask out protocols we cannot establish 673 // mask out protocols we cannot establish
632 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 674 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
633 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 675 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
634 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 }
635 685
636 si.set (conf, protocol); 686 si.set (conf, protocol);
637} 687}
638 688
639// ensure sockinfo is valid, forward if necessary 689// ensure sockinfo is valid, forward if necessary
… …
725} 775}
726 776
727void 777void
728connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 778connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
729{ 779{
730 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 780 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
731 conf->id, rid, (const char *)rsi); 781 conf->id, rid, (const char *)rsi);
732 782
733 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);
734 784
735 r->hmac_set (octx); 785 r->hmac_set (octx);
736 send_vpn_packet (r, si); 786 send_vpn_packet (r, si);
737 787
738 delete r; 788 delete r;
739} 789}
740 790
741void 791inline void
742connection::establish_connection_cb (time_watcher &w) 792connection::establish_connection_cb (ev::timer &w, int revents)
743{ 793{
744 if (!ictx 794 if (!ictx
745 && conf != THISNODE 795 && conf != THISNODE
746 && connectmode != conf_node::C_NEVER 796 && connectmode != conf_node::C_NEVER
747 && connectmode != conf_node::C_DISABLED 797 && connectmode != conf_node::C_DISABLED
748 && NOW > w.at) 798 && !w.is_active ())
749 { 799 {
750 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 800 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
751 801 // and stop trying. should probably be handled by a per-connection expire handler.
752 if (retry_int < conf->max_retry) 802 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
803 {
804 reset_connection ();
753 retry_cnt++; 805 return;
754 else 806 }
755 retry_int = conf->max_retry;
756 807
757 w.start (NOW + retry_int); 808 last_establish_attempt = ev_now ();
809
810 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
811 ? (retry_cnt & 3) + 1
812 : 1 << (retry_cnt >> 2));
758 813
759 reset_si (); 814 reset_si ();
760 815
816 bool slow = si.prot & PROT_SLOW;
817
761 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);
762 vpn->send_connect_request (conf->id); 823 vpn->send_connect_request (conf->id);
824 }
763 else 825 else
764 { 826 {
827 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
828
765 const sockinfo &dsi = forward_si (si); 829 const sockinfo &dsi = forward_si (si);
830
831 slow = slow || (dsi.prot & PROT_SLOW);
766 832
767 if (dsi.valid () && auth_rate_limiter.can (dsi)) 833 if (dsi.valid () && auth_rate_limiter.can (dsi))
768 { 834 {
769 if (retry_cnt < 4) 835 if (retry_cnt < 4)
770 send_auth_request (dsi, true); 836 send_auth_request (dsi, true);
771 else 837 else
772 send_ping (dsi, 0); 838 send_ping (dsi, 0);
773 } 839 }
774 } 840 }
841
842 retry_int *= slow ? 8. : 0.9;
843
844 if (retry_int < conf->max_retry)
845 retry_cnt++;
846 else
847 retry_int = conf->max_retry;
848
849 w.start (retry_int);
775 } 850 }
776} 851}
777 852
778void 853void
779connection::reset_connection () 854connection::reset_connection ()
… …
782 { 857 {
783 slog (L_INFO, _("%s(%s): connection lost"), 858 slog (L_INFO, _("%s(%s): connection lost"),
784 conf->nodename, (const char *)si); 859 conf->nodename, (const char *)si);
785 860
786 if (::conf.script_node_down) 861 if (::conf.script_node_down)
787 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 }
788 } 868 }
789 869
790 delete ictx; ictx = 0; 870 delete ictx; ictx = 0;
791 delete octx; octx = 0; 871 delete octx; octx = 0;
792#if ENABLE_DNS 872#if ENABLE_DNS
… …
810 send_reset (si); 890 send_reset (si);
811 891
812 reset_connection (); 892 reset_connection ();
813} 893}
814 894
815void 895inline void
816connection::rekey_cb (time_watcher &w) 896connection::rekey_cb (ev::timer &w, int revents)
817{ 897{
818 reset_connection (); 898 reset_connection ();
819 establish_connection (); 899 establish_connection ();
820} 900}
821 901
… …
837 if (oseqno > MAX_SEQNO) 917 if (oseqno > MAX_SEQNO)
838 rekey (); 918 rekey ();
839} 919}
840 920
841void 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
842connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 932connection::inject_data_packet (tap_packet *pkt)
843{ 933{
844 if (ictx && octx) 934 if (ictx && octx)
845 send_data_packet (pkt); 935 send_data_packet (pkt);
846 else 936 else
847 { 937 {
848 if (!broadcast)//DDDD
849 data_queue.put (new tap_packet (*pkt)); 938 data_queue.put (new tap_packet (*pkt));
850 939 post_inject_queue ();
851 establish_connection ();
852 } 940 }
853} 941}
854 942
855void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 943void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
856{ 944{
857 if (ictx && octx) 945 if (ictx && octx)
858 send_vpn_packet (pkt, si, tos); 946 send_vpn_packet (pkt, si, tos);
859 else 947 else
860 { 948 {
861 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 949 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
862 950 post_inject_queue ();
863 establish_connection ();
864 } 951 }
865} 952}
866 953
867void 954void
868connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 955connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
869{ 956{
870 last_activity = NOW; 957 last_activity = ev_now ();
871 958
872 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",
873 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;
874 964
875 switch (pkt->typ ()) 965 switch (pkt->typ ())
876 { 966 {
877 case vpn_packet::PT_PING: 967 case vpn_packet::PT_PING:
878 // we send pings instead of auth packets after some retries, 968 // we send pings instead of auth packets after some retries,
… …
938 delete octx; 1028 delete octx;
939 1029
940 octx = new crypto_ctx (k, 1); 1030 octx = new crypto_ctx (k, 1);
941 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1031 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
942 1032
943 // compatibility code, remove when no longer required
944 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
945
946 conf->protocols = p->protocols; 1033 conf->protocols = p->protocols;
947 features = p->features & config_packet::get_features (); 1034 features = p->features & config_packet::get_features ();
948 1035
949 send_auth_response (rsi, p->id, k); 1036 send_auth_response (rsi, p->id, k);
950 1037
… …
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 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 }
1022 1114
1023 break; 1115 break;
1024 } 1116 }
1025 else 1117 else
1026 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"),
… …
1060 { 1152 {
1061 vpn->tap->send (d); 1153 vpn->tap->send (d);
1062 1154
1063 if (si != rsi) 1155 if (si != rsi)
1064 { 1156 {
1065 // fast re-sync on connection changes, useful especially for tcp/ip 1157 // fast re-sync on source address changes, useful especially for tcp/ip
1066 si = rsi; 1158 si = rsi;
1067 1159
1068 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1160 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1069 conf->nodename, (const char *)si, (const char *)rsi); 1161 conf->nodename, (const char *)si, (const char *)rsi);
1070 } 1162 }
… …
1081 case vpn_packet::PT_CONNECT_REQ: 1173 case vpn_packet::PT_CONNECT_REQ:
1082 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1174 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1083 { 1175 {
1084 connect_req_packet *p = (connect_req_packet *) pkt; 1176 connect_req_packet *p = (connect_req_packet *) pkt;
1085 1177
1086 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 ())
1087 connection *c = vpn->conns[p->id - 1];
1088 conf->protocols = p->protocols;
1089
1090 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1091 conf->id, p->id, c->ictx && c->octx);
1092
1093 if (c->ictx && c->octx)
1094 { 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 {
1095 // send connect_info packets to both sides, in case one is 1188 // send connect_info packets to both sides, in case one is
1096 // behind a nat firewall (or both ;) 1189 // behind a nat firewall (or both ;)
1097 c->send_connect_info (conf->id, si, conf->protocols); 1190 c->send_connect_info (conf->id, si, conf->protocols);
1098 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 ();
1099 } 1195 }
1100 else 1196 else
1101 c->establish_connection (); 1197 slog (L_WARN,
1198 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1199 p->id);
1102 } 1200 }
1103 1201
1104 break; 1202 break;
1105 1203
1106 case vpn_packet::PT_CONNECT_INFO: 1204 case vpn_packet::PT_CONNECT_INFO:
1107 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1205 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1108 { 1206 {
1109 connect_info_packet *p = (connect_info_packet *)pkt; 1207 connect_info_packet *p = (connect_info_packet *)pkt;
1110 1208
1111 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 ())
1112 { 1210 {
1113 connection *c = vpn->conns[p->id - 1]; 1211 connection *c = vpn->conns[p->id - 1];
1114 1212
1115 c->conf->protocols = p->protocols; 1213 c->conf->protocols = p->protocols;
1116 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));
… …
1122 const sockinfo &dsi = forward_si (p->si); 1220 const sockinfo &dsi = forward_si (p->si);
1123 1221
1124 if (dsi.valid ()) 1222 if (dsi.valid ())
1125 c->send_auth_request (dsi, true); 1223 c->send_auth_request (dsi, true);
1126 } 1224 }
1225 else
1226 slog (L_WARN,
1227 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1228 p->id);
1127 } 1229 }
1128 1230
1129 break; 1231 break;
1130 1232
1131 default: 1233 default:
1132 send_reset (rsi); 1234 send_reset (rsi);
1133 break; 1235 break;
1134 } 1236 }
1135} 1237}
1136 1238
1137void connection::keepalive_cb (time_watcher &w) 1239inline void
1240connection::keepalive_cb (ev::timer &w, int revents)
1138{ 1241{
1139 if (NOW >= last_activity + ::conf.keepalive + 30) 1242 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1140 { 1243 {
1141 reset_connection (); 1244 reset_connection ();
1142 establish_connection (); 1245 establish_connection ();
1143 } 1246 }
1144 else if (NOW < last_activity + ::conf.keepalive) 1247 else if (ev_now () < last_activity + ::conf.keepalive)
1145 w.start (last_activity + ::conf.keepalive); 1248 w.start (last_activity + ::conf.keepalive - ev::now ());
1146 else if (conf->connectmode != conf_node::C_ONDEMAND 1249 else if (conf->connectmode != conf_node::C_ONDEMAND
1147 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1250 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1148 { 1251 {
1149 send_ping (si); 1252 send_ping (si);
1150 w.start (NOW + 5); 1253 w.start (5);
1151 } 1254 }
1152 else if (NOW < last_activity + ::conf.keepalive + 10) 1255 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1153 // hold ondemand connections implicitly a few seconds longer 1256 // hold ondemand connections implicitly a few seconds longer
1154 // should delete octx, though, or something like that ;) 1257 // should delete octx, though, or something like that ;)
1155 w.start (last_activity + ::conf.keepalive + 10); 1258 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1156 else 1259 else
1157 reset_connection (); 1260 reset_connection ();
1158} 1261}
1159 1262
1160void connection::send_connect_request (int id) 1263void connection::send_connect_request (int id)
… …
1166 send_vpn_packet (p, si); 1269 send_vpn_packet (p, si);
1167 1270
1168 delete p; 1271 delete p;
1169} 1272}
1170 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
1171void connection::script_node () 1284void connection::script_init_connect_env ()
1172{ 1285{
1173 vpn->script_if_up (); 1286 vpn->script_init_env ();
1174 1287
1175 char *env; 1288 char *env;
1176 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1289 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1177 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1290 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1178 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1291 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1179 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1292 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1180} 1293}
1181 1294
1295inline const char *
1182const char *connection::script_node_up () 1296connection::script_node_up ()
1183{ 1297{
1184 script_node (); 1298 script_init_connect_env ();
1185 1299
1186 putenv ("STATE=up"); 1300 putenv ((char *)"STATE=up");
1187 1301
1302 char *filename;
1303 asprintf (&filename,
1304 "%s/%s",
1305 confbase,
1188 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1306 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1189}
1190 1307
1308 return filename;
1309}
1310
1311inline const char *
1191const char *connection::script_node_down () 1312connection::script_node_down ()
1192{ 1313{
1193 script_node (); 1314 script_init_connect_env ();
1194 1315
1195 putenv ("STATE=down"); 1316 putenv ((char *)"STATE=down");
1196 1317
1197 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;
1198} 1325}
1199 1326
1200connection::connection (struct vpn *vpn, conf_node *conf) 1327connection::connection (struct vpn *vpn, conf_node *conf)
1201: vpn(vpn), conf(conf) 1328: vpn(vpn), conf(conf),
1202, rekey (this, &connection::rekey_cb)
1203, keepalive (this, &connection::keepalive_cb)
1204, establish_connection (this, &connection::establish_connection_cb)
1205#if ENABLE_DNS 1329#if ENABLE_DNS
1206, dns (0) 1330 dns (0),
1207#endif 1331#endif
1332 data_queue(conf->max_ttl, conf->max_queue),
1333 vpn_queue(conf->max_ttl, conf->max_queue)
1208{ 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.;
1209 octx = ictx = 0; 1340 octx = ictx = 0;
1210 retry_cnt = 0;
1211 1341
1212 if (!conf->protocols) // make sure some protocol is enabled 1342 if (!conf->protocols) // make sure some protocol is enabled
1213 conf->protocols = PROT_UDPv4; 1343 conf->protocols = PROT_UDPv4;
1214 1344
1215 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
1216 reset_connection (); 1351 reset_connection ();
1217} 1352}
1218 1353
1219connection::~connection () 1354connection::~connection ()
1220{ 1355{

Diff Legend

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