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.2 by pcg, Wed Apr 2 03:25:17 2003 UTC vs.
Revision 1.13 by pcg, Fri Aug 8 07:52:26 2003 UTC

85 rsachallenge chg; 85 rsachallenge chg;
86}; 86};
87 87
88struct rsa_cache : list<rsa_entry> 88struct rsa_cache : list<rsa_entry>
89{ 89{
90 void cleaner_cb (tstamp &ts); time_watcher cleaner; 90 void cleaner_cb (time_watcher &w); time_watcher cleaner;
91 91
92 bool find (const rsaid &id, rsachallenge &chg) 92 bool find (const rsaid &id, rsachallenge &chg)
93 { 93 {
94 for (iterator i = begin (); i != end (); ++i) 94 for (iterator i = begin (); i != end (); ++i)
95 { 95 {
129 : cleaner (this, &rsa_cache::cleaner_cb) 129 : cleaner (this, &rsa_cache::cleaner_cb)
130 { } 130 { }
131 131
132} rsa_cache; 132} rsa_cache;
133 133
134void rsa_cache::cleaner_cb (tstamp &ts) 134void rsa_cache::cleaner_cb (time_watcher &w)
135{ 135{
136 if (empty ()) 136 if (empty ())
137 ts = TSTAMP_CANCEL; 137 w.at = TSTAMP_CANCEL;
138 else 138 else
139 { 139 {
140 ts = NOW + RSA_TTL; 140 w.at = NOW + RSA_TTL;
141 141
142 for (iterator i = begin (); i != end (); ) 142 for (iterator i = begin (); i != end (); )
143 if (i->expire <= NOW) 143 if (i->expire <= NOW)
144 i = erase (i); 144 i = erase (i);
145 else 145 else
147 } 147 }
148} 148}
149 149
150////////////////////////////////////////////////////////////////////////////// 150//////////////////////////////////////////////////////////////////////////////
151 151
152void pkt_queue::put (tap_packet *p) 152void 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
165tap_packet *pkt_queue::get () 165net_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.
200struct net_rate_limiter : list<net_rateinfo> 200struct 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;
285 hmac_gen (ctx); 293 hmac_gen (ctx);
286 294
287 return !memcmp (hmac, hmac_digest, HMACLENGTH); 295 return !memcmp (hmac, hmac_digest, HMACLENGTH);
288} 296}
289 297
290void vpn_packet::set_hdr (ptype type, unsigned int dst) 298void vpn_packet::set_hdr (ptype type_, unsigned int dst)
291{ 299{
292 this->type = type; 300 type = type_;
293 301
294 int src = THISNODE->id; 302 int src = THISNODE->id;
295 303
296 src1 = src; 304 src1 = src;
297 srcdst = ((src >> 8) << 4) | (dst >> 8); 305 srcdst = ((src >> 8) << 4) | (dst >> 8);
546}; 554};
547 555
548///////////////////////////////////////////////////////////////////////////// 556/////////////////////////////////////////////////////////////////////////////
549 557
550void 558void
559connection::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
593void
551connection::reset_dstaddr () 594connection::reset_si ()
552{ 595{
553 si.set (conf);
554}
555
556void
557connection::send_ping (const sockinfo &si, u8 pong)
558{
559 ping_packet *pkt = new ping_packet;
560
561 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
562 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
563
564 delete pkt;
565}
566
567void
568connection::send_reset (const sockinfo &si)
569{
570 if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED)
571 {
572 config_packet *pkt = new config_packet;
573
574 pkt->setup (vpn_packet::PT_RESET, conf->id);
575 send_vpn_packet (pkt, si, IPTOS_MINCOST);
576
577 delete pkt;
578 }
579}
580
581void
582connection::send_auth_request (const sockinfo &si, bool initiate)
583{
584 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
585
586 protocol = best_protocol (THISNODE->protocols & conf->protocols); 596 protocol = best_protocol (THISNODE->protocols & conf->protocols);
587 597
588 // mask out protocols we cannot establish 598 // mask out protocols we cannot establish
589 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 599 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
590 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 600 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
591 601
592 if (protocol) 602 si.set (conf, protocol);
603}
604
605// ensure sockinfo is valid, forward if necessary
606const sockinfo &
607connection::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);
593 { 622 }
594 rsachallenge chg;
595 623
596 rsa_cache.gen (pkt->id, chg); 624 return si;
625}
597 626
598 if (0 > RSA_public_encrypt (sizeof chg, 627void
599 (unsigned char *)&chg, (unsigned char *)&pkt->encr, 628connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
600 conf->rsa_key, RSA_PKCS1_OAEP_PADDING)) 629{
601 fatal ("RSA_public_encrypt error"); 630 if (!vpn->send_vpn_packet (pkt, si, tos))
631 reset_connection ();
632}
602 633
603 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 634void
635connection::send_ping (const sockinfo &si, u8 pong)
636{
637 ping_packet *pkt = new ping_packet;
604 638
605 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 639 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
640 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
641
642 delete pkt;
643}
644
645void
646connection::send_reset (const sockinfo &si)
647{
648 if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED)
649 {
650 config_packet *pkt = new config_packet;
651
652 pkt->setup (vpn_packet::PT_RESET, conf->id);
653 send_vpn_packet (pkt, si, IPTOS_MINCOST);
606 654
607 delete pkt; 655 delete pkt;
608 } 656 }
609 else 657}
610 ; // silently fail 658
659void
660connection::send_auth_request (const sockinfo &si, bool initiate)
661{
662 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
663
664 rsachallenge chg;
665
666 rsa_cache.gen (pkt->id, chg);
667
668 if (0 > RSA_public_encrypt (sizeof chg,
669 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
670 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
671 fatal ("RSA_public_encrypt error");
672
673 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
674
675 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
676
677 delete pkt;
611} 678}
612 679
613void 680void
614connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg) 681connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg)
615{ 682{
641 708
642 delete r; 709 delete r;
643} 710}
644 711
645void 712void
646connection::establish_connection_cb (tstamp &ts) 713connection::establish_connection_cb (time_watcher &w)
647{ 714{
648 if (ictx || conf == THISNODE 715 if (ictx || conf == THISNODE
649 || connectmode == conf_node::C_NEVER 716 || connectmode == conf_node::C_NEVER
650 || connectmode == conf_node::C_DISABLED) 717 || connectmode == conf_node::C_DISABLED)
651 ts = TSTAMP_CANCEL; 718 w.at = TSTAMP_CANCEL;
652 else if (ts <= NOW) 719 else if (w.at <= NOW)
653 { 720 {
654 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 721 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
655 722
656 if (retry_int < 3600 * 8) 723 if (retry_int < 3600 * 8)
657 retry_cnt++; 724 retry_cnt++;
658 725
659 ts = NOW + retry_int; 726 w.at = NOW + retry_int;
660 727
661 if (conf->hostname) 728 reset_si ();
729
730 if (si.prot && !si.host)
731 vpn->send_connect_request (conf->id);
732 else
662 { 733 {
663 reset_dstaddr (); 734 const sockinfo &dsi = forward_si (si);
735
664 if (si.host && auth_rate_limiter.can (si)) 736 if (dsi.valid () && auth_rate_limiter.can (dsi))
665 { 737 {
666 if (retry_cnt < 4) 738 if (retry_cnt < 4)
667 send_auth_request (si, true); 739 send_auth_request (dsi, true);
668 else 740 else
669 send_ping (si, 0); 741 send_ping (dsi, 0);
670 } 742 }
671 } 743 }
672 else
673 vpn->connect_request (conf->id);
674 } 744 }
675} 745}
676 746
677void 747void
678connection::reset_connection () 748connection::reset_connection ()
707 777
708 reset_connection (); 778 reset_connection ();
709} 779}
710 780
711void 781void
712connection::rekey_cb (tstamp &ts) 782connection::rekey_cb (time_watcher &w)
713{ 783{
714 ts = TSTAMP_CANCEL; 784 w.at = TSTAMP_CANCEL;
715 785
716 reset_connection (); 786 reset_connection ();
717 establish_connection (); 787 establish_connection ();
718} 788}
719 789
721connection::send_data_packet (tap_packet *pkt, bool broadcast) 791connection::send_data_packet (tap_packet *pkt, bool broadcast)
722{ 792{
723 vpndata_packet *p = new vpndata_packet; 793 vpndata_packet *p = new vpndata_packet;
724 int tos = 0; 794 int tos = 0;
725 795
796 // I am not hilarious about peeking into packets, but so be it.
726 if (conf->inherit_tos 797 if (conf->inherit_tos
727 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP 798 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP
728 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4 799 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
729 tos = (*pkt)[15] & IPTOS_TOS_MASK; 800 tos = (*pkt)[15] & IPTOS_TOS_MASK;
730 801
743 if (ictx && octx) 814 if (ictx && octx)
744 send_data_packet (pkt, broadcast); 815 send_data_packet (pkt, broadcast);
745 else 816 else
746 { 817 {
747 if (!broadcast)//DDDD 818 if (!broadcast)//DDDD
748 queue.put (new tap_packet (*pkt)); 819 data_queue.put (new tap_packet (*pkt));
820
821 establish_connection ();
822 }
823}
824
825void 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));
749 832
750 establish_connection (); 833 establish_connection ();
751 } 834 }
752} 835}
753 836
759 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 842 slog (L_NOISE, "<<%d received packet type %d from %d to %d",
760 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 843 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
761 844
762 switch (pkt->typ ()) 845 switch (pkt->typ ())
763 { 846 {
764 case vpn_packet::PT_PING: 847 case vpn_packet::PT_PING:
765 // we send pings instead of auth packets after some retries, 848 // we send pings instead of auth packets after some retries,
766 // so reset the retry counter and establish a connection 849 // so reset the retry counter and establish a connection
767 // when we receive a ping. 850 // when we receive a ping.
768 if (!ictx) 851 if (!ictx)
852 {
853 if (auth_rate_limiter.can (rsi))
854 send_auth_request (rsi, true);
855 }
856 else
857 send_ping (rsi, 1); // pong
858
859 break;
860
861 case vpn_packet::PT_PONG:
862 break;
863
864 case vpn_packet::PT_RESET:
769 { 865 {
770 if (auth_rate_limiter.can (rsi)) 866 reset_connection ();
771 send_auth_request (rsi, true); 867
868 config_packet *p = (config_packet *) pkt;
869
870 if (!p->chk_config ())
871 {
872 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"),
873 conf->nodename, (const char *)rsi);
874 connectmode = conf_node::C_DISABLED;
875 }
876 else if (connectmode == conf_node::C_ALWAYS)
877 establish_connection ();
772 } 878 }
773 else
774 send_ping (rsi, 1); // pong
775
776 break; 879 break;
777 880
778 case vpn_packet::PT_PONG:
779 break;
780
781 case vpn_packet::PT_RESET: 881 case vpn_packet::PT_AUTH_REQ:
782 { 882 if (auth_rate_limiter.can (rsi))
783 reset_connection ();
784
785 config_packet *p = (config_packet *) pkt;
786
787 if (!p->chk_config ())
788 { 883 {
789 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 884 auth_req_packet *p = (auth_req_packet *) pkt;
885
886 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate);
887
888 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8))
889 {
890 if (p->prot_minor != PROTOCOL_MINOR)
891 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
892 conf->nodename, (const char *)rsi,
893 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
894
895 if (p->initiate)
896 send_auth_request (rsi, false);
897
898 rsachallenge k;
899
900 if (0 > RSA_private_decrypt (sizeof (p->encr),
901 (unsigned char *)&p->encr, (unsigned char *)&k,
902 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
903 slog (L_ERR, _("%s(%s): challenge illegal or corrupted"),
790 conf->nodename, (const char *)rsi); 904 conf->nodename, (const char *)rsi);
791 connectmode = conf_node::C_DISABLED; 905 else
906 {
907 delete octx;
908
909 octx = new crypto_ctx (k, 1);
910 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
911
912 conf->protocols = p->protocols;
913
914 send_auth_response (rsi, p->id, k);
915
916 connection_established ();
917
918 break;
919 }
920 }
921
922 send_reset (rsi);
792 } 923 }
793 else if (connectmode == conf_node::C_ALWAYS) 924
794 establish_connection ();
795 }
796 break; 925 break;
797 926
798 case vpn_packet::PT_AUTH_REQ: 927 case vpn_packet::PT_AUTH_RES:
799 if (auth_rate_limiter.can (rsi))
800 { 928 {
801 auth_req_packet *p = (auth_req_packet *) pkt; 929 auth_res_packet *p = (auth_res_packet *) pkt;
802 930
803 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 931 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id);
804 932
805 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 933 if (p->chk_config ())
806 { 934 {
807 if (p->prot_minor != PROTOCOL_MINOR) 935 if (p->prot_minor != PROTOCOL_MINOR)
808 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 936 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
809 conf->nodename, (const char *)rsi, 937 conf->nodename, (const char *)rsi,
810 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 938 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
811 939
812 if (p->initiate)
813 send_auth_request (rsi, false);
814
815 rsachallenge k; 940 rsachallenge chg;
816 941
817 if (0 > RSA_private_decrypt (sizeof (p->encr), 942 if (!rsa_cache.find (p->id, chg))
818 (unsigned char *)&p->encr, (unsigned char *)&k, 943 {
819 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING)) 944 slog (L_ERR, _("%s(%s): unrequested auth response"),
820 slog (L_ERR, _("%s(%s): challenge illegal or corrupted"),
821 conf->nodename, (const char *)rsi); 945 conf->nodename, (const char *)rsi);
946 break;
947 }
822 else 948 else
823 { 949 {
824 retry_cnt = 0; 950 crypto_ctx *cctx = new crypto_ctx (chg, 0);
825 establish_connection.set (NOW + 8); //? ;) 951
826 keepalive.reset (); 952 if (!p->hmac_chk (cctx))
953 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
954 "could be an attack, or just corruption or an synchronization error"),
955 conf->nodename, (const char *)rsi);
827 rekey.reset (); 956 else
957 {
958 rsaresponse h;
828 959
960 rsa_hash (p->id, chg, h);
961
962 if (!memcmp ((u8 *)&h, (u8 *)p->response, sizeof h))
963 {
964 prot_minor = p->prot_minor;
965
966 delete ictx; ictx = cctx;
967
968 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
969
970 si = rsi;
971 protocol = rsi.prot;
972
973 connection_established ();
974
975 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
976 conf->nodename, (const char *)rsi,
977 p->prot_major, p->prot_minor);
978
979 if (::conf.script_node_up)
980 run_script (run_script_cb (this, &connection::script_node_up), false);
981
982 break;
983 }
984 else
985 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
986 conf->nodename, (const char *)rsi);
987 }
988
829 delete ictx; 989 delete cctx;
830 ictx = 0;
831
832 delete octx;
833
834 octx = new crypto_ctx (k, 1);
835 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
836
837 conf->protocols = p->protocols;
838 send_auth_response (rsi, p->id, k);
839
840 break;
841 } 990 }
842 } 991 }
843
844 send_reset (rsi);
845 } 992 }
846 993
994 send_reset (rsi);
847 break; 995 break;
848 996
849 case vpn_packet::PT_AUTH_RES: 997 case vpn_packet::PT_DATA_COMPRESSED:
850 { 998#if !ENABLE_COMPRESSION
851 auth_res_packet *p = (auth_res_packet *) pkt; 999 send_reset (rsi);
1000 break;
1001#endif
852 1002
853 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1003 case vpn_packet::PT_DATA_UNCOMPRESSED:
854 1004
855 if (p->chk_config ()) 1005 if (ictx && octx)
856 { 1006 {
857 if (p->prot_minor != PROTOCOL_MINOR) 1007 vpndata_packet *p = (vpndata_packet *)pkt;
858 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
859 conf->nodename, (const char *)rsi,
860 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
861 1008
862 rsachallenge chg; 1009 if (!p->hmac_chk (ictx))
863 1010 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
864 if (!rsa_cache.find (p->id, chg)) 1011 "could be an attack, or just corruption or an synchronization error"),
865 slog (L_ERR, _("%s(%s): unrequested auth response"),
866 conf->nodename, (const char *)rsi); 1012 conf->nodename, (const char *)rsi);
867 else 1013 else
868 { 1014 {
869 crypto_ctx *cctx = new crypto_ctx (chg, 0);
870
871 if (!p->hmac_chk (cctx))
872 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
873 "could be an attack, or just corruption or an synchronization error"),
874 conf->nodename, (const char *)rsi);
875 else 1015 u32 seqno;
1016 tap_packet *d = p->unpack (this, seqno);
1017
1018 if (iseqno.recv_ok (seqno))
876 { 1019 {
877 rsaresponse h; 1020 vpn->tap->send (d);
878 1021
879 rsa_hash (p->id, chg, h); 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;
880 1026
881 if (!memcmp ((u8 *)&h, (u8 *)p->response, sizeof h)) 1027 if (c->conf != THISNODE && c->conf != conf)
1028 c->inject_data_packet (d);
1029 }
1030
1031 if (si != rsi)
882 { 1032 {
883 prot_minor = p->prot_minor; 1033 // fast re-sync on conneciton changes, useful especially for tcp/ip
884
885 delete ictx; ictx = cctx;
886
887 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
888
889 si = rsi; 1034 si = rsi;
890 1035
891 rekey.set (NOW + ::conf.rekey); 1036 slog (L_INFO, _("%s(%s): socket address changed to %s"),
892 keepalive.set (NOW + ::conf.keepalive);
893
894 // send queued packets
895 while (tap_packet *p = queue.get ())
896 {
897 send_data_packet (p);
898 delete p;
899 }
900
901 connectmode = conf->connectmode;
902
903 slog (L_INFO, _("%s(%s): %s connection established, protocol version %d.%d"),
904 conf->nodename, (const char *)rsi, 1037 conf->nodename, (const char *)si, (const char *)rsi);
905 strprotocol (protocol),
906 p->prot_major, p->prot_minor);
907
908 if (::conf.script_node_up)
909 run_script (run_script_cb (this, &connection::script_node_up), false);
910
911 break;
912 } 1038 }
1039
913 else 1040 delete d;
914 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1041
915 conf->nodename, (const char *)rsi); 1042 break;
916 } 1043 }
917
918 delete cctx;
919 } 1044 }
920 } 1045 }
921 }
922 1046
923 send_reset (rsi); 1047 send_reset (rsi);
924 break; 1048 break;
925 1049
926 case vpn_packet::PT_DATA_COMPRESSED:
927#if !ENABLE_COMPRESSION
928 send_reset (rsi);
929 break;
930#endif
931
932 case vpn_packet::PT_DATA_UNCOMPRESSED:
933
934 if (ictx && octx)
935 {
936 vpndata_packet *p = (vpndata_packet *)pkt;
937
938 if (rsi == si)
939 {
940 if (!p->hmac_chk (ictx))
941 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
942 "could be an attack, or just corruption or an synchronization error"),
943 conf->nodename, (const char *)rsi);
944 else
945 {
946 u32 seqno;
947 tap_packet *d = p->unpack (this, seqno);
948
949 if (iseqno.recv_ok (seqno))
950 {
951 vpn->tap->send (d);
952
953 if (p->dst () == 0) // re-broadcast
954 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
955 {
956 connection *c = *i;
957
958 if (c->conf != THISNODE && c->conf != conf)
959 c->inject_data_packet (d);
960 }
961
962 delete d;
963
964 break;
965 }
966 }
967 }
968 else
969 slog (L_ERR, _("received data packet from unknown source %s"), (const char *)rsi);
970 }
971
972 send_reset (rsi);
973 break;
974
975 case vpn_packet::PT_CONNECT_REQ: 1050 case vpn_packet::PT_CONNECT_REQ:
976 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1051 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
977 { 1052 {
978 connect_req_packet *p = (connect_req_packet *) pkt; 1053 connect_req_packet *p = (connect_req_packet *) pkt;
979 1054
980 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
981 conf->protocols = p->protocols;
982 connection *c = vpn->conns[p->id - 1]; 1056 connection *c = vpn->conns[p->id - 1];
1057 conf->protocols = p->protocols;
983 1058
984 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n", 1059 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
985 conf->id, p->id, c->ictx && c->octx); 1060 conf->id, p->id, c->ictx && c->octx);
986 1061
987 if (c->ictx && c->octx) 1062 if (c->ictx && c->octx)
988 { 1063 {
989 // send connect_info packets to both sides, in case one is 1064 // send connect_info packets to both sides, in case one is
990 // behind a nat firewall (or both ;) 1065 // behind a nat firewall (or both ;)
991 c->send_connect_info (conf->id, si, conf->protocols); 1066 c->send_connect_info (conf->id, si, conf->protocols);
992 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1067 send_connect_info (c->conf->id, c->si, c->conf->protocols);
993 } 1068 }
1069 else
1070 c->establish_connection ();
994 } 1071 }
995 1072
996 break; 1073 break;
997 1074
998 case vpn_packet::PT_CONNECT_INFO: 1075 case vpn_packet::PT_CONNECT_INFO:
999 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1076 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1000 { 1077 {
1001 connect_info_packet *p = (connect_info_packet *) pkt; 1078 connect_info_packet *p = (connect_info_packet *) pkt;
1002 1079
1003 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
1004 conf->protocols = p->protocols; 1081
1005 connection *c = vpn->conns[p->id - 1]; 1082 connection *c = vpn->conns[p->id - 1];
1006 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);
1087
1007 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1088 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1008 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);
1009 1090
1091 const sockinfo &dsi = forward_si (p->si);
1092
1093 if (dsi.valid ())
1010 c->send_auth_request (p->si, true); 1094 c->send_auth_request (dsi, true);
1011 } 1095 }
1012 1096
1013 break; 1097 break;
1014 1098
1015 default: 1099 default:
1016 send_reset (rsi); 1100 send_reset (rsi);
1017 break; 1101 break;
1018
1019 } 1102 }
1020} 1103}
1021 1104
1022void connection::keepalive_cb (tstamp &ts) 1105void connection::keepalive_cb (time_watcher &w)
1023{ 1106{
1024 if (NOW >= last_activity + ::conf.keepalive + 30) 1107 if (NOW >= last_activity + ::conf.keepalive + 30)
1025 { 1108 {
1026 reset_connection (); 1109 reset_connection ();
1027 establish_connection (); 1110 establish_connection ();
1028 } 1111 }
1029 else if (NOW < last_activity + ::conf.keepalive) 1112 else if (NOW < last_activity + ::conf.keepalive)
1030 ts = last_activity + ::conf.keepalive; 1113 w.at = last_activity + ::conf.keepalive;
1031 else if (conf->connectmode != conf_node::C_ONDEMAND 1114 else if (conf->connectmode != conf_node::C_ONDEMAND
1032 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1115 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1033 { 1116 {
1034 send_ping (si); 1117 send_ping (si);
1035 ts = NOW + 5; 1118 w.at = NOW + 5;
1036 } 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;
1037 else 1124 else
1038 reset_connection (); 1125 reset_connection ();
1039} 1126}
1040 1127
1041void connection::connect_request (int id) 1128void connection::send_connect_request (int id)
1042{ 1129{
1043 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);
1044 1131
1045 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1132 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id);
1046 p->hmac_set (octx); 1133 p->hmac_set (octx);
1049 delete p; 1136 delete p;
1050} 1137}
1051 1138
1052void connection::script_node () 1139void connection::script_node ()
1053{ 1140{
1054 vpn->script_if_up (0); 1141 vpn->script_if_up ();
1055 1142
1056 char *env; 1143 char *env;
1057 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1144 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1058 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1145 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1059 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1146 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1060 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1147 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1061} 1148}
1062 1149
1063const char *connection::script_node_up (int) 1150const char *connection::script_node_up ()
1064{ 1151{
1065 script_node (); 1152 script_node ();
1066 1153
1067 putenv ("STATE=up"); 1154 putenv ("STATE=up");
1068 1155
1069 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1156 return ::conf.script_node_up ? ::conf.script_node_up : "node-up";
1070} 1157}
1071 1158
1072const char *connection::script_node_down (int) 1159const char *connection::script_node_down ()
1073{ 1160{
1074 script_node (); 1161 script_node ();
1075 1162
1076 putenv ("STATE=down"); 1163 putenv ("STATE=down");
1077 1164
1078 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1165 return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
1079}
1080
1081// send a vpn packet out to other hosts
1082void
1083connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
1084{
1085 if (protocol & PROT_IPv4)
1086 vpn->send_ipv4_packet (pkt, si, tos);
1087 else
1088 vpn->send_udpv4_packet (pkt, si, tos);
1089} 1166}
1090 1167
1091connection::connection(struct vpn *vpn_) 1168connection::connection(struct vpn *vpn_)
1092: vpn(vpn_) 1169: vpn(vpn_)
1093, rekey (this, &connection::rekey_cb) 1170, rekey (this, &connection::rekey_cb)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines