X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=a8860fb2929c473d90c69f2e547478db68021189;hp=17eb3bdf57b7b05f8c34c3c11b067afa7e12496d;hb=6365d0627b9b1e9a31371ec891db0d2cfb4d6ed4;hpb=9a0a50cd3cf2570b39e00edf1a92123acbac41b4

diff --git a/src/protocol.c b/src/protocol.c
index 17eb3bdf..a8860fb2 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.94 2001/06/09 10:00:34 guus Exp $
+    $Id: protocol.c,v 1.28.4.96 2001/07/01 09:21:01 guus Exp $
 */
 
 #include "config.h"
@@ -253,8 +253,14 @@ cp
   
   node = avl_unlink(connection_tree, cl);
   cl->port = port;
-  avl_insert_node(connection_tree, node);
-
+  if(!avl_insert_node(connection_tree, node))
+    {
+      old = avl_search_node(connection_tree, node)->data;
+      syslog(LOG_ERR, _("%s is listening on %s:%hd, which is already in use by %s!"),
+             cl->name, cl->hostname, cl->port, old->name);
+      return -1;
+    }
+    
   /* Read in the public key, so that we can send a metakey */
 
   if(read_rsa_public_key(cl))