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.45 by pcg, Fri Mar 4 09:36:45 2005 UTC vs.
Revision 1.65 by pcg, Tue Dec 4 17:17:20 2007 UTC

… …
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 15 GNU General Public License for more details.
16 16
17 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
18 along with gvpe; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
19 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
20*/ 20*/
21 21
22#include "config.h" 22#include "config.h"
23
24#include <cassert>
25 23
26#include <list> 24#include <list>
27 25
28#include <openssl/rand.h> 26#include <openssl/rand.h>
29#include <openssl/evp.h> 27#include <openssl/evp.h>
30#include <openssl/rsa.h> 28#include <openssl/rsa.h>
31#include <openssl/err.h> 29#include <openssl/err.h>
32
33#include "gettext.h"
34 30
35#include "conf.h" 31#include "conf.h"
36#include "slog.h" 32#include "slog.h"
37#include "device.h" 33#include "device.h"
38#include "vpn.h" 34#include "vpn.h"
… …
86 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 82 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
87 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
88 EVP_MD_CTX_cleanup (&ctx); 84 EVP_MD_CTX_cleanup (&ctx);
89} 85}
90 86
91struct rsa_entry { 87struct rsa_entry
88{
92 tstamp expire; 89 tstamp expire;
93 rsaid id; 90 rsaid id;
94 rsachallenge chg; 91 rsachallenge chg;
95}; 92};
96 93
97struct rsa_cache : list<rsa_entry> 94struct rsa_cache : list<rsa_entry>
98{ 95{
99 void cleaner_cb (time_watcher &w); time_watcher cleaner; 96 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
100 97
101 bool find (const rsaid &id, rsachallenge &chg) 98 bool find (const rsaid &id, rsachallenge &chg)
102 { 99 {
103 for (iterator i = begin (); i != end (); ++i) 100 for (iterator i = begin (); i != end (); ++i)
104 { 101 {
105 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 102 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
106 { 103 {
107 memcpy (&chg, &i->chg, sizeof chg); 104 memcpy (&chg, &i->chg, sizeof chg);
108 105
109 erase (i); 106 erase (i);
110 return true; 107 return true;
111 } 108 }
112 } 109 }
113 110
114 if (cleaner.at < NOW) 111 if (!cleaner.is_active ())
115 cleaner.start (NOW + RSA_TTL); 112 cleaner.again ();
116 113
117 return false; 114 return false;
118 } 115 }
119 116
120 void gen (rsaid &id, rsachallenge &chg) 117 void gen (rsaid &id, rsachallenge &chg)
121 { 118 {
122 rsa_entry e; 119 rsa_entry e;
123 120
124 RAND_bytes ((unsigned char *)&id, sizeof id); 121 RAND_bytes ((unsigned char *)&id, sizeof id);
125 RAND_bytes ((unsigned char *)&chg, sizeof chg); 122 RAND_bytes ((unsigned char *)&chg, sizeof chg);
126 123
127 e.expire = NOW + RSA_TTL; 124 e.expire = ev_now () + RSA_TTL;
128 e.id = id; 125 e.id = id;
129 memcpy (&e.chg, &chg, sizeof chg); 126 memcpy (&e.chg, &chg, sizeof chg);
130 127
131 push_back (e); 128 push_back (e);
132 129
133 if (cleaner.at < NOW) 130 if (!cleaner.is_active ())
134 cleaner.start (NOW + RSA_TTL); 131 cleaner.again ();
135 } 132 }
136 133
137 rsa_cache () 134 rsa_cache ()
138 : cleaner (this, &rsa_cache::cleaner_cb) 135 {
139 { } 136 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
137 cleaner.set (RSA_TTL, RSA_TTL);
138 }
140 139
141} rsa_cache; 140} rsa_cache;
142 141
143void rsa_cache::cleaner_cb (time_watcher &w) 142void rsa_cache::cleaner_cb (ev::timer &w, int revents)
144{ 143{
145 if (!empty ()) 144 if (empty ())
145 w.stop ();
146 else
146 { 147 {
147 w.start (NOW + RSA_TTL);
148
149 for (iterator i = begin (); i != end (); ) 148 for (iterator i = begin (); i != end (); )
150 if (i->expire <= NOW) 149 if (i->expire <= ev_now ())
151 i = erase (i); 150 i = erase (i);
152 else 151 else
153 ++i; 152 ++i;
154 } 153 }
155} 154}
… …
193{ 192{
194 for (i = QUEUEDEPTH; --i > 0; ) 193 for (i = QUEUEDEPTH; --i > 0; )
195 delete queue[i]; 194 delete queue[i];
196} 195}
197 196
198struct net_rateinfo { 197struct net_rateinfo
198{
199 u32 host; 199 u32 host;
200 double pcnt, diff; 200 double pcnt, diff;
201 tstamp last; 201 tstamp last;
202}; 202};
203 203
… …
222 iterator i; 222 iterator i;
223 223
224 for (i = begin (); i != end (); ) 224 for (i = begin (); i != end (); )
225 if (i->host == host) 225 if (i->host == host)
226 break; 226 break;
227 else if (i->last < NOW - NRL_EXPIRE) 227 else if (i->last < ev_now () - NRL_EXPIRE)
228 i = erase (i); 228 i = erase (i);
229 else 229 else
230 i++; 230 i++;
231 231
232 if (i == end ()) 232 if (i == end ())
… …
234 net_rateinfo ri; 234 net_rateinfo ri;
235 235
236 ri.host = host; 236 ri.host = host;
237 ri.pcnt = 1.; 237 ri.pcnt = 1.;
238 ri.diff = NRL_MAXDIF; 238 ri.diff = NRL_MAXDIF;
239 ri.last = NOW; 239 ri.last = ev_now ();
240 240
241 push_front (ri); 241 push_front (ri);
242 242
243 return true; 243 return true;
244 } 244 }
… …
246 { 246 {
247 net_rateinfo ri (*i); 247 net_rateinfo ri (*i);
248 erase (i); 248 erase (i);
249 249
250 ri.pcnt = ri.pcnt * NRL_ALPHA; 250 ri.pcnt = ri.pcnt * NRL_ALPHA;
251 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last); 251 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
252 252
253 ri.last = NOW; 253 ri.last = ev_now ();
254 254
255 double dif = ri.diff / ri.pcnt; 255 double dif = ri.diff / ri.pcnt;
256 256
257 bool send = dif > NRL_CUTOFF; 257 bool send = dif > NRL_CUTOFF;
258 258
… …
468 f |= FEATURE_COMPRESSION; 468 f |= FEATURE_COMPRESSION;
469#endif 469#endif
470#if ENABLE_ROHC 470#if ENABLE_ROHC
471 f |= FEATURE_ROHC; 471 f |= FEATURE_ROHC;
472#endif 472#endif
473#if ENABLE_BRIDGING
474 f |= FEATURE_BRIDGING;
475#endif
473 return f; 476 return f;
474 } 477 }
475}; 478};
476 479
477void config_packet::setup (ptype type, int dst) 480void config_packet::setup (ptype type, int dst)
478{ 481{
479 prot_major = PROTOCOL_MAJOR; 482 prot_major = PROTOCOL_MAJOR;
480 prot_minor = PROTOCOL_MINOR; 483 prot_minor = PROTOCOL_MINOR;
481 randsize = RAND_SIZE; 484 randsize = RAND_SIZE;
482 hmaclen = HMACLENGTH; 485 hmaclen = HMACLENGTH;
483 flags = ENABLE_COMPRESSION ? 0x81 : 0x80; 486 flags = 0;
484 challengelen = sizeof (rsachallenge); 487 challengelen = sizeof (rsachallenge);
485 features = get_features (); 488 features = get_features ();
486 489
487 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 490 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
488 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 491 digest_nid = htonl (EVP_MD_type (RSA_HASH));
… …
498 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);
499 else if (randsize != RAND_SIZE) 502 else if (randsize != RAND_SIZE)
500 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);
501 else if (hmaclen != HMACLENGTH) 504 else if (hmaclen != HMACLENGTH)
502 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);
503#if 0 // this implementation should handle all flag settings
504 else if (flags != curflags ())
505 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
506#endif
507 else if (challengelen != sizeof (rsachallenge)) 506 else if (challengelen != sizeof (rsachallenge))
508 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));
509 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 508 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
510 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 509 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
511 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 510 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
587///////////////////////////////////////////////////////////////////////////// 586/////////////////////////////////////////////////////////////////////////////
588 587
589void 588void
590connection::connection_established () 589connection::connection_established ()
591{ 590{
591 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
592
592 if (ictx && octx) 593 if (ictx && octx)
593 { 594 {
594 connectmode = conf->connectmode; 595 connectmode = conf->connectmode;
595 596
596 // make sure rekeying timeouts are slightly asymmetric 597 // make sure rekeying timeouts are slightly asymmetric
597 rekey.start (NOW + ::conf.rekey 598 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
598 + (conf->id > THISNODE->id ? 10 : 0)); 599 rekey.start (rekey_interval, rekey_interval);
599 keepalive.start (NOW + ::conf.keepalive); 600 keepalive.start (::conf.keepalive);
600 601
601 // send queued packets 602 // send queued packets
602 if (ictx && octx) 603 if (ictx && octx)
603 { 604 {
604 while (tap_packet *p = (tap_packet *)data_queue.get ()) 605 while (tap_packet *p = (tap_packet *)data_queue.get ())
… …
615 } 616 }
616 } 617 }
617 else 618 else
618 { 619 {
619 retry_cnt = 0; 620 retry_cnt = 0;
620 establish_connection.start (NOW + 5); 621 establish_connection.start (5);
621 keepalive.stop (); 622 keepalive.stop ();
622 rekey.stop (); 623 rekey.stop ();
623 } 624 }
624} 625}
625 626
… …
631 // mask out protocols we cannot establish 632 // mask out protocols we cannot establish
632 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 633 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
633 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 634 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
634 if (!conf->dns_port) protocol &= ~PROT_DNSv4; 635 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
635 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 }
644
636 si.set (conf, protocol); 645 si.set (conf, protocol);
637} 646}
638 647
639// ensure sockinfo is valid, forward if necessary 648// ensure sockinfo is valid, forward if necessary
640const sockinfo & 649const sockinfo &
… …
644 { 653 {
645 connection *r = vpn->find_router (); 654 connection *r = vpn->find_router ();
646 655
647 if (r) 656 if (r)
648 { 657 {
649 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 658 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
650 conf->nodename, r->conf->nodename); 659 conf->nodename, r->conf->nodename, (const char *)r->si);
651 return r->si; 660 return r->si;
652 } 661 }
653 else 662 else
654 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 663 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
655 conf->nodename); 664 conf->nodename);
… …
659} 668}
660 669
661void 670void
662connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 671connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
663{ 672{
664 bool ok; 673 if (!vpn->send_vpn_packet (pkt, si, tos))
665
666 switch (si.prot)
667 {
668 case PROT_IPv4:
669 ok = vpn->send_ipv4_packet (pkt, si, tos); break;
670 case PROT_UDPv4:
671 ok = vpn->send_udpv4_packet (pkt, si, tos); break;
672#if ENABLE_TCP
673 case PROT_TCPv4:
674 ok = vpn->send_tcpv4_packet (pkt, si, tos); break;
675#endif
676#if ENABLE_ICMP
677 case PROT_ICMPv4:
678 ok = vpn->send_icmpv4_packet (pkt, si, tos); break;
679#endif
680#if ENABLE_DNS
681 case PROT_DNSv4:
682 ok = send_dnsv4_packet (pkt, si, tos); break;
683#endif
684
685 default:
686 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
687 ok = false;
688 }
689
690 if (!ok)
691 reset_connection (); 674 reset_connection ();
692} 675}
693 676
694void 677void
695connection::send_ping (const sockinfo &si, u8 pong) 678connection::send_ping (const sockinfo &si, u8 pong)
… …
751} 734}
752 735
753void 736void
754connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 737connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
755{ 738{
756 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 739 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
757 conf->id, rid, (const char *)rsi); 740 conf->id, rid, (const char *)rsi);
758 741
759 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);
760 743
761 r->hmac_set (octx); 744 r->hmac_set (octx);
… …
763 746
764 delete r; 747 delete r;
765} 748}
766 749
767void 750void
768connection::establish_connection_cb (time_watcher &w) 751connection::establish_connection_cb (ev::timer &w, int revents)
769{ 752{
770 if (!ictx 753 if (!ictx
771 && conf != THISNODE 754 && conf != THISNODE
772 && connectmode != conf_node::C_NEVER 755 && connectmode != conf_node::C_NEVER
773 && connectmode != conf_node::C_DISABLED 756 && connectmode != conf_node::C_DISABLED
774 && NOW > w.at) 757 && !w.is_active ())
775 { 758 {
776 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
777 760 ? (retry_cnt & 3) + 1
778 if (retry_int < conf->max_retry) 761 : 1 << (retry_cnt >> 2));
779 retry_cnt++;
780 else
781 retry_int = conf->max_retry;
782
783 w.start (NOW + retry_int);
784 762
785 reset_si (); 763 reset_si ();
786 764
765 bool slow = si.prot & PROT_SLOW;
766
787 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);
788 vpn->send_connect_request (conf->id); 772 vpn->send_connect_request (conf->id);
773 }
789 else 774 else
790 { 775 {
776 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
777
791 const sockinfo &dsi = forward_si (si); 778 const sockinfo &dsi = forward_si (si);
779
780 slow = slow || (dsi.prot & PROT_SLOW);
792 781
793 if (dsi.valid () && auth_rate_limiter.can (dsi)) 782 if (dsi.valid () && auth_rate_limiter.can (dsi))
794 { 783 {
795 if (retry_cnt < 4) 784 if (retry_cnt < 4)
796 send_auth_request (dsi, true); 785 send_auth_request (dsi, true);
797 else 786 else
798 send_ping (dsi, 0); 787 send_ping (dsi, 0);
799 } 788 }
800 } 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);
801 } 799 }
802} 800}
803 801
804void 802void
805connection::reset_connection () 803connection::reset_connection ()
… …
808 { 806 {
809 slog (L_INFO, _("%s(%s): connection lost"), 807 slog (L_INFO, _("%s(%s): connection lost"),
810 conf->nodename, (const char *)si); 808 conf->nodename, (const char *)si);
811 809
812 if (::conf.script_node_down) 810 if (::conf.script_node_down)
813 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 }
814 } 817 }
815 818
816 delete ictx; ictx = 0; 819 delete ictx; ictx = 0;
817 delete octx; octx = 0; 820 delete octx; octx = 0;
818#if ENABLE_DNS 821#if ENABLE_DNS
… …
837 840
838 reset_connection (); 841 reset_connection ();
839} 842}
840 843
841void 844void
842connection::rekey_cb (time_watcher &w) 845connection::rekey_cb (ev::timer &w, int revents)
843{ 846{
844 reset_connection (); 847 reset_connection ();
845 establish_connection (); 848 establish_connection ();
846} 849}
847 850
… …
869{ 872{
870 if (ictx && octx) 873 if (ictx && octx)
871 send_data_packet (pkt); 874 send_data_packet (pkt);
872 else 875 else
873 { 876 {
874 if (!broadcast)//DDDD 877 if (!broadcast)
875 data_queue.put (new tap_packet (*pkt)); 878 data_queue.put (new tap_packet (*pkt));
876 879
877 establish_connection (); 880 establish_connection ();
878 } 881 }
879} 882}
… …
891} 894}
892 895
893void 896void
894connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 897connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
895{ 898{
896 last_activity = NOW; 899 last_activity = ev_now ();
897 900
898 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",
899 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;
900 906
901 switch (pkt->typ ()) 907 switch (pkt->typ ())
902 { 908 {
903 case vpn_packet::PT_PING: 909 case vpn_packet::PT_PING:
904 // we send pings instead of auth packets after some retries, 910 // we send pings instead of auth packets after some retries,
… …
964 delete octx; 970 delete octx;
965 971
966 octx = new crypto_ctx (k, 1); 972 octx = new crypto_ctx (k, 1);
967 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 973 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
968 974
969 // compatibility code, remove when no longer required
970 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
971
972 conf->protocols = p->protocols; 975 conf->protocols = p->protocols;
973 features = p->features & config_packet::get_features (); 976 features = p->features & config_packet::get_features ();
974 977
975 send_auth_response (rsi, p->id, k); 978 send_auth_response (rsi, p->id, k);
976 979
… …
1042 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1045 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1043 conf->nodename, (const char *)rsi, 1046 conf->nodename, (const char *)rsi,
1044 p->prot_major, p->prot_minor); 1047 p->prot_major, p->prot_minor);
1045 1048
1046 if (::conf.script_node_up) 1049 if (::conf.script_node_up)
1047 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 }
1048 1056
1049 break; 1057 break;
1050 } 1058 }
1051 else 1059 else
1052 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"),
… …
1086 { 1094 {
1087 vpn->tap->send (d); 1095 vpn->tap->send (d);
1088 1096
1089 if (si != rsi) 1097 if (si != rsi)
1090 { 1098 {
1091 // fast re-sync on connection changes, useful especially for tcp/ip 1099 // fast re-sync on source address changes, useful especially for tcp/ip
1092 si = rsi; 1100 si = rsi;
1093 1101
1094 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1102 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1095 conf->nodename, (const char *)si, (const char *)rsi); 1103 conf->nodename, (const char *)si, (const char *)rsi);
1096 } 1104 }
… …
1107 case vpn_packet::PT_CONNECT_REQ: 1115 case vpn_packet::PT_CONNECT_REQ:
1108 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1116 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1109 { 1117 {
1110 connect_req_packet *p = (connect_req_packet *) pkt; 1118 connect_req_packet *p = (connect_req_packet *) pkt;
1111 1119
1112 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 ())
1113 connection *c = vpn->conns[p->id - 1];
1114 conf->protocols = p->protocols;
1115
1116 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1117 conf->id, p->id, c->ictx && c->octx);
1118
1119 if (c->ictx && c->octx)
1120 { 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 {
1121 // send connect_info packets to both sides, in case one is 1130 // send connect_info packets to both sides, in case one is
1122 // behind a nat firewall (or both ;) 1131 // behind a nat firewall (or both ;)
1123 c->send_connect_info (conf->id, si, conf->protocols); 1132 c->send_connect_info (conf->id, si, conf->protocols);
1124 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 ();
1125 } 1137 }
1126 else 1138 else
1127 c->establish_connection (); 1139 slog (L_WARN,
1140 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1141 p->id);
1128 } 1142 }
1129 1143
1130 break; 1144 break;
1131 1145
1132 case vpn_packet::PT_CONNECT_INFO: 1146 case vpn_packet::PT_CONNECT_INFO:
1133 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1147 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1134 { 1148 {
1135 connect_info_packet *p = (connect_info_packet *)pkt; 1149 connect_info_packet *p = (connect_info_packet *)pkt;
1136 1150
1137 if (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 ())
1138 { 1152 {
1139 connection *c = vpn->conns[p->id - 1]; 1153 connection *c = vpn->conns[p->id - 1];
1140 1154
1141 c->conf->protocols = p->protocols; 1155 c->conf->protocols = p->protocols;
1142 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));
… …
1148 const sockinfo &dsi = forward_si (p->si); 1162 const sockinfo &dsi = forward_si (p->si);
1149 1163
1150 if (dsi.valid ()) 1164 if (dsi.valid ())
1151 c->send_auth_request (dsi, true); 1165 c->send_auth_request (dsi, true);
1152 } 1166 }
1167 else
1168 slog (L_WARN,
1169 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1170 p->id);
1153 } 1171 }
1154 1172
1155 break; 1173 break;
1156 1174
1157 default: 1175 default:
1158 send_reset (rsi); 1176 send_reset (rsi);
1159 break; 1177 break;
1160 } 1178 }
1161} 1179}
1162 1180
1163void connection::keepalive_cb (time_watcher &w) 1181void connection::keepalive_cb (ev::timer &w, int revents)
1164{ 1182{
1165 if (NOW >= last_activity + ::conf.keepalive + 30) 1183 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1166 { 1184 {
1167 reset_connection (); 1185 reset_connection ();
1168 establish_connection (); 1186 establish_connection ();
1169 } 1187 }
1170 else if (NOW < last_activity + ::conf.keepalive) 1188 else if (ev_now () < last_activity + ::conf.keepalive)
1171 w.start (last_activity + ::conf.keepalive); 1189 w.start (last_activity + ::conf.keepalive - ev::now ());
1172 else if (conf->connectmode != conf_node::C_ONDEMAND 1190 else if (conf->connectmode != conf_node::C_ONDEMAND
1173 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1191 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1174 { 1192 {
1175 send_ping (si); 1193 send_ping (si);
1176 w.start (NOW + 5); 1194 w.start (5);
1177 } 1195 }
1178 else if (NOW < last_activity + ::conf.keepalive + 10) 1196 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1179 // hold ondemand connections implicitly a few seconds longer 1197 // hold ondemand connections implicitly a few seconds longer
1180 // should delete octx, though, or something like that ;) 1198 // should delete octx, though, or something like that ;)
1181 w.start (last_activity + ::conf.keepalive + 10); 1199 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1182 else 1200 else
1183 reset_connection (); 1201 reset_connection ();
1184} 1202}
1185 1203
1186void connection::send_connect_request (int id) 1204void connection::send_connect_request (int id)
… …
1192 send_vpn_packet (p, si); 1210 send_vpn_packet (p, si);
1193 1211
1194 delete p; 1212 delete p;
1195} 1213}
1196 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
1197void connection::script_node () 1225void connection::script_init_connect_env ()
1198{ 1226{
1199 vpn->script_if_up (); 1227 vpn->script_init_env ();
1200 1228
1201 char *env; 1229 char *env;
1202 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1230 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1203 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1231 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1204 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1232 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1205 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1233 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1206} 1234}
1207 1235
1208const char *connection::script_node_up () 1236const char *connection::script_node_up ()
1209{ 1237{
1210 script_node (); 1238 script_init_connect_env ();
1211 1239
1212 putenv ("STATE=up"); 1240 putenv ((char *)"STATE=up");
1213 1241
1242 char *filename;
1243 asprintf (&filename,
1244 "%s/%s",
1245 confbase,
1214 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;
1215} 1249}
1216 1250
1217const char *connection::script_node_down () 1251const char *connection::script_node_down ()
1218{ 1252{
1219 script_node (); 1253 script_init_connect_env ();
1220 1254
1221 putenv ("STATE=down"); 1255 putenv ((char *)"STATE=down");
1222 1256
1223 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1257 char *filename;
1258 asprintf (&filename,
1259 "%s/%s",
1260 confbase,
1261 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1262
1263 return filename;
1224} 1264}
1225 1265
1226connection::connection (struct vpn *vpn, conf_node *conf) 1266connection::connection (struct vpn *vpn, conf_node *conf)
1227: vpn(vpn), conf(conf) 1267: vpn(vpn), conf(conf)
1228, rekey (this, &connection::rekey_cb)
1229, keepalive (this, &connection::keepalive_cb)
1230, establish_connection (this, &connection::establish_connection_cb)
1231#if ENABLE_DNS 1268#if ENABLE_DNS
1232, dns (0) 1269, dns (0)
1233#endif 1270#endif
1234{ 1271{
1272 rekey .set<connection, &connection::rekey_cb > (this);
1273 keepalive .set<connection, &connection::keepalive_cb > (this);
1274 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1275
1235 octx = ictx = 0; 1276 octx = ictx = 0;
1236 retry_cnt = 0; 1277 retry_cnt = 0;
1237 1278
1238 if (!conf->protocols) // make sure some protocol is enabled 1279 if (!conf->protocols) // make sure some protocol is enabled
1239 conf->protocols = PROT_UDPv4; 1280 conf->protocols = PROT_UDPv4;

Diff Legend

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