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.17 by pcg, Mon Sep 1 21:23:35 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. / 600.; // 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
210net_rate_limiter auth_rate_limiter, reset_rate_limiter; 211net_rate_limiter auth_rate_limiter, reset_rate_limiter;
211 212
… …
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);
… …
467 set_hdr (type, dst); 475 set_hdr (type, dst);
468} 476}
469 477
470bool config_packet::chk_config () const 478bool config_packet::chk_config () const
471{ 479{
472 return prot_major == PROTOCOL_MAJOR 480 if (prot_major != PROTOCOL_MAJOR)
473 && randsize == RAND_SIZE 481 slog (L_WARN, _("major version mismatch (%d <=> %d)"), prot_major, PROTOCOL_MAJOR);
474 && hmaclen == HMACLENGTH 482 else if (randsize != RAND_SIZE)
475 && flags == curflags () 483 slog (L_WARN, _("rand size mismatch (%d <=> %d)"), randsize, RAND_SIZE);
484 else if (hmaclen != HMACLENGTH)
485 slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH);
486 else if (flags != curflags ())
487 slog (L_WARN, _("flag mismatch (%x <=> %x)"), flags, curflags ());
476 && challengelen == sizeof (rsachallenge) 488 else if (challengelen != sizeof (rsachallenge))
489 slog (L_WARN, _("challenge length mismatch (%d <=> %d)"), challengelen, sizeof (rsachallenge));
477 && cipher_nid == htonl (EVP_CIPHER_nid (CIPHER)) 490 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
491 slog (L_WARN, _("cipher mismatch (%x <=> %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
478 && digest_nid == htonl (EVP_MD_type (RSA_HASH)) 492 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
493 slog (L_WARN, _("digest mismatch (%x <=> %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
479 && hmac_nid == htonl (EVP_MD_type (DIGEST)); 494 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
495 slog (L_WARN, _("hmac mismatch (%x <=> %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
496 else
497 return true;
498
499 return false;
480} 500}
481 501
482struct auth_req_packet : config_packet 502struct auth_req_packet : config_packet
483{ 503{
484 char magic[8]; 504 char magic[8];
… …
546}; 566};
547 567
548///////////////////////////////////////////////////////////////////////////// 568/////////////////////////////////////////////////////////////////////////////
549 569
550void 570void
571connection::connection_established ()
572{
573 if (ictx && octx)
574 {
575 connectmode = conf->connectmode;
576
577 rekey.start (NOW + ::conf.rekey);
578 keepalive.start (NOW + ::conf.keepalive);
579
580 // send queued packets
581 if (ictx && octx)
582 {
583 while (tap_packet *p = (tap_packet *)data_queue.get ())
584 {
585 send_data_packet (p);
586 delete p;
587 }
588
589 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
590 {
591 send_vpn_packet (p, si, IPTOS_RELIABILITY);
592 delete p;
593 }
594 }
595 }
596 else
597 {
598 retry_cnt = 0;
599 establish_connection.start (NOW + 5);
600 keepalive.reset ();
601 rekey.reset ();
602 }
603}
604
605void
551connection::reset_dstaddr () 606connection::reset_si ()
552{ 607{
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); 608 protocol = best_protocol (THISNODE->protocols & conf->protocols);
587 609
588 // mask out protocols we cannot establish 610 // mask out protocols we cannot establish
589 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 611 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
590 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 612 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
591 613
592 if (protocol) 614 si.set (conf, protocol);
615}
616
617// ensure sockinfo is valid, forward if necessary
618const sockinfo &
619connection::forward_si (const sockinfo &si) const
620{
621 if (!si.valid ())
622 {
623 connection *r = vpn->find_router ();
624
625 if (r)
626 {
627 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"),
628 conf->nodename, r->conf->nodename);
629 return r->si;
630 }
631 else
632 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
633 conf->nodename);
593 { 634 }
594 rsachallenge chg;
595 635
596 rsa_cache.gen (pkt->id, chg); 636 return si;
637}
597 638
598 if (0 > RSA_public_encrypt (sizeof chg, 639void
599 (unsigned char *)&chg, (unsigned char *)&pkt->encr, 640connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
600 conf->rsa_key, RSA_PKCS1_OAEP_PADDING)) 641{
601 fatal ("RSA_public_encrypt error"); 642 if (!vpn->send_vpn_packet (pkt, si, tos))
643 reset_connection ();
644}
602 645
603 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 646void
647connection::send_ping (const sockinfo &si, u8 pong)
648{
649 ping_packet *pkt = new ping_packet;
604 650
605 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 651 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
652 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
653
654 delete pkt;
655}
656
657void
658connection::send_reset (const sockinfo &si)
659{
660 if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED)
661 {
662 config_packet *pkt = new config_packet;
663
664 pkt->setup (vpn_packet::PT_RESET, conf->id);
665 send_vpn_packet (pkt, si, IPTOS_MINCOST);
606 666
607 delete pkt; 667 delete pkt;
608 } 668 }
609 else 669}
610 ; // silently fail 670
671void
672connection::send_auth_request (const sockinfo &si, bool initiate)
673{
674 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
675
676 rsachallenge chg;
677
678 rsa_cache.gen (pkt->id, chg);
679
680 if (0 > RSA_public_encrypt (sizeof chg,
681 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
682 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
683 fatal ("RSA_public_encrypt error");
684
685 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
686
687 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
688
689 delete pkt;
611} 690}
612 691
613void 692void
614connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg) 693connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg)
615{ 694{
… …
641 720
642 delete r; 721 delete r;
643} 722}
644 723
645void 724void
646connection::establish_connection_cb (tstamp &ts) 725connection::establish_connection_cb (time_watcher &w)
647{ 726{
648 if (ictx || conf == THISNODE 727 if (ictx || conf == THISNODE
649 || connectmode == conf_node::C_NEVER 728 || connectmode == conf_node::C_NEVER
650 || connectmode == conf_node::C_DISABLED) 729 || connectmode == conf_node::C_DISABLED)
651 ts = TSTAMP_CANCEL; 730 w.at = TSTAMP_CANCEL;
652 else if (ts <= NOW) 731 else if (w.at <= NOW)
653 { 732 {
654 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 733 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
655 734
656 if (retry_int < 3600 * 8) 735 if (retry_int < 3600 * 8)
657 retry_cnt++; 736 retry_cnt++;
658 737
659 ts = NOW + retry_int; 738 w.at = NOW + retry_int;
660 739
661 if (conf->hostname) 740 reset_si ();
741
742 if (si.prot && !si.host)
743 vpn->send_connect_request (conf->id);
744 else
662 { 745 {
663 reset_dstaddr (); 746 const sockinfo &dsi = forward_si (si);
747
664 if (si.host && auth_rate_limiter.can (si)) 748 if (dsi.valid () && auth_rate_limiter.can (dsi))
665 { 749 {
666 if (retry_cnt < 4) 750 if (retry_cnt < 4)
667 send_auth_request (si, true); 751 send_auth_request (dsi, true);
668 else 752 else
669 send_ping (si, 0); 753 send_ping (dsi, 0);
670 } 754 }
671 } 755 }
672 else
673 vpn->connect_request (conf->id);
674 } 756 }
675} 757}
676 758
677void 759void
678connection::reset_connection () 760connection::reset_connection ()
… …
707 789
708 reset_connection (); 790 reset_connection ();
709} 791}
710 792
711void 793void
712connection::rekey_cb (tstamp &ts) 794connection::rekey_cb (time_watcher &w)
713{ 795{
714 ts = TSTAMP_CANCEL; 796 w.at = TSTAMP_CANCEL;
715 797
716 reset_connection (); 798 reset_connection ();
717 establish_connection (); 799 establish_connection ();
718} 800}
719 801
… …
721connection::send_data_packet (tap_packet *pkt, bool broadcast) 803connection::send_data_packet (tap_packet *pkt, bool broadcast)
722{ 804{
723 vpndata_packet *p = new vpndata_packet; 805 vpndata_packet *p = new vpndata_packet;
724 int tos = 0; 806 int tos = 0;
725 807
808 // I am not hilarious about peeking into packets, but so be it.
726 if (conf->inherit_tos 809 if (conf->inherit_tos
727 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP 810 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP
728 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4 811 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
729 tos = (*pkt)[15] & IPTOS_TOS_MASK; 812 tos = (*pkt)[15] & IPTOS_TOS_MASK;
730 813
… …
743 if (ictx && octx) 826 if (ictx && octx)
744 send_data_packet (pkt, broadcast); 827 send_data_packet (pkt, broadcast);
745 else 828 else
746 { 829 {
747 if (!broadcast)//DDDD 830 if (!broadcast)//DDDD
748 queue.put (new tap_packet (*pkt)); 831 data_queue.put (new tap_packet (*pkt));
832
833 establish_connection ();
834 }
835}
836
837void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
838{
839 if (ictx && octx)
840 send_vpn_packet (pkt, si, tos);
841 else
842 {
843 vpn_queue.put (new vpn_packet (*pkt));
749 844
750 establish_connection (); 845 establish_connection ();
751 } 846 }
752} 847}
753 848
… …
759 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 854 slog (L_NOISE, "<<%d received packet type %d from %d to %d",
760 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 855 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
761 856
762 switch (pkt->typ ()) 857 switch (pkt->typ ())
763 { 858 {
764 case vpn_packet::PT_PING: 859 case vpn_packet::PT_PING:
765 // we send pings instead of auth packets after some retries, 860 // we send pings instead of auth packets after some retries,
766 // so reset the retry counter and establish a connection 861 // so reset the retry counter and establish a connection
767 // when we receive a ping. 862 // when we receive a ping.
768 if (!ictx) 863 if (!ictx)
864 {
865 if (auth_rate_limiter.can (rsi))
866 send_auth_request (rsi, true);
867 }
868 else
869 send_ping (rsi, 1); // pong
870
871 break;
872
873 case vpn_packet::PT_PONG:
874 break;
875
876 case vpn_packet::PT_RESET:
769 { 877 {
770 if (auth_rate_limiter.can (rsi)) 878 reset_connection ();
771 send_auth_request (rsi, true); 879
880 config_packet *p = (config_packet *) pkt;
881
882 if (!p->chk_config ())
883 {
884 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"),
885 conf->nodename, (const char *)rsi);
886 connectmode = conf_node::C_DISABLED;
887 }
888 else if (connectmode == conf_node::C_ALWAYS)
889 establish_connection ();
772 } 890 }
773 else
774 send_ping (rsi, 1); // pong
775
776 break; 891 break;
777 892
778 case vpn_packet::PT_PONG:
779 break;
780
781 case vpn_packet::PT_RESET: 893 case vpn_packet::PT_AUTH_REQ:
782 { 894 if (auth_rate_limiter.can (rsi))
783 reset_connection ();
784
785 config_packet *p = (config_packet *) pkt;
786
787 if (!p->chk_config ())
788 { 895 {
896 auth_req_packet *p = (auth_req_packet *) pkt;
897
898 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate);
899
900 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8))
901 {
902 if (p->prot_minor != PROTOCOL_MINOR)
903 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
904 conf->nodename, (const char *)rsi,
905 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
906
907 if (p->initiate)
908 send_auth_request (rsi, false);
909
910 rsachallenge k;
911
912 if (0 > RSA_private_decrypt (sizeof (p->encr),
913 (unsigned char *)&p->encr, (unsigned char *)&k,
914 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
915 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
916 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
917 else
918 {
919 delete octx;
920
921 octx = new crypto_ctx (k, 1);
922 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
923
924 conf->protocols = p->protocols;
925
926 send_auth_response (rsi, p->id, k);
927
928 connection_established ();
929
930 break;
931 }
932 }
933 else
789 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 934 slog (L_WARN, _("%s(%s): protocol mismatch"),
790 conf->nodename, (const char *)rsi); 935 conf->nodename, (const char *)rsi);
791 connectmode = conf_node::C_DISABLED; 936
937 send_reset (rsi);
792 } 938 }
793 else if (connectmode == conf_node::C_ALWAYS) 939
794 establish_connection ();
795 }
796 break; 940 break;
797 941
798 case vpn_packet::PT_AUTH_REQ: 942 case vpn_packet::PT_AUTH_RES:
799 if (auth_rate_limiter.can (rsi))
800 { 943 {
801 auth_req_packet *p = (auth_req_packet *) pkt; 944 auth_res_packet *p = (auth_res_packet *) pkt;
802 945
803 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 946 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id);
804 947
805 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 948 if (p->chk_config ())
806 { 949 {
807 if (p->prot_minor != PROTOCOL_MINOR) 950 if (p->prot_minor != PROTOCOL_MINOR)
808 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 951 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
809 conf->nodename, (const char *)rsi, 952 conf->nodename, (const char *)rsi,
810 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 953 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
811 954
812 if (p->initiate)
813 send_auth_request (rsi, false);
814
815 rsachallenge k; 955 rsachallenge chg;
816 956
817 if (0 > RSA_private_decrypt (sizeof (p->encr), 957 if (!rsa_cache.find (p->id, chg))
818 (unsigned char *)&p->encr, (unsigned char *)&k, 958 {
819 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING)) 959 slog (L_ERR, _("%s(%s): unrequested auth response"),
820 slog (L_ERR, _("%s(%s): challenge illegal or corrupted"),
821 conf->nodename, (const char *)rsi); 960 conf->nodename, (const char *)rsi);
961 break;
962 }
822 else 963 else
823 { 964 {
824 retry_cnt = 0; 965 crypto_ctx *cctx = new crypto_ctx (chg, 0);
825 establish_connection.set (NOW + 8); //? ;) 966
826 keepalive.reset (); 967 if (!p->hmac_chk (cctx))
968 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
969 "could be an attack, or just corruption or an synchronization error"),
970 conf->nodename, (const char *)rsi);
827 rekey.reset (); 971 else
972 {
973 rsaresponse h;
828 974
975 rsa_hash (p->id, chg, h);
976
977 if (!memcmp ((u8 *)&h, (u8 *)p->response, sizeof h))
978 {
979 prot_minor = p->prot_minor;
980
981 delete ictx; ictx = cctx;
982
983 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
984
985 si = rsi;
986 protocol = rsi.prot;
987
988 connection_established ();
989
990 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
991 conf->nodename, (const char *)rsi,
992 p->prot_major, p->prot_minor);
993
994 if (::conf.script_node_up)
995 run_script (run_script_cb (this, &connection::script_node_up), false);
996
997 break;
998 }
999 else
1000 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
1001 conf->nodename, (const char *)rsi);
1002 }
1003
829 delete ictx; 1004 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 } 1005 }
842 } 1006 }
843
844 send_reset (rsi);
845 } 1007 }
846 1008
1009 send_reset (rsi);
847 break; 1010 break;
848 1011
849 case vpn_packet::PT_AUTH_RES: 1012 case vpn_packet::PT_DATA_COMPRESSED:
850 { 1013#if !ENABLE_COMPRESSION
851 auth_res_packet *p = (auth_res_packet *) pkt; 1014 send_reset (rsi);
1015 break;
1016#endif
852 1017
853 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1018 case vpn_packet::PT_DATA_UNCOMPRESSED:
854 1019
855 if (p->chk_config ()) 1020 if (ictx && octx)
856 { 1021 {
857 if (p->prot_minor != PROTOCOL_MINOR) 1022 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 1023
862 rsachallenge chg; 1024 if (!p->hmac_chk (ictx))
863 1025 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
864 if (!rsa_cache.find (p->id, chg)) 1026 "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); 1027 conf->nodename, (const char *)rsi);
867 else 1028 else
868 { 1029 {
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 1030 u32 seqno;
1031 tap_packet *d = p->unpack (this, seqno);
1032
1033 if (iseqno.recv_ok (seqno))
876 { 1034 {
877 rsaresponse h; 1035 vpn->tap->send (d);
878 1036
879 rsa_hash (p->id, chg, h); 1037 if (p->dst () == 0) // re-broadcast
1038 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1039 {
1040 connection *c = *i;
880 1041
881 if (!memcmp ((u8 *)&h, (u8 *)p->response, sizeof h)) 1042 if (c->conf != THISNODE && c->conf != conf)
1043 c->inject_data_packet (d);
1044 }
1045
1046 if (si != rsi)
882 { 1047 {
883 prot_minor = p->prot_minor; 1048 // fast re-sync on connection 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; 1049 si = rsi;
890 1050
891 rekey.set (NOW + ::conf.rekey); 1051 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, 1052 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 } 1053 }
1054
913 else 1055 delete d;
914 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1056
915 conf->nodename, (const char *)rsi); 1057 break;
916 } 1058 }
917
918 delete cctx;
919 } 1059 }
920 } 1060 }
921 }
922 1061
923 send_reset (rsi); 1062 send_reset (rsi);
924 break; 1063 break;
925 1064
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: 1065 case vpn_packet::PT_CONNECT_REQ:
976 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1066 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
977 { 1067 {
978 connect_req_packet *p = (connect_req_packet *) pkt; 1068 connect_req_packet *p = (connect_req_packet *) pkt;
979 1069
980 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1070 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]; 1071 connection *c = vpn->conns[p->id - 1];
1072 conf->protocols = p->protocols;
983 1073
984 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n", 1074 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
985 conf->id, p->id, c->ictx && c->octx); 1075 conf->id, p->id, c->ictx && c->octx);
986 1076
987 if (c->ictx && c->octx) 1077 if (c->ictx && c->octx)
988 { 1078 {
989 // send connect_info packets to both sides, in case one is 1079 // send connect_info packets to both sides, in case one is
990 // behind a nat firewall (or both ;) 1080 // behind a nat firewall (or both ;)
991 c->send_connect_info (conf->id, si, conf->protocols); 1081 c->send_connect_info (conf->id, si, conf->protocols);
992 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1082 send_connect_info (c->conf->id, c->si, c->conf->protocols);
993 } 1083 }
1084 else
1085 c->establish_connection ();
994 } 1086 }
995 1087
996 break; 1088 break;
997 1089
998 case vpn_packet::PT_CONNECT_INFO: 1090 case vpn_packet::PT_CONNECT_INFO:
999 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1091 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1000 { 1092 {
1001 connect_info_packet *p = (connect_info_packet *) pkt; 1093 connect_info_packet *p = (connect_info_packet *) pkt;
1002 1094
1003 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1095 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything
1004 conf->protocols = p->protocols; 1096
1005 connection *c = vpn->conns[p->id - 1]; 1097 connection *c = vpn->conns[p->id - 1];
1006 1098
1099 c->conf->protocols = p->protocols;
1100 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1101 p->si.upgrade_protocol (protocol, c->conf);
1102
1007 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1103 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1008 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1104 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1009 1105
1106 const sockinfo &dsi = forward_si (p->si);
1107
1108 if (dsi.valid ())
1010 c->send_auth_request (p->si, true); 1109 c->send_auth_request (dsi, true);
1011 } 1110 }
1012 1111
1013 break; 1112 break;
1014 1113
1015 default: 1114 default:
1016 send_reset (rsi); 1115 send_reset (rsi);
1017 break; 1116 break;
1018
1019 } 1117 }
1020} 1118}
1021 1119
1022void connection::keepalive_cb (tstamp &ts) 1120void connection::keepalive_cb (time_watcher &w)
1023{ 1121{
1024 if (NOW >= last_activity + ::conf.keepalive + 30) 1122 if (NOW >= last_activity + ::conf.keepalive + 30)
1025 { 1123 {
1026 reset_connection (); 1124 reset_connection ();
1027 establish_connection (); 1125 establish_connection ();
1028 } 1126 }
1029 else if (NOW < last_activity + ::conf.keepalive) 1127 else if (NOW < last_activity + ::conf.keepalive)
1030 ts = last_activity + ::conf.keepalive; 1128 w.at = last_activity + ::conf.keepalive;
1031 else if (conf->connectmode != conf_node::C_ONDEMAND 1129 else if (conf->connectmode != conf_node::C_ONDEMAND
1032 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1130 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1033 { 1131 {
1034 send_ping (si); 1132 send_ping (si);
1035 ts = NOW + 5; 1133 w.at = NOW + 5;
1036 } 1134 }
1135 else if (NOW < last_activity + ::conf.keepalive + 10)
1136 // hold ondemand connections implicitly a few seconds longer
1137 // should delete octx, though, or something like that ;)
1138 w.at = last_activity + ::conf.keepalive + 10;
1037 else 1139 else
1038 reset_connection (); 1140 reset_connection ();
1039} 1141}
1040 1142
1041void connection::connect_request (int id) 1143void connection::send_connect_request (int id)
1042{ 1144{
1043 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1145 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1044 1146
1045 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1147 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id);
1046 p->hmac_set (octx); 1148 p->hmac_set (octx);
… …
1049 delete p; 1151 delete p;
1050} 1152}
1051 1153
1052void connection::script_node () 1154void connection::script_node ()
1053{ 1155{
1054 vpn->script_if_up (0); 1156 vpn->script_if_up ();
1055 1157
1056 char *env; 1158 char *env;
1057 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1159 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1058 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1160 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1059 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1161 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1060 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1162 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1061} 1163}
1062 1164
1063const char *connection::script_node_up (int) 1165const char *connection::script_node_up ()
1064{ 1166{
1065 script_node (); 1167 script_node ();
1066 1168
1067 putenv ("STATE=up"); 1169 putenv ("STATE=up");
1068 1170
1069 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1171 return ::conf.script_node_up ? ::conf.script_node_up : "node-up";
1070} 1172}
1071 1173
1072const char *connection::script_node_down (int) 1174const char *connection::script_node_down ()
1073{ 1175{
1074 script_node (); 1176 script_node ();
1075 1177
1076 putenv ("STATE=down"); 1178 putenv ("STATE=down");
1077 1179
1078 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1180 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} 1181}
1090 1182
1091connection::connection(struct vpn *vpn_) 1183connection::connection(struct vpn *vpn_)
1092: vpn(vpn_) 1184: vpn(vpn_)
1093, rekey (this, &connection::rekey_cb) 1185, rekey (this, &connection::rekey_cb)

Diff Legend

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