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.49 by pcg, Sat Mar 12 18:10:40 2005 UTC vs.
Revision 1.63 by pcg, Sun Dec 2 00:45:41 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"
… …
86 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 82 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
87 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
88 EVP_MD_CTX_cleanup (&ctx); 84 EVP_MD_CTX_cleanup (&ctx);
89} 85}
90 86
91struct rsa_entry { 87struct rsa_entry
88{
92 tstamp expire; 89 tstamp expire;
93 rsaid id; 90 rsaid id;
94 rsachallenge chg; 91 rsachallenge chg;
95}; 92};
96 93
97struct rsa_cache : list<rsa_entry> 94struct rsa_cache : list<rsa_entry>
98{ 95{
99 void cleaner_cb (time_watcher &w); time_watcher cleaner; 96 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
100 97
101 bool find (const rsaid &id, rsachallenge &chg) 98 bool find (const rsaid &id, rsachallenge &chg)
102 { 99 {
103 for (iterator i = begin (); i != end (); ++i) 100 for (iterator i = begin (); i != end (); ++i)
104 { 101 {
105 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 102 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
106 { 103 {
107 memcpy (&chg, &i->chg, sizeof chg); 104 memcpy (&chg, &i->chg, sizeof chg);
108 105
109 erase (i); 106 erase (i);
110 return true; 107 return true;
111 } 108 }
112 } 109 }
113 110
114 if (cleaner.at < NOW) 111 if (!cleaner.is_active ())
115 cleaner.start (NOW + RSA_TTL); 112 cleaner.again ();
116 113
117 return false; 114 return false;
118 } 115 }
119 116
120 void gen (rsaid &id, rsachallenge &chg) 117 void gen (rsaid &id, rsachallenge &chg)
121 { 118 {
122 rsa_entry e; 119 rsa_entry e;
123 120
124 RAND_bytes ((unsigned char *)&id, sizeof id); 121 RAND_bytes ((unsigned char *)&id, sizeof id);
125 RAND_bytes ((unsigned char *)&chg, sizeof chg); 122 RAND_bytes ((unsigned char *)&chg, sizeof chg);
126 123
127 e.expire = NOW + RSA_TTL; 124 e.expire = ev_now () + RSA_TTL;
128 e.id = id; 125 e.id = id;
129 memcpy (&e.chg, &chg, sizeof chg); 126 memcpy (&e.chg, &chg, sizeof chg);
130 127
131 push_back (e); 128 push_back (e);
132 129
133 if (cleaner.at < NOW) 130 if (!cleaner.is_active ())
134 cleaner.start (NOW + RSA_TTL); 131 cleaner.again ();
135 } 132 }
136 133
137 rsa_cache () 134 rsa_cache ()
138 : cleaner (this, &rsa_cache::cleaner_cb) 135 : cleaner (this, &rsa_cache::cleaner_cb)
139 { } 136 {
137 cleaner.set (RSA_TTL, RSA_TTL);
138 }
140 139
141} rsa_cache; 140} rsa_cache;
142 141
143void rsa_cache::cleaner_cb (time_watcher &w) 142void rsa_cache::cleaner_cb (ev::timer &w, int revents)
144{ 143{
145 if (!empty ()) 144 if (empty ())
145 w.stop ();
146 else
146 { 147 {
147 w.start (NOW + RSA_TTL);
148
149 for (iterator i = begin (); i != end (); ) 148 for (iterator i = begin (); i != end (); )
150 if (i->expire <= NOW) 149 if (i->expire <= ev_now ())
151 i = erase (i); 150 i = erase (i);
152 else 151 else
153 ++i; 152 ++i;
154 } 153 }
155} 154}
… …
193{ 192{
194 for (i = QUEUEDEPTH; --i > 0; ) 193 for (i = QUEUEDEPTH; --i > 0; )
195 delete queue[i]; 194 delete queue[i];
196} 195}
197 196
198struct net_rateinfo { 197struct net_rateinfo
198{
199 u32 host; 199 u32 host;
200 double pcnt, diff; 200 double pcnt, diff;
201 tstamp last; 201 tstamp last;
202}; 202};
203 203
… …
222 iterator i; 222 iterator i;
223 223
224 for (i = begin (); i != end (); ) 224 for (i = begin (); i != end (); )
225 if (i->host == host) 225 if (i->host == host)
226 break; 226 break;
227 else if (i->last < NOW - NRL_EXPIRE) 227 else if (i->last < ev_now () - NRL_EXPIRE)
228 i = erase (i); 228 i = erase (i);
229 else 229 else
230 i++; 230 i++;
231 231
232 if (i == end ()) 232 if (i == end ())
… …
234 net_rateinfo ri; 234 net_rateinfo ri;
235 235
236 ri.host = host; 236 ri.host = host;
237 ri.pcnt = 1.; 237 ri.pcnt = 1.;
238 ri.diff = NRL_MAXDIF; 238 ri.diff = NRL_MAXDIF;
239 ri.last = NOW; 239 ri.last = ev_now ();
240 240
241 push_front (ri); 241 push_front (ri);
242 242
243 return true; 243 return true;
244 } 244 }
… …
246 { 246 {
247 net_rateinfo ri (*i); 247 net_rateinfo ri (*i);
248 erase (i); 248 erase (i);
249 249
250 ri.pcnt = ri.pcnt * NRL_ALPHA; 250 ri.pcnt = ri.pcnt * NRL_ALPHA;
251 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last); 251 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
252 252
253 ri.last = NOW; 253 ri.last = ev_now ();
254 254
255 double dif = ri.diff / ri.pcnt; 255 double dif = ri.diff / ri.pcnt;
256 256
257 bool send = dif > NRL_CUTOFF; 257 bool send = dif > NRL_CUTOFF;
258 258
… …
467#if ENABLE_COMPRESSION 467#if ENABLE_COMPRESSION
468 f |= FEATURE_COMPRESSION; 468 f |= FEATURE_COMPRESSION;
469#endif 469#endif
470#if ENABLE_ROHC 470#if ENABLE_ROHC
471 f |= FEATURE_ROHC; 471 f |= FEATURE_ROHC;
472#endif
473#if ENABLE_BRIDGING
474 f |= FEATURE_BRIDGING;
472#endif 475#endif
473 return f; 476 return f;
474 } 477 }
475}; 478};
476 479
… …
583///////////////////////////////////////////////////////////////////////////// 586/////////////////////////////////////////////////////////////////////////////
584 587
585void 588void
586connection::connection_established () 589connection::connection_established ()
587{ 590{
591 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
592
588 if (ictx && octx) 593 if (ictx && octx)
589 { 594 {
590 connectmode = conf->connectmode; 595 connectmode = conf->connectmode;
591 596
592 // make sure rekeying timeouts are slightly asymmetric 597 // make sure rekeying timeouts are slightly asymmetric
593 rekey.start (NOW + ::conf.rekey 598 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
594 + (conf->id > THISNODE->id ? 10 : 0)); 599 rekey.start (rekey_interval, rekey_interval);
595 keepalive.start (NOW + ::conf.keepalive); 600 keepalive.start (::conf.keepalive);
596 601
597 // send queued packets 602 // send queued packets
598 if (ictx && octx) 603 if (ictx && octx)
599 { 604 {
600 while (tap_packet *p = (tap_packet *)data_queue.get ()) 605 while (tap_packet *p = (tap_packet *)data_queue.get ())
… …
611 } 616 }
612 } 617 }
613 else 618 else
614 { 619 {
615 retry_cnt = 0; 620 retry_cnt = 0;
616 establish_connection.start (NOW + 5); 621 establish_connection.start (5);
617 keepalive.stop (); 622 keepalive.stop ();
618 rekey.stop (); 623 rekey.stop ();
619 } 624 }
620} 625}
621 626
… …
626 631
627 // mask out protocols we cannot establish 632 // mask out protocols we cannot establish
628 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 633 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
629 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 634 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
630 if (!conf->dns_port) protocol &= ~PROT_DNSv4; 635 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
636
637 if (protocol
638 && (!conf->can_direct (THISNODE)
639 || !THISNODE->can_direct (conf)))
640 {
641 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename);
642 protocol = 0;
643 }
631 644
632 si.set (conf, protocol); 645 si.set (conf, protocol);
633} 646}
634 647
635// ensure sockinfo is valid, forward if necessary 648// ensure sockinfo is valid, forward if necessary
… …
721} 734}
722 735
723void 736void
724connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 737connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
725{ 738{
726 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 739 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
727 conf->id, rid, (const char *)rsi); 740 conf->id, rid, (const char *)rsi);
728 741
729 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 742 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
730 743
731 r->hmac_set (octx); 744 r->hmac_set (octx);
… …
733 746
734 delete r; 747 delete r;
735} 748}
736 749
737void 750void
738connection::establish_connection_cb (time_watcher &w) 751connection::establish_connection_cb (ev::timer &w, int revents)
739{ 752{
740 if (!ictx 753 if (!ictx
741 && conf != THISNODE 754 && conf != THISNODE
742 && connectmode != conf_node::C_NEVER 755 && connectmode != conf_node::C_NEVER
743 && connectmode != conf_node::C_DISABLED 756 && connectmode != conf_node::C_DISABLED
744 && NOW > w.at) 757 && !w.is_active ())
745 { 758 {
746 w.at = TSTAMP_MAX; // first disable this watcher in case of recursion 759 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
747
748 double retry_int = double (retry_cnt & 3
749 ? (retry_cnt & 3) + 1 760 ? (retry_cnt & 3) + 1
750 : 1 << (retry_cnt >> 2)); 761 : 1 << (retry_cnt >> 2));
751 762
752 reset_si (); 763 reset_si ();
753 764
754 bool slow = si.prot & PROT_SLOW; 765 bool slow = si.prot & PROT_SLOW;
755 766
756 if (si.prot && !si.host) 767 if (si.prot && !si.host)
768 {
769 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
770 /*TODO*/ /* start the timer so we don't recurse endlessly */
771 w.start (1);
757 vpn->send_connect_request (conf->id); 772 vpn->send_connect_request (conf->id);
773 }
758 else 774 else
759 { 775 {
776 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
777
760 const sockinfo &dsi = forward_si (si); 778 const sockinfo &dsi = forward_si (si);
761 779
762 slow = slow || (dsi.prot & PROT_SLOW); 780 slow = slow || (dsi.prot & PROT_SLOW);
763 781
764 if (dsi.valid () && auth_rate_limiter.can (dsi)) 782 if (dsi.valid () && auth_rate_limiter.can (dsi))
… …
775 if (retry_int < conf->max_retry) 793 if (retry_int < conf->max_retry)
776 retry_cnt++; 794 retry_cnt++;
777 else 795 else
778 retry_int = conf->max_retry; 796 retry_int = conf->max_retry;
779 797
780 w.start (NOW + retry_int); 798 w.start (retry_int);
781 } 799 }
782} 800}
783 801
784void 802void
785connection::reset_connection () 803connection::reset_connection ()
… …
788 { 806 {
789 slog (L_INFO, _("%s(%s): connection lost"), 807 slog (L_INFO, _("%s(%s): connection lost"),
790 conf->nodename, (const char *)si); 808 conf->nodename, (const char *)si);
791 809
792 if (::conf.script_node_down) 810 if (::conf.script_node_down)
793 run_script (run_script_cb (this, &connection::script_node_down), false); 811 if (!run_script (run_script_cb (this, &connection::script_node_down), false))
812 slog (L_WARN, _("node-down command execution failed, continuing."));
794 } 813 }
795 814
796 delete ictx; ictx = 0; 815 delete ictx; ictx = 0;
797 delete octx; octx = 0; 816 delete octx; octx = 0;
798#if ENABLE_DNS 817#if ENABLE_DNS
… …
817 836
818 reset_connection (); 837 reset_connection ();
819} 838}
820 839
821void 840void
822connection::rekey_cb (time_watcher &w) 841connection::rekey_cb (ev::timer &w, int revents)
823{ 842{
824 reset_connection (); 843 reset_connection ();
825 establish_connection (); 844 establish_connection ();
826} 845}
827 846
… …
849{ 868{
850 if (ictx && octx) 869 if (ictx && octx)
851 send_data_packet (pkt); 870 send_data_packet (pkt);
852 else 871 else
853 { 872 {
854 if (!broadcast)//DDDD 873 if (!broadcast)
855 data_queue.put (new tap_packet (*pkt)); 874 data_queue.put (new tap_packet (*pkt));
856 875
857 establish_connection (); 876 establish_connection ();
858 } 877 }
859} 878}
… …
871} 890}
872 891
873void 892void
874connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 893connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
875{ 894{
876 last_activity = NOW; 895 last_activity = ev_now ();
877 896
878 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 897 slog (L_NOISE, "<<%d received packet type %d from %d to %d",
879 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 898 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
899
900 if (connectmode == conf_node::C_DISABLED)
901 return;
880 902
881 switch (pkt->typ ()) 903 switch (pkt->typ ())
882 { 904 {
883 case vpn_packet::PT_PING: 905 case vpn_packet::PT_PING:
884 // we send pings instead of auth packets after some retries, 906 // we send pings instead of auth packets after some retries,
… …
1019 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1041 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1020 conf->nodename, (const char *)rsi, 1042 conf->nodename, (const char *)rsi,
1021 p->prot_major, p->prot_minor); 1043 p->prot_major, p->prot_minor);
1022 1044
1023 if (::conf.script_node_up) 1045 if (::conf.script_node_up)
1024 run_script (run_script_cb (this, &connection::script_node_up), false); 1046 if (!run_script (run_script_cb (this, &connection::script_node_up), false))
1047 slog (L_WARN, _("node-up command execution failed, continuing."));
1025 1048
1026 break; 1049 break;
1027 } 1050 }
1028 else 1051 else
1029 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1052 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
… …
1063 { 1086 {
1064 vpn->tap->send (d); 1087 vpn->tap->send (d);
1065 1088
1066 if (si != rsi) 1089 if (si != rsi)
1067 { 1090 {
1068 // fast re-sync on connection changes, useful especially for tcp/ip 1091 // fast re-sync on source address changes, useful especially for tcp/ip
1069 si = rsi; 1092 si = rsi;
1070 1093
1071 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1094 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1072 conf->nodename, (const char *)si, (const char *)rsi); 1095 conf->nodename, (const char *)si, (const char *)rsi);
1073 } 1096 }
… …
1084 case vpn_packet::PT_CONNECT_REQ: 1107 case vpn_packet::PT_CONNECT_REQ:
1085 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1108 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1086 { 1109 {
1087 connect_req_packet *p = (connect_req_packet *) pkt; 1110 connect_req_packet *p = (connect_req_packet *) pkt;
1088 1111
1089 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1112 if (p->id > 0 && p->id <= vpn->conns.size ())
1090 connection *c = vpn->conns[p->id - 1];
1091 conf->protocols = p->protocols;
1092
1093 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1094 conf->id, p->id, c->ictx && c->octx);
1095
1096 if (c->ictx && c->octx)
1097 { 1113 {
1114 connection *c = vpn->conns[p->id - 1];
1115 conf->protocols = p->protocols;
1116
1117 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1118 conf->id, p->id, c->ictx && c->octx);
1119
1120 if (c->ictx && c->octx)
1121 {
1098 // send connect_info packets to both sides, in case one is 1122 // send connect_info packets to both sides, in case one is
1099 // behind a nat firewall (or both ;) 1123 // behind a nat firewall (or both ;)
1100 c->send_connect_info (conf->id, si, conf->protocols); 1124 c->send_connect_info (conf->id, si, conf->protocols);
1101 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1125 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1126 }
1127 else
1128 c->establish_connection ();
1102 } 1129 }
1103 else 1130 else
1104 c->establish_connection (); 1131 slog (L_WARN,
1132 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1133 p->id);
1105 } 1134 }
1106 1135
1107 break; 1136 break;
1108 1137
1109 case vpn_packet::PT_CONNECT_INFO: 1138 case vpn_packet::PT_CONNECT_INFO:
1110 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1139 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1111 { 1140 {
1112 connect_info_packet *p = (connect_info_packet *)pkt; 1141 connect_info_packet *p = (connect_info_packet *)pkt;
1113 1142
1114 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything 1143 if (p->id > 0 && p->id <= vpn->conns.size ())
1115 { 1144 {
1116 connection *c = vpn->conns[p->id - 1]; 1145 connection *c = vpn->conns[p->id - 1];
1117 1146
1118 c->conf->protocols = p->protocols; 1147 c->conf->protocols = p->protocols;
1119 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1148 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
… …
1125 const sockinfo &dsi = forward_si (p->si); 1154 const sockinfo &dsi = forward_si (p->si);
1126 1155
1127 if (dsi.valid ()) 1156 if (dsi.valid ())
1128 c->send_auth_request (dsi, true); 1157 c->send_auth_request (dsi, true);
1129 } 1158 }
1159 else
1160 slog (L_WARN,
1161 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1162 p->id);
1130 } 1163 }
1131 1164
1132 break; 1165 break;
1133 1166
1134 default: 1167 default:
1135 send_reset (rsi); 1168 send_reset (rsi);
1136 break; 1169 break;
1137 } 1170 }
1138} 1171}
1139 1172
1140void connection::keepalive_cb (time_watcher &w) 1173void connection::keepalive_cb (ev::timer &w, int revents)
1141{ 1174{
1142 if (NOW >= last_activity + ::conf.keepalive + 30) 1175 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1143 { 1176 {
1144 reset_connection (); 1177 reset_connection ();
1145 establish_connection (); 1178 establish_connection ();
1146 } 1179 }
1147 else if (NOW < last_activity + ::conf.keepalive) 1180 else if (ev_now () < last_activity + ::conf.keepalive)
1148 w.start (last_activity + ::conf.keepalive); 1181 w.start (last_activity + ::conf.keepalive - ev::now ());
1149 else if (conf->connectmode != conf_node::C_ONDEMAND 1182 else if (conf->connectmode != conf_node::C_ONDEMAND
1150 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1183 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1151 { 1184 {
1152 send_ping (si); 1185 send_ping (si);
1153 w.start (NOW + 5); 1186 w.start (5);
1154 } 1187 }
1155 else if (NOW < last_activity + ::conf.keepalive + 10) 1188 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1156 // hold ondemand connections implicitly a few seconds longer 1189 // hold ondemand connections implicitly a few seconds longer
1157 // should delete octx, though, or something like that ;) 1190 // should delete octx, though, or something like that ;)
1158 w.start (last_activity + ::conf.keepalive + 10); 1191 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1159 else 1192 else
1160 reset_connection (); 1193 reset_connection ();
1161} 1194}
1162 1195
1163void connection::send_connect_request (int id) 1196void connection::send_connect_request (int id)
… …
1169 send_vpn_packet (p, si); 1202 send_vpn_packet (p, si);
1170 1203
1171 delete p; 1204 delete p;
1172} 1205}
1173 1206
1207void connection::script_init_env (const char *ext)
1208{
1209 char *env;
1210 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1211 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1212 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1213 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1214 conf->id & 0xff); putenv (env);
1215}
1216
1174void connection::script_node () 1217void connection::script_init_connect_env ()
1175{ 1218{
1176 vpn->script_if_up (); 1219 vpn->script_init_env ();
1177 1220
1178 char *env; 1221 char *env;
1179 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1222 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1180 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1223 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1181 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1224 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1182 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1225 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1183} 1226}
1184 1227
1185const char *connection::script_node_up () 1228const char *connection::script_node_up ()
1186{ 1229{
1187 script_node (); 1230 script_init_connect_env ();
1188 1231
1189 putenv ("STATE=up"); 1232 putenv ((char *)"STATE=up");
1190 1233
1234 char *filename;
1235 asprintf (&filename,
1236 "%s/%s",
1237 confbase,
1191 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1238 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1239
1240 return filename;
1192} 1241}
1193 1242
1194const char *connection::script_node_down () 1243const char *connection::script_node_down ()
1195{ 1244{
1196 script_node (); 1245 script_init_connect_env ();
1197 1246
1198 putenv ("STATE=down"); 1247 putenv ((char *)"STATE=down");
1199 1248
1200 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1249 char *filename;
1250 asprintf (&filename,
1251 "%s/%s",
1252 confbase,
1253 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1254
1255 return filename;
1201} 1256}
1202 1257
1203connection::connection (struct vpn *vpn, conf_node *conf) 1258connection::connection (struct vpn *vpn, conf_node *conf)
1204: vpn(vpn), conf(conf) 1259: vpn(vpn), conf(conf)
1205, rekey (this, &connection::rekey_cb) 1260, rekey (this, &connection::rekey_cb)

Diff Legend

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