… | |
… | |
147 | } |
147 | } |
148 | } |
148 | } |
149 | |
149 | |
150 | ////////////////////////////////////////////////////////////////////////////// |
150 | ////////////////////////////////////////////////////////////////////////////// |
151 | |
151 | |
152 | void pkt_queue::put (tap_packet *p) |
152 | void pkt_queue::put (net_packet *p) |
153 | { |
153 | { |
154 | if (queue[i]) |
154 | if (queue[i]) |
155 | { |
155 | { |
156 | delete queue[i]; |
156 | delete queue[i]; |
157 | j = (j + 1) % QUEUEDEPTH; |
157 | j = (j + 1) % QUEUEDEPTH; |
… | |
… | |
160 | queue[i] = p; |
160 | queue[i] = p; |
161 | |
161 | |
162 | i = (i + 1) % QUEUEDEPTH; |
162 | i = (i + 1) % QUEUEDEPTH; |
163 | } |
163 | } |
164 | |
164 | |
165 | tap_packet *pkt_queue::get () |
165 | net_packet *pkt_queue::get () |
166 | { |
166 | { |
167 | tap_packet *p = queue[j]; |
167 | net_packet *p = queue[j]; |
168 | |
168 | |
169 | if (p) |
169 | if (p) |
170 | { |
170 | { |
171 | queue[j] = 0; |
171 | queue[j] = 0; |
172 | j = (j + 1) % QUEUEDEPTH; |
172 | j = (j + 1) % QUEUEDEPTH; |
… | |
… | |
197 | // only do action once every x seconds per host whole allowing bursts. |
197 | // only do action once every x seconds per host whole allowing bursts. |
198 | // this implementation ("splay list" ;) is inefficient, |
198 | // this implementation ("splay list" ;) is inefficient, |
199 | // but low on resources. |
199 | // but low on resources. |
200 | struct net_rate_limiter : list<net_rateinfo> |
200 | struct net_rate_limiter : list<net_rateinfo> |
201 | { |
201 | { |
202 | static const double ALPHA = 1. - 1. / 90.; // allow bursts |
202 | static const double ALPHA = 1. - 1. / 180.; // allow bursts |
203 | static const double CUTOFF = 20.; // one event every CUTOFF seconds |
203 | static const double CUTOFF = 10.; // one event every CUTOFF seconds |
204 | static const double EXPIRE = CUTOFF * 30.; // expire entries after this time |
204 | static const double EXPIRE = CUTOFF * 30.; // expire entries after this time |
|
|
205 | static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value |
205 | |
206 | |
206 | bool can (const sockinfo &si) { return can((u32)si.host); } |
207 | bool can (const sockinfo &si) { return can((u32)si.host); } |
207 | bool can (u32 host); |
208 | bool can (u32 host); |
208 | }; |
209 | }; |
209 | |
210 | |
… | |
… | |
225 | { |
226 | { |
226 | net_rateinfo ri; |
227 | net_rateinfo ri; |
227 | |
228 | |
228 | ri.host = host; |
229 | ri.host = host; |
229 | ri.pcnt = 1.; |
230 | ri.pcnt = 1.; |
230 | ri.diff = CUTOFF * (1. / (1. - ALPHA)); |
231 | ri.diff = MAXDIF; |
231 | ri.last = NOW; |
232 | ri.last = NOW; |
232 | |
233 | |
233 | push_front (ri); |
234 | push_front (ri); |
234 | |
235 | |
235 | return true; |
236 | return true; |
… | |
… | |
242 | ri.pcnt = ri.pcnt * ALPHA; |
243 | ri.pcnt = ri.pcnt * ALPHA; |
243 | ri.diff = ri.diff * ALPHA + (NOW - ri.last); |
244 | ri.diff = ri.diff * ALPHA + (NOW - ri.last); |
244 | |
245 | |
245 | ri.last = NOW; |
246 | ri.last = NOW; |
246 | |
247 | |
|
|
248 | double dif = ri.diff / ri.pcnt; |
|
|
249 | |
247 | bool send = ri.diff / ri.pcnt > CUTOFF; |
250 | bool send = dif > CUTOFF; |
248 | |
251 | |
|
|
252 | if (dif > MAXDIF) |
|
|
253 | { |
|
|
254 | ri.pcnt = 1.; |
|
|
255 | ri.diff = MAXDIF; |
|
|
256 | } |
249 | if (send) |
257 | else if (send) |
250 | ri.pcnt++; |
258 | ri.pcnt++; |
251 | |
259 | |
252 | push_front (ri); |
260 | push_front (ri); |
253 | |
261 | |
254 | return send; |
262 | return send; |
… | |
… | |
546 | }; |
554 | }; |
547 | |
555 | |
548 | ///////////////////////////////////////////////////////////////////////////// |
556 | ///////////////////////////////////////////////////////////////////////////// |
549 | |
557 | |
550 | void |
558 | void |
|
|
559 | connection::connection_established () |
|
|
560 | { |
|
|
561 | if (ictx && octx) |
|
|
562 | { |
|
|
563 | connectmode = conf->connectmode; |
|
|
564 | |
|
|
565 | rekey.start (NOW + ::conf.rekey); |
|
|
566 | keepalive.start (NOW + ::conf.keepalive); |
|
|
567 | |
|
|
568 | // send queued packets |
|
|
569 | if (ictx && octx) |
|
|
570 | { |
|
|
571 | while (tap_packet *p = (tap_packet *)data_queue.get ()) |
|
|
572 | { |
|
|
573 | send_data_packet (p); |
|
|
574 | delete p; |
|
|
575 | } |
|
|
576 | |
|
|
577 | while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) |
|
|
578 | { |
|
|
579 | send_vpn_packet (p, si, IPTOS_RELIABILITY); |
|
|
580 | delete p; |
|
|
581 | } |
|
|
582 | } |
|
|
583 | } |
|
|
584 | else |
|
|
585 | { |
|
|
586 | retry_cnt = 0; |
|
|
587 | establish_connection.start (NOW + 5); |
|
|
588 | keepalive.reset (); |
|
|
589 | rekey.reset (); |
|
|
590 | } |
|
|
591 | } |
|
|
592 | |
|
|
593 | void |
551 | connection::reset_dstaddr () |
594 | connection::reset_si () |
552 | { |
595 | { |
553 | protocol = best_protocol (THISNODE->protocols & conf->protocols); |
596 | protocol = best_protocol (THISNODE->protocols & conf->protocols); |
554 | |
597 | |
555 | // mask out protocols we cannot establish |
598 | // mask out protocols we cannot establish |
556 | if (!conf->udp_port) protocol &= ~PROT_UDPv4; |
599 | if (!conf->udp_port) protocol &= ~PROT_UDPv4; |
557 | if (!conf->tcp_port) protocol &= ~PROT_TCPv4; |
600 | if (!conf->tcp_port) protocol &= ~PROT_TCPv4; |
558 | |
601 | |
559 | si.set (conf, protocol); |
602 | si.set (conf, protocol); |
560 | } |
603 | } |
561 | |
604 | |
|
|
605 | // ensure sockinfo is valid, forward if necessary |
|
|
606 | const sockinfo & |
|
|
607 | connection::forward_si (const sockinfo &si) const |
|
|
608 | { |
|
|
609 | if (!si.valid ()) |
|
|
610 | { |
|
|
611 | connection *r = vpn->find_router (); |
|
|
612 | |
|
|
613 | if (r) |
|
|
614 | { |
|
|
615 | slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), |
|
|
616 | conf->nodename, r->conf->nodename); |
|
|
617 | return r->si; |
|
|
618 | } |
|
|
619 | else |
|
|
620 | slog (L_DEBUG, _("%s: node unreachable, no common protocol"), |
|
|
621 | conf->nodename); |
|
|
622 | } |
|
|
623 | |
|
|
624 | return si; |
|
|
625 | } |
|
|
626 | |
|
|
627 | void |
|
|
628 | connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) |
|
|
629 | { |
|
|
630 | if (!vpn->send_vpn_packet (pkt, si, tos)) |
|
|
631 | reset_connection (); |
|
|
632 | } |
|
|
633 | |
562 | void |
634 | void |
563 | connection::send_ping (const sockinfo &si, u8 pong) |
635 | connection::send_ping (const sockinfo &si, u8 pong) |
564 | { |
636 | { |
565 | ping_packet *pkt = new ping_packet; |
637 | ping_packet *pkt = new ping_packet; |
566 | |
638 | |
567 | pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); |
639 | pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); |
568 | vpn->send_vpn_packet (pkt, si, IPTOS_LOWDELAY); |
640 | send_vpn_packet (pkt, si, IPTOS_LOWDELAY); |
569 | |
641 | |
570 | delete pkt; |
642 | delete pkt; |
571 | } |
643 | } |
572 | |
644 | |
573 | void |
645 | void |
… | |
… | |
576 | if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED) |
648 | if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED) |
577 | { |
649 | { |
578 | config_packet *pkt = new config_packet; |
650 | config_packet *pkt = new config_packet; |
579 | |
651 | |
580 | pkt->setup (vpn_packet::PT_RESET, conf->id); |
652 | pkt->setup (vpn_packet::PT_RESET, conf->id); |
581 | vpn->send_vpn_packet (pkt, si, IPTOS_MINCOST); |
653 | send_vpn_packet (pkt, si, IPTOS_MINCOST); |
582 | |
654 | |
583 | delete pkt; |
655 | delete pkt; |
584 | } |
656 | } |
585 | } |
657 | } |
586 | |
658 | |
… | |
… | |
598 | conf->rsa_key, RSA_PKCS1_OAEP_PADDING)) |
670 | conf->rsa_key, RSA_PKCS1_OAEP_PADDING)) |
599 | fatal ("RSA_public_encrypt error"); |
671 | fatal ("RSA_public_encrypt error"); |
600 | |
672 | |
601 | slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); |
673 | slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); |
602 | |
674 | |
603 | vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly |
675 | send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly |
604 | |
676 | |
605 | delete pkt; |
677 | delete pkt; |
606 | } |
678 | } |
607 | |
679 | |
608 | void |
680 | void |
… | |
… | |
616 | |
688 | |
617 | pkt->hmac_set (octx); |
689 | pkt->hmac_set (octx); |
618 | |
690 | |
619 | slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); |
691 | slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); |
620 | |
692 | |
621 | vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly |
693 | send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly |
622 | |
694 | |
623 | delete pkt; |
695 | delete pkt; |
624 | } |
696 | } |
625 | |
697 | |
626 | void |
698 | void |
… | |
… | |
630 | conf->id, rid, (const char *)rsi); |
702 | conf->id, rid, (const char *)rsi); |
631 | |
703 | |
632 | connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); |
704 | connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); |
633 | |
705 | |
634 | r->hmac_set (octx); |
706 | r->hmac_set (octx); |
635 | vpn->send_vpn_packet (r, si); |
707 | send_vpn_packet (r, si); |
636 | |
708 | |
637 | delete r; |
709 | delete r; |
638 | } |
710 | } |
639 | |
711 | |
640 | void |
712 | void |
… | |
… | |
651 | if (retry_int < 3600 * 8) |
723 | if (retry_int < 3600 * 8) |
652 | retry_cnt++; |
724 | retry_cnt++; |
653 | |
725 | |
654 | w.at = NOW + retry_int; |
726 | w.at = NOW + retry_int; |
655 | |
727 | |
656 | if (conf->hostname) |
728 | reset_si (); |
|
|
729 | |
|
|
730 | if (si.prot && !si.host) |
|
|
731 | vpn->send_connect_request (conf->id); |
|
|
732 | else |
657 | { |
733 | { |
658 | reset_dstaddr (); |
734 | const sockinfo &dsi = forward_si (si); |
659 | |
735 | |
660 | if (si.valid () && auth_rate_limiter.can (si)) |
736 | if (dsi.valid () && auth_rate_limiter.can (dsi)) |
661 | { |
737 | { |
662 | if (retry_cnt < 4) |
738 | if (retry_cnt < 4) |
663 | send_auth_request (si, true); |
739 | send_auth_request (dsi, true); |
664 | else |
740 | else |
665 | send_ping (si, 0); |
741 | send_ping (dsi, 0); |
666 | } |
742 | } |
667 | } |
743 | } |
668 | else |
|
|
669 | vpn->connect_request (conf->id); |
|
|
670 | } |
744 | } |
671 | } |
745 | } |
672 | |
746 | |
673 | void |
747 | void |
674 | connection::reset_connection () |
748 | connection::reset_connection () |
… | |
… | |
717 | connection::send_data_packet (tap_packet *pkt, bool broadcast) |
791 | connection::send_data_packet (tap_packet *pkt, bool broadcast) |
718 | { |
792 | { |
719 | vpndata_packet *p = new vpndata_packet; |
793 | vpndata_packet *p = new vpndata_packet; |
720 | int tos = 0; |
794 | int tos = 0; |
721 | |
795 | |
|
|
796 | // I am not hilarious about peeking into packets, but so be it. |
722 | if (conf->inherit_tos |
797 | if (conf->inherit_tos |
723 | && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP |
798 | && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP |
724 | && ((*pkt)[14] & 0xf0) == 0x40) // IPv4 |
799 | && ((*pkt)[14] & 0xf0) == 0x40) // IPv4 |
725 | tos = (*pkt)[15] & IPTOS_TOS_MASK; |
800 | tos = (*pkt)[15] & IPTOS_TOS_MASK; |
726 | |
801 | |
727 | p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs |
802 | p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs |
728 | vpn->send_vpn_packet (p, si, tos); |
803 | send_vpn_packet (p, si, tos); |
729 | |
804 | |
730 | delete p; |
805 | delete p; |
731 | |
806 | |
732 | if (oseqno > MAX_SEQNO) |
807 | if (oseqno > MAX_SEQNO) |
733 | rekey (); |
808 | rekey (); |
… | |
… | |
739 | if (ictx && octx) |
814 | if (ictx && octx) |
740 | send_data_packet (pkt, broadcast); |
815 | send_data_packet (pkt, broadcast); |
741 | else |
816 | else |
742 | { |
817 | { |
743 | if (!broadcast)//DDDD |
818 | if (!broadcast)//DDDD |
744 | queue.put (new tap_packet (*pkt)); |
819 | data_queue.put (new tap_packet (*pkt)); |
|
|
820 | |
|
|
821 | establish_connection (); |
|
|
822 | } |
|
|
823 | } |
|
|
824 | |
|
|
825 | void connection::inject_vpn_packet (vpn_packet *pkt, int tos) |
|
|
826 | { |
|
|
827 | if (ictx && octx) |
|
|
828 | send_vpn_packet (pkt, si, tos); |
|
|
829 | else |
|
|
830 | { |
|
|
831 | vpn_queue.put (new vpn_packet (*pkt)); |
745 | |
832 | |
746 | establish_connection (); |
833 | establish_connection (); |
747 | } |
834 | } |
748 | } |
835 | } |
749 | |
836 | |
… | |
… | |
815 | ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING)) |
902 | ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING)) |
816 | slog (L_ERR, _("%s(%s): challenge illegal or corrupted"), |
903 | slog (L_ERR, _("%s(%s): challenge illegal or corrupted"), |
817 | conf->nodename, (const char *)rsi); |
904 | conf->nodename, (const char *)rsi); |
818 | else |
905 | else |
819 | { |
906 | { |
820 | retry_cnt = 0; |
|
|
821 | establish_connection.start (NOW + 8); //? ;) |
|
|
822 | keepalive.reset (); |
|
|
823 | rekey.reset (); |
|
|
824 | |
|
|
825 | delete ictx; |
|
|
826 | ictx = 0; |
|
|
827 | |
|
|
828 | delete octx; |
907 | delete octx; |
829 | |
908 | |
830 | octx = new crypto_ctx (k, 1); |
909 | octx = new crypto_ctx (k, 1); |
831 | oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; |
910 | oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; |
832 | |
911 | |
833 | conf->protocols = p->protocols; |
912 | conf->protocols = p->protocols; |
|
|
913 | |
834 | send_auth_response (rsi, p->id, k); |
914 | send_auth_response (rsi, p->id, k); |
|
|
915 | |
|
|
916 | connection_established (); |
835 | |
917 | |
836 | break; |
918 | break; |
837 | } |
919 | } |
838 | } |
920 | } |
839 | |
921 | |
… | |
… | |
856 | PROTOCOL_MINOR, conf->nodename, p->prot_minor); |
938 | PROTOCOL_MINOR, conf->nodename, p->prot_minor); |
857 | |
939 | |
858 | rsachallenge chg; |
940 | rsachallenge chg; |
859 | |
941 | |
860 | if (!rsa_cache.find (p->id, chg)) |
942 | if (!rsa_cache.find (p->id, chg)) |
|
|
943 | { |
861 | slog (L_ERR, _("%s(%s): unrequested auth response"), |
944 | slog (L_ERR, _("%s(%s): unrequested auth response"), |
862 | conf->nodename, (const char *)rsi); |
945 | conf->nodename, (const char *)rsi); |
|
|
946 | break; |
|
|
947 | } |
863 | else |
948 | else |
864 | { |
949 | { |
865 | crypto_ctx *cctx = new crypto_ctx (chg, 0); |
950 | crypto_ctx *cctx = new crypto_ctx (chg, 0); |
866 | |
951 | |
867 | if (!p->hmac_chk (cctx)) |
952 | if (!p->hmac_chk (cctx)) |
… | |
… | |
881 | delete ictx; ictx = cctx; |
966 | delete ictx; ictx = cctx; |
882 | |
967 | |
883 | iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid |
968 | iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid |
884 | |
969 | |
885 | si = rsi; |
970 | si = rsi; |
|
|
971 | protocol = rsi.prot; |
886 | |
972 | |
887 | rekey.start (NOW + ::conf.rekey); |
973 | connection_established (); |
888 | keepalive.start (NOW + ::conf.keepalive); |
|
|
889 | |
974 | |
890 | // send queued packets |
|
|
891 | while (tap_packet *p = queue.get ()) |
|
|
892 | { |
|
|
893 | send_data_packet (p); |
|
|
894 | delete p; |
|
|
895 | } |
|
|
896 | |
|
|
897 | connectmode = conf->connectmode; |
|
|
898 | |
|
|
899 | slog (L_INFO, _("%s(%s): %s connection established, protocol version %d.%d"), |
975 | slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), |
900 | conf->nodename, (const char *)rsi, |
976 | conf->nodename, (const char *)rsi, |
901 | strprotocol (protocol), |
|
|
902 | p->prot_major, p->prot_minor); |
977 | p->prot_major, p->prot_minor); |
903 | |
978 | |
904 | if (::conf.script_node_up) |
979 | if (::conf.script_node_up) |
905 | run_script (run_script_cb (this, &connection::script_node_up), false); |
980 | run_script (run_script_cb (this, &connection::script_node_up), false); |
906 | |
981 | |
… | |
… | |
929 | |
1004 | |
930 | if (ictx && octx) |
1005 | if (ictx && octx) |
931 | { |
1006 | { |
932 | vpndata_packet *p = (vpndata_packet *)pkt; |
1007 | vpndata_packet *p = (vpndata_packet *)pkt; |
933 | |
1008 | |
934 | if (rsi == si) |
1009 | if (!p->hmac_chk (ictx)) |
|
|
1010 | slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" |
|
|
1011 | "could be an attack, or just corruption or an synchronization error"), |
|
|
1012 | conf->nodename, (const char *)rsi); |
|
|
1013 | else |
935 | { |
1014 | { |
936 | if (!p->hmac_chk (ictx)) |
|
|
937 | slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" |
|
|
938 | "could be an attack, or just corruption or an synchronization error"), |
|
|
939 | conf->nodename, (const char *)rsi); |
|
|
940 | else |
1015 | u32 seqno; |
|
|
1016 | tap_packet *d = p->unpack (this, seqno); |
|
|
1017 | |
|
|
1018 | if (iseqno.recv_ok (seqno)) |
941 | { |
1019 | { |
942 | u32 seqno; |
1020 | vpn->tap->send (d); |
943 | tap_packet *d = p->unpack (this, seqno); |
|
|
944 | |
1021 | |
945 | if (iseqno.recv_ok (seqno)) |
1022 | if (p->dst () == 0) // re-broadcast |
|
|
1023 | for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i) |
|
|
1024 | { |
|
|
1025 | connection *c = *i; |
|
|
1026 | |
|
|
1027 | if (c->conf != THISNODE && c->conf != conf) |
|
|
1028 | c->inject_data_packet (d); |
|
|
1029 | } |
|
|
1030 | |
|
|
1031 | if (si != rsi) |
946 | { |
1032 | { |
947 | vpn->tap->send (d); |
1033 | // fast re-sync on connection changes, useful especially for tcp/ip |
948 | |
|
|
949 | if (p->dst () == 0) // re-broadcast |
|
|
950 | for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i) |
|
|
951 | { |
|
|
952 | connection *c = *i; |
|
|
953 | |
|
|
954 | if (c->conf != THISNODE && c->conf != conf) |
|
|
955 | c->inject_data_packet (d); |
|
|
956 | } |
|
|
957 | |
|
|
958 | delete d; |
|
|
959 | |
|
|
960 | break; |
1034 | si = rsi; |
|
|
1035 | |
|
|
1036 | slog (L_INFO, _("%s(%s): socket address changed to %s"), |
|
|
1037 | conf->nodename, (const char *)si, (const char *)rsi); |
961 | } |
1038 | } |
|
|
1039 | |
|
|
1040 | delete d; |
|
|
1041 | |
|
|
1042 | break; |
962 | } |
1043 | } |
963 | } |
1044 | } |
964 | else |
|
|
965 | slog (L_ERR, _("received data packet from unknown source %s"), (const char *)rsi); |
|
|
966 | } |
1045 | } |
967 | |
1046 | |
968 | send_reset (rsi); |
1047 | send_reset (rsi); |
969 | break; |
1048 | break; |
970 | |
1049 | |
… | |
… | |
972 | if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) |
1051 | if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) |
973 | { |
1052 | { |
974 | connect_req_packet *p = (connect_req_packet *) pkt; |
1053 | connect_req_packet *p = (connect_req_packet *) pkt; |
975 | |
1054 | |
976 | assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything |
1055 | assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything |
|
|
1056 | connection *c = vpn->conns[p->id - 1]; |
977 | conf->protocols = p->protocols; |
1057 | conf->protocols = p->protocols; |
978 | connection *c = vpn->conns[p->id - 1]; |
|
|
979 | |
1058 | |
980 | slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n", |
1059 | slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n", |
981 | conf->id, p->id, c->ictx && c->octx); |
1060 | conf->id, p->id, c->ictx && c->octx); |
982 | |
1061 | |
983 | if (c->ictx && c->octx) |
1062 | if (c->ictx && c->octx) |
… | |
… | |
985 | // send connect_info packets to both sides, in case one is |
1064 | // send connect_info packets to both sides, in case one is |
986 | // behind a nat firewall (or both ;) |
1065 | // behind a nat firewall (or both ;) |
987 | c->send_connect_info (conf->id, si, conf->protocols); |
1066 | c->send_connect_info (conf->id, si, conf->protocols); |
988 | send_connect_info (c->conf->id, c->si, c->conf->protocols); |
1067 | send_connect_info (c->conf->id, c->si, c->conf->protocols); |
989 | } |
1068 | } |
|
|
1069 | else |
|
|
1070 | c->establish_connection (); |
990 | } |
1071 | } |
991 | |
1072 | |
992 | break; |
1073 | break; |
993 | |
1074 | |
994 | case vpn_packet::PT_CONNECT_INFO: |
1075 | case vpn_packet::PT_CONNECT_INFO: |
995 | if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) |
1076 | if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) |
996 | { |
1077 | { |
997 | connect_info_packet *p = (connect_info_packet *) pkt; |
1078 | connect_info_packet *p = (connect_info_packet *) pkt; |
998 | |
1079 | |
999 | assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything |
1080 | assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything |
1000 | conf->protocols = p->protocols; |
1081 | |
1001 | connection *c = vpn->conns[p->id - 1]; |
1082 | connection *c = vpn->conns[p->id - 1]; |
|
|
1083 | |
|
|
1084 | c->conf->protocols = p->protocols; |
|
|
1085 | protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); |
|
|
1086 | p->si.upgrade_protocol (protocol, c->conf); |
1002 | |
1087 | |
1003 | slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", |
1088 | slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", |
1004 | conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); |
1089 | conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); |
1005 | |
1090 | |
|
|
1091 | const sockinfo &dsi = forward_si (p->si); |
|
|
1092 | |
|
|
1093 | if (dsi.valid ()) |
1006 | c->send_auth_request (p->si, true); |
1094 | c->send_auth_request (dsi, true); |
1007 | } |
1095 | } |
1008 | |
1096 | |
1009 | break; |
1097 | break; |
1010 | |
1098 | |
1011 | default: |
1099 | default: |
… | |
… | |
1027 | || THISNODE->connectmode != conf_node::C_ONDEMAND) |
1115 | || THISNODE->connectmode != conf_node::C_ONDEMAND) |
1028 | { |
1116 | { |
1029 | send_ping (si); |
1117 | send_ping (si); |
1030 | w.at = NOW + 5; |
1118 | w.at = NOW + 5; |
1031 | } |
1119 | } |
|
|
1120 | else if (NOW < last_activity + ::conf.keepalive + 10) |
|
|
1121 | // hold ondemand connections implicitly a few seconds longer |
|
|
1122 | // should delete octx, though, or something like that ;) |
|
|
1123 | w.at = last_activity + ::conf.keepalive + 10; |
1032 | else |
1124 | else |
1033 | reset_connection (); |
1125 | reset_connection (); |
1034 | } |
1126 | } |
1035 | |
1127 | |
1036 | void connection::connect_request (int id) |
1128 | void connection::send_connect_request (int id) |
1037 | { |
1129 | { |
1038 | connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); |
1130 | connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); |
1039 | |
1131 | |
1040 | slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); |
1132 | slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); |
1041 | p->hmac_set (octx); |
1133 | p->hmac_set (octx); |
1042 | vpn->send_vpn_packet (p, si); |
1134 | send_vpn_packet (p, si); |
1043 | |
1135 | |
1044 | delete p; |
1136 | delete p; |
1045 | } |
1137 | } |
1046 | |
1138 | |
1047 | void connection::script_node () |
1139 | void connection::script_node () |