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.41 by pcg, Wed Mar 2 05:49:31 2005 UTC vs.
Revision 1.46 by pcg, Sat Mar 5 19:13:15 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
… …
642 { 644 {
643 connection *r = vpn->find_router (); 645 connection *r = vpn->find_router ();
644 646
645 if (r) 647 if (r)
646 { 648 {
647 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 649 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
648 conf->nodename, r->conf->nodename); 650 conf->nodename, r->conf->nodename, (const char *)r->si);
649 return r->si; 651 return r->si;
650 } 652 }
651 else 653 else
652 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 654 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
653 conf->nodename); 655 conf->nodename);
… …
657} 659}
658 660
659void 661void
660connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 662connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
661{ 663{
662 bool ok; 664 if (!vpn->send_vpn_packet (pkt, si, tos))
663
664 switch (si.prot)
665 {
666 case PROT_IPv4:
667 ok = vpn->send_ipv4_packet (pkt, si, tos); break;
668 case PROT_UDPv4:
669 ok = vpn->send_udpv4_packet (pkt, si, tos); break;
670#if ENABLE_TCP
671 case PROT_TCPv4:
672 ok = vpn->send_tcpv4_packet (pkt, si, tos); break;
673#endif
674#if ENABLE_ICMP
675 case PROT_ICMPv4:
676 ok = vpn->send_icmpv4_packet (pkt, si, tos); break;
677#endif
678#if ENABLE_DNS
679 case PROT_DNSv4:
680 ok = send_dnsv4_packet (pkt, si, tos); break;
681#endif
682
683 default:
684 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
685 ok = false;
686 }
687
688 if (!ok)
689 reset_connection (); 665 reset_connection ();
690} 666}
691 667
692void 668void
693connection::send_ping (const sockinfo &si, u8 pong) 669connection::send_ping (const sockinfo &si, u8 pong)
… …
811 run_script (run_script_cb (this, &connection::script_node_down), false); 787 run_script (run_script_cb (this, &connection::script_node_down), false);
812 } 788 }
813 789
814 delete ictx; ictx = 0; 790 delete ictx; ictx = 0;
815 delete octx; octx = 0; 791 delete octx; octx = 0;
792#if ENABLE_DNS
793 dnsv4_reset_connection ();
794#endif
816 795
817 si.host = 0; 796 si.host = 0;
818 797
819 last_activity = 0; 798 last_activity = 0;
820 retry_cnt = 0; 799 retry_cnt = 0;
… …
1222: vpn(vpn), conf(conf) 1201: vpn(vpn), conf(conf)
1223, rekey (this, &connection::rekey_cb) 1202, rekey (this, &connection::rekey_cb)
1224, keepalive (this, &connection::keepalive_cb) 1203, keepalive (this, &connection::keepalive_cb)
1225, establish_connection (this, &connection::establish_connection_cb) 1204, establish_connection (this, &connection::establish_connection_cb)
1226#if ENABLE_DNS 1205#if ENABLE_DNS
1227, dnsv4_tw (this, &connection::dnsv4_cb) 1206, dns (0)
1228, dns_rcvdq (0), dns_snddq (0)
1229, dns_rcvseq (0), dns_sndseq (0)
1230#endif 1207#endif
1231{ 1208{
1232 octx = ictx = 0; 1209 octx = ictx = 0;
1233 retry_cnt = 0; 1210 retry_cnt = 0;
1234 1211

Diff Legend

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