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.36 by pcg, Sun May 30 17:36:00 2004 UTC vs.
Revision 1.47 by pcg, Mon Mar 7 01:31:26 2005 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 10 (at your option) any later version.
9 11
10 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 15 GNU General Public License for more details.
14 16
15 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18*/ 20*/
19 21
20#include "config.h" 22#include "config.h"
21 23
… …
627 protocol = best_protocol (THISNODE->protocols & conf->protocols); 629 protocol = best_protocol (THISNODE->protocols & conf->protocols);
628 630
629 // mask out protocols we cannot establish 631 // mask out protocols we cannot establish
630 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 632 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
631 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 633 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
634 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
632 635
633 si.set (conf, protocol); 636 si.set (conf, protocol);
634} 637}
635 638
636// ensure sockinfo is valid, forward if necessary 639// ensure sockinfo is valid, forward if necessary
… …
641 { 644 {
642 connection *r = vpn->find_router (); 645 connection *r = vpn->find_router ();
643 646
644 if (r) 647 if (r)
645 { 648 {
646 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 649 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
647 conf->nodename, r->conf->nodename); 650 conf->nodename, r->conf->nodename, (const char *)r->si);
648 return r->si; 651 return r->si;
649 } 652 }
650 else 653 else
651 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 654 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
652 conf->nodename); 655 conf->nodename);
… …
742 && conf != THISNODE 745 && conf != THISNODE
743 && connectmode != conf_node::C_NEVER 746 && connectmode != conf_node::C_NEVER
744 && connectmode != conf_node::C_DISABLED 747 && connectmode != conf_node::C_DISABLED
745 && NOW > w.at) 748 && NOW > w.at)
746 { 749 {
747 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 750 w.at = TSTAMP_MAX; // first disable this watcher in case of recursion
748 751
749 if (retry_int < 3600 * 8) 752 double retry_int = double (retry_cnt & 3
750 retry_cnt++; 753 ? (retry_cnt & 3) + 1
751 754 : 1 << (retry_cnt >> 2));
752 w.start (NOW + retry_int);
753 755
754 reset_si (); 756 reset_si ();
757
758 bool slow = si.prot & PROT_SLOW;
755 759
756 if (si.prot && !si.host) 760 if (si.prot && !si.host)
757 vpn->send_connect_request (conf->id); 761 vpn->send_connect_request (conf->id);
758 else 762 else
759 { 763 {
760 const sockinfo &dsi = forward_si (si); 764 const sockinfo &dsi = forward_si (si);
765
766 slow = slow || (dsi.prot & PROT_SLOW);
761 767
762 if (dsi.valid () && auth_rate_limiter.can (dsi)) 768 if (dsi.valid () && auth_rate_limiter.can (dsi))
763 { 769 {
764 if (retry_cnt < 4) 770 if (retry_cnt < 4)
765 send_auth_request (dsi, true); 771 send_auth_request (dsi, true);
766 else 772 else
767 send_ping (dsi, 0); 773 send_ping (dsi, 0);
768 } 774 }
769 } 775 }
776
777 retry_int *= slow ? 3. : 0.7;
778
779 if (retry_int < conf->max_retry)
780 retry_cnt++;
781 else
782 retry_int = conf->max_retry;
783
784 w.start (NOW + retry_int);
770 } 785 }
771} 786}
772 787
773void 788void
774connection::reset_connection () 789connection::reset_connection ()
… …
782 run_script (run_script_cb (this, &connection::script_node_down), false); 797 run_script (run_script_cb (this, &connection::script_node_down), false);
783 } 798 }
784 799
785 delete ictx; ictx = 0; 800 delete ictx; ictx = 0;
786 delete octx; octx = 0; 801 delete octx; octx = 0;
802#if ENABLE_DNS
803 dnsv4_reset_connection ();
804#endif
787 805
788 si.host= 0; 806 si.host = 0;
789 807
790 last_activity = 0; 808 last_activity = 0;
791 retry_cnt = 0; 809 retry_cnt = 0;
792 810
793 rekey.stop (); 811 rekey.stop ();
… …
1096 break; 1114 break;
1097 1115
1098 case vpn_packet::PT_CONNECT_INFO: 1116 case vpn_packet::PT_CONNECT_INFO:
1099 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1117 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1100 { 1118 {
1101 connect_info_packet *p = (connect_info_packet *) pkt; 1119 connect_info_packet *p = (connect_info_packet *)pkt;
1102 1120
1103 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1121 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything
1104 1122 {
1105 connection *c = vpn->conns[p->id - 1]; 1123 connection *c = vpn->conns[p->id - 1];
1106 1124
1107 c->conf->protocols = p->protocols; 1125 c->conf->protocols = p->protocols;
1108 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1126 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1109 p->si.upgrade_protocol (protocol, c->conf); 1127 p->si.upgrade_protocol (protocol, c->conf);
1110 1128
1111 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1129 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1112 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1130 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1113 1131
1114 const sockinfo &dsi = forward_si (p->si); 1132 const sockinfo &dsi = forward_si (p->si);
1115 1133
1116 if (dsi.valid ()) 1134 if (dsi.valid ())
1117 c->send_auth_request (dsi, true); 1135 c->send_auth_request (dsi, true);
1136 }
1118 } 1137 }
1119 1138
1120 break; 1139 break;
1121 1140
1122 default: 1141 default:
… …
1186 putenv ("STATE=down"); 1205 putenv ("STATE=down");
1187 1206
1188 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1207 return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
1189} 1208}
1190 1209
1191connection::connection(struct vpn *vpn_) 1210connection::connection (struct vpn *vpn, conf_node *conf)
1192: vpn(vpn_) 1211: vpn(vpn), conf(conf)
1193, rekey (this, &connection::rekey_cb) 1212, rekey (this, &connection::rekey_cb)
1194, keepalive (this, &connection::keepalive_cb) 1213, keepalive (this, &connection::keepalive_cb)
1195, establish_connection (this, &connection::establish_connection_cb) 1214, establish_connection (this, &connection::establish_connection_cb)
1215#if ENABLE_DNS
1216, dns (0)
1217#endif
1196{ 1218{
1197 octx = ictx = 0; 1219 octx = ictx = 0;
1198 retry_cnt = 0; 1220 retry_cnt = 0;
1199 1221
1222 if (!conf->protocols) // make sure some protocol is enabled
1223 conf->protocols = PROT_UDPv4;
1224
1200 connectmode = conf_node::C_ALWAYS; // initial setting 1225 connectmode = conf_node::C_ALWAYS; // initial setting
1201 reset_connection (); 1226 reset_connection ();
1202} 1227}
1203 1228
1204connection::~connection () 1229connection::~connection ()

Diff Legend

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