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

Diff Legend

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