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.60 by pcg, Sat Nov 10 05:14:22 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"
… …
94 rsachallenge chg; 90 rsachallenge chg;
95}; 91};
96 92
97struct rsa_cache : list<rsa_entry> 93struct rsa_cache : list<rsa_entry>
98{ 94{
99 void cleaner_cb (time_watcher &w); time_watcher cleaner; 95 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
100 96
101 bool find (const rsaid &id, rsachallenge &chg) 97 bool find (const rsaid &id, rsachallenge &chg)
102 { 98 {
103 for (iterator i = begin (); i != end (); ++i) 99 for (iterator i = begin (); i != end (); ++i)
104 { 100 {
105 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 101 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev::ev_now ())
106 { 102 {
107 memcpy (&chg, &i->chg, sizeof chg); 103 memcpy (&chg, &i->chg, sizeof chg);
108 104
109 erase (i); 105 erase (i);
110 return true; 106 return true;
111 } 107 }
112 } 108 }
113 109
114 if (cleaner.at < NOW) 110 if (!cleaner.is_active ())
115 cleaner.start (NOW + RSA_TTL); 111 cleaner.again ();
116 112
117 return false; 113 return false;
118 } 114 }
119 115
120 void gen (rsaid &id, rsachallenge &chg) 116 void gen (rsaid &id, rsachallenge &chg)
121 { 117 {
122 rsa_entry e; 118 rsa_entry e;
123 119
124 RAND_bytes ((unsigned char *)&id, sizeof id); 120 RAND_bytes ((unsigned char *)&id, sizeof id);
125 RAND_bytes ((unsigned char *)&chg, sizeof chg); 121 RAND_bytes ((unsigned char *)&chg, sizeof chg);
126 122
127 e.expire = NOW + RSA_TTL; 123 e.expire = ev::ev_now () + RSA_TTL;
128 e.id = id; 124 e.id = id;
129 memcpy (&e.chg, &chg, sizeof chg); 125 memcpy (&e.chg, &chg, sizeof chg);
130 126
131 push_back (e); 127 push_back (e);
132 128
133 if (cleaner.at < NOW) 129 if (!cleaner.is_active ())
134 cleaner.start (NOW + RSA_TTL); 130 cleaner.again ();
135 } 131 }
136 132
137 rsa_cache () 133 rsa_cache ()
138 : cleaner (this, &rsa_cache::cleaner_cb) 134 : cleaner (this, &rsa_cache::cleaner_cb)
139 { } 135 {
136 cleaner.set (RSA_TTL, RSA_TTL);
137 }
140 138
141} rsa_cache; 139} rsa_cache;
142 140
143void rsa_cache::cleaner_cb (time_watcher &w) 141void rsa_cache::cleaner_cb (ev::timer &w, int revents)
144{ 142{
145 if (!empty ()) 143 if (empty ())
144 w.stop ();
145 else
146 { 146 {
147 w.start (NOW + RSA_TTL);
148
149 for (iterator i = begin (); i != end (); ) 147 for (iterator i = begin (); i != end (); )
150 if (i->expire <= NOW) 148 if (i->expire <= ev::ev_now ())
151 i = erase (i); 149 i = erase (i);
152 else 150 else
153 ++i; 151 ++i;
154 } 152 }
155} 153}
… …
222 iterator i; 220 iterator i;
223 221
224 for (i = begin (); i != end (); ) 222 for (i = begin (); i != end (); )
225 if (i->host == host) 223 if (i->host == host)
226 break; 224 break;
227 else if (i->last < NOW - NRL_EXPIRE) 225 else if (i->last < ev::ev_now () - NRL_EXPIRE)
228 i = erase (i); 226 i = erase (i);
229 else 227 else
230 i++; 228 i++;
231 229
232 if (i == end ()) 230 if (i == end ())
… …
234 net_rateinfo ri; 232 net_rateinfo ri;
235 233
236 ri.host = host; 234 ri.host = host;
237 ri.pcnt = 1.; 235 ri.pcnt = 1.;
238 ri.diff = NRL_MAXDIF; 236 ri.diff = NRL_MAXDIF;
239 ri.last = NOW; 237 ri.last = ev::ev_now ();
240 238
241 push_front (ri); 239 push_front (ri);
242 240
243 return true; 241 return true;
244 } 242 }
… …
246 { 244 {
247 net_rateinfo ri (*i); 245 net_rateinfo ri (*i);
248 erase (i); 246 erase (i);
249 247
250 ri.pcnt = ri.pcnt * NRL_ALPHA; 248 ri.pcnt = ri.pcnt * NRL_ALPHA;
251 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last); 249 ri.diff = ri.diff * NRL_ALPHA + (ev::ev_now () - ri.last);
252 250
253 ri.last = NOW; 251 ri.last = ev::ev_now ();
254 252
255 double dif = ri.diff / ri.pcnt; 253 double dif = ri.diff / ri.pcnt;
256 254
257 bool send = dif > NRL_CUTOFF; 255 bool send = dif > NRL_CUTOFF;
258 256
… …
468 f |= FEATURE_COMPRESSION; 466 f |= FEATURE_COMPRESSION;
469#endif 467#endif
470#if ENABLE_ROHC 468#if ENABLE_ROHC
471 f |= FEATURE_ROHC; 469 f |= FEATURE_ROHC;
472#endif 470#endif
471#if ENABLE_BRIDGING
472 f |= FEATURE_BRIDGING;
473#endif
473 return f; 474 return f;
474 } 475 }
475}; 476};
476 477
477void config_packet::setup (ptype type, int dst) 478void config_packet::setup (ptype type, int dst)
478{ 479{
479 prot_major = PROTOCOL_MAJOR; 480 prot_major = PROTOCOL_MAJOR;
480 prot_minor = PROTOCOL_MINOR; 481 prot_minor = PROTOCOL_MINOR;
481 randsize = RAND_SIZE; 482 randsize = RAND_SIZE;
482 hmaclen = HMACLENGTH; 483 hmaclen = HMACLENGTH;
483 flags = ENABLE_COMPRESSION ? 0x81 : 0x80; 484 flags = 0;
484 challengelen = sizeof (rsachallenge); 485 challengelen = sizeof (rsachallenge);
485 features = get_features (); 486 features = get_features ();
486 487
487 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 488 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
488 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 489 digest_nid = htonl (EVP_MD_type (RSA_HASH));
… …
498 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 499 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
499 else if (randsize != RAND_SIZE) 500 else if (randsize != RAND_SIZE)
500 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 501 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
501 else if (hmaclen != HMACLENGTH) 502 else if (hmaclen != HMACLENGTH)
502 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH); 503 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)) 504 else if (challengelen != sizeof (rsachallenge))
508 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 505 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
509 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 506 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)); 507 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))) 508 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
592 if (ictx && octx) 589 if (ictx && octx)
593 { 590 {
594 connectmode = conf->connectmode; 591 connectmode = conf->connectmode;
595 592
596 // make sure rekeying timeouts are slightly asymmetric 593 // make sure rekeying timeouts are slightly asymmetric
597 rekey.start (NOW + ::conf.rekey 594 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
598 + (conf->id > THISNODE->id ? 10 : 0)); 595 rekey.start (rekey_interval, rekey_interval);
599 keepalive.start (NOW + ::conf.keepalive); 596 keepalive.start (::conf.keepalive);
600 597
601 // send queued packets 598 // send queued packets
602 if (ictx && octx) 599 if (ictx && octx)
603 { 600 {
604 while (tap_packet *p = (tap_packet *)data_queue.get ()) 601 while (tap_packet *p = (tap_packet *)data_queue.get ())
… …
615 } 612 }
616 } 613 }
617 else 614 else
618 { 615 {
619 retry_cnt = 0; 616 retry_cnt = 0;
620 establish_connection.start (NOW + 5); 617 establish_connection.start (5);
621 keepalive.stop (); 618 keepalive.stop ();
622 rekey.stop (); 619 rekey.stop ();
623 } 620 }
624} 621}
625 622
… …
631 // mask out protocols we cannot establish 628 // mask out protocols we cannot establish
632 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 629 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
633 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 630 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
634 if (!conf->dns_port) protocol &= ~PROT_DNSv4; 631 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
635 632
633 if (protocol
634 && (!conf->can_direct (THISNODE)
635 || !THISNODE->can_direct (conf)))
636 {
637 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename);
638 protocol = 0;
639 }
640
636 si.set (conf, protocol); 641 si.set (conf, protocol);
637} 642}
638 643
639// ensure sockinfo is valid, forward if necessary 644// ensure sockinfo is valid, forward if necessary
640const sockinfo & 645const sockinfo &
… …
644 { 649 {
645 connection *r = vpn->find_router (); 650 connection *r = vpn->find_router ();
646 651
647 if (r) 652 if (r)
648 { 653 {
649 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 654 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
650 conf->nodename, r->conf->nodename); 655 conf->nodename, r->conf->nodename, (const char *)r->si);
651 return r->si; 656 return r->si;
652 } 657 }
653 else 658 else
654 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 659 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
655 conf->nodename); 660 conf->nodename);
… …
659} 664}
660 665
661void 666void
662connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 667connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
663{ 668{
664 bool ok; 669 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 (); 670 reset_connection ();
692} 671}
693 672
694void 673void
695connection::send_ping (const sockinfo &si, u8 pong) 674connection::send_ping (const sockinfo &si, u8 pong)
… …
751} 730}
752 731
753void 732void
754connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 733connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
755{ 734{
756 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 735 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
757 conf->id, rid, (const char *)rsi); 736 conf->id, rid, (const char *)rsi);
758 737
759 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 738 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
760 739
761 r->hmac_set (octx); 740 r->hmac_set (octx);
… …
763 742
764 delete r; 743 delete r;
765} 744}
766 745
767void 746void
768connection::establish_connection_cb (time_watcher &w) 747connection::establish_connection_cb (ev::timer &w, int revents)
769{ 748{
770 if (!ictx 749 if (!ictx
771 && conf != THISNODE 750 && conf != THISNODE
772 && connectmode != conf_node::C_NEVER 751 && connectmode != conf_node::C_NEVER
773 && connectmode != conf_node::C_DISABLED 752 && connectmode != conf_node::C_DISABLED
774 && NOW > w.at) 753 && !w.is_active ())
775 { 754 {
776 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 755 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
777 756 ? (retry_cnt & 3) + 1
778 if (retry_int < conf->max_retry) 757 : 1 << (retry_cnt >> 2));
779 retry_cnt++;
780 else
781 retry_int = conf->max_retry;
782
783 w.start (NOW + retry_int);
784 758
785 reset_si (); 759 reset_si ();
786 760
761 bool slow = si.prot & PROT_SLOW;
762
787 if (si.prot && !si.host) 763 if (si.prot && !si.host)
764 {
765 /*TODO*/ /* start the timer so we don't recurse endlessly */
766 w.start (1);
788 vpn->send_connect_request (conf->id); 767 vpn->send_connect_request (conf->id);
768 }
789 else 769 else
790 { 770 {
791 const sockinfo &dsi = forward_si (si); 771 const sockinfo &dsi = forward_si (si);
772
773 slow = slow || (dsi.prot & PROT_SLOW);
792 774
793 if (dsi.valid () && auth_rate_limiter.can (dsi)) 775 if (dsi.valid () && auth_rate_limiter.can (dsi))
794 { 776 {
795 if (retry_cnt < 4) 777 if (retry_cnt < 4)
796 send_auth_request (dsi, true); 778 send_auth_request (dsi, true);
797 else 779 else
798 send_ping (dsi, 0); 780 send_ping (dsi, 0);
799 } 781 }
800 } 782 }
783
784 retry_int *= slow ? 8. : 0.7;
785
786 if (retry_int < conf->max_retry)
787 retry_cnt++;
788 else
789 retry_int = conf->max_retry;
790
791 w.start (retry_int);
801 } 792 }
802} 793}
803 794
804void 795void
805connection::reset_connection () 796connection::reset_connection ()
… …
808 { 799 {
809 slog (L_INFO, _("%s(%s): connection lost"), 800 slog (L_INFO, _("%s(%s): connection lost"),
810 conf->nodename, (const char *)si); 801 conf->nodename, (const char *)si);
811 802
812 if (::conf.script_node_down) 803 if (::conf.script_node_down)
813 run_script (run_script_cb (this, &connection::script_node_down), false); 804 if (!run_script (run_script_cb (this, &connection::script_node_down), false))
805 slog (L_WARN, _("node-down command execution failed, continuing."));
814 } 806 }
815 807
816 delete ictx; ictx = 0; 808 delete ictx; ictx = 0;
817 delete octx; octx = 0; 809 delete octx; octx = 0;
818#if ENABLE_DNS 810#if ENABLE_DNS
… …
837 829
838 reset_connection (); 830 reset_connection ();
839} 831}
840 832
841void 833void
842connection::rekey_cb (time_watcher &w) 834connection::rekey_cb (ev::timer &w, int revents)
843{ 835{
844 reset_connection (); 836 reset_connection ();
845 establish_connection (); 837 establish_connection ();
846} 838}
847 839
… …
869{ 861{
870 if (ictx && octx) 862 if (ictx && octx)
871 send_data_packet (pkt); 863 send_data_packet (pkt);
872 else 864 else
873 { 865 {
874 if (!broadcast)//DDDD 866 if (!broadcast)
875 data_queue.put (new tap_packet (*pkt)); 867 data_queue.put (new tap_packet (*pkt));
876 868
877 establish_connection (); 869 establish_connection ();
878 } 870 }
879} 871}
… …
891} 883}
892 884
893void 885void
894connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 886connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
895{ 887{
896 last_activity = NOW; 888 last_activity = ev::ev_now ();
897 889
898 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 890 slog (L_NOISE, "<<%d received packet type %d from %d to %d",
899 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 891 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
900 892
901 switch (pkt->typ ()) 893 switch (pkt->typ ())
… …
964 delete octx; 956 delete octx;
965 957
966 octx = new crypto_ctx (k, 1); 958 octx = new crypto_ctx (k, 1);
967 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 959 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
968 960
969 // compatibility code, remove when no longer required
970 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
971
972 conf->protocols = p->protocols; 961 conf->protocols = p->protocols;
973 features = p->features & config_packet::get_features (); 962 features = p->features & config_packet::get_features ();
974 963
975 send_auth_response (rsi, p->id, k); 964 send_auth_response (rsi, p->id, k);
976 965
… …
1042 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1031 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1043 conf->nodename, (const char *)rsi, 1032 conf->nodename, (const char *)rsi,
1044 p->prot_major, p->prot_minor); 1033 p->prot_major, p->prot_minor);
1045 1034
1046 if (::conf.script_node_up) 1035 if (::conf.script_node_up)
1047 run_script (run_script_cb (this, &connection::script_node_up), false); 1036 if (!run_script (run_script_cb (this, &connection::script_node_up), false))
1037 slog (L_WARN, _("node-up command execution failed, continuing."));
1048 1038
1049 break; 1039 break;
1050 } 1040 }
1051 else 1041 else
1052 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1042 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
… …
1086 { 1076 {
1087 vpn->tap->send (d); 1077 vpn->tap->send (d);
1088 1078
1089 if (si != rsi) 1079 if (si != rsi)
1090 { 1080 {
1091 // fast re-sync on connection changes, useful especially for tcp/ip 1081 // fast re-sync on source address changes, useful especially for tcp/ip
1092 si = rsi; 1082 si = rsi;
1093 1083
1094 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1084 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1095 conf->nodename, (const char *)si, (const char *)rsi); 1085 conf->nodename, (const char *)si, (const char *)rsi);
1096 } 1086 }
… …
1107 case vpn_packet::PT_CONNECT_REQ: 1097 case vpn_packet::PT_CONNECT_REQ:
1108 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1098 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1109 { 1099 {
1110 connect_req_packet *p = (connect_req_packet *) pkt; 1100 connect_req_packet *p = (connect_req_packet *) pkt;
1111 1101
1112 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1102 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 { 1103 {
1104 connection *c = vpn->conns[p->id - 1];
1105 conf->protocols = p->protocols;
1106
1107 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1108 conf->id, p->id, c->ictx && c->octx);
1109
1110 if (c->ictx && c->octx)
1111 {
1121 // send connect_info packets to both sides, in case one is 1112 // send connect_info packets to both sides, in case one is
1122 // behind a nat firewall (or both ;) 1113 // behind a nat firewall (or both ;)
1123 c->send_connect_info (conf->id, si, conf->protocols); 1114 c->send_connect_info (conf->id, si, conf->protocols);
1124 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1115 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1116 }
1117 else
1118 c->establish_connection ();
1125 } 1119 }
1126 else 1120 else
1127 c->establish_connection (); 1121 slog (L_WARN,
1122 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1123 p->id);
1128 } 1124 }
1129 1125
1130 break; 1126 break;
1131 1127
1132 case vpn_packet::PT_CONNECT_INFO: 1128 case vpn_packet::PT_CONNECT_INFO:
1133 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1129 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1134 { 1130 {
1135 connect_info_packet *p = (connect_info_packet *)pkt; 1131 connect_info_packet *p = (connect_info_packet *)pkt;
1136 1132
1137 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything 1133 if (p->id > 0 && p->id <= vpn->conns.size ())
1138 { 1134 {
1139 connection *c = vpn->conns[p->id - 1]; 1135 connection *c = vpn->conns[p->id - 1];
1140 1136
1141 c->conf->protocols = p->protocols; 1137 c->conf->protocols = p->protocols;
1142 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1138 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
… …
1148 const sockinfo &dsi = forward_si (p->si); 1144 const sockinfo &dsi = forward_si (p->si);
1149 1145
1150 if (dsi.valid ()) 1146 if (dsi.valid ())
1151 c->send_auth_request (dsi, true); 1147 c->send_auth_request (dsi, true);
1152 } 1148 }
1149 else
1150 slog (L_WARN,
1151 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1152 p->id);
1153 } 1153 }
1154 1154
1155 break; 1155 break;
1156 1156
1157 default: 1157 default:
1158 send_reset (rsi); 1158 send_reset (rsi);
1159 break; 1159 break;
1160 } 1160 }
1161} 1161}
1162 1162
1163void connection::keepalive_cb (time_watcher &w) 1163void connection::keepalive_cb (ev::timer &w, int revents)
1164{ 1164{
1165 if (NOW >= last_activity + ::conf.keepalive + 30) 1165 if (ev::ev_now () >= last_activity + ::conf.keepalive + 30)
1166 { 1166 {
1167 reset_connection (); 1167 reset_connection ();
1168 establish_connection (); 1168 establish_connection ();
1169 } 1169 }
1170 else if (NOW < last_activity + ::conf.keepalive) 1170 else if (ev::ev_now () < last_activity + ::conf.keepalive)
1171 w.start (last_activity + ::conf.keepalive); 1171 w.start (last_activity + ::conf.keepalive - ev::now ());
1172 else if (conf->connectmode != conf_node::C_ONDEMAND 1172 else if (conf->connectmode != conf_node::C_ONDEMAND
1173 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1173 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1174 { 1174 {
1175 send_ping (si); 1175 send_ping (si);
1176 w.start (NOW + 5); 1176 w.start (5);
1177 } 1177 }
1178 else if (NOW < last_activity + ::conf.keepalive + 10) 1178 else if (ev::ev_now () < last_activity + ::conf.keepalive + 10)
1179 // hold ondemand connections implicitly a few seconds longer 1179 // hold ondemand connections implicitly a few seconds longer
1180 // should delete octx, though, or something like that ;) 1180 // should delete octx, though, or something like that ;)
1181 w.start (last_activity + ::conf.keepalive + 10); 1181 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1182 else 1182 else
1183 reset_connection (); 1183 reset_connection ();
1184} 1184}
1185 1185
1186void connection::send_connect_request (int id) 1186void connection::send_connect_request (int id)
… …
1192 send_vpn_packet (p, si); 1192 send_vpn_packet (p, si);
1193 1193
1194 delete p; 1194 delete p;
1195} 1195}
1196 1196
1197void connection::script_init_env (const char *ext)
1198{
1199 char *env;
1200 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1201 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1202 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1203 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1204 conf->id & 0xff); putenv (env);
1205}
1206
1197void connection::script_node () 1207void connection::script_init_connect_env ()
1198{ 1208{
1199 vpn->script_if_up (); 1209 vpn->script_init_env ();
1200 1210
1201 char *env; 1211 char *env;
1202 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1212 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1203 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1213 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1204 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1214 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1205 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1215 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1206} 1216}
1207 1217
1208const char *connection::script_node_up () 1218const char *connection::script_node_up ()
1209{ 1219{
1210 script_node (); 1220 script_init_connect_env ();
1211 1221
1212 putenv ("STATE=up"); 1222 putenv ((char *)"STATE=up");
1213 1223
1224 char *filename;
1225 asprintf (&filename,
1226 "%s/%s",
1227 confbase,
1214 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1228 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1229
1230 return filename;
1215} 1231}
1216 1232
1217const char *connection::script_node_down () 1233const char *connection::script_node_down ()
1218{ 1234{
1219 script_node (); 1235 script_init_connect_env ();
1220 1236
1221 putenv ("STATE=down"); 1237 putenv ((char *)"STATE=down");
1222 1238
1223 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1239 char *filename;
1240 asprintf (&filename,
1241 "%s/%s",
1242 confbase,
1243 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1244
1245 return filename;
1224} 1246}
1225 1247
1226connection::connection (struct vpn *vpn, conf_node *conf) 1248connection::connection (struct vpn *vpn, conf_node *conf)
1227: vpn(vpn), conf(conf) 1249: vpn(vpn), conf(conf)
1228, rekey (this, &connection::rekey_cb) 1250, rekey (this, &connection::rekey_cb)

Diff Legend

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