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.40 by pcg, Tue Mar 1 06:27:20 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-2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
6 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
7 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
8 (at your option) any later version. 10 option) any later version.
9 11
10 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
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
13 GNU General Public License for more details. 15 Public License for more details.
14 16
15 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
16 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
17 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.
18*/ 30*/
19 31
20#include "config.h" 32#include "config.h"
21
22#include <cassert>
23 33
24#include <list> 34#include <list>
25 35
26#include <openssl/rand.h> 36#include <openssl/rand.h>
27#include <openssl/evp.h> 37#include <openssl/evp.h>
28#include <openssl/rsa.h> 38#include <openssl/rsa.h>
29#include <openssl/err.h> 39#include <openssl/err.h>
30
31#include "gettext.h"
32 40
33#include "conf.h" 41#include "conf.h"
34#include "slog.h" 42#include "slog.h"
35#include "device.h" 43#include "device.h"
36#include "vpn.h" 44#include "vpn.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
… …
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;
470#endif 515#endif
516#if ENABLE_BRIDGING
517 f |= FEATURE_BRIDGING;
518#endif
471 return f; 519 return f;
472 } 520 }
473}; 521};
474 522
475void config_packet::setup (ptype type, int dst) 523void config_packet::setup (ptype type, int dst)
476{ 524{
477 prot_major = PROTOCOL_MAJOR; 525 prot_major = PROTOCOL_MAJOR;
478 prot_minor = PROTOCOL_MINOR; 526 prot_minor = PROTOCOL_MINOR;
479 randsize = RAND_SIZE; 527 randsize = RAND_SIZE;
480 hmaclen = HMACLENGTH; 528 hmaclen = HMACLENGTH;
481 flags = ENABLE_COMPRESSION ? 0x81 : 0x80; 529 flags = 0;
482 challengelen = sizeof (rsachallenge); 530 challengelen = sizeof (rsachallenge);
483 features = get_features (); 531 features = get_features ();
484 532
485 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 533 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
486 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 534 digest_nid = htonl (EVP_MD_type (RSA_HASH));
… …
496 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);
497 else if (randsize != RAND_SIZE) 545 else if (randsize != RAND_SIZE)
498 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);
499 else if (hmaclen != HMACLENGTH) 547 else if (hmaclen != HMACLENGTH)
500 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);
501#if 0 // this implementation should handle all flag settings
502 else if (flags != curflags ())
503 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
504#endif
505 else if (challengelen != sizeof (rsachallenge)) 549 else if (challengelen != sizeof (rsachallenge))
506 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));
507 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 551 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
508 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));
509 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 553 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
585///////////////////////////////////////////////////////////////////////////// 629/////////////////////////////////////////////////////////////////////////////
586 630
587void 631void
588connection::connection_established () 632connection::connection_established ()
589{ 633{
634 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
635
590 if (ictx && octx) 636 if (ictx && octx)
591 { 637 {
592 connectmode = conf->connectmode;
593
594 // make sure rekeying timeouts are slightly asymmetric 638 // make sure rekeying timeouts are slightly asymmetric
595 rekey.start (NOW + ::conf.rekey 639 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
596 + (conf->id > THISNODE->id ? 10 : 0)); 640 rekey.start (rekey_interval, rekey_interval);
597 keepalive.start (NOW + ::conf.keepalive); 641 keepalive.start (::conf.keepalive);
598 642
599 // send queued packets 643 // send queued packets
600 if (ictx && octx) 644 if (ictx && octx)
601 { 645 {
602 while (tap_packet *p = (tap_packet *)data_queue.get ()) 646 while (tap_packet *p = (tap_packet *)data_queue.get ())
603 { 647 {
604 send_data_packet (p); 648 if (p->len) send_data_packet (p);
605 delete p; 649 delete p;
606 } 650 }
607 651
608 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 652 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
609 { 653 {
610 send_vpn_packet (p, si, IPTOS_RELIABILITY); 654 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
611 delete p; 655 delete p;
612 } 656 }
613 } 657 }
614 } 658 }
615 else 659 else
616 { 660 {
617 retry_cnt = 0; 661 retry_cnt = 0;
618 establish_connection.start (NOW + 5); 662 establish_connection.start (5);
619 keepalive.stop (); 663 keepalive.stop ();
620 rekey.stop (); 664 rekey.stop ();
621 } 665 }
622} 666}
623 667
… …
629 // mask out protocols we cannot establish 673 // mask out protocols we cannot establish
630 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 674 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
631 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 675 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
632 if (!conf->dns_port) protocol &= ~PROT_DNSv4; 676 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
633 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 }
685
634 si.set (conf, protocol); 686 si.set (conf, protocol);
635} 687}
636 688
637// ensure sockinfo is valid, forward if necessary 689// ensure sockinfo is valid, forward if necessary
638const sockinfo & 690const sockinfo &
… …
642 { 694 {
643 connection *r = vpn->find_router (); 695 connection *r = vpn->find_router ();
644 696
645 if (r) 697 if (r)
646 { 698 {
647 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 699 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
648 conf->nodename, r->conf->nodename); 700 conf->nodename, r->conf->nodename, (const char *)r->si);
649 return r->si; 701 return r->si;
650 } 702 }
651 else 703 else
652 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 704 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
653 conf->nodename); 705 conf->nodename);
… …
657} 709}
658 710
659void 711void
660connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 712connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
661{ 713{
662 bool ok; 714 if (!vpn->send_vpn_packet (pkt, si, tos))
663
664 switch (si.prot)
665 {
666 case PROT_IPv4:
667 ok = vpn->send_ipv4_packet (pkt, si, tos); break;
668 case PROT_UDPv4:
669 ok = vpn->send_udpv4_packet (pkt, si, tos); break;
670#if ENABLE_TCP
671 case PROT_TCPv4:
672 ok = vpn->send_tcpv4_packet (pkt, si, tos); break;
673#endif
674#if ENABLE_ICMP
675 case PROT_ICMPv4:
676 ok = vpn->send_icmpv4_packet (pkt, si, tos); break;
677#endif
678#if ENABLE_DNS
679 case PROT_DNSv4:
680 ok = send_dnsv4_packet (pkt, si, tos); break;
681#endif
682
683 default:
684 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
685 ok = false;
686 }
687
688 if (!ok)
689 reset_connection (); 715 reset_connection ();
690} 716}
691 717
692void 718void
693connection::send_ping (const sockinfo &si, u8 pong) 719connection::send_ping (const sockinfo &si, u8 pong)
… …
749} 775}
750 776
751void 777void
752connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 778connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
753{ 779{
754 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 780 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
755 conf->id, rid, (const char *)rsi); 781 conf->id, rid, (const char *)rsi);
756 782
757 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);
758 784
759 r->hmac_set (octx); 785 r->hmac_set (octx);
760 send_vpn_packet (r, si); 786 send_vpn_packet (r, si);
761 787
762 delete r; 788 delete r;
763} 789}
764 790
765void 791inline void
766connection::establish_connection_cb (time_watcher &w) 792connection::establish_connection_cb (ev::timer &w, int revents)
767{ 793{
768 if (!ictx 794 if (!ictx
769 && conf != THISNODE 795 && conf != THISNODE
770 && connectmode != conf_node::C_NEVER 796 && connectmode != conf_node::C_NEVER
771 && connectmode != conf_node::C_DISABLED 797 && connectmode != conf_node::C_DISABLED
772 && NOW > w.at) 798 && !w.is_active ())
773 { 799 {
774 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
775 801 // and stop trying. should probably be handled by a per-connection expire handler.
776 if (retry_int < conf->max_retry) 802 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
803 {
804 reset_connection ();
777 retry_cnt++; 805 return;
778 else 806 }
779 retry_int = conf->max_retry;
780 807
781 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));
782 813
783 reset_si (); 814 reset_si ();
784 815
816 bool slow = si.prot & PROT_SLOW;
817
785 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);
786 vpn->send_connect_request (conf->id); 823 vpn->send_connect_request (conf->id);
824 }
787 else 825 else
788 { 826 {
827 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
828
789 const sockinfo &dsi = forward_si (si); 829 const sockinfo &dsi = forward_si (si);
830
831 slow = slow || (dsi.prot & PROT_SLOW);
790 832
791 if (dsi.valid () && auth_rate_limiter.can (dsi)) 833 if (dsi.valid () && auth_rate_limiter.can (dsi))
792 { 834 {
793 if (retry_cnt < 4) 835 if (retry_cnt < 4)
794 send_auth_request (dsi, true); 836 send_auth_request (dsi, true);
795 else 837 else
796 send_ping (dsi, 0); 838 send_ping (dsi, 0);
797 } 839 }
798 } 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);
799 } 850 }
800} 851}
801 852
802void 853void
803connection::reset_connection () 854connection::reset_connection ()
… …
806 { 857 {
807 slog (L_INFO, _("%s(%s): connection lost"), 858 slog (L_INFO, _("%s(%s): connection lost"),
808 conf->nodename, (const char *)si); 859 conf->nodename, (const char *)si);
809 860
810 if (::conf.script_node_down) 861 if (::conf.script_node_down)
811 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 }
812 } 868 }
813 869
814 delete ictx; ictx = 0; 870 delete ictx; ictx = 0;
815 delete octx; octx = 0; 871 delete octx; octx = 0;
872#if ENABLE_DNS
873 dnsv4_reset_connection ();
874#endif
816 875
817 si.host = 0; 876 si.host = 0;
818 877
819 last_activity = 0; 878 last_activity = 0;
820 retry_cnt = 0; 879 retry_cnt = 0;
… …
831 send_reset (si); 890 send_reset (si);
832 891
833 reset_connection (); 892 reset_connection ();
834} 893}
835 894
836void 895inline void
837connection::rekey_cb (time_watcher &w) 896connection::rekey_cb (ev::timer &w, int revents)
838{ 897{
839 reset_connection (); 898 reset_connection ();
840 establish_connection (); 899 establish_connection ();
841} 900}
842 901
… …
858 if (oseqno > MAX_SEQNO) 917 if (oseqno > MAX_SEQNO)
859 rekey (); 918 rekey ();
860} 919}
861 920
862void 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
863connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 932connection::inject_data_packet (tap_packet *pkt)
864{ 933{
865 if (ictx && octx) 934 if (ictx && octx)
866 send_data_packet (pkt); 935 send_data_packet (pkt);
867 else 936 else
868 { 937 {
869 if (!broadcast)//DDDD
870 data_queue.put (new tap_packet (*pkt)); 938 data_queue.put (new tap_packet (*pkt));
871 939 post_inject_queue ();
872 establish_connection ();
873 } 940 }
874} 941}
875 942
876void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 943void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
877{ 944{
878 if (ictx && octx) 945 if (ictx && octx)
879 send_vpn_packet (pkt, si, tos); 946 send_vpn_packet (pkt, si, tos);
880 else 947 else
881 { 948 {
882 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 949 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
883 950 post_inject_queue ();
884 establish_connection ();
885 } 951 }
886} 952}
887 953
888void 954void
889connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 955connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
890{ 956{
891 last_activity = NOW; 957 last_activity = ev_now ();
892 958
893 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",
894 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;
895 964
896 switch (pkt->typ ()) 965 switch (pkt->typ ())
897 { 966 {
898 case vpn_packet::PT_PING: 967 case vpn_packet::PT_PING:
899 // we send pings instead of auth packets after some retries, 968 // we send pings instead of auth packets after some retries,
… …
959 delete octx; 1028 delete octx;
960 1029
961 octx = new crypto_ctx (k, 1); 1030 octx = new crypto_ctx (k, 1);
962 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1031 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
963 1032
964 // compatibility code, remove when no longer required
965 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
966
967 conf->protocols = p->protocols; 1033 conf->protocols = p->protocols;
968 features = p->features & config_packet::get_features (); 1034 features = p->features & config_packet::get_features ();
969 1035
970 send_auth_response (rsi, p->id, k); 1036 send_auth_response (rsi, p->id, k);
971 1037
… …
1037 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1103 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1038 conf->nodename, (const char *)rsi, 1104 conf->nodename, (const char *)rsi,
1039 p->prot_major, p->prot_minor); 1105 p->prot_major, p->prot_minor);
1040 1106
1041 if (::conf.script_node_up) 1107 if (::conf.script_node_up)
1042 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 }
1043 1114
1044 break; 1115 break;
1045 } 1116 }
1046 else 1117 else
1047 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"),
… …
1081 { 1152 {
1082 vpn->tap->send (d); 1153 vpn->tap->send (d);
1083 1154
1084 if (si != rsi) 1155 if (si != rsi)
1085 { 1156 {
1086 // fast re-sync on connection changes, useful especially for tcp/ip 1157 // fast re-sync on source address changes, useful especially for tcp/ip
1087 si = rsi; 1158 si = rsi;
1088 1159
1089 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1160 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1090 conf->nodename, (const char *)si, (const char *)rsi); 1161 conf->nodename, (const char *)si, (const char *)rsi);
1091 } 1162 }
… …
1102 case vpn_packet::PT_CONNECT_REQ: 1173 case vpn_packet::PT_CONNECT_REQ:
1103 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1174 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1104 { 1175 {
1105 connect_req_packet *p = (connect_req_packet *) pkt; 1176 connect_req_packet *p = (connect_req_packet *) pkt;
1106 1177
1107 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 ())
1108 connection *c = vpn->conns[p->id - 1];
1109 conf->protocols = p->protocols;
1110
1111 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1112 conf->id, p->id, c->ictx && c->octx);
1113
1114 if (c->ictx && c->octx)
1115 { 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 {
1116 // send connect_info packets to both sides, in case one is 1188 // send connect_info packets to both sides, in case one is
1117 // behind a nat firewall (or both ;) 1189 // behind a nat firewall (or both ;)
1118 c->send_connect_info (conf->id, si, conf->protocols); 1190 c->send_connect_info (conf->id, si, conf->protocols);
1119 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 ();
1120 } 1195 }
1121 else 1196 else
1122 c->establish_connection (); 1197 slog (L_WARN,
1198 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1199 p->id);
1123 } 1200 }
1124 1201
1125 break; 1202 break;
1126 1203
1127 case vpn_packet::PT_CONNECT_INFO: 1204 case vpn_packet::PT_CONNECT_INFO:
1128 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1205 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1129 { 1206 {
1130 connect_info_packet *p = (connect_info_packet *)pkt; 1207 connect_info_packet *p = (connect_info_packet *)pkt;
1131 1208
1132 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 ())
1133 { 1210 {
1134 connection *c = vpn->conns[p->id - 1]; 1211 connection *c = vpn->conns[p->id - 1];
1135 1212
1136 c->conf->protocols = p->protocols; 1213 c->conf->protocols = p->protocols;
1137 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));
… …
1143 const sockinfo &dsi = forward_si (p->si); 1220 const sockinfo &dsi = forward_si (p->si);
1144 1221
1145 if (dsi.valid ()) 1222 if (dsi.valid ())
1146 c->send_auth_request (dsi, true); 1223 c->send_auth_request (dsi, true);
1147 } 1224 }
1225 else
1226 slog (L_WARN,
1227 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1228 p->id);
1148 } 1229 }
1149 1230
1150 break; 1231 break;
1151 1232
1152 default: 1233 default:
1153 send_reset (rsi); 1234 send_reset (rsi);
1154 break; 1235 break;
1155 } 1236 }
1156} 1237}
1157 1238
1158void connection::keepalive_cb (time_watcher &w) 1239inline void
1240connection::keepalive_cb (ev::timer &w, int revents)
1159{ 1241{
1160 if (NOW >= last_activity + ::conf.keepalive + 30) 1242 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1161 { 1243 {
1162 reset_connection (); 1244 reset_connection ();
1163 establish_connection (); 1245 establish_connection ();
1164 } 1246 }
1165 else if (NOW < last_activity + ::conf.keepalive) 1247 else if (ev_now () < last_activity + ::conf.keepalive)
1166 w.start (last_activity + ::conf.keepalive); 1248 w.start (last_activity + ::conf.keepalive - ev::now ());
1167 else if (conf->connectmode != conf_node::C_ONDEMAND 1249 else if (conf->connectmode != conf_node::C_ONDEMAND
1168 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1250 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1169 { 1251 {
1170 send_ping (si); 1252 send_ping (si);
1171 w.start (NOW + 5); 1253 w.start (5);
1172 } 1254 }
1173 else if (NOW < last_activity + ::conf.keepalive + 10) 1255 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1174 // hold ondemand connections implicitly a few seconds longer 1256 // hold ondemand connections implicitly a few seconds longer
1175 // should delete octx, though, or something like that ;) 1257 // should delete octx, though, or something like that ;)
1176 w.start (last_activity + ::conf.keepalive + 10); 1258 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1177 else 1259 else
1178 reset_connection (); 1260 reset_connection ();
1179} 1261}
1180 1262
1181void connection::send_connect_request (int id) 1263void connection::send_connect_request (int id)
… …
1187 send_vpn_packet (p, si); 1269 send_vpn_packet (p, si);
1188 1270
1189 delete p; 1271 delete p;
1190} 1272}
1191 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
1192void connection::script_node () 1284void connection::script_init_connect_env ()
1193{ 1285{
1194 vpn->script_if_up (); 1286 vpn->script_init_env ();
1195 1287
1196 char *env; 1288 char *env;
1197 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1289 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
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_node (); 1298 script_init_connect_env ();
1206 1299
1207 putenv ("STATE=up"); 1300 putenv ((char *)"STATE=up");
1208 1301
1302 char *filename;
1303 asprintf (&filename,
1304 "%s/%s",
1305 confbase,
1209 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1306 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1210}
1211 1307
1308 return filename;
1309}
1310
1311inline const char *
1212const char *connection::script_node_down () 1312connection::script_node_down ()
1213{ 1313{
1214 script_node (); 1314 script_init_connect_env ();
1215 1315
1216 putenv ("STATE=down"); 1316 putenv ((char *)"STATE=down");
1217 1317
1218 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;
1219} 1325}
1220 1326
1221connection::connection (struct vpn *vpn, conf_node *conf) 1327connection::connection (struct vpn *vpn, conf_node *conf)
1222: vpn(vpn), conf(conf) 1328: vpn(vpn), conf(conf),
1223, rekey (this, &connection::rekey_cb)
1224, keepalive (this, &connection::keepalive_cb)
1225, establish_connection (this, &connection::establish_connection_cb)
1226#if ENABLE_DNS 1329#if ENABLE_DNS
1227, dnsv4_tw (this, &connection::dnsv4_cb) 1330 dns (0),
1228#endif 1331#endif
1332 data_queue(conf->max_ttl, conf->max_queue),
1333 vpn_queue(conf->max_ttl, conf->max_queue)
1229{ 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.;
1230 octx = ictx = 0; 1340 octx = ictx = 0;
1231 retry_cnt = 0;
1232 1341
1233 if (!conf->protocols) // make sure some protocol is enabled 1342 if (!conf->protocols) // make sure some protocol is enabled
1234 conf->protocols = PROT_UDPv4; 1343 conf->protocols = PROT_UDPv4;
1235 1344
1236 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
1237 reset_connection (); 1351 reset_connection ();
1238} 1352}
1239 1353
1240connection::~connection () 1354connection::~connection ()
1241{ 1355{

Diff Legend

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