… | |
… | |
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> |
… | |
… | |
92 | rsachallenge chg; |
90 | rsachallenge chg; |
93 | }; |
91 | }; |
94 | |
92 | |
95 | struct rsa_cache : list<rsa_entry> |
93 | struct rsa_cache : list<rsa_entry> |
96 | { |
94 | { |
97 | void cleaner_cb (time_watcher &w); time_watcher cleaner; |
95 | void cleaner_cb (ev::timer &w, int revents); ev::timer 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 > ev::ev_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.is_active ()) |
113 | cleaner.start (NOW + RSA_TTL); |
111 | cleaner.again (); |
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 = ev::ev_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.is_active ()) |
132 | cleaner.start (NOW + RSA_TTL); |
130 | cleaner.again (); |
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 | { |
|
|
136 | cleaner.set (RSA_TTL, RSA_TTL); |
|
|
137 | } |
138 | |
138 | |
139 | } rsa_cache; |
139 | } rsa_cache; |
140 | |
140 | |
141 | void rsa_cache::cleaner_cb (time_watcher &w) |
141 | void rsa_cache::cleaner_cb (ev::timer &w, int revents) |
142 | { |
142 | { |
143 | if (!empty ()) |
143 | if (empty ()) |
|
|
144 | w.stop (); |
|
|
145 | else |
144 | { |
146 | { |
145 | w.start (NOW + RSA_TTL); |
|
|
146 | |
|
|
147 | for (iterator i = begin (); i != end (); ) |
147 | for (iterator i = begin (); i != end (); ) |
148 | if (i->expire <= NOW) |
148 | if (i->expire <= ev::ev_now ()) |
149 | i = erase (i); |
149 | i = erase (i); |
150 | else |
150 | else |
151 | ++i; |
151 | ++i; |
152 | } |
152 | } |
153 | } |
153 | } |
… | |
… | |
220 | iterator i; |
220 | iterator i; |
221 | |
221 | |
222 | for (i = begin (); i != end (); ) |
222 | for (i = begin (); i != end (); ) |
223 | if (i->host == host) |
223 | if (i->host == host) |
224 | break; |
224 | break; |
225 | else if (i->last < NOW - NRL_EXPIRE) |
225 | else if (i->last < ev::ev_now () - NRL_EXPIRE) |
226 | i = erase (i); |
226 | i = erase (i); |
227 | else |
227 | else |
228 | i++; |
228 | i++; |
229 | |
229 | |
230 | if (i == end ()) |
230 | if (i == end ()) |
… | |
… | |
232 | net_rateinfo ri; |
232 | net_rateinfo ri; |
233 | |
233 | |
234 | ri.host = host; |
234 | ri.host = host; |
235 | ri.pcnt = 1.; |
235 | ri.pcnt = 1.; |
236 | ri.diff = NRL_MAXDIF; |
236 | ri.diff = NRL_MAXDIF; |
237 | ri.last = NOW; |
237 | ri.last = ev::ev_now (); |
238 | |
238 | |
239 | push_front (ri); |
239 | push_front (ri); |
240 | |
240 | |
241 | return true; |
241 | return true; |
242 | } |
242 | } |
… | |
… | |
244 | { |
244 | { |
245 | net_rateinfo ri (*i); |
245 | net_rateinfo ri (*i); |
246 | erase (i); |
246 | erase (i); |
247 | |
247 | |
248 | ri.pcnt = ri.pcnt * NRL_ALPHA; |
248 | ri.pcnt = ri.pcnt * NRL_ALPHA; |
249 | ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last); |
249 | ri.diff = ri.diff * NRL_ALPHA + (ev::ev_now () - ri.last); |
250 | |
250 | |
251 | ri.last = NOW; |
251 | ri.last = ev::ev_now (); |
252 | |
252 | |
253 | double dif = ri.diff / ri.pcnt; |
253 | double dif = ri.diff / ri.pcnt; |
254 | |
254 | |
255 | bool send = dif > NRL_CUTOFF; |
255 | bool send = dif > NRL_CUTOFF; |
256 | |
256 | |
… | |
… | |
465 | #if ENABLE_COMPRESSION |
465 | #if ENABLE_COMPRESSION |
466 | f |= FEATURE_COMPRESSION; |
466 | f |= FEATURE_COMPRESSION; |
467 | #endif |
467 | #endif |
468 | #if ENABLE_ROHC |
468 | #if ENABLE_ROHC |
469 | f |= FEATURE_ROHC; |
469 | f |= FEATURE_ROHC; |
|
|
470 | #endif |
|
|
471 | #if ENABLE_BRIDGING |
|
|
472 | f |= FEATURE_BRIDGING; |
470 | #endif |
473 | #endif |
471 | return f; |
474 | return f; |
472 | } |
475 | } |
473 | }; |
476 | }; |
474 | |
477 | |
… | |
… | |
586 | if (ictx && octx) |
589 | if (ictx && octx) |
587 | { |
590 | { |
588 | connectmode = conf->connectmode; |
591 | connectmode = conf->connectmode; |
589 | |
592 | |
590 | // make sure rekeying timeouts are slightly asymmetric |
593 | // make sure rekeying timeouts are slightly asymmetric |
591 | rekey.start (NOW + ::conf.rekey |
594 | ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0); |
592 | + (conf->id > THISNODE->id ? 10 : 0)); |
595 | rekey.start (rekey_interval, rekey_interval); |
593 | keepalive.start (NOW + ::conf.keepalive); |
596 | keepalive.start (::conf.keepalive); |
594 | |
597 | |
595 | // send queued packets |
598 | // send queued packets |
596 | if (ictx && octx) |
599 | if (ictx && octx) |
597 | { |
600 | { |
598 | while (tap_packet *p = (tap_packet *)data_queue.get ()) |
601 | while (tap_packet *p = (tap_packet *)data_queue.get ()) |
… | |
… | |
609 | } |
612 | } |
610 | } |
613 | } |
611 | else |
614 | else |
612 | { |
615 | { |
613 | retry_cnt = 0; |
616 | retry_cnt = 0; |
614 | establish_connection.start (NOW + 5); |
617 | establish_connection.start (5); |
615 | keepalive.stop (); |
618 | keepalive.stop (); |
616 | rekey.stop (); |
619 | rekey.stop (); |
617 | } |
620 | } |
618 | } |
621 | } |
619 | |
622 | |
… | |
… | |
624 | |
627 | |
625 | // mask out protocols we cannot establish |
628 | // mask out protocols we cannot establish |
626 | if (!conf->udp_port) protocol &= ~PROT_UDPv4; |
629 | if (!conf->udp_port) protocol &= ~PROT_UDPv4; |
627 | if (!conf->tcp_port) protocol &= ~PROT_TCPv4; |
630 | if (!conf->tcp_port) protocol &= ~PROT_TCPv4; |
628 | if (!conf->dns_port) protocol &= ~PROT_DNSv4; |
631 | if (!conf->dns_port) protocol &= ~PROT_DNSv4; |
|
|
632 | |
|
|
633 | if (protocol |
|
|
634 | && (!conf->can_direct (THISNODE) |
|
|
635 | || !THISNODE->can_direct (conf))) |
|
|
636 | { |
|
|
637 | slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename); |
|
|
638 | protocol = 0; |
|
|
639 | } |
629 | |
640 | |
630 | si.set (conf, protocol); |
641 | si.set (conf, protocol); |
631 | } |
642 | } |
632 | |
643 | |
633 | // ensure sockinfo is valid, forward if necessary |
644 | // ensure sockinfo is valid, forward if necessary |
… | |
… | |
719 | } |
730 | } |
720 | |
731 | |
721 | void |
732 | void |
722 | connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) |
733 | connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) |
723 | { |
734 | { |
724 | slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", |
735 | slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)", |
725 | conf->id, rid, (const char *)rsi); |
736 | conf->id, rid, (const char *)rsi); |
726 | |
737 | |
727 | connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); |
738 | connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); |
728 | |
739 | |
729 | r->hmac_set (octx); |
740 | r->hmac_set (octx); |
… | |
… | |
731 | |
742 | |
732 | delete r; |
743 | delete r; |
733 | } |
744 | } |
734 | |
745 | |
735 | void |
746 | void |
736 | connection::establish_connection_cb (time_watcher &w) |
747 | connection::establish_connection_cb (ev::timer &w, int revents) |
737 | { |
748 | { |
738 | if (!ictx |
749 | if (!ictx |
739 | && conf != THISNODE |
750 | && conf != THISNODE |
740 | && connectmode != conf_node::C_NEVER |
751 | && connectmode != conf_node::C_NEVER |
741 | && connectmode != conf_node::C_DISABLED |
752 | && connectmode != conf_node::C_DISABLED |
742 | && NOW > w.at) |
753 | && !w.is_active ()) |
743 | { |
754 | { |
744 | w.at = TSTAMP_MAX; // first disable this watcher in case of recursion |
755 | ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 |
745 | |
|
|
746 | double retry_int = double (retry_cnt & 3 |
|
|
747 | ? (retry_cnt & 3) + 1 |
756 | ? (retry_cnt & 3) + 1 |
748 | : 1 << (retry_cnt >> 2)); |
757 | : 1 << (retry_cnt >> 2)); |
749 | |
758 | |
750 | reset_si (); |
759 | reset_si (); |
751 | |
760 | |
752 | bool slow = si.prot & PROT_SLOW; |
761 | bool slow = si.prot & PROT_SLOW; |
753 | |
762 | |
754 | if (si.prot && !si.host) |
763 | if (si.prot && !si.host) |
|
|
764 | { |
|
|
765 | /*TODO*/ /* start the timer so we don't recurse endlessly */ |
|
|
766 | w.start (1); |
755 | vpn->send_connect_request (conf->id); |
767 | vpn->send_connect_request (conf->id); |
|
|
768 | } |
756 | else |
769 | else |
757 | { |
770 | { |
758 | const sockinfo &dsi = forward_si (si); |
771 | const sockinfo &dsi = forward_si (si); |
759 | |
772 | |
760 | slow = slow || (dsi.prot & PROT_SLOW); |
773 | slow = slow || (dsi.prot & PROT_SLOW); |
… | |
… | |
773 | if (retry_int < conf->max_retry) |
786 | if (retry_int < conf->max_retry) |
774 | retry_cnt++; |
787 | retry_cnt++; |
775 | else |
788 | else |
776 | retry_int = conf->max_retry; |
789 | retry_int = conf->max_retry; |
777 | |
790 | |
778 | w.start (NOW + retry_int); |
791 | w.start (retry_int); |
779 | } |
792 | } |
780 | } |
793 | } |
781 | |
794 | |
782 | void |
795 | void |
783 | connection::reset_connection () |
796 | connection::reset_connection () |
… | |
… | |
786 | { |
799 | { |
787 | slog (L_INFO, _("%s(%s): connection lost"), |
800 | slog (L_INFO, _("%s(%s): connection lost"), |
788 | conf->nodename, (const char *)si); |
801 | conf->nodename, (const char *)si); |
789 | |
802 | |
790 | if (::conf.script_node_down) |
803 | if (::conf.script_node_down) |
791 | run_script (run_script_cb (this, &connection::script_node_down), false); |
804 | if (!run_script (run_script_cb (this, &connection::script_node_down), false)) |
|
|
805 | slog (L_WARN, _("node-down command execution failed, continuing.")); |
792 | } |
806 | } |
793 | |
807 | |
794 | delete ictx; ictx = 0; |
808 | delete ictx; ictx = 0; |
795 | delete octx; octx = 0; |
809 | delete octx; octx = 0; |
796 | #if ENABLE_DNS |
810 | #if ENABLE_DNS |
… | |
… | |
815 | |
829 | |
816 | reset_connection (); |
830 | reset_connection (); |
817 | } |
831 | } |
818 | |
832 | |
819 | void |
833 | void |
820 | connection::rekey_cb (time_watcher &w) |
834 | connection::rekey_cb (ev::timer &w, int revents) |
821 | { |
835 | { |
822 | reset_connection (); |
836 | reset_connection (); |
823 | establish_connection (); |
837 | establish_connection (); |
824 | } |
838 | } |
825 | |
839 | |
… | |
… | |
847 | { |
861 | { |
848 | if (ictx && octx) |
862 | if (ictx && octx) |
849 | send_data_packet (pkt); |
863 | send_data_packet (pkt); |
850 | else |
864 | else |
851 | { |
865 | { |
852 | if (!broadcast)//DDDD |
866 | if (!broadcast) |
853 | data_queue.put (new tap_packet (*pkt)); |
867 | data_queue.put (new tap_packet (*pkt)); |
854 | |
868 | |
855 | establish_connection (); |
869 | establish_connection (); |
856 | } |
870 | } |
857 | } |
871 | } |
… | |
… | |
869 | } |
883 | } |
870 | |
884 | |
871 | void |
885 | void |
872 | connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) |
886 | connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) |
873 | { |
887 | { |
874 | last_activity = NOW; |
888 | last_activity = ev::ev_now (); |
875 | |
889 | |
876 | slog (L_NOISE, "<<%d received packet type %d from %d to %d", |
890 | slog (L_NOISE, "<<%d received packet type %d from %d to %d", |
877 | conf->id, pkt->typ (), pkt->src (), pkt->dst ()); |
891 | conf->id, pkt->typ (), pkt->src (), pkt->dst ()); |
878 | |
892 | |
879 | switch (pkt->typ ()) |
893 | switch (pkt->typ ()) |
… | |
… | |
1017 | slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), |
1031 | slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), |
1018 | conf->nodename, (const char *)rsi, |
1032 | conf->nodename, (const char *)rsi, |
1019 | p->prot_major, p->prot_minor); |
1033 | p->prot_major, p->prot_minor); |
1020 | |
1034 | |
1021 | if (::conf.script_node_up) |
1035 | if (::conf.script_node_up) |
1022 | run_script (run_script_cb (this, &connection::script_node_up), false); |
1036 | if (!run_script (run_script_cb (this, &connection::script_node_up), false)) |
|
|
1037 | slog (L_WARN, _("node-up command execution failed, continuing.")); |
1023 | |
1038 | |
1024 | break; |
1039 | break; |
1025 | } |
1040 | } |
1026 | else |
1041 | else |
1027 | slog (L_ERR, _("%s(%s): sent and received challenge do not match"), |
1042 | slog (L_ERR, _("%s(%s): sent and received challenge do not match"), |
… | |
… | |
1061 | { |
1076 | { |
1062 | vpn->tap->send (d); |
1077 | vpn->tap->send (d); |
1063 | |
1078 | |
1064 | if (si != rsi) |
1079 | if (si != rsi) |
1065 | { |
1080 | { |
1066 | // fast re-sync on connection changes, useful especially for tcp/ip |
1081 | // fast re-sync on source address changes, useful especially for tcp/ip |
1067 | si = rsi; |
1082 | si = rsi; |
1068 | |
1083 | |
1069 | slog (L_INFO, _("%s(%s): socket address changed to %s"), |
1084 | slog (L_INFO, _("%s(%s): socket address changed to %s"), |
1070 | conf->nodename, (const char *)si, (const char *)rsi); |
1085 | conf->nodename, (const char *)si, (const char *)rsi); |
1071 | } |
1086 | } |
… | |
… | |
1082 | case vpn_packet::PT_CONNECT_REQ: |
1097 | case vpn_packet::PT_CONNECT_REQ: |
1083 | if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) |
1098 | if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) |
1084 | { |
1099 | { |
1085 | connect_req_packet *p = (connect_req_packet *) pkt; |
1100 | connect_req_packet *p = (connect_req_packet *) pkt; |
1086 | |
1101 | |
1087 | assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything |
1102 | 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 | { |
1103 | { |
|
|
1104 | connection *c = vpn->conns[p->id - 1]; |
|
|
1105 | conf->protocols = p->protocols; |
|
|
1106 | |
|
|
1107 | slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]", |
|
|
1108 | conf->id, p->id, c->ictx && c->octx); |
|
|
1109 | |
|
|
1110 | if (c->ictx && c->octx) |
|
|
1111 | { |
1096 | // send connect_info packets to both sides, in case one is |
1112 | // send connect_info packets to both sides, in case one is |
1097 | // behind a nat firewall (or both ;) |
1113 | // behind a nat firewall (or both ;) |
1098 | c->send_connect_info (conf->id, si, conf->protocols); |
1114 | c->send_connect_info (conf->id, si, conf->protocols); |
1099 | send_connect_info (c->conf->id, c->si, c->conf->protocols); |
1115 | send_connect_info (c->conf->id, c->si, c->conf->protocols); |
|
|
1116 | } |
|
|
1117 | else |
|
|
1118 | c->establish_connection (); |
1100 | } |
1119 | } |
1101 | else |
1120 | else |
1102 | c->establish_connection (); |
1121 | slog (L_WARN, |
|
|
1122 | _("received authenticated connection request from unknown node #%d, config file mismatch?"), |
|
|
1123 | p->id); |
1103 | } |
1124 | } |
1104 | |
1125 | |
1105 | break; |
1126 | break; |
1106 | |
1127 | |
1107 | case vpn_packet::PT_CONNECT_INFO: |
1128 | case vpn_packet::PT_CONNECT_INFO: |
1108 | if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) |
1129 | if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) |
1109 | { |
1130 | { |
1110 | connect_info_packet *p = (connect_info_packet *)pkt; |
1131 | connect_info_packet *p = (connect_info_packet *)pkt; |
1111 | |
1132 | |
1112 | if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything |
1133 | if (p->id > 0 && p->id <= vpn->conns.size ()) |
1113 | { |
1134 | { |
1114 | connection *c = vpn->conns[p->id - 1]; |
1135 | connection *c = vpn->conns[p->id - 1]; |
1115 | |
1136 | |
1116 | c->conf->protocols = p->protocols; |
1137 | c->conf->protocols = p->protocols; |
1117 | protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); |
1138 | protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); |
… | |
… | |
1123 | const sockinfo &dsi = forward_si (p->si); |
1144 | const sockinfo &dsi = forward_si (p->si); |
1124 | |
1145 | |
1125 | if (dsi.valid ()) |
1146 | if (dsi.valid ()) |
1126 | c->send_auth_request (dsi, true); |
1147 | c->send_auth_request (dsi, true); |
1127 | } |
1148 | } |
|
|
1149 | else |
|
|
1150 | slog (L_WARN, |
|
|
1151 | _("received authenticated connection request from unknown node #%d, config file mismatch?"), |
|
|
1152 | p->id); |
1128 | } |
1153 | } |
1129 | |
1154 | |
1130 | break; |
1155 | break; |
1131 | |
1156 | |
1132 | default: |
1157 | default: |
1133 | send_reset (rsi); |
1158 | send_reset (rsi); |
1134 | break; |
1159 | break; |
1135 | } |
1160 | } |
1136 | } |
1161 | } |
1137 | |
1162 | |
1138 | void connection::keepalive_cb (time_watcher &w) |
1163 | void connection::keepalive_cb (ev::timer &w, int revents) |
1139 | { |
1164 | { |
1140 | if (NOW >= last_activity + ::conf.keepalive + 30) |
1165 | if (ev::ev_now () >= last_activity + ::conf.keepalive + 30) |
1141 | { |
1166 | { |
1142 | reset_connection (); |
1167 | reset_connection (); |
1143 | establish_connection (); |
1168 | establish_connection (); |
1144 | } |
1169 | } |
1145 | else if (NOW < last_activity + ::conf.keepalive) |
1170 | else if (ev::ev_now () < last_activity + ::conf.keepalive) |
1146 | w.start (last_activity + ::conf.keepalive); |
1171 | w.start (last_activity + ::conf.keepalive - ev::now ()); |
1147 | else if (conf->connectmode != conf_node::C_ONDEMAND |
1172 | else if (conf->connectmode != conf_node::C_ONDEMAND |
1148 | || THISNODE->connectmode != conf_node::C_ONDEMAND) |
1173 | || THISNODE->connectmode != conf_node::C_ONDEMAND) |
1149 | { |
1174 | { |
1150 | send_ping (si); |
1175 | send_ping (si); |
1151 | w.start (NOW + 5); |
1176 | w.start (5); |
1152 | } |
1177 | } |
1153 | else if (NOW < last_activity + ::conf.keepalive + 10) |
1178 | else if (ev::ev_now () < last_activity + ::conf.keepalive + 10) |
1154 | // hold ondemand connections implicitly a few seconds longer |
1179 | // hold ondemand connections implicitly a few seconds longer |
1155 | // should delete octx, though, or something like that ;) |
1180 | // should delete octx, though, or something like that ;) |
1156 | w.start (last_activity + ::conf.keepalive + 10); |
1181 | w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); |
1157 | else |
1182 | else |
1158 | reset_connection (); |
1183 | reset_connection (); |
1159 | } |
1184 | } |
1160 | |
1185 | |
1161 | void connection::send_connect_request (int id) |
1186 | void connection::send_connect_request (int id) |
… | |
… | |
1167 | send_vpn_packet (p, si); |
1192 | send_vpn_packet (p, si); |
1168 | |
1193 | |
1169 | delete p; |
1194 | delete p; |
1170 | } |
1195 | } |
1171 | |
1196 | |
|
|
1197 | void connection::script_init_env (const char *ext) |
|
|
1198 | { |
|
|
1199 | char *env; |
|
|
1200 | asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env); |
|
|
1201 | asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); |
|
|
1202 | asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, |
|
|
1203 | 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, |
|
|
1204 | conf->id & 0xff); putenv (env); |
|
|
1205 | } |
|
|
1206 | |
1172 | void connection::script_node () |
1207 | void connection::script_init_connect_env () |
1173 | { |
1208 | { |
1174 | vpn->script_if_up (); |
1209 | vpn->script_init_env (); |
1175 | |
1210 | |
1176 | char *env; |
1211 | char *env; |
1177 | asprintf (&env, "DESTID=%d", conf->id); putenv (env); |
1212 | asprintf (&env, "DESTID=%d", conf->id); putenv (env); |
1178 | asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); |
1213 | asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); |
1179 | asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); |
1214 | asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); |
1180 | asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); |
1215 | asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); |
1181 | } |
1216 | } |
1182 | |
1217 | |
1183 | const char *connection::script_node_up () |
1218 | const char *connection::script_node_up () |
1184 | { |
1219 | { |
1185 | script_node (); |
1220 | script_init_connect_env (); |
1186 | |
1221 | |
1187 | putenv ("STATE=up"); |
1222 | putenv ((char *)"STATE=up"); |
1188 | |
1223 | |
|
|
1224 | char *filename; |
|
|
1225 | asprintf (&filename, |
|
|
1226 | "%s/%s", |
|
|
1227 | confbase, |
1189 | return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; |
1228 | ::conf.script_node_up ? ::conf.script_node_up : "node-up"); |
|
|
1229 | |
|
|
1230 | return filename; |
1190 | } |
1231 | } |
1191 | |
1232 | |
1192 | const char *connection::script_node_down () |
1233 | const char *connection::script_node_down () |
1193 | { |
1234 | { |
1194 | script_node (); |
1235 | script_init_connect_env (); |
1195 | |
1236 | |
1196 | putenv ("STATE=down"); |
1237 | putenv ((char *)"STATE=down"); |
1197 | |
1238 | |
1198 | return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; |
1239 | char *filename; |
|
|
1240 | asprintf (&filename, |
|
|
1241 | "%s/%s", |
|
|
1242 | confbase, |
|
|
1243 | ::conf.script_node_down ? ::conf.script_node_down : "node-down"); |
|
|
1244 | |
|
|
1245 | return filename; |
1199 | } |
1246 | } |
1200 | |
1247 | |
1201 | connection::connection (struct vpn *vpn, conf_node *conf) |
1248 | connection::connection (struct vpn *vpn, conf_node *conf) |
1202 | : vpn(vpn), conf(conf) |
1249 | : vpn(vpn), conf(conf) |
1203 | , rekey (this, &connection::rekey_cb) |
1250 | , rekey (this, &connection::rekey_cb) |