From: Guus Sliepen <guus@tinc-vpn.org>
Date: Wed, 6 Jun 2001 19:11:16 +0000 (+0000)
Subject: Log and warn about duplicate subnet_add()'s for the same subnet.
X-Git-Tag: release-1.0pre5~127
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ce6c8e6d089abac81520c517185c6ef81b09f051;p=oweals%2Ftinc.git

Log and warn about duplicate subnet_add()'s for the same subnet.
---

diff --git a/src/subnet.c b/src/subnet.c
index 2e1a24a..537be11 100644
--- a/src/subnet.c
+++ b/src/subnet.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: subnet.c,v 1.1.2.21 2001/06/05 18:07:14 guus Exp $
+    $Id: subnet.c,v 1.1.2.22 2001/06/06 19:11:16 guus Exp $
 */
 
 #include "config.h"
@@ -127,7 +127,25 @@ void subnet_add(connection_t *cl, subnet_t *subnet)
 {
 cp
   subnet->owner = cl;
-  avl_insert(subnet_tree, subnet);
+
+  while(!avl_insert(subnet_tree, subnet))
+    {
+      subnet_t *old;
+      
+      old = (subnet_t *)avl_search(subnet_tree, subnet);
+
+      if(debug_lvl >= DEBUG_PROTOCOL)
+        {
+          char *subnetstr;
+          subnetstr = net2str(subnet);
+          syslog(LOG_WARNING, _("Duplicate subnet %s for %s (%s), previous owner %s (%s)!"),
+                 subnetstr, cl->name, cl->hostname, old->owner->name, old->owner->hostname);
+          free(subnetstr);
+        }
+
+      subnet_del(old);
+    }
+
   avl_insert(cl->subnet_tree, subnet);
 cp
 }