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.33 by pcg, Sun Mar 21 13:16:36 2004 UTC vs.
Revision 1.59 by pcg, Mon Dec 5 12:58:09 2005 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"
… …
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 (time_watcher &w); time_watcher 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 > 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.at < NOW)
113 cleaner.start (NOW + RSA_TTL); 111 cleaner.start (NOW + RSA_TTL);
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 = 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.at < NOW)
132 cleaner.start (NOW + RSA_TTL); 130 cleaner.start (NOW + RSA_TTL);
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 { }
138 136
139} rsa_cache; 137} rsa_cache;
140 138
141void rsa_cache::cleaner_cb (time_watcher &w) 139void rsa_cache::cleaner_cb (time_watcher &w)
142{ 140{
… …
202// only do action once every x seconds per host whole allowing bursts. 200// only do action once every x seconds per host whole allowing bursts.
203// this implementation ("splay list" ;) is inefficient, 201// this implementation ("splay list" ;) is inefficient,
204// but low on resources. 202// but low on resources.
205struct net_rate_limiter : list<net_rateinfo> 203struct net_rate_limiter : list<net_rateinfo>
206{ 204{
207 static const double ALPHA = 1. - 1. / 600.; // allow bursts 205# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
208 static const double CUTOFF = 10.; // one event every CUTOFF seconds 206# define NRL_CUTOFF 10. // one event every CUTOFF seconds
209 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 207# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
210 static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value 208# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
211 209
212 bool can (const sockinfo &si) { return can((u32)si.host); } 210 bool can (const sockinfo &si) { return can((u32)si.host); }
213 bool can (u32 host); 211 bool can (u32 host);
214}; 212};
215 213
… …
220 iterator i; 218 iterator i;
221 219
222 for (i = begin (); i != end (); ) 220 for (i = begin (); i != end (); )
223 if (i->host == host) 221 if (i->host == host)
224 break; 222 break;
225 else if (i->last < NOW - EXPIRE) 223 else if (i->last < NOW - NRL_EXPIRE)
226 i = erase (i); 224 i = erase (i);
227 else 225 else
228 i++; 226 i++;
229 227
230 if (i == end ()) 228 if (i == end ())
231 { 229 {
232 net_rateinfo ri; 230 net_rateinfo ri;
233 231
234 ri.host = host; 232 ri.host = host;
235 ri.pcnt = 1.; 233 ri.pcnt = 1.;
236 ri.diff = MAXDIF; 234 ri.diff = NRL_MAXDIF;
237 ri.last = NOW; 235 ri.last = NOW;
238 236
239 push_front (ri); 237 push_front (ri);
240 238
241 return true; 239 return true;
… …
243 else 241 else
244 { 242 {
245 net_rateinfo ri (*i); 243 net_rateinfo ri (*i);
246 erase (i); 244 erase (i);
247 245
248 ri.pcnt = ri.pcnt * ALPHA; 246 ri.pcnt = ri.pcnt * NRL_ALPHA;
249 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 247 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last);
250 248
251 ri.last = NOW; 249 ri.last = NOW;
252 250
253 double dif = ri.diff / ri.pcnt; 251 double dif = ri.diff / ri.pcnt;
254 252
255 bool send = dif > CUTOFF; 253 bool send = dif > NRL_CUTOFF;
256 254
257 if (dif > MAXDIF) 255 if (dif > NRL_MAXDIF)
258 { 256 {
259 ri.pcnt = 1.; 257 ri.pcnt = 1.;
260 ri.diff = MAXDIF; 258 ri.diff = NRL_MAXDIF;
261 } 259 }
262 else if (send) 260 else if (send)
263 ri.pcnt++; 261 ri.pcnt++;
264 262
265 push_front (ri); 263 push_front (ri);
… …
466 f |= FEATURE_COMPRESSION; 464 f |= FEATURE_COMPRESSION;
467#endif 465#endif
468#if ENABLE_ROHC 466#if ENABLE_ROHC
469 f |= FEATURE_ROHC; 467 f |= FEATURE_ROHC;
470#endif 468#endif
469#if ENABLE_BRIDGING
470 f |= FEATURE_BRIDGING;
471#endif
471 return f; 472 return f;
472 } 473 }
473}; 474};
474 475
475void config_packet::setup (ptype type, int dst) 476void config_packet::setup (ptype type, int dst)
476{ 477{
477 prot_major = PROTOCOL_MAJOR; 478 prot_major = PROTOCOL_MAJOR;
478 prot_minor = PROTOCOL_MINOR; 479 prot_minor = PROTOCOL_MINOR;
479 randsize = RAND_SIZE; 480 randsize = RAND_SIZE;
480 hmaclen = HMACLENGTH; 481 hmaclen = HMACLENGTH;
481 flags = ENABLE_COMPRESSION ? 0x81 : 0x80; 482 flags = 0;
482 challengelen = sizeof (rsachallenge); 483 challengelen = sizeof (rsachallenge);
483 features = get_features (); 484 features = get_features ();
484 485
485 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 486 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
486 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 487 digest_nid = htonl (EVP_MD_type (RSA_HASH));
… …
496 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 497 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
497 else if (randsize != RAND_SIZE) 498 else if (randsize != RAND_SIZE)
498 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 499 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
499 else if (hmaclen != HMACLENGTH) 500 else if (hmaclen != HMACLENGTH)
500 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH); 501 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)) 502 else if (challengelen != sizeof (rsachallenge))
506 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 503 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
507 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 504 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)); 505 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))) 506 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
589{ 586{
590 if (ictx && octx) 587 if (ictx && octx)
591 { 588 {
592 connectmode = conf->connectmode; 589 connectmode = conf->connectmode;
593 590
591 // make sure rekeying timeouts are slightly asymmetric
594 rekey.start (NOW + ::conf.rekey); 592 rekey.start (NOW + ::conf.rekey
593 + (conf->id > THISNODE->id ? 10 : 0));
595 keepalive.start (NOW + ::conf.keepalive); 594 keepalive.start (NOW + ::conf.keepalive);
596 595
597 // send queued packets 596 // send queued packets
598 if (ictx && octx) 597 if (ictx && octx)
599 { 598 {
… …
625 protocol = best_protocol (THISNODE->protocols & conf->protocols); 624 protocol = best_protocol (THISNODE->protocols & conf->protocols);
626 625
627 // mask out protocols we cannot establish 626 // mask out protocols we cannot establish
628 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 627 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
629 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 628 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
629 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
630
631 if (protocol
632 && (!conf->can_direct (THISNODE)
633 || !THISNODE->can_direct (conf)))
634 {
635 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename);
636 protocol = 0;
637 }
630 638
631 si.set (conf, protocol); 639 si.set (conf, protocol);
632} 640}
633 641
634// ensure sockinfo is valid, forward if necessary 642// ensure sockinfo is valid, forward if necessary
… …
639 { 647 {
640 connection *r = vpn->find_router (); 648 connection *r = vpn->find_router ();
641 649
642 if (r) 650 if (r)
643 { 651 {
644 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 652 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
645 conf->nodename, r->conf->nodename); 653 conf->nodename, r->conf->nodename, (const char *)r->si);
646 return r->si; 654 return r->si;
647 } 655 }
648 else 656 else
649 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 657 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
650 conf->nodename); 658 conf->nodename);
… …
720} 728}
721 729
722void 730void
723connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 731connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
724{ 732{
725 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 733 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
726 conf->id, rid, (const char *)rsi); 734 conf->id, rid, (const char *)rsi);
727 735
728 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 736 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
729 737
730 r->hmac_set (octx); 738 r->hmac_set (octx);
… …
740 && conf != THISNODE 748 && conf != THISNODE
741 && connectmode != conf_node::C_NEVER 749 && connectmode != conf_node::C_NEVER
742 && connectmode != conf_node::C_DISABLED 750 && connectmode != conf_node::C_DISABLED
743 && NOW > w.at) 751 && NOW > w.at)
744 { 752 {
745 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 753 w.at = TSTAMP_MAX; // first disable this watcher in case of recursion
746 754
747 if (retry_int < 3600 * 8) 755 double retry_int = double (retry_cnt & 3
748 retry_cnt++; 756 ? (retry_cnt & 3) + 1
749 757 : 1 << (retry_cnt >> 2));
750 w.start (NOW + retry_int);
751 758
752 reset_si (); 759 reset_si ();
760
761 bool slow = si.prot & PROT_SLOW;
753 762
754 if (si.prot && !si.host) 763 if (si.prot && !si.host)
755 vpn->send_connect_request (conf->id); 764 vpn->send_connect_request (conf->id);
756 else 765 else
757 { 766 {
758 const sockinfo &dsi = forward_si (si); 767 const sockinfo &dsi = forward_si (si);
768
769 slow = slow || (dsi.prot & PROT_SLOW);
759 770
760 if (dsi.valid () && auth_rate_limiter.can (dsi)) 771 if (dsi.valid () && auth_rate_limiter.can (dsi))
761 { 772 {
762 if (retry_cnt < 4) 773 if (retry_cnt < 4)
763 send_auth_request (dsi, true); 774 send_auth_request (dsi, true);
764 else 775 else
765 send_ping (dsi, 0); 776 send_ping (dsi, 0);
766 } 777 }
767 } 778 }
779
780 retry_int *= slow ? 8. : 0.7;
781
782 if (retry_int < conf->max_retry)
783 retry_cnt++;
784 else
785 retry_int = conf->max_retry;
786
787 w.start (NOW + retry_int);
768 } 788 }
769} 789}
770 790
771void 791void
772connection::reset_connection () 792connection::reset_connection ()
… …
775 { 795 {
776 slog (L_INFO, _("%s(%s): connection lost"), 796 slog (L_INFO, _("%s(%s): connection lost"),
777 conf->nodename, (const char *)si); 797 conf->nodename, (const char *)si);
778 798
779 if (::conf.script_node_down) 799 if (::conf.script_node_down)
780 run_script (run_script_cb (this, &connection::script_node_down), false); 800 if (!run_script (run_script_cb (this, &connection::script_node_down), false))
801 slog (L_WARN, _("node-down command execution failed, continuing."));
781 } 802 }
782 803
783 delete ictx; ictx = 0; 804 delete ictx; ictx = 0;
784 delete octx; octx = 0; 805 delete octx; octx = 0;
806#if ENABLE_DNS
807 dnsv4_reset_connection ();
808#endif
785 809
786 si.host= 0; 810 si.host = 0;
787 811
788 last_activity = 0; 812 last_activity = 0;
789 retry_cnt = 0; 813 retry_cnt = 0;
790 814
791 rekey.stop (); 815 rekey.stop ();
… …
833{ 857{
834 if (ictx && octx) 858 if (ictx && octx)
835 send_data_packet (pkt); 859 send_data_packet (pkt);
836 else 860 else
837 { 861 {
838 if (!broadcast)//DDDD 862 if (!broadcast)
839 data_queue.put (new tap_packet (*pkt)); 863 data_queue.put (new tap_packet (*pkt));
840 864
841 establish_connection (); 865 establish_connection ();
842 } 866 }
843} 867}
… …
928 delete octx; 952 delete octx;
929 953
930 octx = new crypto_ctx (k, 1); 954 octx = new crypto_ctx (k, 1);
931 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 955 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
932 956
933 // compatibility code, remove when no longer required
934 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
935
936 conf->protocols = p->protocols; 957 conf->protocols = p->protocols;
937 features = p->features & config_packet::get_features (); 958 features = p->features & config_packet::get_features ();
938 959
939 send_auth_response (rsi, p->id, k); 960 send_auth_response (rsi, p->id, k);
940 961
… …
1006 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1027 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1007 conf->nodename, (const char *)rsi, 1028 conf->nodename, (const char *)rsi,
1008 p->prot_major, p->prot_minor); 1029 p->prot_major, p->prot_minor);
1009 1030
1010 if (::conf.script_node_up) 1031 if (::conf.script_node_up)
1011 run_script (run_script_cb (this, &connection::script_node_up), false); 1032 if (!run_script (run_script_cb (this, &connection::script_node_up), false))
1033 slog (L_WARN, _("node-up command execution failed, continuing."));
1012 1034
1013 break; 1035 break;
1014 } 1036 }
1015 else 1037 else
1016 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1038 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
… …
1050 { 1072 {
1051 vpn->tap->send (d); 1073 vpn->tap->send (d);
1052 1074
1053 if (si != rsi) 1075 if (si != rsi)
1054 { 1076 {
1055 // fast re-sync on connection changes, useful especially for tcp/ip 1077 // fast re-sync on source address changes, useful especially for tcp/ip
1056 si = rsi; 1078 si = rsi;
1057 1079
1058 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1080 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1059 conf->nodename, (const char *)si, (const char *)rsi); 1081 conf->nodename, (const char *)si, (const char *)rsi);
1060 } 1082 }
… …
1071 case vpn_packet::PT_CONNECT_REQ: 1093 case vpn_packet::PT_CONNECT_REQ:
1072 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1094 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1073 { 1095 {
1074 connect_req_packet *p = (connect_req_packet *) pkt; 1096 connect_req_packet *p = (connect_req_packet *) pkt;
1075 1097
1076 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1098 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 { 1099 {
1100 connection *c = vpn->conns[p->id - 1];
1101 conf->protocols = p->protocols;
1102
1103 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1104 conf->id, p->id, c->ictx && c->octx);
1105
1106 if (c->ictx && c->octx)
1107 {
1085 // send connect_info packets to both sides, in case one is 1108 // send connect_info packets to both sides, in case one is
1086 // behind a nat firewall (or both ;) 1109 // behind a nat firewall (or both ;)
1087 c->send_connect_info (conf->id, si, conf->protocols); 1110 c->send_connect_info (conf->id, si, conf->protocols);
1088 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1111 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1112 }
1113 else
1114 c->establish_connection ();
1089 } 1115 }
1090 else 1116 else
1091 c->establish_connection (); 1117 slog (L_WARN,
1118 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1119 p->id);
1092 } 1120 }
1093 1121
1094 break; 1122 break;
1095 1123
1096 case vpn_packet::PT_CONNECT_INFO: 1124 case vpn_packet::PT_CONNECT_INFO:
1097 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1125 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1098 { 1126 {
1099 connect_info_packet *p = (connect_info_packet *) pkt; 1127 connect_info_packet *p = (connect_info_packet *)pkt;
1100 1128
1101 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1129 if (p->id > 0 && p->id <= vpn->conns.size ())
1102 1130 {
1103 connection *c = vpn->conns[p->id - 1]; 1131 connection *c = vpn->conns[p->id - 1];
1104 1132
1105 c->conf->protocols = p->protocols; 1133 c->conf->protocols = p->protocols;
1106 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1134 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1107 p->si.upgrade_protocol (protocol, c->conf); 1135 p->si.upgrade_protocol (protocol, c->conf);
1108 1136
1109 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1137 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1110 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1138 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1111 1139
1112 const sockinfo &dsi = forward_si (p->si); 1140 const sockinfo &dsi = forward_si (p->si);
1113 1141
1114 if (dsi.valid ()) 1142 if (dsi.valid ())
1115 c->send_auth_request (dsi, true); 1143 c->send_auth_request (dsi, true);
1144 }
1145 else
1146 slog (L_WARN,
1147 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1148 p->id);
1116 } 1149 }
1117 1150
1118 break; 1151 break;
1119 1152
1120 default: 1153 default:
… …
1155 send_vpn_packet (p, si); 1188 send_vpn_packet (p, si);
1156 1189
1157 delete p; 1190 delete p;
1158} 1191}
1159 1192
1193void connection::script_init_env (const char *ext)
1194{
1195 char *env;
1196 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1197 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1198 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1199 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1200 conf->id & 0xff); putenv (env);
1201}
1202
1160void connection::script_node () 1203void connection::script_init_connect_env ()
1161{ 1204{
1162 vpn->script_if_up (); 1205 vpn->script_init_env ();
1163 1206
1164 char *env; 1207 char *env;
1165 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1208 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1166 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1209 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1167 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1210 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1168 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1211 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1169} 1212}
1170 1213
1171const char *connection::script_node_up () 1214const char *connection::script_node_up ()
1172{ 1215{
1173 script_node (); 1216 script_init_connect_env ();
1174 1217
1175 putenv ("STATE=up"); 1218 putenv ("STATE=up");
1176 1219
1220 char *filename;
1221 asprintf (&filename,
1222 "%s/%s",
1223 confbase,
1177 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1224 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1225
1226 return filename;
1178} 1227}
1179 1228
1180const char *connection::script_node_down () 1229const char *connection::script_node_down ()
1181{ 1230{
1182 script_node (); 1231 script_init_connect_env ();
1183 1232
1184 putenv ("STATE=down"); 1233 putenv ("STATE=down");
1185 1234
1186 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1235 char *filename;
1187} 1236 asprintf (&filename,
1237 "%s/%s",
1238 confbase,
1239 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1188 1240
1241 return filename;
1242}
1243
1189connection::connection(struct vpn *vpn_) 1244connection::connection (struct vpn *vpn, conf_node *conf)
1190: vpn(vpn_) 1245: vpn(vpn), conf(conf)
1191, rekey (this, &connection::rekey_cb) 1246, rekey (this, &connection::rekey_cb)
1192, keepalive (this, &connection::keepalive_cb) 1247, keepalive (this, &connection::keepalive_cb)
1193, establish_connection (this, &connection::establish_connection_cb) 1248, establish_connection (this, &connection::establish_connection_cb)
1249#if ENABLE_DNS
1250, dns (0)
1251#endif
1194{ 1252{
1195 octx = ictx = 0; 1253 octx = ictx = 0;
1196 retry_cnt = 0; 1254 retry_cnt = 0;
1197 1255
1256 if (!conf->protocols) // make sure some protocol is enabled
1257 conf->protocols = PROT_UDPv4;
1258
1198 connectmode = conf_node::C_ALWAYS; // initial setting 1259 connectmode = conf_node::C_ALWAYS; // initial setting
1199 reset_connection (); 1260 reset_connection ();
1200} 1261}
1201 1262
1202connection::~connection () 1263connection::~connection ()

Diff Legend

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