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.46 by pcg, Sat Mar 5 19:13:15 2005 UTC vs.
Revision 1.63 by pcg, Sun Dec 2 00:45:41 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 : cleaner (this, &rsa_cache::cleaner_cb)
139 { } 136 {
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
… …
630 631
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;
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 }
635 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
… …
725} 734}
726 735
727void 736void
728connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 737connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
729{ 738{
730 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 739 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
731 conf->id, rid, (const char *)rsi); 740 conf->id, rid, (const char *)rsi);
732 741
733 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);
734 743
735 r->hmac_set (octx); 744 r->hmac_set (octx);
… …
737 746
738 delete r; 747 delete r;
739} 748}
740 749
741void 750void
742connection::establish_connection_cb (time_watcher &w) 751connection::establish_connection_cb (ev::timer &w, int revents)
743{ 752{
744 if (!ictx 753 if (!ictx
745 && conf != THISNODE 754 && conf != THISNODE
746 && connectmode != conf_node::C_NEVER 755 && connectmode != conf_node::C_NEVER
747 && connectmode != conf_node::C_DISABLED 756 && connectmode != conf_node::C_DISABLED
748 && NOW > w.at) 757 && !w.is_active ())
749 { 758 {
750 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
751 760 ? (retry_cnt & 3) + 1
752 if (retry_int < conf->max_retry) 761 : 1 << (retry_cnt >> 2));
753 retry_cnt++;
754 else
755 retry_int = conf->max_retry;
756
757 w.start (NOW + retry_int);
758 762
759 reset_si (); 763 reset_si ();
760 764
765 bool slow = si.prot & PROT_SLOW;
766
761 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);
762 vpn->send_connect_request (conf->id); 772 vpn->send_connect_request (conf->id);
773 }
763 else 774 else
764 { 775 {
776 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
777
765 const sockinfo &dsi = forward_si (si); 778 const sockinfo &dsi = forward_si (si);
779
780 slow = slow || (dsi.prot & PROT_SLOW);
766 781
767 if (dsi.valid () && auth_rate_limiter.can (dsi)) 782 if (dsi.valid () && auth_rate_limiter.can (dsi))
768 { 783 {
769 if (retry_cnt < 4) 784 if (retry_cnt < 4)
770 send_auth_request (dsi, true); 785 send_auth_request (dsi, true);
771 else 786 else
772 send_ping (dsi, 0); 787 send_ping (dsi, 0);
773 } 788 }
774 } 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);
775 } 799 }
776} 800}
777 801
778void 802void
779connection::reset_connection () 803connection::reset_connection ()
… …
782 { 806 {
783 slog (L_INFO, _("%s(%s): connection lost"), 807 slog (L_INFO, _("%s(%s): connection lost"),
784 conf->nodename, (const char *)si); 808 conf->nodename, (const char *)si);
785 809
786 if (::conf.script_node_down) 810 if (::conf.script_node_down)
787 run_script (run_script_cb (this, &connection::script_node_down), false); 811 if (!run_script (run_script_cb (this, &connection::script_node_down), false))
812 slog (L_WARN, _("node-down command execution failed, continuing."));
788 } 813 }
789 814
790 delete ictx; ictx = 0; 815 delete ictx; ictx = 0;
791 delete octx; octx = 0; 816 delete octx; octx = 0;
792#if ENABLE_DNS 817#if ENABLE_DNS
… …
811 836
812 reset_connection (); 837 reset_connection ();
813} 838}
814 839
815void 840void
816connection::rekey_cb (time_watcher &w) 841connection::rekey_cb (ev::timer &w, int revents)
817{ 842{
818 reset_connection (); 843 reset_connection ();
819 establish_connection (); 844 establish_connection ();
820} 845}
821 846
… …
843{ 868{
844 if (ictx && octx) 869 if (ictx && octx)
845 send_data_packet (pkt); 870 send_data_packet (pkt);
846 else 871 else
847 { 872 {
848 if (!broadcast)//DDDD 873 if (!broadcast)
849 data_queue.put (new tap_packet (*pkt)); 874 data_queue.put (new tap_packet (*pkt));
850 875
851 establish_connection (); 876 establish_connection ();
852 } 877 }
853} 878}
… …
865} 890}
866 891
867void 892void
868connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 893connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
869{ 894{
870 last_activity = NOW; 895 last_activity = ev_now ();
871 896
872 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 897 slog (L_NOISE, "<<%d received packet type %d from %d to %d",
873 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 898 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
899
900 if (connectmode == conf_node::C_DISABLED)
901 return;
874 902
875 switch (pkt->typ ()) 903 switch (pkt->typ ())
876 { 904 {
877 case vpn_packet::PT_PING: 905 case vpn_packet::PT_PING:
878 // we send pings instead of auth packets after some retries, 906 // we send pings instead of auth packets after some retries,
… …
938 delete octx; 966 delete octx;
939 967
940 octx = new crypto_ctx (k, 1); 968 octx = new crypto_ctx (k, 1);
941 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 969 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
942 970
943 // compatibility code, remove when no longer required
944 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
945
946 conf->protocols = p->protocols; 971 conf->protocols = p->protocols;
947 features = p->features & config_packet::get_features (); 972 features = p->features & config_packet::get_features ();
948 973
949 send_auth_response (rsi, p->id, k); 974 send_auth_response (rsi, p->id, k);
950 975
… …
1016 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1041 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1017 conf->nodename, (const char *)rsi, 1042 conf->nodename, (const char *)rsi,
1018 p->prot_major, p->prot_minor); 1043 p->prot_major, p->prot_minor);
1019 1044
1020 if (::conf.script_node_up) 1045 if (::conf.script_node_up)
1021 run_script (run_script_cb (this, &connection::script_node_up), false); 1046 if (!run_script (run_script_cb (this, &connection::script_node_up), false))
1047 slog (L_WARN, _("node-up command execution failed, continuing."));
1022 1048
1023 break; 1049 break;
1024 } 1050 }
1025 else 1051 else
1026 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1052 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
… …
1060 { 1086 {
1061 vpn->tap->send (d); 1087 vpn->tap->send (d);
1062 1088
1063 if (si != rsi) 1089 if (si != rsi)
1064 { 1090 {
1065 // fast re-sync on connection changes, useful especially for tcp/ip 1091 // fast re-sync on source address changes, useful especially for tcp/ip
1066 si = rsi; 1092 si = rsi;
1067 1093
1068 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1094 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1069 conf->nodename, (const char *)si, (const char *)rsi); 1095 conf->nodename, (const char *)si, (const char *)rsi);
1070 } 1096 }
… …
1081 case vpn_packet::PT_CONNECT_REQ: 1107 case vpn_packet::PT_CONNECT_REQ:
1082 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1108 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1083 { 1109 {
1084 connect_req_packet *p = (connect_req_packet *) pkt; 1110 connect_req_packet *p = (connect_req_packet *) pkt;
1085 1111
1086 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1112 if (p->id > 0 && p->id <= vpn->conns.size ())
1087 connection *c = vpn->conns[p->id - 1];
1088 conf->protocols = p->protocols;
1089
1090 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1091 conf->id, p->id, c->ictx && c->octx);
1092
1093 if (c->ictx && c->octx)
1094 { 1113 {
1114 connection *c = vpn->conns[p->id - 1];
1115 conf->protocols = p->protocols;
1116
1117 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1118 conf->id, p->id, c->ictx && c->octx);
1119
1120 if (c->ictx && c->octx)
1121 {
1095 // send connect_info packets to both sides, in case one is 1122 // send connect_info packets to both sides, in case one is
1096 // behind a nat firewall (or both ;) 1123 // behind a nat firewall (or both ;)
1097 c->send_connect_info (conf->id, si, conf->protocols); 1124 c->send_connect_info (conf->id, si, conf->protocols);
1098 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1125 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1126 }
1127 else
1128 c->establish_connection ();
1099 } 1129 }
1100 else 1130 else
1101 c->establish_connection (); 1131 slog (L_WARN,
1132 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1133 p->id);
1102 } 1134 }
1103 1135
1104 break; 1136 break;
1105 1137
1106 case vpn_packet::PT_CONNECT_INFO: 1138 case vpn_packet::PT_CONNECT_INFO:
1107 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1139 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1108 { 1140 {
1109 connect_info_packet *p = (connect_info_packet *)pkt; 1141 connect_info_packet *p = (connect_info_packet *)pkt;
1110 1142
1111 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything 1143 if (p->id > 0 && p->id <= vpn->conns.size ())
1112 { 1144 {
1113 connection *c = vpn->conns[p->id - 1]; 1145 connection *c = vpn->conns[p->id - 1];
1114 1146
1115 c->conf->protocols = p->protocols; 1147 c->conf->protocols = p->protocols;
1116 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1148 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
… …
1122 const sockinfo &dsi = forward_si (p->si); 1154 const sockinfo &dsi = forward_si (p->si);
1123 1155
1124 if (dsi.valid ()) 1156 if (dsi.valid ())
1125 c->send_auth_request (dsi, true); 1157 c->send_auth_request (dsi, true);
1126 } 1158 }
1159 else
1160 slog (L_WARN,
1161 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1162 p->id);
1127 } 1163 }
1128 1164
1129 break; 1165 break;
1130 1166
1131 default: 1167 default:
1132 send_reset (rsi); 1168 send_reset (rsi);
1133 break; 1169 break;
1134 } 1170 }
1135} 1171}
1136 1172
1137void connection::keepalive_cb (time_watcher &w) 1173void connection::keepalive_cb (ev::timer &w, int revents)
1138{ 1174{
1139 if (NOW >= last_activity + ::conf.keepalive + 30) 1175 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1140 { 1176 {
1141 reset_connection (); 1177 reset_connection ();
1142 establish_connection (); 1178 establish_connection ();
1143 } 1179 }
1144 else if (NOW < last_activity + ::conf.keepalive) 1180 else if (ev_now () < last_activity + ::conf.keepalive)
1145 w.start (last_activity + ::conf.keepalive); 1181 w.start (last_activity + ::conf.keepalive - ev::now ());
1146 else if (conf->connectmode != conf_node::C_ONDEMAND 1182 else if (conf->connectmode != conf_node::C_ONDEMAND
1147 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1183 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1148 { 1184 {
1149 send_ping (si); 1185 send_ping (si);
1150 w.start (NOW + 5); 1186 w.start (5);
1151 } 1187 }
1152 else if (NOW < last_activity + ::conf.keepalive + 10) 1188 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1153 // hold ondemand connections implicitly a few seconds longer 1189 // hold ondemand connections implicitly a few seconds longer
1154 // should delete octx, though, or something like that ;) 1190 // should delete octx, though, or something like that ;)
1155 w.start (last_activity + ::conf.keepalive + 10); 1191 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1156 else 1192 else
1157 reset_connection (); 1193 reset_connection ();
1158} 1194}
1159 1195
1160void connection::send_connect_request (int id) 1196void connection::send_connect_request (int id)
… …
1166 send_vpn_packet (p, si); 1202 send_vpn_packet (p, si);
1167 1203
1168 delete p; 1204 delete p;
1169} 1205}
1170 1206
1207void connection::script_init_env (const char *ext)
1208{
1209 char *env;
1210 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1211 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1212 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1213 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1214 conf->id & 0xff); putenv (env);
1215}
1216
1171void connection::script_node () 1217void connection::script_init_connect_env ()
1172{ 1218{
1173 vpn->script_if_up (); 1219 vpn->script_init_env ();
1174 1220
1175 char *env; 1221 char *env;
1176 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1222 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1177 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1223 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1178 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1224 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1179 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1225 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1180} 1226}
1181 1227
1182const char *connection::script_node_up () 1228const char *connection::script_node_up ()
1183{ 1229{
1184 script_node (); 1230 script_init_connect_env ();
1185 1231
1186 putenv ("STATE=up"); 1232 putenv ((char *)"STATE=up");
1187 1233
1234 char *filename;
1235 asprintf (&filename,
1236 "%s/%s",
1237 confbase,
1188 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1238 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1239
1240 return filename;
1189} 1241}
1190 1242
1191const char *connection::script_node_down () 1243const char *connection::script_node_down ()
1192{ 1244{
1193 script_node (); 1245 script_init_connect_env ();
1194 1246
1195 putenv ("STATE=down"); 1247 putenv ((char *)"STATE=down");
1196 1248
1197 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1249 char *filename;
1250 asprintf (&filename,
1251 "%s/%s",
1252 confbase,
1253 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1254
1255 return filename;
1198} 1256}
1199 1257
1200connection::connection (struct vpn *vpn, conf_node *conf) 1258connection::connection (struct vpn *vpn, conf_node *conf)
1201: vpn(vpn), conf(conf) 1259: vpn(vpn), conf(conf)
1202, rekey (this, &connection::rekey_cb) 1260, rekey (this, &connection::rekey_cb)

Diff Legend

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