Set $INTERFACE correctly when using ethertap while compiled with tun/tap support.

[tinc] / src / protocol_auth.c

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index cbe0958..6b5b874 100644 (file)
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.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_auth.c,v 1.1.4.5 2002/03/22 13:31:18 guus Exp $
+    $Id: protocol_auth.c,v 1.1.4.7 2002/03/23 20:21:10 guus Exp $
 */
 
 #include "config.h"
@@ -473,7 +473,7 @@ cp
   gettimeofday(&now, NULL);
   c->estimated_weight = (now.tv_sec - c->start.tv_sec) * 1000 + (now.tv_usec - c->start.tv_usec) / 1000;
   sockaddr2str(&c->address, &address, &port);
-  x = send_request(c, "%d %s %s %s %d %lx", ACK, myport, address, port, c->estimated_weight, c->options);
+  x = send_request(c, "%d %s %s %d %lx", ACK, myport, address, c->estimated_weight, c->options);
   free(address);
   free(port);
 cp
@@ -602,11 +602,6 @@ cp
   /* Run MST and SSSP algorithms */
  
   graph();
-
-  /* Succesful connection, reset timeout if this is an outgoing connection. */
-  
-  if(c->outgoing)
-    c->outgoing->timeout = 0;
 cp
   return 0;
 }