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.36 by pcg, Sun May 30 17:36:00 2004 UTC vs.
Revision 1.60 by pcg, Sat Nov 10 05:14:22 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)))
… …
590 if (ictx && octx) 589 if (ictx && octx)
591 { 590 {
592 connectmode = conf->connectmode; 591 connectmode = conf->connectmode;
593 592
594 // make sure rekeying timeouts are slightly asymmetric 593 // make sure rekeying timeouts are slightly asymmetric
595 rekey.start (NOW + ::conf.rekey 594 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
596 + (conf->id > THISNODE->id ? 10 : 0)); 595 rekey.start (rekey_interval, rekey_interval);
597 keepalive.start (NOW + ::conf.keepalive); 596 keepalive.start (::conf.keepalive);
598 597
599 // send queued packets 598 // send queued packets
600 if (ictx && octx) 599 if (ictx && octx)
601 { 600 {
602 while (tap_packet *p = (tap_packet *)data_queue.get ()) 601 while (tap_packet *p = (tap_packet *)data_queue.get ())
… …
613 } 612 }
614 } 613 }
615 else 614 else
616 { 615 {
617 retry_cnt = 0; 616 retry_cnt = 0;
618 establish_connection.start (NOW + 5); 617 establish_connection.start (5);
619 keepalive.stop (); 618 keepalive.stop ();
620 rekey.stop (); 619 rekey.stop ();
621 } 620 }
622} 621}
623 622
… …
627 protocol = best_protocol (THISNODE->protocols & conf->protocols); 626 protocol = best_protocol (THISNODE->protocols & conf->protocols);
628 627
629 // mask out protocols we cannot establish 628 // mask out protocols we cannot establish
630 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 629 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
631 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 630 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
631 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
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 }
632 640
633 si.set (conf, protocol); 641 si.set (conf, protocol);
634} 642}
635 643
636// ensure sockinfo is valid, forward if necessary 644// ensure sockinfo is valid, forward if necessary
… …
641 { 649 {
642 connection *r = vpn->find_router (); 650 connection *r = vpn->find_router ();
643 651
644 if (r) 652 if (r)
645 { 653 {
646 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 654 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
647 conf->nodename, r->conf->nodename); 655 conf->nodename, r->conf->nodename, (const char *)r->si);
648 return r->si; 656 return r->si;
649 } 657 }
650 else 658 else
651 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 659 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
652 conf->nodename); 660 conf->nodename);
… …
722} 730}
723 731
724void 732void
725connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 733connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
726{ 734{
727 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 735 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
728 conf->id, rid, (const char *)rsi); 736 conf->id, rid, (const char *)rsi);
729 737
730 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);
731 739
732 r->hmac_set (octx); 740 r->hmac_set (octx);
… …
734 742
735 delete r; 743 delete r;
736} 744}
737 745
738void 746void
739connection::establish_connection_cb (time_watcher &w) 747connection::establish_connection_cb (ev::timer &w, int revents)
740{ 748{
741 if (!ictx 749 if (!ictx
742 && conf != THISNODE 750 && conf != THISNODE
743 && connectmode != conf_node::C_NEVER 751 && connectmode != conf_node::C_NEVER
744 && connectmode != conf_node::C_DISABLED 752 && connectmode != conf_node::C_DISABLED
745 && NOW > w.at) 753 && !w.is_active ())
746 { 754 {
747 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
748 756 ? (retry_cnt & 3) + 1
749 if (retry_int < 3600 * 8) 757 : 1 << (retry_cnt >> 2));
750 retry_cnt++;
751
752 w.start (NOW + retry_int);
753 758
754 reset_si (); 759 reset_si ();
755 760
761 bool slow = si.prot & PROT_SLOW;
762
756 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);
757 vpn->send_connect_request (conf->id); 767 vpn->send_connect_request (conf->id);
768 }
758 else 769 else
759 { 770 {
760 const sockinfo &dsi = forward_si (si); 771 const sockinfo &dsi = forward_si (si);
772
773 slow = slow || (dsi.prot & PROT_SLOW);
761 774
762 if (dsi.valid () && auth_rate_limiter.can (dsi)) 775 if (dsi.valid () && auth_rate_limiter.can (dsi))
763 { 776 {
764 if (retry_cnt < 4) 777 if (retry_cnt < 4)
765 send_auth_request (dsi, true); 778 send_auth_request (dsi, true);
766 else 779 else
767 send_ping (dsi, 0); 780 send_ping (dsi, 0);
768 } 781 }
769 } 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);
770 } 792 }
771} 793}
772 794
773void 795void
774connection::reset_connection () 796connection::reset_connection ()
… …
777 { 799 {
778 slog (L_INFO, _("%s(%s): connection lost"), 800 slog (L_INFO, _("%s(%s): connection lost"),
779 conf->nodename, (const char *)si); 801 conf->nodename, (const char *)si);
780 802
781 if (::conf.script_node_down) 803 if (::conf.script_node_down)
782 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."));
783 } 806 }
784 807
785 delete ictx; ictx = 0; 808 delete ictx; ictx = 0;
786 delete octx; octx = 0; 809 delete octx; octx = 0;
810#if ENABLE_DNS
811 dnsv4_reset_connection ();
812#endif
787 813
788 si.host= 0; 814 si.host = 0;
789 815
790 last_activity = 0; 816 last_activity = 0;
791 retry_cnt = 0; 817 retry_cnt = 0;
792 818
793 rekey.stop (); 819 rekey.stop ();
… …
803 829
804 reset_connection (); 830 reset_connection ();
805} 831}
806 832
807void 833void
808connection::rekey_cb (time_watcher &w) 834connection::rekey_cb (ev::timer &w, int revents)
809{ 835{
810 reset_connection (); 836 reset_connection ();
811 establish_connection (); 837 establish_connection ();
812} 838}
813 839
… …
835{ 861{
836 if (ictx && octx) 862 if (ictx && octx)
837 send_data_packet (pkt); 863 send_data_packet (pkt);
838 else 864 else
839 { 865 {
840 if (!broadcast)//DDDD 866 if (!broadcast)
841 data_queue.put (new tap_packet (*pkt)); 867 data_queue.put (new tap_packet (*pkt));
842 868
843 establish_connection (); 869 establish_connection ();
844 } 870 }
845} 871}
… …
857} 883}
858 884
859void 885void
860connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 886connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
861{ 887{
862 last_activity = NOW; 888 last_activity = ev::ev_now ();
863 889
864 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",
865 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 891 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
866 892
867 switch (pkt->typ ()) 893 switch (pkt->typ ())
… …
930 delete octx; 956 delete octx;
931 957
932 octx = new crypto_ctx (k, 1); 958 octx = new crypto_ctx (k, 1);
933 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 959 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
934 960
935 // compatibility code, remove when no longer required
936 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
937
938 conf->protocols = p->protocols; 961 conf->protocols = p->protocols;
939 features = p->features & config_packet::get_features (); 962 features = p->features & config_packet::get_features ();
940 963
941 send_auth_response (rsi, p->id, k); 964 send_auth_response (rsi, p->id, k);
942 965
… …
1008 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1031 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1009 conf->nodename, (const char *)rsi, 1032 conf->nodename, (const char *)rsi,
1010 p->prot_major, p->prot_minor); 1033 p->prot_major, p->prot_minor);
1011 1034
1012 if (::conf.script_node_up) 1035 if (::conf.script_node_up)
1013 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."));
1014 1038
1015 break; 1039 break;
1016 } 1040 }
1017 else 1041 else
1018 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"),
… …
1052 { 1076 {
1053 vpn->tap->send (d); 1077 vpn->tap->send (d);
1054 1078
1055 if (si != rsi) 1079 if (si != rsi)
1056 { 1080 {
1057 // fast re-sync on connection changes, useful especially for tcp/ip 1081 // fast re-sync on source address changes, useful especially for tcp/ip
1058 si = rsi; 1082 si = rsi;
1059 1083
1060 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1084 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1061 conf->nodename, (const char *)si, (const char *)rsi); 1085 conf->nodename, (const char *)si, (const char *)rsi);
1062 } 1086 }
… …
1073 case vpn_packet::PT_CONNECT_REQ: 1097 case vpn_packet::PT_CONNECT_REQ:
1074 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1098 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1075 { 1099 {
1076 connect_req_packet *p = (connect_req_packet *) pkt; 1100 connect_req_packet *p = (connect_req_packet *) pkt;
1077 1101
1078 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 ())
1079 connection *c = vpn->conns[p->id - 1];
1080 conf->protocols = p->protocols;
1081
1082 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1083 conf->id, p->id, c->ictx && c->octx);
1084
1085 if (c->ictx && c->octx)
1086 { 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 {
1087 // send connect_info packets to both sides, in case one is 1112 // send connect_info packets to both sides, in case one is
1088 // behind a nat firewall (or both ;) 1113 // behind a nat firewall (or both ;)
1089 c->send_connect_info (conf->id, si, conf->protocols); 1114 c->send_connect_info (conf->id, si, conf->protocols);
1090 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 ();
1091 } 1119 }
1092 else 1120 else
1093 c->establish_connection (); 1121 slog (L_WARN,
1122 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1123 p->id);
1094 } 1124 }
1095 1125
1096 break; 1126 break;
1097 1127
1098 case vpn_packet::PT_CONNECT_INFO: 1128 case vpn_packet::PT_CONNECT_INFO:
1099 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1129 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1100 { 1130 {
1101 connect_info_packet *p = (connect_info_packet *) pkt; 1131 connect_info_packet *p = (connect_info_packet *)pkt;
1102 1132
1103 assert (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 ())
1104 1134 {
1105 connection *c = vpn->conns[p->id - 1]; 1135 connection *c = vpn->conns[p->id - 1];
1106 1136
1107 c->conf->protocols = p->protocols; 1137 c->conf->protocols = p->protocols;
1108 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));
1109 p->si.upgrade_protocol (protocol, c->conf); 1139 p->si.upgrade_protocol (protocol, c->conf);
1110 1140
1111 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1141 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1112 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1142 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1113 1143
1114 const sockinfo &dsi = forward_si (p->si); 1144 const sockinfo &dsi = forward_si (p->si);
1115 1145
1116 if (dsi.valid ()) 1146 if (dsi.valid ())
1117 c->send_auth_request (dsi, true); 1147 c->send_auth_request (dsi, true);
1148 }
1149 else
1150 slog (L_WARN,
1151 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1152 p->id);
1118 } 1153 }
1119 1154
1120 break; 1155 break;
1121 1156
1122 default: 1157 default:
1123 send_reset (rsi); 1158 send_reset (rsi);
1124 break; 1159 break;
1125 } 1160 }
1126} 1161}
1127 1162
1128void connection::keepalive_cb (time_watcher &w) 1163void connection::keepalive_cb (ev::timer &w, int revents)
1129{ 1164{
1130 if (NOW >= last_activity + ::conf.keepalive + 30) 1165 if (ev::ev_now () >= last_activity + ::conf.keepalive + 30)
1131 { 1166 {
1132 reset_connection (); 1167 reset_connection ();
1133 establish_connection (); 1168 establish_connection ();
1134 } 1169 }
1135 else if (NOW < last_activity + ::conf.keepalive) 1170 else if (ev::ev_now () < last_activity + ::conf.keepalive)
1136 w.start (last_activity + ::conf.keepalive); 1171 w.start (last_activity + ::conf.keepalive - ev::now ());
1137 else if (conf->connectmode != conf_node::C_ONDEMAND 1172 else if (conf->connectmode != conf_node::C_ONDEMAND
1138 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1173 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1139 { 1174 {
1140 send_ping (si); 1175 send_ping (si);
1141 w.start (NOW + 5); 1176 w.start (5);
1142 } 1177 }
1143 else if (NOW < last_activity + ::conf.keepalive + 10) 1178 else if (ev::ev_now () < last_activity + ::conf.keepalive + 10)
1144 // hold ondemand connections implicitly a few seconds longer 1179 // hold ondemand connections implicitly a few seconds longer
1145 // should delete octx, though, or something like that ;) 1180 // should delete octx, though, or something like that ;)
1146 w.start (last_activity + ::conf.keepalive + 10); 1181 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1147 else 1182 else
1148 reset_connection (); 1183 reset_connection ();
1149} 1184}
1150 1185
1151void connection::send_connect_request (int id) 1186void connection::send_connect_request (int id)
… …
1157 send_vpn_packet (p, si); 1192 send_vpn_packet (p, si);
1158 1193
1159 delete p; 1194 delete p;
1160} 1195}
1161 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
1162void connection::script_node () 1207void connection::script_init_connect_env ()
1163{ 1208{
1164 vpn->script_if_up (); 1209 vpn->script_init_env ();
1165 1210
1166 char *env; 1211 char *env;
1167 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1212 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1168 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1213 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1169 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1214 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1170 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1215 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1171} 1216}
1172 1217
1173const char *connection::script_node_up () 1218const char *connection::script_node_up ()
1174{ 1219{
1175 script_node (); 1220 script_init_connect_env ();
1176 1221
1177 putenv ("STATE=up"); 1222 putenv ((char *)"STATE=up");
1178 1223
1224 char *filename;
1225 asprintf (&filename,
1226 "%s/%s",
1227 confbase,
1179 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;
1180} 1231}
1181 1232
1182const char *connection::script_node_down () 1233const char *connection::script_node_down ()
1183{ 1234{
1184 script_node (); 1235 script_init_connect_env ();
1185 1236
1186 putenv ("STATE=down"); 1237 putenv ((char *)"STATE=down");
1187 1238
1188 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1239 char *filename;
1189} 1240 asprintf (&filename,
1241 "%s/%s",
1242 confbase,
1243 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1190 1244
1245 return filename;
1246}
1247
1191connection::connection(struct vpn *vpn_) 1248connection::connection (struct vpn *vpn, conf_node *conf)
1192: vpn(vpn_) 1249: vpn(vpn), conf(conf)
1193, rekey (this, &connection::rekey_cb) 1250, rekey (this, &connection::rekey_cb)
1194, keepalive (this, &connection::keepalive_cb) 1251, keepalive (this, &connection::keepalive_cb)
1195, establish_connection (this, &connection::establish_connection_cb) 1252, establish_connection (this, &connection::establish_connection_cb)
1253#if ENABLE_DNS
1254, dns (0)
1255#endif
1196{ 1256{
1197 octx = ictx = 0; 1257 octx = ictx = 0;
1198 retry_cnt = 0; 1258 retry_cnt = 0;
1199 1259
1260 if (!conf->protocols) // make sure some protocol is enabled
1261 conf->protocols = PROT_UDPv4;
1262
1200 connectmode = conf_node::C_ALWAYS; // initial setting 1263 connectmode = conf_node::C_ALWAYS; // initial setting
1201 reset_connection (); 1264 reset_connection ();
1202} 1265}
1203 1266
1204connection::~connection () 1267connection::~connection ()

Diff Legend

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