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.33 by pcg, Sun Mar 21 13:16:36 2004 UTC vs.
Revision 1.65 by pcg, Tue Dec 4 17:17:20 2007 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 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}
… …
191{ 192{
192 for (i = QUEUEDEPTH; --i > 0; ) 193 for (i = QUEUEDEPTH; --i > 0; )
193 delete queue[i]; 194 delete queue[i];
194} 195}
195 196
196struct net_rateinfo { 197struct net_rateinfo
198{
197 u32 host; 199 u32 host;
198 double pcnt, diff; 200 double pcnt, diff;
199 tstamp last; 201 tstamp last;
200}; 202};
201 203
202// only do action once every x seconds per host whole allowing bursts. 204// only do action once every x seconds per host whole allowing bursts.
203// this implementation ("splay list" ;) is inefficient, 205// this implementation ("splay list" ;) is inefficient,
204// but low on resources. 206// but low on resources.
205struct net_rate_limiter : list<net_rateinfo> 207struct net_rate_limiter : list<net_rateinfo>
206{ 208{
207 static const double ALPHA = 1. - 1. / 600.; // allow bursts 209# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
208 static const double CUTOFF = 10.; // one event every CUTOFF seconds 210# define NRL_CUTOFF 10. // one event every CUTOFF seconds
209 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 211# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
210 static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value 212# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
211 213
212 bool can (const sockinfo &si) { return can((u32)si.host); } 214 bool can (const sockinfo &si) { return can((u32)si.host); }
213 bool can (u32 host); 215 bool can (u32 host);
214}; 216};
215 217
… …
220 iterator i; 222 iterator i;
221 223
222 for (i = begin (); i != end (); ) 224 for (i = begin (); i != end (); )
223 if (i->host == host) 225 if (i->host == host)
224 break; 226 break;
225 else if (i->last < NOW - EXPIRE) 227 else if (i->last < ev_now () - NRL_EXPIRE)
226 i = erase (i); 228 i = erase (i);
227 else 229 else
228 i++; 230 i++;
229 231
230 if (i == end ()) 232 if (i == end ())
231 { 233 {
232 net_rateinfo ri; 234 net_rateinfo ri;
233 235
234 ri.host = host; 236 ri.host = host;
235 ri.pcnt = 1.; 237 ri.pcnt = 1.;
236 ri.diff = MAXDIF; 238 ri.diff = NRL_MAXDIF;
237 ri.last = NOW; 239 ri.last = ev_now ();
238 240
239 push_front (ri); 241 push_front (ri);
240 242
241 return true; 243 return true;
242 } 244 }
243 else 245 else
244 { 246 {
245 net_rateinfo ri (*i); 247 net_rateinfo ri (*i);
246 erase (i); 248 erase (i);
247 249
248 ri.pcnt = ri.pcnt * ALPHA; 250 ri.pcnt = ri.pcnt * NRL_ALPHA;
249 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 251 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
250 252
251 ri.last = NOW; 253 ri.last = ev_now ();
252 254
253 double dif = ri.diff / ri.pcnt; 255 double dif = ri.diff / ri.pcnt;
254 256
255 bool send = dif > CUTOFF; 257 bool send = dif > NRL_CUTOFF;
256 258
257 if (dif > MAXDIF) 259 if (dif > NRL_MAXDIF)
258 { 260 {
259 ri.pcnt = 1.; 261 ri.pcnt = 1.;
260 ri.diff = MAXDIF; 262 ri.diff = NRL_MAXDIF;
261 } 263 }
262 else if (send) 264 else if (send)
263 ri.pcnt++; 265 ri.pcnt++;
264 266
265 push_front (ri); 267 push_front (ri);
… …
466 f |= FEATURE_COMPRESSION; 468 f |= FEATURE_COMPRESSION;
467#endif 469#endif
468#if ENABLE_ROHC 470#if ENABLE_ROHC
469 f |= FEATURE_ROHC; 471 f |= FEATURE_ROHC;
470#endif 472#endif
473#if ENABLE_BRIDGING
474 f |= FEATURE_BRIDGING;
475#endif
471 return f; 476 return f;
472 } 477 }
473}; 478};
474 479
475void config_packet::setup (ptype type, int dst) 480void config_packet::setup (ptype type, int dst)
476{ 481{
477 prot_major = PROTOCOL_MAJOR; 482 prot_major = PROTOCOL_MAJOR;
478 prot_minor = PROTOCOL_MINOR; 483 prot_minor = PROTOCOL_MINOR;
479 randsize = RAND_SIZE; 484 randsize = RAND_SIZE;
480 hmaclen = HMACLENGTH; 485 hmaclen = HMACLENGTH;
481 flags = ENABLE_COMPRESSION ? 0x81 : 0x80; 486 flags = 0;
482 challengelen = sizeof (rsachallenge); 487 challengelen = sizeof (rsachallenge);
483 features = get_features (); 488 features = get_features ();
484 489
485 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 490 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
486 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 491 digest_nid = htonl (EVP_MD_type (RSA_HASH));
… …
496 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 501 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
497 else if (randsize != RAND_SIZE) 502 else if (randsize != RAND_SIZE)
498 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 503 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
499 else if (hmaclen != HMACLENGTH) 504 else if (hmaclen != HMACLENGTH)
500 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH); 505 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)) 506 else if (challengelen != sizeof (rsachallenge))
506 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 507 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
507 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 508 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)); 509 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))) 510 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
585///////////////////////////////////////////////////////////////////////////// 586/////////////////////////////////////////////////////////////////////////////
586 587
587void 588void
588connection::connection_established () 589connection::connection_established ()
589{ 590{
591 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
592
590 if (ictx && octx) 593 if (ictx && octx)
591 { 594 {
592 connectmode = conf->connectmode; 595 connectmode = conf->connectmode;
593 596
594 rekey.start (NOW + ::conf.rekey); 597 // make sure rekeying timeouts are slightly asymmetric
598 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
599 rekey.start (rekey_interval, rekey_interval);
595 keepalive.start (NOW + ::conf.keepalive); 600 keepalive.start (::conf.keepalive);
596 601
597 // send queued packets 602 // send queued packets
598 if (ictx && octx) 603 if (ictx && octx)
599 { 604 {
600 while (tap_packet *p = (tap_packet *)data_queue.get ()) 605 while (tap_packet *p = (tap_packet *)data_queue.get ())
… …
611 } 616 }
612 } 617 }
613 else 618 else
614 { 619 {
615 retry_cnt = 0; 620 retry_cnt = 0;
616 establish_connection.start (NOW + 5); 621 establish_connection.start (5);
617 keepalive.stop (); 622 keepalive.stop ();
618 rekey.stop (); 623 rekey.stop ();
619 } 624 }
620} 625}
621 626
… …
625 protocol = best_protocol (THISNODE->protocols & conf->protocols); 630 protocol = best_protocol (THISNODE->protocols & conf->protocols);
626 631
627 // mask out protocols we cannot establish 632 // mask out protocols we cannot establish
628 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 633 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
629 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 634 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
635 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
636
637 if (protocol
638 && (!conf->can_direct (THISNODE)
639 || !THISNODE->can_direct (conf)))
640 {
641 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename);
642 protocol = 0;
643 }
630 644
631 si.set (conf, protocol); 645 si.set (conf, protocol);
632} 646}
633 647
634// ensure sockinfo is valid, forward if necessary 648// ensure sockinfo is valid, forward if necessary
… …
639 { 653 {
640 connection *r = vpn->find_router (); 654 connection *r = vpn->find_router ();
641 655
642 if (r) 656 if (r)
643 { 657 {
644 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 658 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
645 conf->nodename, r->conf->nodename); 659 conf->nodename, r->conf->nodename, (const char *)r->si);
646 return r->si; 660 return r->si;
647 } 661 }
648 else 662 else
649 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 663 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
650 conf->nodename); 664 conf->nodename);
… …
720} 734}
721 735
722void 736void
723connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 737connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
724{ 738{
725 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 739 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
726 conf->id, rid, (const char *)rsi); 740 conf->id, rid, (const char *)rsi);
727 741
728 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 742 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
729 743
730 r->hmac_set (octx); 744 r->hmac_set (octx);
… …
732 746
733 delete r; 747 delete r;
734} 748}
735 749
736void 750void
737connection::establish_connection_cb (time_watcher &w) 751connection::establish_connection_cb (ev::timer &w, int revents)
738{ 752{
739 if (!ictx 753 if (!ictx
740 && conf != THISNODE 754 && conf != THISNODE
741 && connectmode != conf_node::C_NEVER 755 && connectmode != conf_node::C_NEVER
742 && connectmode != conf_node::C_DISABLED 756 && connectmode != conf_node::C_DISABLED
743 && NOW > w.at) 757 && !w.is_active ())
744 { 758 {
745 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 759 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
746 760 ? (retry_cnt & 3) + 1
747 if (retry_int < 3600 * 8) 761 : 1 << (retry_cnt >> 2));
748 retry_cnt++;
749
750 w.start (NOW + retry_int);
751 762
752 reset_si (); 763 reset_si ();
753 764
765 bool slow = si.prot & PROT_SLOW;
766
754 if (si.prot && !si.host) 767 if (si.prot && !si.host)
768 {
769 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
770 /*TODO*/ /* start the timer so we don't recurse endlessly */
771 w.start (1);
755 vpn->send_connect_request (conf->id); 772 vpn->send_connect_request (conf->id);
773 }
756 else 774 else
757 { 775 {
776 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
777
758 const sockinfo &dsi = forward_si (si); 778 const sockinfo &dsi = forward_si (si);
779
780 slow = slow || (dsi.prot & PROT_SLOW);
759 781
760 if (dsi.valid () && auth_rate_limiter.can (dsi)) 782 if (dsi.valid () && auth_rate_limiter.can (dsi))
761 { 783 {
762 if (retry_cnt < 4) 784 if (retry_cnt < 4)
763 send_auth_request (dsi, true); 785 send_auth_request (dsi, true);
764 else 786 else
765 send_ping (dsi, 0); 787 send_ping (dsi, 0);
766 } 788 }
767 } 789 }
790
791 retry_int *= slow ? 8. : 0.7;
792
793 if (retry_int < conf->max_retry)
794 retry_cnt++;
795 else
796 retry_int = conf->max_retry;
797
798 w.start (retry_int);
768 } 799 }
769} 800}
770 801
771void 802void
772connection::reset_connection () 803connection::reset_connection ()
… …
775 { 806 {
776 slog (L_INFO, _("%s(%s): connection lost"), 807 slog (L_INFO, _("%s(%s): connection lost"),
777 conf->nodename, (const char *)si); 808 conf->nodename, (const char *)si);
778 809
779 if (::conf.script_node_down) 810 if (::conf.script_node_down)
780 run_script (run_script_cb (this, &connection::script_node_down), false); 811 {
812 run_script_cb cb;
813 cb.set<connection, &connection::script_node_down> (this);
814 if (!run_script (cb, false))
815 slog (L_WARN, _("node-down command execution failed, continuing."));
816 }
781 } 817 }
782 818
783 delete ictx; ictx = 0; 819 delete ictx; ictx = 0;
784 delete octx; octx = 0; 820 delete octx; octx = 0;
821#if ENABLE_DNS
822 dnsv4_reset_connection ();
823#endif
785 824
786 si.host= 0; 825 si.host = 0;
787 826
788 last_activity = 0; 827 last_activity = 0;
789 retry_cnt = 0; 828 retry_cnt = 0;
790 829
791 rekey.stop (); 830 rekey.stop ();
… …
801 840
802 reset_connection (); 841 reset_connection ();
803} 842}
804 843
805void 844void
806connection::rekey_cb (time_watcher &w) 845connection::rekey_cb (ev::timer &w, int revents)
807{ 846{
808 reset_connection (); 847 reset_connection ();
809 establish_connection (); 848 establish_connection ();
810} 849}
811 850
… …
833{ 872{
834 if (ictx && octx) 873 if (ictx && octx)
835 send_data_packet (pkt); 874 send_data_packet (pkt);
836 else 875 else
837 { 876 {
838 if (!broadcast)//DDDD 877 if (!broadcast)
839 data_queue.put (new tap_packet (*pkt)); 878 data_queue.put (new tap_packet (*pkt));
840 879
841 establish_connection (); 880 establish_connection ();
842 } 881 }
843} 882}
… …
855} 894}
856 895
857void 896void
858connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 897connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
859{ 898{
860 last_activity = NOW; 899 last_activity = ev_now ();
861 900
862 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 901 slog (L_NOISE, "<<%d received packet type %d from %d to %d",
863 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 902 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
903
904 if (connectmode == conf_node::C_DISABLED)
905 return;
864 906
865 switch (pkt->typ ()) 907 switch (pkt->typ ())
866 { 908 {
867 case vpn_packet::PT_PING: 909 case vpn_packet::PT_PING:
868 // we send pings instead of auth packets after some retries, 910 // we send pings instead of auth packets after some retries,
… …
928 delete octx; 970 delete octx;
929 971
930 octx = new crypto_ctx (k, 1); 972 octx = new crypto_ctx (k, 1);
931 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 973 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
932 974
933 // compatibility code, remove when no longer required
934 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
935
936 conf->protocols = p->protocols; 975 conf->protocols = p->protocols;
937 features = p->features & config_packet::get_features (); 976 features = p->features & config_packet::get_features ();
938 977
939 send_auth_response (rsi, p->id, k); 978 send_auth_response (rsi, p->id, k);
940 979
… …
1006 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1045 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1007 conf->nodename, (const char *)rsi, 1046 conf->nodename, (const char *)rsi,
1008 p->prot_major, p->prot_minor); 1047 p->prot_major, p->prot_minor);
1009 1048
1010 if (::conf.script_node_up) 1049 if (::conf.script_node_up)
1011 run_script (run_script_cb (this, &connection::script_node_up), false); 1050 {
1051 run_script_cb cb;
1052 cb.set<connection, &connection::script_node_up> (this);
1053 if (!run_script (cb, false))
1054 slog (L_WARN, _("node-up command execution failed, continuing."));
1055 }
1012 1056
1013 break; 1057 break;
1014 } 1058 }
1015 else 1059 else
1016 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1060 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
… …
1050 { 1094 {
1051 vpn->tap->send (d); 1095 vpn->tap->send (d);
1052 1096
1053 if (si != rsi) 1097 if (si != rsi)
1054 { 1098 {
1055 // fast re-sync on connection changes, useful especially for tcp/ip 1099 // fast re-sync on source address changes, useful especially for tcp/ip
1056 si = rsi; 1100 si = rsi;
1057 1101
1058 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1102 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1059 conf->nodename, (const char *)si, (const char *)rsi); 1103 conf->nodename, (const char *)si, (const char *)rsi);
1060 } 1104 }
… …
1071 case vpn_packet::PT_CONNECT_REQ: 1115 case vpn_packet::PT_CONNECT_REQ:
1072 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1116 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1073 { 1117 {
1074 connect_req_packet *p = (connect_req_packet *) pkt; 1118 connect_req_packet *p = (connect_req_packet *) pkt;
1075 1119
1076 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1120 if (p->id > 0 && p->id <= vpn->conns.size ())
1077 connection *c = vpn->conns[p->id - 1];
1078 conf->protocols = p->protocols;
1079
1080 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1081 conf->id, p->id, c->ictx && c->octx);
1082
1083 if (c->ictx && c->octx)
1084 { 1121 {
1122 connection *c = vpn->conns[p->id - 1];
1123 conf->protocols = p->protocols;
1124
1125 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1126 conf->id, p->id, c->ictx && c->octx);
1127
1128 if (c->ictx && c->octx)
1129 {
1085 // send connect_info packets to both sides, in case one is 1130 // send connect_info packets to both sides, in case one is
1086 // behind a nat firewall (or both ;) 1131 // behind a nat firewall (or both ;)
1087 c->send_connect_info (conf->id, si, conf->protocols); 1132 c->send_connect_info (conf->id, si, conf->protocols);
1088 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1133 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1134 }
1135 else
1136 c->establish_connection ();
1089 } 1137 }
1090 else 1138 else
1091 c->establish_connection (); 1139 slog (L_WARN,
1140 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1141 p->id);
1092 } 1142 }
1093 1143
1094 break; 1144 break;
1095 1145
1096 case vpn_packet::PT_CONNECT_INFO: 1146 case vpn_packet::PT_CONNECT_INFO:
1097 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1147 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1098 { 1148 {
1099 connect_info_packet *p = (connect_info_packet *) pkt; 1149 connect_info_packet *p = (connect_info_packet *)pkt;
1100 1150
1101 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1151 if (p->id > 0 && p->id <= vpn->conns.size ())
1102 1152 {
1103 connection *c = vpn->conns[p->id - 1]; 1153 connection *c = vpn->conns[p->id - 1];
1104 1154
1105 c->conf->protocols = p->protocols; 1155 c->conf->protocols = p->protocols;
1106 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1156 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1107 p->si.upgrade_protocol (protocol, c->conf); 1157 p->si.upgrade_protocol (protocol, c->conf);
1108 1158
1109 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1159 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1110 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1160 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1111 1161
1112 const sockinfo &dsi = forward_si (p->si); 1162 const sockinfo &dsi = forward_si (p->si);
1113 1163
1114 if (dsi.valid ()) 1164 if (dsi.valid ())
1115 c->send_auth_request (dsi, true); 1165 c->send_auth_request (dsi, true);
1166 }
1167 else
1168 slog (L_WARN,
1169 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1170 p->id);
1116 } 1171 }
1117 1172
1118 break; 1173 break;
1119 1174
1120 default: 1175 default:
1121 send_reset (rsi); 1176 send_reset (rsi);
1122 break; 1177 break;
1123 } 1178 }
1124} 1179}
1125 1180
1126void connection::keepalive_cb (time_watcher &w) 1181void connection::keepalive_cb (ev::timer &w, int revents)
1127{ 1182{
1128 if (NOW >= last_activity + ::conf.keepalive + 30) 1183 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1129 { 1184 {
1130 reset_connection (); 1185 reset_connection ();
1131 establish_connection (); 1186 establish_connection ();
1132 } 1187 }
1133 else if (NOW < last_activity + ::conf.keepalive) 1188 else if (ev_now () < last_activity + ::conf.keepalive)
1134 w.start (last_activity + ::conf.keepalive); 1189 w.start (last_activity + ::conf.keepalive - ev::now ());
1135 else if (conf->connectmode != conf_node::C_ONDEMAND 1190 else if (conf->connectmode != conf_node::C_ONDEMAND
1136 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1191 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1137 { 1192 {
1138 send_ping (si); 1193 send_ping (si);
1139 w.start (NOW + 5); 1194 w.start (5);
1140 } 1195 }
1141 else if (NOW < last_activity + ::conf.keepalive + 10) 1196 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1142 // hold ondemand connections implicitly a few seconds longer 1197 // hold ondemand connections implicitly a few seconds longer
1143 // should delete octx, though, or something like that ;) 1198 // should delete octx, though, or something like that ;)
1144 w.start (last_activity + ::conf.keepalive + 10); 1199 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1145 else 1200 else
1146 reset_connection (); 1201 reset_connection ();
1147} 1202}
1148 1203
1149void connection::send_connect_request (int id) 1204void connection::send_connect_request (int id)
… …
1155 send_vpn_packet (p, si); 1210 send_vpn_packet (p, si);
1156 1211
1157 delete p; 1212 delete p;
1158} 1213}
1159 1214
1215void connection::script_init_env (const char *ext)
1216{
1217 char *env;
1218 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1219 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1220 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1221 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1222 conf->id & 0xff); putenv (env);
1223}
1224
1160void connection::script_node () 1225void connection::script_init_connect_env ()
1161{ 1226{
1162 vpn->script_if_up (); 1227 vpn->script_init_env ();
1163 1228
1164 char *env; 1229 char *env;
1165 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1230 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1166 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1231 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1167 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1232 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1168 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1233 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1169} 1234}
1170 1235
1171const char *connection::script_node_up () 1236const char *connection::script_node_up ()
1172{ 1237{
1173 script_node (); 1238 script_init_connect_env ();
1174 1239
1175 putenv ("STATE=up"); 1240 putenv ((char *)"STATE=up");
1176 1241
1242 char *filename;
1243 asprintf (&filename,
1244 "%s/%s",
1245 confbase,
1177 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1246 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1247
1248 return filename;
1178} 1249}
1179 1250
1180const char *connection::script_node_down () 1251const char *connection::script_node_down ()
1181{ 1252{
1182 script_node (); 1253 script_init_connect_env ();
1183 1254
1184 putenv ("STATE=down"); 1255 putenv ((char *)"STATE=down");
1185 1256
1186 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1257 char *filename;
1187} 1258 asprintf (&filename,
1259 "%s/%s",
1260 confbase,
1261 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1188 1262
1263 return filename;
1264}
1265
1189connection::connection(struct vpn *vpn_) 1266connection::connection (struct vpn *vpn, conf_node *conf)
1190: vpn(vpn_) 1267: vpn(vpn), conf(conf)
1191, rekey (this, &connection::rekey_cb) 1268#if ENABLE_DNS
1192, keepalive (this, &connection::keepalive_cb) 1269, dns (0)
1270#endif
1271{
1272 rekey .set<connection, &connection::rekey_cb > (this);
1273 keepalive .set<connection, &connection::keepalive_cb > (this);
1193, establish_connection (this, &connection::establish_connection_cb) 1274 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1194{ 1275
1195 octx = ictx = 0; 1276 octx = ictx = 0;
1196 retry_cnt = 0; 1277 retry_cnt = 0;
1197 1278
1279 if (!conf->protocols) // make sure some protocol is enabled
1280 conf->protocols = PROT_UDPv4;
1281
1198 connectmode = conf_node::C_ALWAYS; // initial setting 1282 connectmode = conf_node::C_ALWAYS; // initial setting
1199 reset_connection (); 1283 reset_connection ();
1200} 1284}
1201 1285
1202connection::~connection () 1286connection::~connection ()

Diff Legend

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