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