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.61 by pcg, Sat Nov 10 19:43:37 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)))
… …
587///////////////////////////////////////////////////////////////////////////// 584/////////////////////////////////////////////////////////////////////////////
588 585
589void 586void
590connection::connection_established () 587connection::connection_established ()
591{ 588{
589 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
590
592 if (ictx && octx) 591 if (ictx && octx)
593 { 592 {
594 connectmode = conf->connectmode; 593 connectmode = conf->connectmode;
595 594
596 // make sure rekeying timeouts are slightly asymmetric 595 // make sure rekeying timeouts are slightly asymmetric
597 rekey.start (NOW + ::conf.rekey 596 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
598 + (conf->id > THISNODE->id ? 10 : 0)); 597 rekey.start (rekey_interval, rekey_interval);
599 keepalive.start (NOW + ::conf.keepalive); 598 keepalive.start (::conf.keepalive);
600 599
601 // send queued packets 600 // send queued packets
602 if (ictx && octx) 601 if (ictx && octx)
603 { 602 {
604 while (tap_packet *p = (tap_packet *)data_queue.get ()) 603 while (tap_packet *p = (tap_packet *)data_queue.get ())
… …
615 } 614 }
616 } 615 }
617 else 616 else
618 { 617 {
619 retry_cnt = 0; 618 retry_cnt = 0;
620 establish_connection.start (NOW + 5); 619 establish_connection.start (5);
621 keepalive.stop (); 620 keepalive.stop ();
622 rekey.stop (); 621 rekey.stop ();
623 } 622 }
624} 623}
625 624
… …
630 629
631 // mask out protocols we cannot establish 630 // mask out protocols we cannot establish
632 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 631 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
633 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 632 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
634 if (!conf->dns_port) protocol &= ~PROT_DNSv4; 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 }
635 642
636 si.set (conf, protocol); 643 si.set (conf, protocol);
637} 644}
638 645
639// ensure sockinfo is valid, forward if necessary 646// ensure sockinfo is valid, forward if necessary
… …
725} 732}
726 733
727void 734void
728connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 735connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
729{ 736{
730 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 737 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
731 conf->id, rid, (const char *)rsi); 738 conf->id, rid, (const char *)rsi);
732 739
733 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);
734 741
735 r->hmac_set (octx); 742 r->hmac_set (octx);
… …
737 744
738 delete r; 745 delete r;
739} 746}
740 747
741void 748void
742connection::establish_connection_cb (time_watcher &w) 749connection::establish_connection_cb (ev::timer &w, int revents)
743{ 750{
744 if (!ictx 751 if (!ictx
745 && conf != THISNODE 752 && conf != THISNODE
746 && connectmode != conf_node::C_NEVER 753 && connectmode != conf_node::C_NEVER
747 && connectmode != conf_node::C_DISABLED 754 && connectmode != conf_node::C_DISABLED
748 && NOW > w.at) 755 && !w.is_active ())
749 { 756 {
750 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
751 758 ? (retry_cnt & 3) + 1
752 if (retry_int < conf->max_retry) 759 : 1 << (retry_cnt >> 2));
753 retry_cnt++;
754 else
755 retry_int = conf->max_retry;
756
757 w.start (NOW + retry_int);
758 760
759 reset_si (); 761 reset_si ();
760 762
763 bool slow = si.prot & PROT_SLOW;
764
761 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);
762 vpn->send_connect_request (conf->id); 770 vpn->send_connect_request (conf->id);
771 }
763 else 772 else
764 { 773 {
774 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
775
765 const sockinfo &dsi = forward_si (si); 776 const sockinfo &dsi = forward_si (si);
777
778 slow = slow || (dsi.prot & PROT_SLOW);
766 779
767 if (dsi.valid () && auth_rate_limiter.can (dsi)) 780 if (dsi.valid () && auth_rate_limiter.can (dsi))
768 { 781 {
769 if (retry_cnt < 4) 782 if (retry_cnt < 4)
770 send_auth_request (dsi, true); 783 send_auth_request (dsi, true);
771 else 784 else
772 send_ping (dsi, 0); 785 send_ping (dsi, 0);
773 } 786 }
774 } 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);
775 } 797 }
776} 798}
777 799
778void 800void
779connection::reset_connection () 801connection::reset_connection ()
… …
782 { 804 {
783 slog (L_INFO, _("%s(%s): connection lost"), 805 slog (L_INFO, _("%s(%s): connection lost"),
784 conf->nodename, (const char *)si); 806 conf->nodename, (const char *)si);
785 807
786 if (::conf.script_node_down) 808 if (::conf.script_node_down)
787 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."));
788 } 811 }
789 812
790 delete ictx; ictx = 0; 813 delete ictx; ictx = 0;
791 delete octx; octx = 0; 814 delete octx; octx = 0;
792#if ENABLE_DNS 815#if ENABLE_DNS
… …
811 834
812 reset_connection (); 835 reset_connection ();
813} 836}
814 837
815void 838void
816connection::rekey_cb (time_watcher &w) 839connection::rekey_cb (ev::timer &w, int revents)
817{ 840{
818 reset_connection (); 841 reset_connection ();
819 establish_connection (); 842 establish_connection ();
820} 843}
821 844
… …
843{ 866{
844 if (ictx && octx) 867 if (ictx && octx)
845 send_data_packet (pkt); 868 send_data_packet (pkt);
846 else 869 else
847 { 870 {
848 if (!broadcast)//DDDD 871 if (!broadcast)
849 data_queue.put (new tap_packet (*pkt)); 872 data_queue.put (new tap_packet (*pkt));
850 873
851 establish_connection (); 874 establish_connection ();
852 } 875 }
853} 876}
… …
865} 888}
866 889
867void 890void
868connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 891connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
869{ 892{
870 last_activity = NOW; 893 last_activity = ev::ev_now ();
871 894
872 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",
873 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;
874 900
875 switch (pkt->typ ()) 901 switch (pkt->typ ())
876 { 902 {
877 case vpn_packet::PT_PING: 903 case vpn_packet::PT_PING:
878 // we send pings instead of auth packets after some retries, 904 // we send pings instead of auth packets after some retries,
… …
938 delete octx; 964 delete octx;
939 965
940 octx = new crypto_ctx (k, 1); 966 octx = new crypto_ctx (k, 1);
941 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 967 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
942 968
943 // compatibility code, remove when no longer required
944 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
945
946 conf->protocols = p->protocols; 969 conf->protocols = p->protocols;
947 features = p->features & config_packet::get_features (); 970 features = p->features & config_packet::get_features ();
948 971
949 send_auth_response (rsi, p->id, k); 972 send_auth_response (rsi, p->id, k);
950 973
… …
1016 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1039 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1017 conf->nodename, (const char *)rsi, 1040 conf->nodename, (const char *)rsi,
1018 p->prot_major, p->prot_minor); 1041 p->prot_major, p->prot_minor);
1019 1042
1020 if (::conf.script_node_up) 1043 if (::conf.script_node_up)
1021 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."));
1022 1046
1023 break; 1047 break;
1024 } 1048 }
1025 else 1049 else
1026 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"),
… …
1060 { 1084 {
1061 vpn->tap->send (d); 1085 vpn->tap->send (d);
1062 1086
1063 if (si != rsi) 1087 if (si != rsi)
1064 { 1088 {
1065 // fast re-sync on connection changes, useful especially for tcp/ip 1089 // fast re-sync on source address changes, useful especially for tcp/ip
1066 si = rsi; 1090 si = rsi;
1067 1091
1068 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1092 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1069 conf->nodename, (const char *)si, (const char *)rsi); 1093 conf->nodename, (const char *)si, (const char *)rsi);
1070 } 1094 }
… …
1081 case vpn_packet::PT_CONNECT_REQ: 1105 case vpn_packet::PT_CONNECT_REQ:
1082 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1106 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1083 { 1107 {
1084 connect_req_packet *p = (connect_req_packet *) pkt; 1108 connect_req_packet *p = (connect_req_packet *) pkt;
1085 1109
1086 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 ())
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 { 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 {
1095 // send connect_info packets to both sides, in case one is 1120 // send connect_info packets to both sides, in case one is
1096 // behind a nat firewall (or both ;) 1121 // behind a nat firewall (or both ;)
1097 c->send_connect_info (conf->id, si, conf->protocols); 1122 c->send_connect_info (conf->id, si, conf->protocols);
1098 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 ();
1099 } 1127 }
1100 else 1128 else
1101 c->establish_connection (); 1129 slog (L_WARN,
1130 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1131 p->id);
1102 } 1132 }
1103 1133
1104 break; 1134 break;
1105 1135
1106 case vpn_packet::PT_CONNECT_INFO: 1136 case vpn_packet::PT_CONNECT_INFO:
1107 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1137 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1108 { 1138 {
1109 connect_info_packet *p = (connect_info_packet *)pkt; 1139 connect_info_packet *p = (connect_info_packet *)pkt;
1110 1140
1111 if (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 ())
1112 { 1142 {
1113 connection *c = vpn->conns[p->id - 1]; 1143 connection *c = vpn->conns[p->id - 1];
1114 1144
1115 c->conf->protocols = p->protocols; 1145 c->conf->protocols = p->protocols;
1116 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));
… …
1122 const sockinfo &dsi = forward_si (p->si); 1152 const sockinfo &dsi = forward_si (p->si);
1123 1153
1124 if (dsi.valid ()) 1154 if (dsi.valid ())
1125 c->send_auth_request (dsi, true); 1155 c->send_auth_request (dsi, true);
1126 } 1156 }
1157 else
1158 slog (L_WARN,
1159 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1160 p->id);
1127 } 1161 }
1128 1162
1129 break; 1163 break;
1130 1164
1131 default: 1165 default:
1132 send_reset (rsi); 1166 send_reset (rsi);
1133 break; 1167 break;
1134 } 1168 }
1135} 1169}
1136 1170
1137void connection::keepalive_cb (time_watcher &w) 1171void connection::keepalive_cb (ev::timer &w, int revents)
1138{ 1172{
1139 if (NOW >= last_activity + ::conf.keepalive + 30) 1173 if (ev::ev_now () >= last_activity + ::conf.keepalive + 30)
1140 { 1174 {
1141 reset_connection (); 1175 reset_connection ();
1142 establish_connection (); 1176 establish_connection ();
1143 } 1177 }
1144 else if (NOW < last_activity + ::conf.keepalive) 1178 else if (ev::ev_now () < last_activity + ::conf.keepalive)
1145 w.start (last_activity + ::conf.keepalive); 1179 w.start (last_activity + ::conf.keepalive - ev::now ());
1146 else if (conf->connectmode != conf_node::C_ONDEMAND 1180 else if (conf->connectmode != conf_node::C_ONDEMAND
1147 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1181 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1148 { 1182 {
1149 send_ping (si); 1183 send_ping (si);
1150 w.start (NOW + 5); 1184 w.start (5);
1151 } 1185 }
1152 else if (NOW < last_activity + ::conf.keepalive + 10) 1186 else if (ev::ev_now () < last_activity + ::conf.keepalive + 10)
1153 // hold ondemand connections implicitly a few seconds longer 1187 // hold ondemand connections implicitly a few seconds longer
1154 // should delete octx, though, or something like that ;) 1188 // should delete octx, though, or something like that ;)
1155 w.start (last_activity + ::conf.keepalive + 10); 1189 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1156 else 1190 else
1157 reset_connection (); 1191 reset_connection ();
1158} 1192}
1159 1193
1160void connection::send_connect_request (int id) 1194void connection::send_connect_request (int id)
… …
1166 send_vpn_packet (p, si); 1200 send_vpn_packet (p, si);
1167 1201
1168 delete p; 1202 delete p;
1169} 1203}
1170 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
1171void connection::script_node () 1215void connection::script_init_connect_env ()
1172{ 1216{
1173 vpn->script_if_up (); 1217 vpn->script_init_env ();
1174 1218
1175 char *env; 1219 char *env;
1176 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1220 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1177 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1221 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1178 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1222 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1179 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1223 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1180} 1224}
1181 1225
1182const char *connection::script_node_up () 1226const char *connection::script_node_up ()
1183{ 1227{
1184 script_node (); 1228 script_init_connect_env ();
1185 1229
1186 putenv ("STATE=up"); 1230 putenv ((char *)"STATE=up");
1187 1231
1232 char *filename;
1233 asprintf (&filename,
1234 "%s/%s",
1235 confbase,
1188 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;
1189} 1239}
1190 1240
1191const char *connection::script_node_down () 1241const char *connection::script_node_down ()
1192{ 1242{
1193 script_node (); 1243 script_init_connect_env ();
1194 1244
1195 putenv ("STATE=down"); 1245 putenv ((char *)"STATE=down");
1196 1246
1197 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1247 char *filename;
1248 asprintf (&filename,
1249 "%s/%s",
1250 confbase,
1251 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1252
1253 return filename;
1198} 1254}
1199 1255
1200connection::connection (struct vpn *vpn, conf_node *conf) 1256connection::connection (struct vpn *vpn, conf_node *conf)
1201: vpn(vpn), conf(conf) 1257: vpn(vpn), conf(conf)
1202, rekey (this, &connection::rekey_cb) 1258, rekey (this, &connection::rekey_cb)

Diff Legend

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