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.31 by pcg, Sun Feb 8 07:24:25 2004 UTC vs.
Revision 1.68 by pcg, Thu Aug 7 17:30:27 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-2005 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
6 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 10 (at your 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,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but 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
13 GNU General Public License for more details. 15 GNU General 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
16 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18*/ 20*/
19 21
20#include "config.h" 22#include "config.h"
21
22#include <cassert>
23 23
24#include <list> 24#include <list>
25 25
26#include <openssl/rand.h> 26#include <openssl/rand.h>
27#include <openssl/evp.h> 27#include <openssl/evp.h>
28#include <openssl/rsa.h> 28#include <openssl/rsa.h>
29#include <openssl/err.h> 29#include <openssl/err.h>
30
31#include "gettext.h"
32 30
33#include "conf.h" 31#include "conf.h"
34#include "slog.h" 32#include "slog.h"
35#include "device.h" 33#include "device.h"
36#include "vpn.h" 34#include "vpn.h"
… …
84 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 82 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
85 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
86 EVP_MD_CTX_cleanup (&ctx); 84 EVP_MD_CTX_cleanup (&ctx);
87} 85}
88 86
89struct rsa_entry { 87struct rsa_entry
88{
90 tstamp expire; 89 tstamp expire;
91 rsaid id; 90 rsaid id;
92 rsachallenge chg; 91 rsachallenge chg;
93}; 92};
94 93
95struct rsa_cache : list<rsa_entry> 94struct rsa_cache : list<rsa_entry>
96{ 95{
97 void cleaner_cb (time_watcher &w); time_watcher cleaner; 96 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
98 97
99 bool find (const rsaid &id, rsachallenge &chg) 98 bool find (const rsaid &id, rsachallenge &chg)
100 { 99 {
101 for (iterator i = begin (); i != end (); ++i) 100 for (iterator i = begin (); i != end (); ++i)
102 { 101 {
103 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 102 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
104 { 103 {
105 memcpy (&chg, &i->chg, sizeof chg); 104 memcpy (&chg, &i->chg, sizeof chg);
106 105
107 erase (i); 106 erase (i);
108 return true; 107 return true;
109 } 108 }
110 } 109 }
111 110
112 if (cleaner.at < NOW) 111 if (!cleaner.is_active ())
113 cleaner.start (NOW + RSA_TTL); 112 cleaner.again ();
114 113
115 return false; 114 return false;
116 } 115 }
117 116
118 void gen (rsaid &id, rsachallenge &chg) 117 void gen (rsaid &id, rsachallenge &chg)
119 { 118 {
120 rsa_entry e; 119 rsa_entry e;
121 120
122 RAND_bytes ((unsigned char *)&id, sizeof id); 121 RAND_bytes ((unsigned char *)&id, sizeof id);
123 RAND_bytes ((unsigned char *)&chg, sizeof chg); 122 RAND_bytes ((unsigned char *)&chg, sizeof chg);
124 123
125 e.expire = NOW + RSA_TTL; 124 e.expire = ev_now () + RSA_TTL;
126 e.id = id; 125 e.id = id;
127 memcpy (&e.chg, &chg, sizeof chg); 126 memcpy (&e.chg, &chg, sizeof chg);
128 127
129 push_back (e); 128 push_back (e);
130 129
131 if (cleaner.at < NOW) 130 if (!cleaner.is_active ())
132 cleaner.start (NOW + RSA_TTL); 131 cleaner.again ();
133 } 132 }
134 133
135 rsa_cache () 134 rsa_cache ()
136 : cleaner (this, &rsa_cache::cleaner_cb) 135 {
137 { } 136 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
137 cleaner.set (RSA_TTL, RSA_TTL);
138 }
138 139
139} rsa_cache; 140} rsa_cache;
140 141
141void rsa_cache::cleaner_cb (time_watcher &w) 142void rsa_cache::cleaner_cb (ev::timer &w, int revents)
142{ 143{
143 if (!empty ()) 144 if (empty ())
145 w.stop ();
146 else
144 { 147 {
145 w.start (NOW + RSA_TTL);
146
147 for (iterator i = begin (); i != end (); ) 148 for (iterator i = begin (); i != end (); )
148 if (i->expire <= NOW) 149 if (i->expire <= ev_now ())
149 i = erase (i); 150 i = erase (i);
150 else 151 else
151 ++i; 152 ++i;
152 } 153 }
153} 154}
154 155
155////////////////////////////////////////////////////////////////////////////// 156//////////////////////////////////////////////////////////////////////////////
156 157
157void pkt_queue::put (net_packet *p) 158pkt_queue::pkt_queue (double max_ttl, int max_queue)
159: max_ttl (max_ttl), max_queue (max_queue)
158{ 160{
159 if (queue[i]) 161 queue = new pkt [max_queue];
160 {
161 delete queue[i];
162 j = (j + 1) % QUEUEDEPTH;
163 }
164 162
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; 163 i = 0;
187 j = 0; 164 j = 0;
165
166 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
188} 167}
189 168
190pkt_queue::~pkt_queue () 169pkt_queue::~pkt_queue ()
191{ 170{
192 for (i = QUEUEDEPTH; --i > 0; ) 171 while (net_packet *p = get ())
172 delete p;
173
193 delete queue[i]; 174 delete [] queue;
194} 175}
195 176
177void pkt_queue::expire_cb (ev::timer &w, int revents)
178{
179 ev_tstamp expire = ev_now () - max_ttl;
180
181 for (;;)
182 {
183 if (empty ())
184 break;
185
186 double diff = queue[j].tstamp - expire;
187
188 if (diff >= 0.)
189 {
190 w.start (diff > 0.5 ? diff : 0.5);
191 break;
192 }
193
194 delete get ();
195 }
196}
197
198void pkt_queue::put (net_packet *p)
199{
200 ev_tstamp now = ev_now ();
201
202 // start expiry timer
203 if (empty ())
204 expire.start (max_ttl);
205
206 int ni = i + 1 == max_queue ? 0 : i + 1;
207
208 if (ni == j)
209 delete get ();
210
211 queue[i].pkt = p;
212 queue[i].tstamp = now;
213
214 i = ni;
215}
216
217net_packet *pkt_queue::get ()
218{
219 if (empty ())
220 return 0;
221
222 net_packet *p = queue[j].pkt;
223 queue[j].pkt = 0;
224
225 j = j + 1 == max_queue ? 0 : j + 1;
226
227 return p;
228}
229
196struct net_rateinfo { 230struct net_rateinfo
231{
197 u32 host; 232 u32 host;
198 double pcnt, diff; 233 double pcnt, diff;
199 tstamp last; 234 tstamp last;
200}; 235};
201 236
202// only do action once every x seconds per host whole allowing bursts. 237// only do action once every x seconds per host whole allowing bursts.
203// this implementation ("splay list" ;) is inefficient, 238// this implementation ("splay list" ;) is inefficient,
204// but low on resources. 239// but low on resources.
205struct net_rate_limiter : list<net_rateinfo> 240struct net_rate_limiter : list<net_rateinfo>
206{ 241{
207 static const double ALPHA = 1. - 1. / 600.; // allow bursts 242# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
208 static const double CUTOFF = 10.; // one event every CUTOFF seconds 243# define NRL_CUTOFF 10. // one event every CUTOFF seconds
209 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 244# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
210 static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value 245# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
211 246
212 bool can (const sockinfo &si) { return can((u32)si.host); } 247 bool can (const sockinfo &si) { return can((u32)si.host); }
213 bool can (u32 host); 248 bool can (u32 host);
214}; 249};
215 250
… …
220 iterator i; 255 iterator i;
221 256
222 for (i = begin (); i != end (); ) 257 for (i = begin (); i != end (); )
223 if (i->host == host) 258 if (i->host == host)
224 break; 259 break;
225 else if (i->last < NOW - EXPIRE) 260 else if (i->last < ev_now () - NRL_EXPIRE)
226 i = erase (i); 261 i = erase (i);
227 else 262 else
228 i++; 263 i++;
229 264
230 if (i == end ()) 265 if (i == end ())
231 { 266 {
232 net_rateinfo ri; 267 net_rateinfo ri;
233 268
234 ri.host = host; 269 ri.host = host;
235 ri.pcnt = 1.; 270 ri.pcnt = 1.;
236 ri.diff = MAXDIF; 271 ri.diff = NRL_MAXDIF;
237 ri.last = NOW; 272 ri.last = ev_now ();
238 273
239 push_front (ri); 274 push_front (ri);
240 275
241 return true; 276 return true;
242 } 277 }
243 else 278 else
244 { 279 {
245 net_rateinfo ri (*i); 280 net_rateinfo ri (*i);
246 erase (i); 281 erase (i);
247 282
248 ri.pcnt = ri.pcnt * ALPHA; 283 ri.pcnt = ri.pcnt * NRL_ALPHA;
249 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 284 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
250 285
251 ri.last = NOW; 286 ri.last = ev_now ();
252 287
253 double dif = ri.diff / ri.pcnt; 288 double dif = ri.diff / ri.pcnt;
254 289
255 bool send = dif > CUTOFF; 290 bool send = dif > NRL_CUTOFF;
256 291
257 if (dif > MAXDIF) 292 if (dif > NRL_MAXDIF)
258 { 293 {
259 ri.pcnt = 1.; 294 ri.pcnt = 1.;
260 ri.diff = MAXDIF; 295 ri.diff = NRL_MAXDIF;
261 } 296 }
262 else if (send) 297 else if (send)
263 ri.pcnt++; 298 ri.pcnt++;
264 299
265 push_front (ri); 300 push_front (ri);
… …
456 u8 flags, challengelen, features, pad3; 491 u8 flags, challengelen, features, pad3;
457 u32 cipher_nid, digest_nid, hmac_nid; 492 u32 cipher_nid, digest_nid, hmac_nid;
458 493
459 void setup (ptype type, int dst); 494 void setup (ptype type, int dst);
460 bool chk_config () const; 495 bool chk_config () const;
496
497 static u8 get_features ()
498 {
499 u8 f = 0;
500#if ENABLE_COMPRESSION
501 f |= FEATURE_COMPRESSION;
502#endif
503#if ENABLE_ROHC
504 f |= FEATURE_ROHC;
505#endif
506#if ENABLE_BRIDGING
507 f |= FEATURE_BRIDGING;
508#endif
509 return f;
510 }
461}; 511};
462
463#define FEATURES ((ENABLE_COMPRESSION ? FEATURE_COMPRESSION : 0) \
464 | (ENABLE_ROHC ? FEATURE_ROHC : 0))
465 512
466void config_packet::setup (ptype type, int dst) 513void config_packet::setup (ptype type, int dst)
467{ 514{
468 prot_major = PROTOCOL_MAJOR; 515 prot_major = PROTOCOL_MAJOR;
469 prot_minor = PROTOCOL_MINOR; 516 prot_minor = PROTOCOL_MINOR;
470 randsize = RAND_SIZE; 517 randsize = RAND_SIZE;
471 hmaclen = HMACLENGTH; 518 hmaclen = HMACLENGTH;
472 flags = ENABLE_COMPRESSION ? 0x81 : 0x80; 519 flags = 0;
473 challengelen = sizeof (rsachallenge); 520 challengelen = sizeof (rsachallenge);
474 features = FEATURES; 521 features = get_features ();
475 522
476 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 523 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
477 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 524 digest_nid = htonl (EVP_MD_type (RSA_HASH));
478 hmac_nid = htonl (EVP_MD_type (DIGEST)); 525 hmac_nid = htonl (EVP_MD_type (DIGEST));
479 526
… …
487 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 534 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
488 else if (randsize != RAND_SIZE) 535 else if (randsize != RAND_SIZE)
489 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 536 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
490 else if (hmaclen != HMACLENGTH) 537 else if (hmaclen != HMACLENGTH)
491 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH); 538 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
492#if 0 // this implementation should handle all flag settings
493 else if (flags != curflags ())
494 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
495#endif
496 else if (challengelen != sizeof (rsachallenge)) 539 else if (challengelen != sizeof (rsachallenge))
497 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 540 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
498 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 541 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
499 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 542 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
500 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 543 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
576///////////////////////////////////////////////////////////////////////////// 619/////////////////////////////////////////////////////////////////////////////
577 620
578void 621void
579connection::connection_established () 622connection::connection_established ()
580{ 623{
624 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
625
581 if (ictx && octx) 626 if (ictx && octx)
582 { 627 {
583 connectmode = conf->connectmode; 628 // make sure rekeying timeouts are slightly asymmetric
584 629 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
585 rekey.start (NOW + ::conf.rekey); 630 rekey.start (rekey_interval, rekey_interval);
586 keepalive.start (NOW + ::conf.keepalive); 631 keepalive.start (::conf.keepalive);
587 632
588 // send queued packets 633 // send queued packets
589 if (ictx && octx) 634 if (ictx && octx)
590 { 635 {
591 while (tap_packet *p = (tap_packet *)data_queue.get ()) 636 while (tap_packet *p = (tap_packet *)data_queue.get ())
592 { 637 {
593 send_data_packet (p); 638 if (p->len) send_data_packet (p);
594 delete p; 639 delete p;
595 } 640 }
596 641
597 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 642 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
598 { 643 {
599 send_vpn_packet (p, si, IPTOS_RELIABILITY); 644 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
600 delete p; 645 delete p;
601 } 646 }
602 } 647 }
603 } 648 }
604 else 649 else
605 { 650 {
606 retry_cnt = 0; 651 retry_cnt = 0;
607 establish_connection.start (NOW + 5); 652 establish_connection.start (5);
608 keepalive.stop (); 653 keepalive.stop ();
609 rekey.stop (); 654 rekey.stop ();
610 } 655 }
611} 656}
612 657
… …
616 protocol = best_protocol (THISNODE->protocols & conf->protocols); 661 protocol = best_protocol (THISNODE->protocols & conf->protocols);
617 662
618 // mask out protocols we cannot establish 663 // mask out protocols we cannot establish
619 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 664 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
620 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 665 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
666 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
667
668 if (protocol
669 && (!conf->can_direct (THISNODE)
670 || !THISNODE->can_direct (conf)))
671 {
672 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename);
673 protocol = 0;
674 }
621 675
622 si.set (conf, protocol); 676 si.set (conf, protocol);
623} 677}
624 678
625// ensure sockinfo is valid, forward if necessary 679// ensure sockinfo is valid, forward if necessary
… …
630 { 684 {
631 connection *r = vpn->find_router (); 685 connection *r = vpn->find_router ();
632 686
633 if (r) 687 if (r)
634 { 688 {
635 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 689 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
636 conf->nodename, r->conf->nodename); 690 conf->nodename, r->conf->nodename, (const char *)r->si);
637 return r->si; 691 return r->si;
638 } 692 }
639 else 693 else
640 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 694 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
641 conf->nodename); 695 conf->nodename);
… …
711} 765}
712 766
713void 767void
714connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 768connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
715{ 769{
716 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 770 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
717 conf->id, rid, (const char *)rsi); 771 conf->id, rid, (const char *)rsi);
718 772
719 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 773 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
720 774
721 r->hmac_set (octx); 775 r->hmac_set (octx);
722 send_vpn_packet (r, si); 776 send_vpn_packet (r, si);
723 777
724 delete r; 778 delete r;
725} 779}
726 780
727void 781inline void
728connection::establish_connection_cb (time_watcher &w) 782connection::establish_connection_cb (ev::timer &w, int revents)
729{ 783{
730 if (!ictx 784 if (!ictx
731 && conf != THISNODE 785 && conf != THISNODE
732 && connectmode != conf_node::C_NEVER 786 && connectmode != conf_node::C_NEVER
733 && connectmode != conf_node::C_DISABLED 787 && connectmode != conf_node::C_DISABLED
734 && NOW > w.at) 788 && !w.is_active ())
735 { 789 {
736 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 790 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
737 791 // and stop trying. should probably be handled by a per-connection expire handler.
738 if (retry_int < 3600 * 8) 792 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
793 {
794 reset_connection ();
739 retry_cnt++; 795 return;
796 }
740 797
741 w.start (NOW + retry_int); 798 last_establish_attempt = ev_now ();
799
800 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
801 ? (retry_cnt & 3) + 1
802 : 1 << (retry_cnt >> 2));
742 803
743 reset_si (); 804 reset_si ();
744 805
806 bool slow = si.prot & PROT_SLOW;
807
745 if (si.prot && !si.host) 808 if (si.prot && !si.host)
809 {
810 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
811 /*TODO*/ /* start the timer so we don't recurse endlessly */
812 w.start (1);
746 vpn->send_connect_request (conf->id); 813 vpn->send_connect_request (conf->id);
814 }
747 else 815 else
748 { 816 {
817 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
818
749 const sockinfo &dsi = forward_si (si); 819 const sockinfo &dsi = forward_si (si);
820
821 slow = slow || (dsi.prot & PROT_SLOW);
750 822
751 if (dsi.valid () && auth_rate_limiter.can (dsi)) 823 if (dsi.valid () && auth_rate_limiter.can (dsi))
752 { 824 {
753 if (retry_cnt < 4) 825 if (retry_cnt < 4)
754 send_auth_request (dsi, true); 826 send_auth_request (dsi, true);
755 else 827 else
756 send_ping (dsi, 0); 828 send_ping (dsi, 0);
757 } 829 }
758 } 830 }
831
832 retry_int *= slow ? 8. : 0.9;
833
834 if (retry_int < conf->max_retry)
835 retry_cnt++;
836 else
837 retry_int = conf->max_retry;
838
839 w.start (retry_int);
759 } 840 }
760} 841}
761 842
762void 843void
763connection::reset_connection () 844connection::reset_connection ()
… …
766 { 847 {
767 slog (L_INFO, _("%s(%s): connection lost"), 848 slog (L_INFO, _("%s(%s): connection lost"),
768 conf->nodename, (const char *)si); 849 conf->nodename, (const char *)si);
769 850
770 if (::conf.script_node_down) 851 if (::conf.script_node_down)
771 run_script (run_script_cb (this, &connection::script_node_down), false); 852 {
853 run_script_cb cb;
854 cb.set<connection, &connection::script_node_down> (this);
855 if (!run_script (cb, false))
856 slog (L_WARN, _("node-down command execution failed, continuing."));
857 }
772 } 858 }
773 859
774 delete ictx; ictx = 0; 860 delete ictx; ictx = 0;
775 delete octx; octx = 0; 861 delete octx; octx = 0;
862#if ENABLE_DNS
863 dnsv4_reset_connection ();
864#endif
776 865
777 si.host= 0; 866 si.host = 0;
778 867
779 last_activity = 0; 868 last_activity = 0;
780 retry_cnt = 0; 869 retry_cnt = 0;
781 870
782 rekey.stop (); 871 rekey.stop ();
… …
791 send_reset (si); 880 send_reset (si);
792 881
793 reset_connection (); 882 reset_connection ();
794} 883}
795 884
796void 885inline void
797connection::rekey_cb (time_watcher &w) 886connection::rekey_cb (ev::timer &w, int revents)
798{ 887{
799 reset_connection (); 888 reset_connection ();
800 establish_connection (); 889 establish_connection ();
801} 890}
802 891
… …
818 if (oseqno > MAX_SEQNO) 907 if (oseqno > MAX_SEQNO)
819 rekey (); 908 rekey ();
820} 909}
821 910
822void 911void
912connection::post_inject_queue ()
913{
914 // force a connection every now and when when packets are sent (max 1/s)
915 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
916 establish_connection.stop ();
917
918 establish_connection ();
919}
920
921void
823connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 922connection::inject_data_packet (tap_packet *pkt)
824{ 923{
825 if (ictx && octx) 924 if (ictx && octx)
826 send_data_packet (pkt); 925 send_data_packet (pkt);
827 else 926 else
828 { 927 {
829 if (!broadcast)//DDDD
830 data_queue.put (new tap_packet (*pkt)); 928 data_queue.put (new tap_packet (*pkt));
831 929 post_inject_queue ();
832 establish_connection ();
833 } 930 }
834} 931}
835 932
836void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 933void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
837{ 934{
838 if (ictx && octx) 935 if (ictx && octx)
839 send_vpn_packet (pkt, si, tos); 936 send_vpn_packet (pkt, si, tos);
840 else 937 else
841 { 938 {
842 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 939 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
843 940 post_inject_queue ();
844 establish_connection ();
845 } 941 }
846} 942}
847 943
848void 944void
849connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 945connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
850{ 946{
851 last_activity = NOW; 947 last_activity = ev_now ();
852 948
853 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 949 slog (L_NOISE, "<<%d received packet type %d from %d to %d",
854 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 950 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
951
952 if (connectmode == conf_node::C_DISABLED)
953 return;
855 954
856 switch (pkt->typ ()) 955 switch (pkt->typ ())
857 { 956 {
858 case vpn_packet::PT_PING: 957 case vpn_packet::PT_PING:
859 // we send pings instead of auth packets after some retries, 958 // we send pings instead of auth packets after some retries,
… …
919 delete octx; 1018 delete octx;
920 1019
921 octx = new crypto_ctx (k, 1); 1020 octx = new crypto_ctx (k, 1);
922 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1021 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
923 1022
924 // compatibility code, remove when no longer required
925 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
926
927 conf->protocols = p->protocols; 1023 conf->protocols = p->protocols;
928 features = p->features & FEATURES; 1024 features = p->features & config_packet::get_features ();
929 1025
930 send_auth_response (rsi, p->id, k); 1026 send_auth_response (rsi, p->id, k);
931 1027
932 connection_established (); 1028 connection_established ();
933 1029
… …
997 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1093 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
998 conf->nodename, (const char *)rsi, 1094 conf->nodename, (const char *)rsi,
999 p->prot_major, p->prot_minor); 1095 p->prot_major, p->prot_minor);
1000 1096
1001 if (::conf.script_node_up) 1097 if (::conf.script_node_up)
1002 run_script (run_script_cb (this, &connection::script_node_up), false); 1098 {
1099 run_script_cb cb;
1100 cb.set<connection, &connection::script_node_up> (this);
1101 if (!run_script (cb, false))
1102 slog (L_WARN, _("node-up command execution failed, continuing."));
1103 }
1003 1104
1004 break; 1105 break;
1005 } 1106 }
1006 else 1107 else
1007 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1108 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
… …
1041 { 1142 {
1042 vpn->tap->send (d); 1143 vpn->tap->send (d);
1043 1144
1044 if (si != rsi) 1145 if (si != rsi)
1045 { 1146 {
1046 // fast re-sync on connection changes, useful especially for tcp/ip 1147 // fast re-sync on source address changes, useful especially for tcp/ip
1047 si = rsi; 1148 si = rsi;
1048 1149
1049 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1150 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1050 conf->nodename, (const char *)si, (const char *)rsi); 1151 conf->nodename, (const char *)si, (const char *)rsi);
1051 } 1152 }
1052
1053 delete d;
1054
1055 break;
1056 } 1153 }
1154
1155 delete d;
1156 break;
1057 } 1157 }
1058 } 1158 }
1059 1159
1060 send_reset (rsi); 1160 send_reset (rsi);
1061 break; 1161 break;
… …
1063 case vpn_packet::PT_CONNECT_REQ: 1163 case vpn_packet::PT_CONNECT_REQ:
1064 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1164 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1065 { 1165 {
1066 connect_req_packet *p = (connect_req_packet *) pkt; 1166 connect_req_packet *p = (connect_req_packet *) pkt;
1067 1167
1068 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1168 if (p->id > 0 && p->id <= vpn->conns.size ())
1069 connection *c = vpn->conns[p->id - 1];
1070 conf->protocols = p->protocols;
1071
1072 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1073 conf->id, p->id, c->ictx && c->octx);
1074
1075 if (c->ictx && c->octx)
1076 { 1169 {
1170 connection *c = vpn->conns[p->id - 1];
1171 conf->protocols = p->protocols;
1172
1173 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1174 conf->id, p->id, c->ictx && c->octx);
1175
1176 if (c->ictx && c->octx)
1177 {
1077 // send connect_info packets to both sides, in case one is 1178 // send connect_info packets to both sides, in case one is
1078 // behind a nat firewall (or both ;) 1179 // behind a nat firewall (or both ;)
1079 c->send_connect_info (conf->id, si, conf->protocols); 1180 c->send_connect_info (conf->id, si, conf->protocols);
1080 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1181 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1182 }
1183 else
1184 c->establish_connection ();
1081 } 1185 }
1082 else 1186 else
1083 c->establish_connection (); 1187 slog (L_WARN,
1188 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1189 p->id);
1084 } 1190 }
1085 1191
1086 break; 1192 break;
1087 1193
1088 case vpn_packet::PT_CONNECT_INFO: 1194 case vpn_packet::PT_CONNECT_INFO:
1089 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1195 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1090 { 1196 {
1091 connect_info_packet *p = (connect_info_packet *) pkt; 1197 connect_info_packet *p = (connect_info_packet *)pkt;
1092 1198
1093 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1199 if (p->id > 0 && p->id <= vpn->conns.size ())
1094 1200 {
1095 connection *c = vpn->conns[p->id - 1]; 1201 connection *c = vpn->conns[p->id - 1];
1096 1202
1097 c->conf->protocols = p->protocols; 1203 c->conf->protocols = p->protocols;
1098 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1204 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1099 p->si.upgrade_protocol (protocol, c->conf); 1205 p->si.upgrade_protocol (protocol, c->conf);
1100 1206
1101 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1207 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1102 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1208 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1103 1209
1104 const sockinfo &dsi = forward_si (p->si); 1210 const sockinfo &dsi = forward_si (p->si);
1105 1211
1106 if (dsi.valid ()) 1212 if (dsi.valid ())
1107 c->send_auth_request (dsi, true); 1213 c->send_auth_request (dsi, true);
1214 }
1215 else
1216 slog (L_WARN,
1217 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1218 p->id);
1108 } 1219 }
1109 1220
1110 break; 1221 break;
1111 1222
1112 default: 1223 default:
1113 send_reset (rsi); 1224 send_reset (rsi);
1114 break; 1225 break;
1115 } 1226 }
1116} 1227}
1117 1228
1118void connection::keepalive_cb (time_watcher &w) 1229inline void
1230connection::keepalive_cb (ev::timer &w, int revents)
1119{ 1231{
1120 if (NOW >= last_activity + ::conf.keepalive + 30) 1232 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1121 { 1233 {
1122 reset_connection (); 1234 reset_connection ();
1123 establish_connection (); 1235 establish_connection ();
1124 } 1236 }
1125 else if (NOW < last_activity + ::conf.keepalive) 1237 else if (ev_now () < last_activity + ::conf.keepalive)
1126 w.start (last_activity + ::conf.keepalive); 1238 w.start (last_activity + ::conf.keepalive - ev::now ());
1127 else if (conf->connectmode != conf_node::C_ONDEMAND 1239 else if (conf->connectmode != conf_node::C_ONDEMAND
1128 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1240 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1129 { 1241 {
1130 send_ping (si); 1242 send_ping (si);
1131 w.start (NOW + 5); 1243 w.start (5);
1132 } 1244 }
1133 else if (NOW < last_activity + ::conf.keepalive + 10) 1245 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1134 // hold ondemand connections implicitly a few seconds longer 1246 // hold ondemand connections implicitly a few seconds longer
1135 // should delete octx, though, or something like that ;) 1247 // should delete octx, though, or something like that ;)
1136 w.start (last_activity + ::conf.keepalive + 10); 1248 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1137 else 1249 else
1138 reset_connection (); 1250 reset_connection ();
1139} 1251}
1140 1252
1141void connection::send_connect_request (int id) 1253void connection::send_connect_request (int id)
… …
1147 send_vpn_packet (p, si); 1259 send_vpn_packet (p, si);
1148 1260
1149 delete p; 1261 delete p;
1150} 1262}
1151 1263
1264void connection::script_init_env (const char *ext)
1265{
1266 char *env;
1267 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1268 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1269 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1270 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1271 conf->id & 0xff); putenv (env);
1272}
1273
1152void connection::script_node () 1274void connection::script_init_connect_env ()
1153{ 1275{
1154 vpn->script_if_up (); 1276 vpn->script_init_env ();
1155 1277
1156 char *env; 1278 char *env;
1157 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1279 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1158 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1280 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1159 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1281 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1160 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1282 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1161} 1283}
1162 1284
1285inline const char *
1163const char *connection::script_node_up () 1286connection::script_node_up ()
1164{ 1287{
1165 script_node (); 1288 script_init_connect_env ();
1166 1289
1167 putenv ("STATE=up"); 1290 putenv ((char *)"STATE=up");
1168 1291
1292 char *filename;
1293 asprintf (&filename,
1294 "%s/%s",
1295 confbase,
1169 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1296 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1170}
1171 1297
1298 return filename;
1299}
1300
1301inline const char *
1172const char *connection::script_node_down () 1302connection::script_node_down ()
1173{ 1303{
1174 script_node (); 1304 script_init_connect_env ();
1175 1305
1176 putenv ("STATE=down"); 1306 putenv ((char *)"STATE=down");
1177 1307
1178 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1308 char *filename;
1179} 1309 asprintf (&filename,
1310 "%s/%s",
1311 confbase,
1312 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1180 1313
1314 return filename;
1315}
1316
1181connection::connection(struct vpn *vpn_) 1317connection::connection (struct vpn *vpn, conf_node *conf)
1182: vpn(vpn_) 1318: vpn(vpn), conf(conf),
1183, rekey (this, &connection::rekey_cb) 1319#if ENABLE_DNS
1184, keepalive (this, &connection::keepalive_cb) 1320 dns (0),
1321#endif
1322 data_queue(conf->max_ttl, conf->max_queue),
1323 vpn_queue(conf->max_ttl, conf->max_queue)
1324{
1325 rekey .set<connection, &connection::rekey_cb > (this);
1326 keepalive .set<connection, &connection::keepalive_cb > (this);
1185, establish_connection (this, &connection::establish_connection_cb) 1327 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1186{ 1328
1329 last_establish_attempt = 0.;
1187 octx = ictx = 0; 1330 octx = ictx = 0;
1188 retry_cnt = 0;
1189 1331
1190 connectmode = conf_node::C_ALWAYS; // initial setting 1332 if (!conf->protocols) // make sure some protocol is enabled
1333 conf->protocols = PROT_UDPv4;
1334
1335 connectmode = conf->connectmode;
1336
1337 // queue a dummy packet to force an initial connection attempt
1338 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1339 vpn_queue.put (new net_packet);
1340
1191 reset_connection (); 1341 reset_connection ();
1192} 1342}
1193 1343
1194connection::~connection () 1344connection::~connection ()
1195{ 1345{

Diff Legend

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