X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=537be117520913413a295a7200e4a7dc23ad5415;hp=51b1cd7a3158677a13d43e8c344ac78aabad0a81;hb=ce6c8e6d089abac81520c517185c6ef81b09f051;hpb=0a3c8cefd4a154948799baaaa246cf0eba050eff

diff --git a/src/subnet.c b/src/subnet.c
index 51b1cd7a..537be117 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.19 2001/06/01 08:02:09 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
 }
@@ -244,7 +262,7 @@ cp
                    subnet->net.ipv6.mask.x[7]);
         break;
       default:
-        asprintf(&netstr, _("unknown"));
+        asprintf(&netstr, _("unknown subnet type"));
     }
 cp
   return netstr;
@@ -289,7 +307,7 @@ cp
             /* Otherwise, see if there is a bigger enclosing subnet */
 
             subnet.net.ipv4.mask = p->net.ipv4.mask << 1;
-            subnet.net.ipv4.address &= subnet.net.ipv4.mask;
+            subnet.net.ipv4.address = p->net.ipv4.address & subnet.net.ipv4.mask;
           }
       }
    } while (p);