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

Diff Legend

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