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.24 2001/08/28 20:52:39 guus Exp $
*/
#include "config.h"
#include <stdio.h>
#include <syslog.h>
+#include <string.h>
#include "conf.h"
#include "net.h"
/* We compare as if a subnet is a number that equals (address << 32 + netmask). */
if(a->net.ipv4.address == b->net.ipv4.address)
- return a->net.ipv4.mask - b->net.ipv4.mask;
+ {
+ if(a->net.ipv4.mask < b->net.ipv4.mask)
+ return -1;
+ else if(a->net.ipv4.mask > b->net.ipv4.mask)
+ return 1;
+ else
+ return 0;
+ }
else
- return a->net.ipv4.address - b->net.ipv4.address;
+ {
+ if(a->net.ipv4.address < b->net.ipv4.address)
+ return -1;
+ else if(a->net.ipv4.address > b->net.ipv4.address)
+ return 1;
+ else
+ return 0;
+ }
}
int subnet_compare_ipv6(subnet_t *a, subnet_t *b)
{
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
}