--- gvpe/src/connection.C	2004/05/30 17:36:00	1.36
+++ gvpe/src/connection.C	2004/10/12 12:06:06	1.39
@@ -746,8 +746,10 @@
     {
       double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
 
-      if (retry_int < 3600 * 8)
+      if (retry_int < conf->max_retry)
         retry_cnt++;
+      else
+        retry_int = conf->max_retry;
 
       w.start (NOW + retry_int);
 
@@ -785,7 +787,7 @@
   delete ictx; ictx = 0;
   delete octx; octx = 0;
 
-  si.host= 0;
+  si.host = 0;
 
   last_activity = 0;
   retry_cnt = 0;
@@ -1098,23 +1100,24 @@
       case vpn_packet::PT_CONNECT_INFO:
         if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
           {
-            connect_info_packet *p = (connect_info_packet *) pkt;
-
-            assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything
+            connect_info_packet *p = (connect_info_packet *)pkt;
 
-            connection *c = vpn->conns[p->id - 1];
+            if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything
+              {
+                connection *c = vpn->conns[p->id - 1];
 
-            c->conf->protocols = p->protocols;
-            protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
-            p->si.upgrade_protocol (protocol, c->conf);
+                c->conf->protocols = p->protocols;
+                protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
+                p->si.upgrade_protocol (protocol, c->conf);
 
-            slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
-                           conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
+                slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
+                               conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
 
-            const sockinfo &dsi = forward_si (p->si);
+                const sockinfo &dsi = forward_si (p->si);
 
-            if (dsi.valid ())
-              c->send_auth_request (dsi, true);
+                if (dsi.valid ())
+                  c->send_auth_request (dsi, true);
+              }
           }
 
         break;