--- gvpe/src/connection.C	2005/03/04 09:36:45	1.45
+++ gvpe/src/connection.C	2005/03/07 01:31:26	1.47
@@ -646,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
@@ -661,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 ();
 }
 
@@ -773,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;
-
-      if (retry_int < conf->max_retry)
-        retry_cnt++;
-      else
-        retry_int = conf->max_retry;
+      w.at = TSTAMP_MAX; // first disable this watcher in case of recursion
 
-      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)
@@ -798,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);
     }
 }