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.30 by pcg, Thu Jan 29 19:22:05 2004 UTC vs.
Revision 1.57 by pcg, Thu Jul 7 14:41:51 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);
… …
335 int outl = 0, outl2; 333 int outl = 0, outl2;
336 ptype type = PT_DATA_UNCOMPRESSED; 334 ptype type = PT_DATA_UNCOMPRESSED;
337 335
338#if ENABLE_COMPRESSION 336#if ENABLE_COMPRESSION
339 u8 cdata[MAX_MTU]; 337 u8 cdata[MAX_MTU];
340 u32 cl;
341 338
339 if (conn->features & ENABLE_COMPRESSION)
340 {
342 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 341 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
342
343 if (cl) 343 if (cl)
344 { 344 {
345 type = PT_DATA_COMPRESSED; 345 type = PT_DATA_COMPRESSED;
346 d = cdata; 346 d = cdata;
347 l = cl + 2; 347 l = cl + 2;
348 348
349 d[0] = cl >> 8; 349 d[0] = cl >> 8;
350 d[1] = cl; 350 d[1] = cl;
351 }
351 } 352 }
352#endif 353#endif
353 354
354 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0)); 355 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
355 356
… …
448{ 449{
449 // actually, hmaclen cannot be checked because the hmac 450 // actually, hmaclen cannot be checked because the hmac
450 // field comes before this data, so peers with other 451 // field comes before this data, so peers with other
451 // hmacs simply will not work. 452 // hmacs simply will not work.
452 u8 prot_major, prot_minor, randsize, hmaclen; 453 u8 prot_major, prot_minor, randsize, hmaclen;
453 u8 flags, challengelen, pad2, pad3; 454 u8 flags, challengelen, features, pad3;
454 u32 cipher_nid, digest_nid, hmac_nid; 455 u32 cipher_nid, digest_nid, hmac_nid;
455
456 const u8 curflags () const
457 {
458 return 0x80
459 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
460 }
461 456
462 void setup (ptype type, int dst); 457 void setup (ptype type, int dst);
463 bool chk_config () const; 458 bool chk_config () const;
459
460 static u8 get_features ()
461 {
462 u8 f = 0;
463#if ENABLE_COMPRESSION
464 f |= FEATURE_COMPRESSION;
465#endif
466#if ENABLE_ROHC
467 f |= FEATURE_ROHC;
468#endif
469 return f;
470 }
464}; 471};
465 472
466void config_packet::setup (ptype type, int dst) 473void config_packet::setup (ptype type, int dst)
467{ 474{
468 prot_major = PROTOCOL_MAJOR; 475 prot_major = PROTOCOL_MAJOR;
469 prot_minor = PROTOCOL_MINOR; 476 prot_minor = PROTOCOL_MINOR;
470 randsize = RAND_SIZE; 477 randsize = RAND_SIZE;
471 hmaclen = HMACLENGTH; 478 hmaclen = HMACLENGTH;
472 flags = curflags (); 479 flags = 0;
473 challengelen = sizeof (rsachallenge); 480 challengelen = sizeof (rsachallenge);
481 features = get_features ();
474 482
475 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 483 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
476 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 484 digest_nid = htonl (EVP_MD_type (RSA_HASH));
477 hmac_nid = htonl (EVP_MD_type (DIGEST)); 485 hmac_nid = htonl (EVP_MD_type (DIGEST));
478 486
… …
486 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 494 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
487 else if (randsize != RAND_SIZE) 495 else if (randsize != RAND_SIZE)
488 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 496 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
489 else if (hmaclen != HMACLENGTH) 497 else if (hmaclen != HMACLENGTH)
490 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH); 498 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
491 else if (flags != curflags ())
492 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
493 else if (challengelen != sizeof (rsachallenge)) 499 else if (challengelen != sizeof (rsachallenge))
494 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 500 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
495 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 501 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
496 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 502 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
497 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 503 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
577{ 583{
578 if (ictx && octx) 584 if (ictx && octx)
579 { 585 {
580 connectmode = conf->connectmode; 586 connectmode = conf->connectmode;
581 587
588 // make sure rekeying timeouts are slightly asymmetric
582 rekey.start (NOW + ::conf.rekey); 589 rekey.start (NOW + ::conf.rekey
590 + (conf->id > THISNODE->id ? 10 : 0));
583 keepalive.start (NOW + ::conf.keepalive); 591 keepalive.start (NOW + ::conf.keepalive);
584 592
585 // send queued packets 593 // send queued packets
586 if (ictx && octx) 594 if (ictx && octx)
587 { 595 {
… …
613 protocol = best_protocol (THISNODE->protocols & conf->protocols); 621 protocol = best_protocol (THISNODE->protocols & conf->protocols);
614 622
615 // mask out protocols we cannot establish 623 // mask out protocols we cannot establish
616 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 624 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
617 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 625 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
626 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
618 627
619 si.set (conf, protocol); 628 si.set (conf, protocol);
620} 629}
621 630
622// ensure sockinfo is valid, forward if necessary 631// ensure sockinfo is valid, forward if necessary
… …
627 { 636 {
628 connection *r = vpn->find_router (); 637 connection *r = vpn->find_router ();
629 638
630 if (r) 639 if (r)
631 { 640 {
632 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 641 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
633 conf->nodename, r->conf->nodename); 642 conf->nodename, r->conf->nodename, (const char *)r->si);
634 return r->si; 643 return r->si;
635 } 644 }
636 else 645 else
637 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 646 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
638 conf->nodename); 647 conf->nodename);
… …
728 && conf != THISNODE 737 && conf != THISNODE
729 && connectmode != conf_node::C_NEVER 738 && connectmode != conf_node::C_NEVER
730 && connectmode != conf_node::C_DISABLED 739 && connectmode != conf_node::C_DISABLED
731 && NOW > w.at) 740 && NOW > w.at)
732 { 741 {
733 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 742 w.at = TSTAMP_MAX; // first disable this watcher in case of recursion
734 743
735 if (retry_int < 3600 * 8) 744 double retry_int = double (retry_cnt & 3
736 retry_cnt++; 745 ? (retry_cnt & 3) + 1
737 746 : 1 << (retry_cnt >> 2));
738 w.start (NOW + retry_int);
739 747
740 reset_si (); 748 reset_si ();
749
750 bool slow = si.prot & PROT_SLOW;
741 751
742 if (si.prot && !si.host) 752 if (si.prot && !si.host)
743 vpn->send_connect_request (conf->id); 753 vpn->send_connect_request (conf->id);
744 else 754 else
745 { 755 {
746 const sockinfo &dsi = forward_si (si); 756 const sockinfo &dsi = forward_si (si);
757
758 slow = slow || (dsi.prot & PROT_SLOW);
747 759
748 if (dsi.valid () && auth_rate_limiter.can (dsi)) 760 if (dsi.valid () && auth_rate_limiter.can (dsi))
749 { 761 {
750 if (retry_cnt < 4) 762 if (retry_cnt < 4)
751 send_auth_request (dsi, true); 763 send_auth_request (dsi, true);
752 else 764 else
753 send_ping (dsi, 0); 765 send_ping (dsi, 0);
754 } 766 }
755 } 767 }
768
769 retry_int *= slow ? 8. : 0.7;
770
771 if (retry_int < conf->max_retry)
772 retry_cnt++;
773 else
774 retry_int = conf->max_retry;
775
776 w.start (NOW + retry_int);
756 } 777 }
757} 778}
758 779
759void 780void
760connection::reset_connection () 781connection::reset_connection ()
… …
763 { 784 {
764 slog (L_INFO, _("%s(%s): connection lost"), 785 slog (L_INFO, _("%s(%s): connection lost"),
765 conf->nodename, (const char *)si); 786 conf->nodename, (const char *)si);
766 787
767 if (::conf.script_node_down) 788 if (::conf.script_node_down)
768 run_script (run_script_cb (this, &connection::script_node_down), false); 789 if (!run_script (run_script_cb (this, &connection::script_node_down), false))
790 slog (L_WARN, _("node-down command execution failed, continuing."));
769 } 791 }
770 792
771 delete ictx; ictx = 0; 793 delete ictx; ictx = 0;
772 delete octx; octx = 0; 794 delete octx; octx = 0;
795#if ENABLE_DNS
796 dnsv4_reset_connection ();
797#endif
773 798
774 si.host= 0; 799 si.host = 0;
775 800
776 last_activity = 0; 801 last_activity = 0;
777 retry_cnt = 0; 802 retry_cnt = 0;
778 803
779 rekey.stop (); 804 rekey.stop ();
… …
821{ 846{
822 if (ictx && octx) 847 if (ictx && octx)
823 send_data_packet (pkt); 848 send_data_packet (pkt);
824 else 849 else
825 { 850 {
826 if (!broadcast)//DDDD 851 if (!broadcast)
827 data_queue.put (new tap_packet (*pkt)); 852 data_queue.put (new tap_packet (*pkt));
828 853
829 establish_connection (); 854 establish_connection ();
830 } 855 }
831} 856}
… …
917 942
918 octx = new crypto_ctx (k, 1); 943 octx = new crypto_ctx (k, 1);
919 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 944 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
920 945
921 conf->protocols = p->protocols; 946 conf->protocols = p->protocols;
947 features = p->features & config_packet::get_features ();
922 948
923 send_auth_response (rsi, p->id, k); 949 send_auth_response (rsi, p->id, k);
924 950
925 connection_established (); 951 connection_established ();
926 952
… …
990 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1016 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
991 conf->nodename, (const char *)rsi, 1017 conf->nodename, (const char *)rsi,
992 p->prot_major, p->prot_minor); 1018 p->prot_major, p->prot_minor);
993 1019
994 if (::conf.script_node_up) 1020 if (::conf.script_node_up)
995 run_script (run_script_cb (this, &connection::script_node_up), false); 1021 if (!run_script (run_script_cb (this, &connection::script_node_up), false))
1022 slog (L_WARN, _("node-up command execution failed, continuing."));
996 1023
997 break; 1024 break;
998 } 1025 }
999 else 1026 else
1000 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1027 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
… …
1034 { 1061 {
1035 vpn->tap->send (d); 1062 vpn->tap->send (d);
1036 1063
1037 if (si != rsi) 1064 if (si != rsi)
1038 { 1065 {
1039 // fast re-sync on connection changes, useful especially for tcp/ip 1066 // fast re-sync on source address changes, useful especially for tcp/ip
1040 si = rsi; 1067 si = rsi;
1041 1068
1042 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1069 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1043 conf->nodename, (const char *)si, (const char *)rsi); 1070 conf->nodename, (const char *)si, (const char *)rsi);
1044 } 1071 }
1045
1046 delete d;
1047
1048 break;
1049 } 1072 }
1073
1074 delete d;
1075 break;
1050 } 1076 }
1051 } 1077 }
1052 1078
1053 send_reset (rsi); 1079 send_reset (rsi);
1054 break; 1080 break;
… …
1056 case vpn_packet::PT_CONNECT_REQ: 1082 case vpn_packet::PT_CONNECT_REQ:
1057 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1083 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1058 { 1084 {
1059 connect_req_packet *p = (connect_req_packet *) pkt; 1085 connect_req_packet *p = (connect_req_packet *) pkt;
1060 1086
1061 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1087 if (p->id > 0 && p->id <= vpn->conns.size ())
1062 connection *c = vpn->conns[p->id - 1];
1063 conf->protocols = p->protocols;
1064
1065 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1066 conf->id, p->id, c->ictx && c->octx);
1067
1068 if (c->ictx && c->octx)
1069 { 1088 {
1089 connection *c = vpn->conns[p->id - 1];
1090 conf->protocols = p->protocols;
1091
1092 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1093 conf->id, p->id, c->ictx && c->octx);
1094
1095 if (c->ictx && c->octx)
1096 {
1070 // send connect_info packets to both sides, in case one is 1097 // send connect_info packets to both sides, in case one is
1071 // behind a nat firewall (or both ;) 1098 // behind a nat firewall (or both ;)
1072 c->send_connect_info (conf->id, si, conf->protocols); 1099 c->send_connect_info (conf->id, si, conf->protocols);
1073 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1100 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1101 }
1102 else
1103 c->establish_connection ();
1074 } 1104 }
1075 else 1105 else
1076 c->establish_connection (); 1106 slog (L_WARN,
1107 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1108 p->id);
1077 } 1109 }
1078 1110
1079 break; 1111 break;
1080 1112
1081 case vpn_packet::PT_CONNECT_INFO: 1113 case vpn_packet::PT_CONNECT_INFO:
1082 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1114 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1083 { 1115 {
1084 connect_info_packet *p = (connect_info_packet *) pkt; 1116 connect_info_packet *p = (connect_info_packet *)pkt;
1085 1117
1086 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1118 if (p->id > 0 && p->id <= vpn->conns.size ())
1087 1119 {
1088 connection *c = vpn->conns[p->id - 1]; 1120 connection *c = vpn->conns[p->id - 1];
1089 1121
1090 c->conf->protocols = p->protocols; 1122 c->conf->protocols = p->protocols;
1091 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1123 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1092 p->si.upgrade_protocol (protocol, c->conf); 1124 p->si.upgrade_protocol (protocol, c->conf);
1093 1125
1094 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1126 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1095 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1127 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1096 1128
1097 const sockinfo &dsi = forward_si (p->si); 1129 const sockinfo &dsi = forward_si (p->si);
1098 1130
1099 if (dsi.valid ()) 1131 if (dsi.valid ())
1100 c->send_auth_request (dsi, true); 1132 c->send_auth_request (dsi, true);
1133 }
1134 else
1135 slog (L_WARN,
1136 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1137 p->id);
1101 } 1138 }
1102 1139
1103 break; 1140 break;
1104 1141
1105 default: 1142 default:
… …
1140 send_vpn_packet (p, si); 1177 send_vpn_packet (p, si);
1141 1178
1142 delete p; 1179 delete p;
1143} 1180}
1144 1181
1182void connection::script_init_env (const char *ext)
1183{
1184 char *env;
1185 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1186 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1187 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1188 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1189 conf->id & 0xff); putenv (env);
1190}
1191
1145void connection::script_node () 1192void connection::script_init_connect_env ()
1146{ 1193{
1147 vpn->script_if_up (); 1194 vpn->script_init_env ();
1148 1195
1149 char *env; 1196 char *env;
1150 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1197 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1151 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1198 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1152 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1199 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1153 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1200 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1154} 1201}
1155 1202
1156const char *connection::script_node_up () 1203const char *connection::script_node_up ()
1157{ 1204{
1158 script_node (); 1205 script_init_connect_env ();
1159 1206
1160 putenv ("STATE=up"); 1207 putenv ("STATE=up");
1161 1208
1209 char *filename;
1210 asprintf (&filename,
1211 "%s/%s",
1212 confbase,
1162 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1213 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1214
1215 return filename;
1163} 1216}
1164 1217
1165const char *connection::script_node_down () 1218const char *connection::script_node_down ()
1166{ 1219{
1167 script_node (); 1220 script_init_connect_env ();
1168 1221
1169 putenv ("STATE=down"); 1222 putenv ("STATE=down");
1170 1223
1171 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1224 char *filename;
1172} 1225 asprintf (&filename,
1226 "%s/%s",
1227 confbase,
1228 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1173 1229
1230 return filename;
1231}
1232
1174connection::connection(struct vpn *vpn_) 1233connection::connection (struct vpn *vpn, conf_node *conf)
1175: vpn(vpn_) 1234: vpn(vpn), conf(conf)
1176, rekey (this, &connection::rekey_cb) 1235, rekey (this, &connection::rekey_cb)
1177, keepalive (this, &connection::keepalive_cb) 1236, keepalive (this, &connection::keepalive_cb)
1178, establish_connection (this, &connection::establish_connection_cb) 1237, establish_connection (this, &connection::establish_connection_cb)
1238#if ENABLE_DNS
1239, dns (0)
1240#endif
1179{ 1241{
1180 octx = ictx = 0; 1242 octx = ictx = 0;
1181 retry_cnt = 0; 1243 retry_cnt = 0;
1182 1244
1245 if (!conf->protocols) // make sure some protocol is enabled
1246 conf->protocols = PROT_UDPv4;
1247
1183 connectmode = conf_node::C_ALWAYS; // initial setting 1248 connectmode = conf_node::C_ALWAYS; // initial setting
1184 reset_connection (); 1249 reset_connection ();
1185} 1250}
1186 1251
1187connection::~connection () 1252connection::~connection ()

Diff Legend

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