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.39 by pcg, Tue Oct 12 12:06:06 2004 UTC vs.
Revision 1.64 by pcg, Tue Dec 4 15:01:12 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 : cleaner (this, &rsa_cache::cleaner_cb)
137 { } 136 {
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
… …
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 - NRL_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 ())
… …
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 = NRL_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 }
… …
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 * NRL_ALPHA; 250 ri.pcnt = ri.pcnt * NRL_ALPHA;
249 ri.diff = ri.diff * NRL_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 > NRL_CUTOFF; 257 bool send = dif > NRL_CUTOFF;
256 258
… …
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 // make sure rekeying timeouts are slightly asymmetric 597 // make sure rekeying timeouts are slightly asymmetric
595 rekey.start (NOW + ::conf.rekey 598 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
596 + (conf->id > THISNODE->id ? 10 : 0)); 599 rekey.start (rekey_interval, rekey_interval);
597 keepalive.start (NOW + ::conf.keepalive); 600 keepalive.start (::conf.keepalive);
598 601
599 // send queued packets 602 // send queued packets
600 if (ictx && octx) 603 if (ictx && octx)
601 { 604 {
602 while (tap_packet *p = (tap_packet *)data_queue.get ()) 605 while (tap_packet *p = (tap_packet *)data_queue.get ())
… …
613 } 616 }
614 } 617 }
615 else 618 else
616 { 619 {
617 retry_cnt = 0; 620 retry_cnt = 0;
618 establish_connection.start (NOW + 5); 621 establish_connection.start (5);
619 keepalive.stop (); 622 keepalive.stop ();
620 rekey.stop (); 623 rekey.stop ();
621 } 624 }
622} 625}
623 626
… …
627 protocol = best_protocol (THISNODE->protocols & conf->protocols); 630 protocol = best_protocol (THISNODE->protocols & conf->protocols);
628 631
629 // mask out protocols we cannot establish 632 // mask out protocols we cannot establish
630 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 633 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
631 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 }
632 644
633 si.set (conf, protocol); 645 si.set (conf, protocol);
634} 646}
635 647
636// ensure sockinfo is valid, forward if necessary 648// ensure sockinfo is valid, forward if necessary
… …
641 { 653 {
642 connection *r = vpn->find_router (); 654 connection *r = vpn->find_router ();
643 655
644 if (r) 656 if (r)
645 { 657 {
646 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 658 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
647 conf->nodename, r->conf->nodename); 659 conf->nodename, r->conf->nodename, (const char *)r->si);
648 return r->si; 660 return r->si;
649 } 661 }
650 else 662 else
651 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 663 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
652 conf->nodename); 664 conf->nodename);
… …
722} 734}
723 735
724void 736void
725connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 737connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
726{ 738{
727 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 739 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
728 conf->id, rid, (const char *)rsi); 740 conf->id, rid, (const char *)rsi);
729 741
730 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);
731 743
732 r->hmac_set (octx); 744 r->hmac_set (octx);
… …
734 746
735 delete r; 747 delete r;
736} 748}
737 749
738void 750void
739connection::establish_connection_cb (time_watcher &w) 751connection::establish_connection_cb (ev::timer &w, int revents)
740{ 752{
741 if (!ictx 753 if (!ictx
742 && conf != THISNODE 754 && conf != THISNODE
743 && connectmode != conf_node::C_NEVER 755 && connectmode != conf_node::C_NEVER
744 && connectmode != conf_node::C_DISABLED 756 && connectmode != conf_node::C_DISABLED
745 && NOW > w.at) 757 && !w.is_active ())
746 { 758 {
747 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
748 760 ? (retry_cnt & 3) + 1
749 if (retry_int < conf->max_retry) 761 : 1 << (retry_cnt >> 2));
750 retry_cnt++;
751 else
752 retry_int = conf->max_retry;
753
754 w.start (NOW + retry_int);
755 762
756 reset_si (); 763 reset_si ();
757 764
765 bool slow = si.prot & PROT_SLOW;
766
758 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);
759 vpn->send_connect_request (conf->id); 772 vpn->send_connect_request (conf->id);
773 }
760 else 774 else
761 { 775 {
776 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
777
762 const sockinfo &dsi = forward_si (si); 778 const sockinfo &dsi = forward_si (si);
779
780 slow = slow || (dsi.prot & PROT_SLOW);
763 781
764 if (dsi.valid () && auth_rate_limiter.can (dsi)) 782 if (dsi.valid () && auth_rate_limiter.can (dsi))
765 { 783 {
766 if (retry_cnt < 4) 784 if (retry_cnt < 4)
767 send_auth_request (dsi, true); 785 send_auth_request (dsi, true);
768 else 786 else
769 send_ping (dsi, 0); 787 send_ping (dsi, 0);
770 } 788 }
771 } 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);
772 } 799 }
773} 800}
774 801
775void 802void
776connection::reset_connection () 803connection::reset_connection ()
… …
779 { 806 {
780 slog (L_INFO, _("%s(%s): connection lost"), 807 slog (L_INFO, _("%s(%s): connection lost"),
781 conf->nodename, (const char *)si); 808 conf->nodename, (const char *)si);
782 809
783 if (::conf.script_node_down) 810 if (::conf.script_node_down)
784 run_script (run_script_cb (this, &connection::script_node_down), false); 811 {
812 run_script_cb cb;
813 callback_set (cb, this, connection, script_node_down);
814 if (!run_script (cb, false))
815 slog (L_WARN, _("node-down command execution failed, continuing."));
816 }
785 } 817 }
786 818
787 delete ictx; ictx = 0; 819 delete ictx; ictx = 0;
788 delete octx; octx = 0; 820 delete octx; octx = 0;
821#if ENABLE_DNS
822 dnsv4_reset_connection ();
823#endif
789 824
790 si.host = 0; 825 si.host = 0;
791 826
792 last_activity = 0; 827 last_activity = 0;
793 retry_cnt = 0; 828 retry_cnt = 0;
… …
805 840
806 reset_connection (); 841 reset_connection ();
807} 842}
808 843
809void 844void
810connection::rekey_cb (time_watcher &w) 845connection::rekey_cb (ev::timer &w, int revents)
811{ 846{
812 reset_connection (); 847 reset_connection ();
813 establish_connection (); 848 establish_connection ();
814} 849}
815 850
… …
837{ 872{
838 if (ictx && octx) 873 if (ictx && octx)
839 send_data_packet (pkt); 874 send_data_packet (pkt);
840 else 875 else
841 { 876 {
842 if (!broadcast)//DDDD 877 if (!broadcast)
843 data_queue.put (new tap_packet (*pkt)); 878 data_queue.put (new tap_packet (*pkt));
844 879
845 establish_connection (); 880 establish_connection ();
846 } 881 }
847} 882}
… …
859} 894}
860 895
861void 896void
862connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 897connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
863{ 898{
864 last_activity = NOW; 899 last_activity = ev_now ();
865 900
866 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",
867 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;
868 906
869 switch (pkt->typ ()) 907 switch (pkt->typ ())
870 { 908 {
871 case vpn_packet::PT_PING: 909 case vpn_packet::PT_PING:
872 // we send pings instead of auth packets after some retries, 910 // we send pings instead of auth packets after some retries,
… …
932 delete octx; 970 delete octx;
933 971
934 octx = new crypto_ctx (k, 1); 972 octx = new crypto_ctx (k, 1);
935 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 973 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
936 974
937 // compatibility code, remove when no longer required
938 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
939
940 conf->protocols = p->protocols; 975 conf->protocols = p->protocols;
941 features = p->features & config_packet::get_features (); 976 features = p->features & config_packet::get_features ();
942 977
943 send_auth_response (rsi, p->id, k); 978 send_auth_response (rsi, p->id, k);
944 979
… …
1010 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1045 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1011 conf->nodename, (const char *)rsi, 1046 conf->nodename, (const char *)rsi,
1012 p->prot_major, p->prot_minor); 1047 p->prot_major, p->prot_minor);
1013 1048
1014 if (::conf.script_node_up) 1049 if (::conf.script_node_up)
1015 run_script (run_script_cb (this, &connection::script_node_up), false); 1050 {
1051 run_script_cb cb;
1052 callback_set (cb, this, connection, script_node_up);
1053 if (!run_script (cb, false))
1054 slog (L_WARN, _("node-up command execution failed, continuing."));
1055 }
1016 1056
1017 break; 1057 break;
1018 } 1058 }
1019 else 1059 else
1020 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"),
… …
1054 { 1094 {
1055 vpn->tap->send (d); 1095 vpn->tap->send (d);
1056 1096
1057 if (si != rsi) 1097 if (si != rsi)
1058 { 1098 {
1059 // fast re-sync on connection changes, useful especially for tcp/ip 1099 // fast re-sync on source address changes, useful especially for tcp/ip
1060 si = rsi; 1100 si = rsi;
1061 1101
1062 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1102 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1063 conf->nodename, (const char *)si, (const char *)rsi); 1103 conf->nodename, (const char *)si, (const char *)rsi);
1064 } 1104 }
… …
1075 case vpn_packet::PT_CONNECT_REQ: 1115 case vpn_packet::PT_CONNECT_REQ:
1076 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1116 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1077 { 1117 {
1078 connect_req_packet *p = (connect_req_packet *) pkt; 1118 connect_req_packet *p = (connect_req_packet *) pkt;
1079 1119
1080 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 ())
1081 connection *c = vpn->conns[p->id - 1];
1082 conf->protocols = p->protocols;
1083
1084 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1085 conf->id, p->id, c->ictx && c->octx);
1086
1087 if (c->ictx && c->octx)
1088 { 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 {
1089 // send connect_info packets to both sides, in case one is 1130 // send connect_info packets to both sides, in case one is
1090 // behind a nat firewall (or both ;) 1131 // behind a nat firewall (or both ;)
1091 c->send_connect_info (conf->id, si, conf->protocols); 1132 c->send_connect_info (conf->id, si, conf->protocols);
1092 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 ();
1093 } 1137 }
1094 else 1138 else
1095 c->establish_connection (); 1139 slog (L_WARN,
1140 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1141 p->id);
1096 } 1142 }
1097 1143
1098 break; 1144 break;
1099 1145
1100 case vpn_packet::PT_CONNECT_INFO: 1146 case vpn_packet::PT_CONNECT_INFO:
1101 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1147 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1102 { 1148 {
1103 connect_info_packet *p = (connect_info_packet *)pkt; 1149 connect_info_packet *p = (connect_info_packet *)pkt;
1104 1150
1105 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 ())
1106 { 1152 {
1107 connection *c = vpn->conns[p->id - 1]; 1153 connection *c = vpn->conns[p->id - 1];
1108 1154
1109 c->conf->protocols = p->protocols; 1155 c->conf->protocols = p->protocols;
1110 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));
… …
1116 const sockinfo &dsi = forward_si (p->si); 1162 const sockinfo &dsi = forward_si (p->si);
1117 1163
1118 if (dsi.valid ()) 1164 if (dsi.valid ())
1119 c->send_auth_request (dsi, true); 1165 c->send_auth_request (dsi, true);
1120 } 1166 }
1167 else
1168 slog (L_WARN,
1169 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1170 p->id);
1121 } 1171 }
1122 1172
1123 break; 1173 break;
1124 1174
1125 default: 1175 default:
1126 send_reset (rsi); 1176 send_reset (rsi);
1127 break; 1177 break;
1128 } 1178 }
1129} 1179}
1130 1180
1131void connection::keepalive_cb (time_watcher &w) 1181void connection::keepalive_cb (ev::timer &w, int revents)
1132{ 1182{
1133 if (NOW >= last_activity + ::conf.keepalive + 30) 1183 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1134 { 1184 {
1135 reset_connection (); 1185 reset_connection ();
1136 establish_connection (); 1186 establish_connection ();
1137 } 1187 }
1138 else if (NOW < last_activity + ::conf.keepalive) 1188 else if (ev_now () < last_activity + ::conf.keepalive)
1139 w.start (last_activity + ::conf.keepalive); 1189 w.start (last_activity + ::conf.keepalive - ev::now ());
1140 else if (conf->connectmode != conf_node::C_ONDEMAND 1190 else if (conf->connectmode != conf_node::C_ONDEMAND
1141 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1191 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1142 { 1192 {
1143 send_ping (si); 1193 send_ping (si);
1144 w.start (NOW + 5); 1194 w.start (5);
1145 } 1195 }
1146 else if (NOW < last_activity + ::conf.keepalive + 10) 1196 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1147 // hold ondemand connections implicitly a few seconds longer 1197 // hold ondemand connections implicitly a few seconds longer
1148 // should delete octx, though, or something like that ;) 1198 // should delete octx, though, or something like that ;)
1149 w.start (last_activity + ::conf.keepalive + 10); 1199 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1150 else 1200 else
1151 reset_connection (); 1201 reset_connection ();
1152} 1202}
1153 1203
1154void connection::send_connect_request (int id) 1204void connection::send_connect_request (int id)
… …
1160 send_vpn_packet (p, si); 1210 send_vpn_packet (p, si);
1161 1211
1162 delete p; 1212 delete p;
1163} 1213}
1164 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
1165void connection::script_node () 1225void connection::script_init_connect_env ()
1166{ 1226{
1167 vpn->script_if_up (); 1227 vpn->script_init_env ();
1168 1228
1169 char *env; 1229 char *env;
1170 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1230 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1171 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1231 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1172 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1232 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1173 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1233 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1174} 1234}
1175 1235
1176const char *connection::script_node_up () 1236const char *connection::script_node_up ()
1177{ 1237{
1178 script_node (); 1238 script_init_connect_env ();
1179 1239
1180 putenv ("STATE=up"); 1240 putenv ((char *)"STATE=up");
1181 1241
1242 char *filename;
1243 asprintf (&filename,
1244 "%s/%s",
1245 confbase,
1182 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;
1183} 1249}
1184 1250
1185const char *connection::script_node_down () 1251const char *connection::script_node_down ()
1186{ 1252{
1187 script_node (); 1253 script_init_connect_env ();
1188 1254
1189 putenv ("STATE=down"); 1255 putenv ((char *)"STATE=down");
1190 1256
1191 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1257 char *filename;
1192} 1258 asprintf (&filename,
1259 "%s/%s",
1260 confbase,
1261 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1193 1262
1263 return filename;
1264}
1265
1194connection::connection(struct vpn *vpn_) 1266connection::connection (struct vpn *vpn, conf_node *conf)
1195: vpn(vpn_) 1267: vpn(vpn), conf(conf)
1196, rekey (this, &connection::rekey_cb) 1268, rekey (this, &connection::rekey_cb)
1197, keepalive (this, &connection::keepalive_cb) 1269, keepalive (this, &connection::keepalive_cb)
1198, establish_connection (this, &connection::establish_connection_cb) 1270, establish_connection (this, &connection::establish_connection_cb)
1271#if ENABLE_DNS
1272, dns (0)
1273#endif
1199{ 1274{
1200 octx = ictx = 0; 1275 octx = ictx = 0;
1201 retry_cnt = 0; 1276 retry_cnt = 0;
1202 1277
1278 if (!conf->protocols) // make sure some protocol is enabled
1279 conf->protocols = PROT_UDPv4;
1280
1203 connectmode = conf_node::C_ALWAYS; // initial setting 1281 connectmode = conf_node::C_ALWAYS; // initial setting
1204 reset_connection (); 1282 reset_connection ();
1205} 1283}
1206 1284
1207connection::~connection () 1285connection::~connection ()

Diff Legend

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