--- gvpe/src/connection.C	2005/03/02 05:49:31	1.41
+++ gvpe/src/connection.C	2005/03/07 01:31:26	1.47
@@ -1,8 +1,10 @@
 /*
     connection.C -- manage a single connection
-    Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>
+    Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
  
-    This program is free software; you can redistribute it and/or modify
+    This file is part of GVPE.
+
+    GVPE is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
@@ -13,7 +15,7 @@
     GNU General Public License for more details.
  
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
+    along with gvpe; if not, write to the Free Software
     Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
@@ -644,8 +646,8 @@
 
       if (r)
         {
-          slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"),
-                conf->nodename, r->conf->nodename);
+          slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
+                conf->nodename, r->conf->nodename, (const char *)r->si);
           return r->si;
         }
       else
@@ -659,33 +661,7 @@
 void
 connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
 {
-  bool ok;
-
-  switch (si.prot)
-    {
-      case PROT_IPv4:
-        ok = vpn->send_ipv4_packet (pkt, si, tos); break;
-      case PROT_UDPv4:
-        ok = vpn->send_udpv4_packet (pkt, si, tos); break;
-#if ENABLE_TCP 
-      case PROT_TCPv4:
-        ok = vpn->send_tcpv4_packet (pkt, si, tos); break;
-#endif
-#if ENABLE_ICMP
-      case PROT_ICMPv4:
-        ok = vpn->send_icmpv4_packet (pkt, si, tos); break;
-#endif
-#if ENABLE_DNS
-      case PROT_DNSv4:
-        ok = send_dnsv4_packet (pkt, si, tos); break;
-#endif
-
-      default:
-        slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
-        ok = false;
-    }
-
-  if (!ok)
+  if (!vpn->send_vpn_packet (pkt, si, tos))
     reset_connection ();
 }
 
@@ -771,23 +747,24 @@
       && connectmode != conf_node::C_DISABLED
       && NOW > w.at)
     {
-      double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
+      w.at = TSTAMP_MAX; // first disable this watcher in case of recursion
 
-      if (retry_int < conf->max_retry)
-        retry_cnt++;
-      else
-        retry_int = conf->max_retry;
-
-      w.start (NOW + retry_int);
+      double retry_int = double (retry_cnt & 3
+                                 ? (retry_cnt & 3) + 1
+                                 : 1 << (retry_cnt >> 2));
 
       reset_si ();
 
+      bool slow = si.prot & PROT_SLOW;
+
       if (si.prot && !si.host)
         vpn->send_connect_request (conf->id);
       else
         {
           const sockinfo &dsi = forward_si (si);
 
+          slow = slow || (dsi.prot & PROT_SLOW);
+
           if (dsi.valid () && auth_rate_limiter.can (dsi))
             {
               if (retry_cnt < 4)
@@ -796,6 +773,15 @@
                 send_ping (dsi, 0);
             }
         }
+
+      retry_int *= slow ? 3. : 0.7;
+
+      if (retry_int < conf->max_retry)
+        retry_cnt++;
+      else
+        retry_int = conf->max_retry;
+
+      w.start (NOW + retry_int);
     }
 }
 
@@ -813,6 +799,9 @@
 
   delete ictx; ictx = 0;
   delete octx; octx = 0;
+#if ENABLE_DNS
+  dnsv4_reset_connection ();
+#endif
 
   si.host = 0;
 
@@ -1224,9 +1213,7 @@
 , keepalive (this, &connection::keepalive_cb)
 , establish_connection (this, &connection::establish_connection_cb)
 #if ENABLE_DNS
-, dnsv4_tw (this, &connection::dnsv4_cb)
-, dns_rcvdq (0), dns_snddq (0)
-, dns_rcvseq (0), dns_sndseq (0)
+, dns (0)
 #endif
 {
   octx = ictx = 0;