chnum and usage counters are kept and unit test succeeds.

git-svn-id: file:///svn/nsd/trunk@3322 a26ef69c-88ff-0310-839f-98b793d9c207

Author: wcawijngaards

dbaccess.c

@@ -246,6 +246,7 @@ make_zone(namedb_type* db, const dname_type* dname, zone_options_t* zo,
 		dname->name_size, zone);
 	assert(zone->node);
 	zone->apex = domain_table_insert(db->domains, dname);
+	zone->apex->usage++; /* the zone.apex reference */
 	zone->soa_rrset = NULL;
 	zone->soa_nx_rrset = NULL;
 	zone->ns_rrset = NULL;

difffile.c

@@ -320,6 +320,27 @@ find_rr_num(rrset_type* rrset,
 	return -1;
 }
 
+/* fixup usage lower for domain names in the rdata */
+static void
+rr_lower_usage(rr_type* rr)
+{
+	unsigned i;
+	for(i=0; i<rr->rdata_count; i++) {
+		if(rdata_atom_is_domain(rr->type, i)) {
+			assert(rdata_atom_domain(rr->rdatas[i])->usage > 0);
+			rdata_atom_domain(rr->rdatas[i])->usage --;
+		}
+	}
+}
+
+static void
+rrset_lower_usage(rrset_type* rrset)
+{
+	unsigned i;
+	for(i=0; i<rrset->rr_count; i++)
+		rr_lower_usage(&rrset->rrs[i]);
+}
+
 int
 delete_RR(namedb_type* db, const dname_type* dname,
 	uint16_t type, uint16_t klass,
@@ -364,6 +385,8 @@ delete_RR(namedb_type* db, const dname_type* dname,
 				dname_to_string(dname,0));
 			return 1; /* not fatal error */
 		}
+		rr_lower_usage(&rrset->rrs[rrnum]);
+
 		/* delete the normalized RR from the udb */
 		udb_del_rr(db->udb, udbz, &rrset->rrs[rrnum]);
 		if(rrset->rr_count == 1) {
@@ -502,6 +525,7 @@ find_or_create_zone(namedb_type* db, const dname_type* zone_name,
 		zone_name->name_size, zone);
 	assert(zone->node);
 	zone->apex = domain;
+	domain->usage++; /* the zone.apex reference */
 	zone->soa_rrset = 0;
 	zone->soa_nx_rrset = 0;
 	zone->ns_rrset = 0;
@@ -540,6 +564,7 @@ delete_zone_rrs(namedb_type* db, zone_type* zone)
 			dname_to_string(domain_dname(domain),0)));
 		/* delete all rrsets of the zone */
 		while((rrset = domain_find_any_rrset(domain, zone))) {
+			rrset_lower_usage(rrset);
 			rrset_delete(db, domain, rrset);
 		}
 		domain = domain_next(domain);

namedb.c

@@ -187,6 +187,8 @@ domain_table_insert(domain_table_type *table,
 				dname_name(result->dname),
 				result->dname->name_size, result);
 			result->number = table->nametree->count;
+			if(result->parent)
+				result->parent->chnum ++;
 
 			/*
 			 * If the newly added domain name is larger

rdata.c

@@ -698,9 +698,11 @@ rdata_wireformat_to_rdata_atoms(region_type *region,
 				temp_rdatas[i].data[0] = dname->name_size;
 				memcpy(temp_rdatas[i].data+1, dname_name(dname),
 					dname->name_size);
-			} else
+			} else {
 				temp_rdatas[i].domain
 					= domain_table_insert(owners, dname);
+				temp_rdatas[i].domain->usage ++;
+			}
 		} else {
 			if (buffer_position(packet) + length > end) {
 				if (required) {

tpkg/cutest/cutest_namedb.c

@@ -479,9 +479,14 @@ check_walkdomains(CuTest* tc, namedb_type* db)
 	}
 	for(d=db->domains->root; d; d=domain_next(d)) {
 		/* check chnum */ 
-		/* TODO CuAssertTrue(tc, d->chnum == chnum[d->number]); */
+		CuAssertTrue(tc, d->chnum == chnum[d->number]);
 		/* check usage */
-		/* TODO CuAssertTrue(tc, d->usage == usage[d->number]); */
+		if(d->usage != usage[d->number]) {
+			printf("bad usage %s, have %d want %d\n",
+				dname_to_string(domain_dname(d), NULL),
+				(int)d->usage, (int)usage[d->number]);
+		}
+		CuAssertTrue(tc, d->usage == usage[d->number]);
 	}
 	free(numbers);
 	free(chnum);
@@ -711,6 +716,10 @@ test_add_del(CuTest *tc, namedb_type* db)
 	del_str(db, zone, &udbz, "lotso.example.org. IN TXT lotso\n");
 	check_namedb(tc, db);
 
+	zone->is_ok = 0;
+	delete_zone_rrs(db, zone);
+	check_namedb(tc, db);
+
 	udb_ptr_unlink(&udbz, db->udb);
 }
 

zonec.c

@@ -1001,6 +1001,7 @@ zadd_rdata_domain(domain_type *domain)
 	} else {
 		parser->current_rr.rdatas[parser->current_rr.rdata_count].domain
 			= domain;
+		domain->usage ++; /* new reference to domain */
 		++parser->current_rr.rdata_count;
 	}
 }