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.9 by pcg, Sun Apr 6 04:31:51 2003 UTC vs.
Revision 1.10 by pcg, Sun Apr 6 18:12:18 2003 UTC

… …
200struct net_rate_limiter : list<net_rateinfo> 200struct net_rate_limiter : list<net_rateinfo>
201{ 201{
202 static const double ALPHA = 1. - 1. / 180.; // allow bursts 202 static const double ALPHA = 1. - 1. / 180.; // allow bursts
203 static const double CUTOFF = 10.; // 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;
… …
544 len = sizeof (*this) - sizeof (net_packet); 552 len = sizeof (*this) - sizeof (net_packet);
545 } 553 }
546}; 554};
547 555
548///////////////////////////////////////////////////////////////////////////// 556/////////////////////////////////////////////////////////////////////////////
557
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 while (tap_packet *p = queue.get ())
571 {
572 send_data_packet (p);
573 delete p;
574 }
575 }
576 else
577 {
578 retry_cnt = 0;
579 establish_connection.start (NOW + 5);
580 keepalive.reset ();
581 rekey.reset ();
582 }
583}
549 584
550void 585void
551connection::reset_si () 586connection::reset_si ()
552{ 587{
553 protocol = best_protocol (THISNODE->protocols & conf->protocols); 588 protocol = best_protocol (THISNODE->protocols & conf->protocols);
… …
580 615
581 return si; 616 return si;
582} 617}
583 618
584void 619void
620connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
621{
622 if (!vpn->send_vpn_packet (pkt, si, tos))
623 reset_connection ();
624}
625
626void
585connection::send_ping (const sockinfo &si, u8 pong) 627connection::send_ping (const sockinfo &si, u8 pong)
586{ 628{
587 ping_packet *pkt = new ping_packet; 629 ping_packet *pkt = new ping_packet;
588 630
589 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 631 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
590 vpn->send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 632 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
591 633
592 delete pkt; 634 delete pkt;
593} 635}
594 636
595void 637void
… …
598 if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED) 640 if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED)
599 { 641 {
600 config_packet *pkt = new config_packet; 642 config_packet *pkt = new config_packet;
601 643
602 pkt->setup (vpn_packet::PT_RESET, conf->id); 644 pkt->setup (vpn_packet::PT_RESET, conf->id);
603 vpn->send_vpn_packet (pkt, si, IPTOS_MINCOST); 645 send_vpn_packet (pkt, si, IPTOS_MINCOST);
604 646
605 delete pkt; 647 delete pkt;
606 } 648 }
607} 649}
608 650
… …
620 conf->rsa_key, RSA_PKCS1_OAEP_PADDING)) 662 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
621 fatal ("RSA_public_encrypt error"); 663 fatal ("RSA_public_encrypt error");
622 664
623 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 665 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
624 666
625 vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 667 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
626 668
627 delete pkt; 669 delete pkt;
628} 670}
629 671
630void 672void
… …
638 680
639 pkt->hmac_set (octx); 681 pkt->hmac_set (octx);
640 682
641 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); 683 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si);
642 684
643 vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 685 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
644 686
645 delete pkt; 687 delete pkt;
646} 688}
647 689
648void 690void
… …
652 conf->id, rid, (const char *)rsi); 694 conf->id, rid, (const char *)rsi);
653 695
654 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 696 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
655 697
656 r->hmac_set (octx); 698 r->hmac_set (octx);
657 vpn->send_vpn_packet (r, si); 699 send_vpn_packet (r, si);
658 700
659 delete r; 701 delete r;
660} 702}
661 703
662void 704void
… …
676 w.at = NOW + retry_int; 718 w.at = NOW + retry_int;
677 719
678 reset_si (); 720 reset_si ();
679 721
680 if (si.prot && !si.host) 722 if (si.prot && !si.host)
681 vpn->connect_request (conf->id); 723 vpn->send_connect_request (conf->id);
682 else 724 else
683 { 725 {
684 const sockinfo &dsi = forward_si (si); 726 const sockinfo &dsi = forward_si (si);
685 727
686 if (dsi.valid () && auth_rate_limiter.can (dsi)) 728 if (dsi.valid () && auth_rate_limiter.can (dsi))
… …
747 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP 789 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP
748 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4 790 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
749 tos = (*pkt)[15] & IPTOS_TOS_MASK; 791 tos = (*pkt)[15] & IPTOS_TOS_MASK;
750 792
751 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs 793 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
752 vpn->send_vpn_packet (p, si, tos); 794 send_vpn_packet (p, si, tos);
753 795
754 delete p; 796 delete p;
755 797
756 if (oseqno > MAX_SEQNO) 798 if (oseqno > MAX_SEQNO)
757 rekey (); 799 rekey ();
… …
772} 814}
773 815
774void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 816void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
775{ 817{
776 if (ictx && octx) 818 if (ictx && octx)
777 vpn->send_vpn_packet (pkt, si, tos); 819 send_vpn_packet (pkt, si, tos);
778 else 820 else
779 establish_connection (); 821 establish_connection ();
780} 822}
781 823
782void 824void
… …
847 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING)) 889 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
848 slog (L_ERR, _("%s(%s): challenge illegal or corrupted"), 890 slog (L_ERR, _("%s(%s): challenge illegal or corrupted"),
849 conf->nodename, (const char *)rsi); 891 conf->nodename, (const char *)rsi);
850 else 892 else
851 { 893 {
852 retry_cnt = 0;
853 establish_connection.start (NOW + 8); //? ;)
854 keepalive.reset ();
855 rekey.reset ();
856
857 delete ictx;
858 ictx = 0;
859
860 delete octx; 894 delete octx;
861 895
862 octx = new crypto_ctx (k, 1); 896 octx = new crypto_ctx (k, 1);
863 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 897 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
864 898
865 conf->protocols = p->protocols; 899 conf->protocols = p->protocols;
900
866 send_auth_response (rsi, p->id, k); 901 send_auth_response (rsi, p->id, k);
902
903 connection_established ();
867 904
868 break; 905 break;
869 } 906 }
870 } 907 }
871 908
… …
915 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 952 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
916 953
917 si = rsi; 954 si = rsi;
918 protocol = rsi.prot; 955 protocol = rsi.prot;
919 956
920 rekey.start (NOW + ::conf.rekey); 957 connection_established ();
921 keepalive.start (NOW + ::conf.keepalive);
922
923 // send queued packets
924 while (tap_packet *p = queue.get ())
925 {
926 send_data_packet (p);
927 delete p;
928 }
929
930 connectmode = conf->connectmode;
931 958
932 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 959 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
933 conf->nodename, (const char *)rsi, 960 conf->nodename, (const char *)rsi,
934 p->prot_major, p->prot_minor); 961 p->prot_major, p->prot_minor);
935 962
… …
961 988
962 if (ictx && octx) 989 if (ictx && octx)
963 { 990 {
964 vpndata_packet *p = (vpndata_packet *)pkt; 991 vpndata_packet *p = (vpndata_packet *)pkt;
965 992
966 if (rsi == si) 993 if (!p->hmac_chk (ictx))
994 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
995 "could be an attack, or just corruption or an synchronization error"),
996 conf->nodename, (const char *)rsi);
997 else
967 { 998 {
968 if (!p->hmac_chk (ictx))
969 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
970 "could be an attack, or just corruption or an synchronization error"),
971 conf->nodename, (const char *)rsi);
972 else 999 u32 seqno;
1000 tap_packet *d = p->unpack (this, seqno);
1001
1002 if (iseqno.recv_ok (seqno))
973 { 1003 {
974 u32 seqno; 1004 vpn->tap->send (d);
975 tap_packet *d = p->unpack (this, seqno);
976 1005
977 if (iseqno.recv_ok (seqno)) 1006 if (p->dst () == 0) // re-broadcast
1007 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1008 {
1009 connection *c = *i;
1010
1011 if (c->conf != THISNODE && c->conf != conf)
1012 c->inject_data_packet (d);
1013 }
1014
1015 if (si != rsi)
978 { 1016 {
979 vpn->tap->send (d); 1017 // fast re-sync on conneciton changes, useful especially for tcp/ip
980
981 if (p->dst () == 0) // re-broadcast
982 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
983 {
984 connection *c = *i;
985
986 if (c->conf != THISNODE && c->conf != conf)
987 c->inject_data_packet (d);
988 }
989
990 delete d;
991
992 break; 1018 si = rsi;
1019
1020 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1021 conf->nodename, (const char *)si, (const char *)rsi);
993 } 1022 }
1023
1024 delete d;
1025
1026 break;
994 } 1027 }
995 } 1028 }
996 else
997 slog (L_ERR, _("received data packet from unknown source %s"), (const char *)rsi);
998 } 1029 }
999 1030
1000 send_reset (rsi); 1031 send_reset (rsi);
1001 break; 1032 break;
1002 1033
… …
1070 } 1101 }
1071 else 1102 else
1072 reset_connection (); 1103 reset_connection ();
1073} 1104}
1074 1105
1075void connection::connect_request (int id) 1106void connection::send_connect_request (int id)
1076{ 1107{
1077 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1108 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1078 1109
1079 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1110 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id);
1080 p->hmac_set (octx); 1111 p->hmac_set (octx);
1081 vpn->send_vpn_packet (p, si); 1112 send_vpn_packet (p, si);
1082 1113
1083 delete p; 1114 delete p;
1084} 1115}
1085 1116
1086void connection::script_node () 1117void connection::script_node ()

Diff Legend

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