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.43 by pcg, Fri Mar 4 04:52:38 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
… …
656} 659}
657 660
658void 661void
659connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 662connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
660{ 663{
661 if (!vpn->send_vpn_packet (pkt, si, tos)) 664 bool ok;
665
666 switch (si.prot)
667 {
668 case PROT_IPv4:
669 ok = vpn->send_ipv4_packet (pkt, si, tos); break;
670 case PROT_UDPv4:
671 ok = vpn->send_udpv4_packet (pkt, si, tos); break;
672#if ENABLE_TCP
673 case PROT_TCPv4:
674 ok = vpn->send_tcpv4_packet (pkt, si, tos); break;
675#endif
676#if ENABLE_ICMP
677 case PROT_ICMPv4:
678 ok = vpn->send_icmpv4_packet (pkt, si, tos); break;
679#endif
680#if ENABLE_DNS
681 case PROT_DNSv4:
682 ok = send_dnsv4_packet (pkt, si, tos); break;
683#endif
684
685 default:
686 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
687 ok = false;
688 }
689
690 if (!ok)
662 reset_connection (); 691 reset_connection ();
663} 692}
664 693
665void 694void
666connection::send_ping (const sockinfo &si, u8 pong) 695connection::send_ping (const sockinfo &si, u8 pong)
… …
744 && connectmode != conf_node::C_DISABLED 773 && connectmode != conf_node::C_DISABLED
745 && NOW > w.at) 774 && NOW > w.at)
746 { 775 {
747 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 776 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
748 777
749 if (retry_int < 3600 * 8) 778 if (retry_int < conf->max_retry)
750 retry_cnt++; 779 retry_cnt++;
780 else
781 retry_int = conf->max_retry;
751 782
752 w.start (NOW + retry_int); 783 w.start (NOW + retry_int);
753 784
754 reset_si (); 785 reset_si ();
755 786
… …
783 } 814 }
784 815
785 delete ictx; ictx = 0; 816 delete ictx; ictx = 0;
786 delete octx; octx = 0; 817 delete octx; octx = 0;
787 818
788 si.host= 0; 819 si.host = 0;
789 820
790 last_activity = 0; 821 last_activity = 0;
791 retry_cnt = 0; 822 retry_cnt = 0;
792 823
793 rekey.stop (); 824 rekey.stop ();
… …
1096 break; 1127 break;
1097 1128
1098 case vpn_packet::PT_CONNECT_INFO: 1129 case vpn_packet::PT_CONNECT_INFO:
1099 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1130 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1100 { 1131 {
1101 connect_info_packet *p = (connect_info_packet *) pkt; 1132 connect_info_packet *p = (connect_info_packet *)pkt;
1102 1133
1103 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1134 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything
1104 1135 {
1105 connection *c = vpn->conns[p->id - 1]; 1136 connection *c = vpn->conns[p->id - 1];
1106 1137
1107 c->conf->protocols = p->protocols; 1138 c->conf->protocols = p->protocols;
1108 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1139 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1109 p->si.upgrade_protocol (protocol, c->conf); 1140 p->si.upgrade_protocol (protocol, c->conf);
1110 1141
1111 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1142 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1112 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1143 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1113 1144
1114 const sockinfo &dsi = forward_si (p->si); 1145 const sockinfo &dsi = forward_si (p->si);
1115 1146
1116 if (dsi.valid ()) 1147 if (dsi.valid ())
1117 c->send_auth_request (dsi, true); 1148 c->send_auth_request (dsi, true);
1149 }
1118 } 1150 }
1119 1151
1120 break; 1152 break;
1121 1153
1122 default: 1154 default:
… …
1186 putenv ("STATE=down"); 1218 putenv ("STATE=down");
1187 1219
1188 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1220 return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
1189} 1221}
1190 1222
1191connection::connection(struct vpn *vpn_) 1223connection::connection (struct vpn *vpn, conf_node *conf)
1192: vpn(vpn_) 1224: vpn(vpn), conf(conf)
1193, rekey (this, &connection::rekey_cb) 1225, rekey (this, &connection::rekey_cb)
1194, keepalive (this, &connection::keepalive_cb) 1226, keepalive (this, &connection::keepalive_cb)
1195, establish_connection (this, &connection::establish_connection_cb) 1227, establish_connection (this, &connection::establish_connection_cb)
1228#if ENABLE_DNS
1229, dns (0)
1230#endif
1196{ 1231{
1197 octx = ictx = 0; 1232 octx = ictx = 0;
1198 retry_cnt = 0; 1233 retry_cnt = 0;
1199 1234
1235 if (!conf->protocols) // make sure some protocol is enabled
1236 conf->protocols = PROT_UDPv4;
1237
1200 connectmode = conf_node::C_ALWAYS; // initial setting 1238 connectmode = conf_node::C_ALWAYS; // initial setting
1201 reset_connection (); 1239 reset_connection ();
1202} 1240}
1203 1241
1204connection::~connection () 1242connection::~connection ()

Diff Legend

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