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.32 by pcg, Sun Mar 21 13:15:42 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);
… …
476{ 474{
477 prot_major = PROTOCOL_MAJOR; 475 prot_major = PROTOCOL_MAJOR;
478 prot_minor = PROTOCOL_MINOR; 476 prot_minor = PROTOCOL_MINOR;
479 randsize = RAND_SIZE; 477 randsize = RAND_SIZE;
480 hmaclen = HMACLENGTH; 478 hmaclen = HMACLENGTH;
481 flags = ENABLE_COMPRESSION ? 0x81 : 0x80; 479 flags = 0;
482 challengelen = sizeof (rsachallenge); 480 challengelen = sizeof (rsachallenge);
483 features = get_features (); 481 features = get_features ();
484 482
485 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 483 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
486 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 484 digest_nid = htonl (EVP_MD_type (RSA_HASH));
… …
496 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);
497 else if (randsize != RAND_SIZE) 495 else if (randsize != RAND_SIZE)
498 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);
499 else if (hmaclen != HMACLENGTH) 497 else if (hmaclen != HMACLENGTH)
500 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);
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)) 499 else if (challengelen != sizeof (rsachallenge))
506 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));
507 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 501 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)); 502 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))) 503 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
589{ 583{
590 if (ictx && octx) 584 if (ictx && octx)
591 { 585 {
592 connectmode = conf->connectmode; 586 connectmode = conf->connectmode;
593 587
588 // make sure rekeying timeouts are slightly asymmetric
594 rekey.start (NOW + ::conf.rekey); 589 rekey.start (NOW + ::conf.rekey
590 + (conf->id > THISNODE->id ? 10 : 0));
595 keepalive.start (NOW + ::conf.keepalive); 591 keepalive.start (NOW + ::conf.keepalive);
596 592
597 // send queued packets 593 // send queued packets
598 if (ictx && octx) 594 if (ictx && octx)
599 { 595 {
… …
625 protocol = best_protocol (THISNODE->protocols & conf->protocols); 621 protocol = best_protocol (THISNODE->protocols & conf->protocols);
626 622
627 // mask out protocols we cannot establish 623 // mask out protocols we cannot establish
628 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 624 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
629 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 625 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
626 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
630 627
631 si.set (conf, protocol); 628 si.set (conf, protocol);
632} 629}
633 630
634// ensure sockinfo is valid, forward if necessary 631// ensure sockinfo is valid, forward if necessary
… …
639 { 636 {
640 connection *r = vpn->find_router (); 637 connection *r = vpn->find_router ();
641 638
642 if (r) 639 if (r)
643 { 640 {
644 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 641 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
645 conf->nodename, r->conf->nodename); 642 conf->nodename, r->conf->nodename, (const char *)r->si);
646 return r->si; 643 return r->si;
647 } 644 }
648 else 645 else
649 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 646 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
650 conf->nodename); 647 conf->nodename);
… …
740 && conf != THISNODE 737 && conf != THISNODE
741 && connectmode != conf_node::C_NEVER 738 && connectmode != conf_node::C_NEVER
742 && connectmode != conf_node::C_DISABLED 739 && connectmode != conf_node::C_DISABLED
743 && NOW > w.at) 740 && NOW > w.at)
744 { 741 {
745 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
746 743
747 if (retry_int < 3600 * 8) 744 double retry_int = double (retry_cnt & 3
748 retry_cnt++; 745 ? (retry_cnt & 3) + 1
749 746 : 1 << (retry_cnt >> 2));
750 w.start (NOW + retry_int);
751 747
752 reset_si (); 748 reset_si ();
749
750 bool slow = si.prot & PROT_SLOW;
753 751
754 if (si.prot && !si.host) 752 if (si.prot && !si.host)
755 vpn->send_connect_request (conf->id); 753 vpn->send_connect_request (conf->id);
756 else 754 else
757 { 755 {
758 const sockinfo &dsi = forward_si (si); 756 const sockinfo &dsi = forward_si (si);
757
758 slow = slow || (dsi.prot & PROT_SLOW);
759 759
760 if (dsi.valid () && auth_rate_limiter.can (dsi)) 760 if (dsi.valid () && auth_rate_limiter.can (dsi))
761 { 761 {
762 if (retry_cnt < 4) 762 if (retry_cnt < 4)
763 send_auth_request (dsi, true); 763 send_auth_request (dsi, true);
764 else 764 else
765 send_ping (dsi, 0); 765 send_ping (dsi, 0);
766 } 766 }
767 } 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);
768 } 777 }
769} 778}
770 779
771void 780void
772connection::reset_connection () 781connection::reset_connection ()
… …
775 { 784 {
776 slog (L_INFO, _("%s(%s): connection lost"), 785 slog (L_INFO, _("%s(%s): connection lost"),
777 conf->nodename, (const char *)si); 786 conf->nodename, (const char *)si);
778 787
779 if (::conf.script_node_down) 788 if (::conf.script_node_down)
780 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."));
781 } 791 }
782 792
783 delete ictx; ictx = 0; 793 delete ictx; ictx = 0;
784 delete octx; octx = 0; 794 delete octx; octx = 0;
795#if ENABLE_DNS
796 dnsv4_reset_connection ();
797#endif
785 798
786 si.host= 0; 799 si.host = 0;
787 800
788 last_activity = 0; 801 last_activity = 0;
789 retry_cnt = 0; 802 retry_cnt = 0;
790 803
791 rekey.stop (); 804 rekey.stop ();
… …
833{ 846{
834 if (ictx && octx) 847 if (ictx && octx)
835 send_data_packet (pkt); 848 send_data_packet (pkt);
836 else 849 else
837 { 850 {
838 if (!broadcast)//DDDD 851 if (!broadcast)
839 data_queue.put (new tap_packet (*pkt)); 852 data_queue.put (new tap_packet (*pkt));
840 853
841 establish_connection (); 854 establish_connection ();
842 } 855 }
843} 856}
… …
928 delete octx; 941 delete octx;
929 942
930 octx = new crypto_ctx (k, 1); 943 octx = new crypto_ctx (k, 1);
931 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 944 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
932 945
933 // compatibility code, remove when no longer required
934 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
935
936 conf->protocols = p->protocols; 946 conf->protocols = p->protocols;
937 features = p->features & config_packet::get_features (); 947 features = p->features & config_packet::get_features ();
938 948
939 send_auth_response (rsi, p->id, k); 949 send_auth_response (rsi, p->id, k);
940 950
… …
1006 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1016 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1007 conf->nodename, (const char *)rsi, 1017 conf->nodename, (const char *)rsi,
1008 p->prot_major, p->prot_minor); 1018 p->prot_major, p->prot_minor);
1009 1019
1010 if (::conf.script_node_up) 1020 if (::conf.script_node_up)
1011 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."));
1012 1023
1013 break; 1024 break;
1014 } 1025 }
1015 else 1026 else
1016 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"),
… …
1050 { 1061 {
1051 vpn->tap->send (d); 1062 vpn->tap->send (d);
1052 1063
1053 if (si != rsi) 1064 if (si != rsi)
1054 { 1065 {
1055 // fast re-sync on connection changes, useful especially for tcp/ip 1066 // fast re-sync on source address changes, useful especially for tcp/ip
1056 si = rsi; 1067 si = rsi;
1057 1068
1058 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1069 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1059 conf->nodename, (const char *)si, (const char *)rsi); 1070 conf->nodename, (const char *)si, (const char *)rsi);
1060 } 1071 }
1061 } 1072 }
1062 1073
1063 delete d; 1074 delete d;
1064
1065 break; 1075 break;
1066 } 1076 }
1067 } 1077 }
1068 1078
1069 send_reset (rsi); 1079 send_reset (rsi);
… …
1072 case vpn_packet::PT_CONNECT_REQ: 1082 case vpn_packet::PT_CONNECT_REQ:
1073 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1083 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1074 { 1084 {
1075 connect_req_packet *p = (connect_req_packet *) pkt; 1085 connect_req_packet *p = (connect_req_packet *) pkt;
1076 1086
1077 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 ())
1078 connection *c = vpn->conns[p->id - 1];
1079 conf->protocols = p->protocols;
1080
1081 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1082 conf->id, p->id, c->ictx && c->octx);
1083
1084 if (c->ictx && c->octx)
1085 { 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 {
1086 // send connect_info packets to both sides, in case one is 1097 // send connect_info packets to both sides, in case one is
1087 // behind a nat firewall (or both ;) 1098 // behind a nat firewall (or both ;)
1088 c->send_connect_info (conf->id, si, conf->protocols); 1099 c->send_connect_info (conf->id, si, conf->protocols);
1089 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 ();
1090 } 1104 }
1091 else 1105 else
1092 c->establish_connection (); 1106 slog (L_WARN,
1107 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1108 p->id);
1093 } 1109 }
1094 1110
1095 break; 1111 break;
1096 1112
1097 case vpn_packet::PT_CONNECT_INFO: 1113 case vpn_packet::PT_CONNECT_INFO:
1098 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1114 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1099 { 1115 {
1100 connect_info_packet *p = (connect_info_packet *) pkt; 1116 connect_info_packet *p = (connect_info_packet *)pkt;
1101 1117
1102 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 ())
1103 1119 {
1104 connection *c = vpn->conns[p->id - 1]; 1120 connection *c = vpn->conns[p->id - 1];
1105 1121
1106 c->conf->protocols = p->protocols; 1122 c->conf->protocols = p->protocols;
1107 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));
1108 p->si.upgrade_protocol (protocol, c->conf); 1124 p->si.upgrade_protocol (protocol, c->conf);
1109 1125
1110 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1126 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1111 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);
1112 1128
1113 const sockinfo &dsi = forward_si (p->si); 1129 const sockinfo &dsi = forward_si (p->si);
1114 1130
1115 if (dsi.valid ()) 1131 if (dsi.valid ())
1116 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);
1117 } 1138 }
1118 1139
1119 break; 1140 break;
1120 1141
1121 default: 1142 default:
… …
1156 send_vpn_packet (p, si); 1177 send_vpn_packet (p, si);
1157 1178
1158 delete p; 1179 delete p;
1159} 1180}
1160 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
1161void connection::script_node () 1192void connection::script_init_connect_env ()
1162{ 1193{
1163 vpn->script_if_up (); 1194 vpn->script_init_env ();
1164 1195
1165 char *env; 1196 char *env;
1166 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1197 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1167 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1198 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1168 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1199 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1169 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1200 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1170} 1201}
1171 1202
1172const char *connection::script_node_up () 1203const char *connection::script_node_up ()
1173{ 1204{
1174 script_node (); 1205 script_init_connect_env ();
1175 1206
1176 putenv ("STATE=up"); 1207 putenv ("STATE=up");
1177 1208
1209 char *filename;
1210 asprintf (&filename,
1211 "%s/%s",
1212 confbase,
1178 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;
1179} 1216}
1180 1217
1181const char *connection::script_node_down () 1218const char *connection::script_node_down ()
1182{ 1219{
1183 script_node (); 1220 script_init_connect_env ();
1184 1221
1185 putenv ("STATE=down"); 1222 putenv ("STATE=down");
1186 1223
1187 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1224 char *filename;
1188} 1225 asprintf (&filename,
1226 "%s/%s",
1227 confbase,
1228 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1189 1229
1230 return filename;
1231}
1232
1190connection::connection(struct vpn *vpn_) 1233connection::connection (struct vpn *vpn, conf_node *conf)
1191: vpn(vpn_) 1234: vpn(vpn), conf(conf)
1192, rekey (this, &connection::rekey_cb) 1235, rekey (this, &connection::rekey_cb)
1193, keepalive (this, &connection::keepalive_cb) 1236, keepalive (this, &connection::keepalive_cb)
1194, establish_connection (this, &connection::establish_connection_cb) 1237, establish_connection (this, &connection::establish_connection_cb)
1238#if ENABLE_DNS
1239, dns (0)
1240#endif
1195{ 1241{
1196 octx = ictx = 0; 1242 octx = ictx = 0;
1197 retry_cnt = 0; 1243 retry_cnt = 0;
1198 1244
1245 if (!conf->protocols) // make sure some protocol is enabled
1246 conf->protocols = PROT_UDPv4;
1247
1199 connectmode = conf_node::C_ALWAYS; // initial setting 1248 connectmode = conf_node::C_ALWAYS; // initial setting
1200 reset_connection (); 1249 reset_connection ();
1201} 1250}
1202 1251
1203connection::~connection () 1252connection::~connection ()

Diff Legend

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