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.20 2001/06/05 16:09:55 guus Exp $
+ $Id: subnet.c,v 1.1.2.23 2001/06/29 13:09:55 guus Exp $
*/
#include "config.h"
#include <stdio.h>
#include <syslog.h>
+#include <string.h>
#include "conf.h"
#include "net.h"
{
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
}
/* 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);