X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=1fe75e711a127eb6da2831a91a5d23ffaf21ca2a;hp=70122c1be7bfeb9e6d62bca7f76e942487be713f;hb=4aeaea5e590fbd38aebbfacf2672304d04ba4ad1;hpb=45a28b1e893d4da9d7977945a35ec6a8e4554830

diff --git a/src/protocol.c b/src/protocol.c
index 70122c1b..1fe75e71 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol.c,v 1.28.4.10 2000/06/27 12:58:04 guus Exp $
+    $Id: protocol.c,v 1.28.4.11 2000/06/27 20:10:48 guus Exp $
 */
 
 #include "config.h"
@@ -403,16 +403,6 @@ cp
     {
        syslog(LOG_ERR, _("Got bad BASIC_INFO from %s"),
               cl->hostname);
-       if(cl->status.outgoing)
-         {
-           /* If we get here, it means that our uplink uses the wrong protocol.
-              If we don't do anything, we will reconnect every 5 seconds. Pretty dumb.
-              So we disable the outgoing flag, so that we won't reconnect anymore.
-              This still allows other tinc daemons to connect to us.
-            */
-           syslog(LOG_ERR, _("Warning: disabling uplink!"));
-           cl->status.outgoing = 0;
-         }
        return -1;
     }  
 
@@ -519,6 +509,7 @@ cp
   cl->status.active = 1;
   syslog(LOG_NOTICE, _("Connection with " IP_ADDR_S " (%s) activated"),
               IP_ADDR_V(cl->vpn_ip), cl->hostname);
+  upstreamindex = 0;
 cp
   return 0;
 }