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.8 by pcg, Sun Apr 6 04:17:36 2003 UTC vs.
Revision 1.16 by pcg, Mon Sep 1 15:52:03 2003 UTC

… …
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;
… …
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];
… …
544 len = sizeof (*this) - sizeof (net_packet); 564 len = sizeof (*this) - sizeof (net_packet);
545 } 565 }
546}; 566};
547 567
548///////////////////////////////////////////////////////////////////////////// 568/////////////////////////////////////////////////////////////////////////////
569
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}
549 604
550void 605void
551connection::reset_si () 606connection::reset_si ()
552{ 607{
553 protocol = best_protocol (THISNODE->protocols & conf->protocols); 608 protocol = best_protocol (THISNODE->protocols & conf->protocols);
… …
580 635
581 return si; 636 return si;
582} 637}
583 638
584void 639void
640connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
641{
642 if (!vpn->send_vpn_packet (pkt, si, tos))
643 reset_connection ();
644}
645
646void
585connection::send_ping (const sockinfo &si, u8 pong) 647connection::send_ping (const sockinfo &si, u8 pong)
586{ 648{
587 ping_packet *pkt = new ping_packet; 649 ping_packet *pkt = new ping_packet;
588 650
589 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 651 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
590 vpn->send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 652 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
591 653
592 delete pkt; 654 delete pkt;
593} 655}
594 656
595void 657void
… …
598 if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED) 660 if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED)
599 { 661 {
600 config_packet *pkt = new config_packet; 662 config_packet *pkt = new config_packet;
601 663
602 pkt->setup (vpn_packet::PT_RESET, conf->id); 664 pkt->setup (vpn_packet::PT_RESET, conf->id);
603 vpn->send_vpn_packet (pkt, si, IPTOS_MINCOST); 665 send_vpn_packet (pkt, si, IPTOS_MINCOST);
604 666
605 delete pkt; 667 delete pkt;
606 } 668 }
607} 669}
608 670
… …
620 conf->rsa_key, RSA_PKCS1_OAEP_PADDING)) 682 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
621 fatal ("RSA_public_encrypt error"); 683 fatal ("RSA_public_encrypt error");
622 684
623 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 685 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
624 686
625 vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 687 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
626
627 688
628 delete pkt; 689 delete pkt;
629} 690}
630 691
631void 692void
… …
639 700
640 pkt->hmac_set (octx); 701 pkt->hmac_set (octx);
641 702
642 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); 703 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si);
643 704
644 vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 705 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
645 706
646 delete pkt; 707 delete pkt;
647} 708}
648 709
649void 710void
… …
653 conf->id, rid, (const char *)rsi); 714 conf->id, rid, (const char *)rsi);
654 715
655 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 716 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
656 717
657 r->hmac_set (octx); 718 r->hmac_set (octx);
658 vpn->send_vpn_packet (r, si); 719 send_vpn_packet (r, si);
659 720
660 delete r; 721 delete r;
661} 722}
662 723
663void 724void
… …
677 w.at = NOW + retry_int; 738 w.at = NOW + retry_int;
678 739
679 reset_si (); 740 reset_si ();
680 741
681 if (si.prot && !si.host) 742 if (si.prot && !si.host)
682 vpn->connect_request (conf->id); 743 vpn->send_connect_request (conf->id);
683 else 744 else
684 { 745 {
685 const sockinfo &dsi = forward_si (si); 746 const sockinfo &dsi = forward_si (si);
686 747
687 if (dsi.valid () && auth_rate_limiter.can (dsi)) 748 if (dsi.valid () && auth_rate_limiter.can (dsi))
… …
742connection::send_data_packet (tap_packet *pkt, bool broadcast) 803connection::send_data_packet (tap_packet *pkt, bool broadcast)
743{ 804{
744 vpndata_packet *p = new vpndata_packet; 805 vpndata_packet *p = new vpndata_packet;
745 int tos = 0; 806 int tos = 0;
746 807
808 // I am not hilarious about peeking into packets, but so be it.
747 if (conf->inherit_tos 809 if (conf->inherit_tos
748 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP 810 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP
749 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4 811 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
750 tos = (*pkt)[15] & IPTOS_TOS_MASK; 812 tos = (*pkt)[15] & IPTOS_TOS_MASK;
751 813
752 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs 814 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
753 vpn->send_vpn_packet (p, si, tos); 815 send_vpn_packet (p, si, tos);
754 816
755 delete p; 817 delete p;
756 818
757 if (oseqno > MAX_SEQNO) 819 if (oseqno > MAX_SEQNO)
758 rekey (); 820 rekey ();
… …
764 if (ictx && octx) 826 if (ictx && octx)
765 send_data_packet (pkt, broadcast); 827 send_data_packet (pkt, broadcast);
766 else 828 else
767 { 829 {
768 if (!broadcast)//DDDD 830 if (!broadcast)//DDDD
769 queue.put (new tap_packet (*pkt)); 831 data_queue.put (new tap_packet (*pkt));
770 832
771 establish_connection (); 833 establish_connection ();
772 } 834 }
773} 835}
774 836
775void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 837void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
776{ 838{
777 if (ictx && octx) 839 if (ictx && octx)
778 vpn->send_vpn_packet (pkt, si, tos); 840 send_vpn_packet (pkt, si, tos);
779 else 841 else
842 {
843 vpn_queue.put (new vpn_packet (*pkt));
844
780 establish_connection (); 845 establish_connection ();
846 }
781} 847}
782 848
783void 849void
784connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 850connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
785{ 851{
… …
848 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING)) 914 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
849 slog (L_ERR, _("%s(%s): challenge illegal or corrupted"), 915 slog (L_ERR, _("%s(%s): challenge illegal or corrupted"),
850 conf->nodename, (const char *)rsi); 916 conf->nodename, (const char *)rsi);
851 else 917 else
852 { 918 {
853 retry_cnt = 0;
854 establish_connection.start (NOW + 8); //? ;)
855 keepalive.reset ();
856 rekey.reset ();
857
858 delete ictx;
859 ictx = 0;
860
861 delete octx; 919 delete octx;
862 920
863 octx = new crypto_ctx (k, 1); 921 octx = new crypto_ctx (k, 1);
864 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 922 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
865 923
866 conf->protocols = p->protocols; 924 conf->protocols = p->protocols;
925
867 send_auth_response (rsi, p->id, k); 926 send_auth_response (rsi, p->id, k);
927
928 connection_established ();
868 929
869 break; 930 break;
870 } 931 }
871 } 932 }
933 else
934 slog (L_WARN, _("%s(%s): protocol mismatch"),
935 conf->nodename, (const char *)rsi);
872 936
873 send_reset (rsi); 937 send_reset (rsi);
874 } 938 }
875 939
876 break; 940 break;
… …
889 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 953 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
890 954
891 rsachallenge chg; 955 rsachallenge chg;
892 956
893 if (!rsa_cache.find (p->id, chg)) 957 if (!rsa_cache.find (p->id, chg))
958 {
894 slog (L_ERR, _("%s(%s): unrequested auth response"), 959 slog (L_ERR, _("%s(%s): unrequested auth response"),
895 conf->nodename, (const char *)rsi); 960 conf->nodename, (const char *)rsi);
961 break;
962 }
896 else 963 else
897 { 964 {
898 crypto_ctx *cctx = new crypto_ctx (chg, 0); 965 crypto_ctx *cctx = new crypto_ctx (chg, 0);
899 966
900 if (!p->hmac_chk (cctx)) 967 if (!p->hmac_chk (cctx))
… …
916 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 983 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
917 984
918 si = rsi; 985 si = rsi;
919 protocol = rsi.prot; 986 protocol = rsi.prot;
920 987
921 rekey.start (NOW + ::conf.rekey); 988 connection_established ();
922 keepalive.start (NOW + ::conf.keepalive);
923
924 // send queued packets
925 while (tap_packet *p = queue.get ())
926 {
927 send_data_packet (p);
928 delete p;
929 }
930
931 connectmode = conf->connectmode;
932 989
933 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 990 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
934 conf->nodename, (const char *)rsi, 991 conf->nodename, (const char *)rsi,
935 p->prot_major, p->prot_minor); 992 p->prot_major, p->prot_minor);
936 993
… …
962 1019
963 if (ictx && octx) 1020 if (ictx && octx)
964 { 1021 {
965 vpndata_packet *p = (vpndata_packet *)pkt; 1022 vpndata_packet *p = (vpndata_packet *)pkt;
966 1023
967 if (rsi == si) 1024 if (!p->hmac_chk (ictx))
1025 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1026 "could be an attack, or just corruption or an synchronization error"),
1027 conf->nodename, (const char *)rsi);
1028 else
968 { 1029 {
969 if (!p->hmac_chk (ictx))
970 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
971 "could be an attack, or just corruption or an synchronization error"),
972 conf->nodename, (const char *)rsi);
973 else 1030 u32 seqno;
1031 tap_packet *d = p->unpack (this, seqno);
1032
1033 if (iseqno.recv_ok (seqno))
974 { 1034 {
975 u32 seqno; 1035 vpn->tap->send (d);
976 tap_packet *d = p->unpack (this, seqno);
977 1036
978 if (iseqno.recv_ok (seqno)) 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;
1041
1042 if (c->conf != THISNODE && c->conf != conf)
1043 c->inject_data_packet (d);
1044 }
1045
1046 if (si != rsi)
979 { 1047 {
980 vpn->tap->send (d); 1048 // fast re-sync on connection changes, useful especially for tcp/ip
981
982 if (p->dst () == 0) // re-broadcast
983 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
984 {
985 connection *c = *i;
986
987 if (c->conf != THISNODE && c->conf != conf)
988 c->inject_data_packet (d);
989 }
990
991 delete d;
992
993 break; 1049 si = rsi;
1050
1051 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1052 conf->nodename, (const char *)si, (const char *)rsi);
994 } 1053 }
1054
1055 delete d;
1056
1057 break;
995 } 1058 }
996 } 1059 }
997 else
998 slog (L_ERR, _("received data packet from unknown source %s"), (const char *)rsi);
999 } 1060 }
1000 1061
1001 send_reset (rsi); 1062 send_reset (rsi);
1002 break; 1063 break;
1003 1064
… …
1018 // send connect_info packets to both sides, in case one is 1079 // send connect_info packets to both sides, in case one is
1019 // behind a nat firewall (or both ;) 1080 // behind a nat firewall (or both ;)
1020 c->send_connect_info (conf->id, si, conf->protocols); 1081 c->send_connect_info (conf->id, si, conf->protocols);
1021 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1082 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1022 } 1083 }
1084 else
1085 c->establish_connection ();
1023 } 1086 }
1024 1087
1025 break; 1088 break;
1026 1089
1027 case vpn_packet::PT_CONNECT_INFO: 1090 case vpn_packet::PT_CONNECT_INFO:
… …
1067 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1130 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1068 { 1131 {
1069 send_ping (si); 1132 send_ping (si);
1070 w.at = NOW + 5; 1133 w.at = NOW + 5;
1071 } 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;
1072 else 1139 else
1073 reset_connection (); 1140 reset_connection ();
1074} 1141}
1075 1142
1076void connection::connect_request (int id) 1143void connection::send_connect_request (int id)
1077{ 1144{
1078 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);
1079 1146
1080 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1147 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id);
1081 p->hmac_set (octx); 1148 p->hmac_set (octx);
1082 vpn->send_vpn_packet (p, si); 1149 send_vpn_packet (p, si);
1083 1150
1084 delete p; 1151 delete p;
1085} 1152}
1086 1153
1087void connection::script_node () 1154void connection::script_node ()

Diff Legend

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