upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

2379. [contrib] queryperf/gen-data-queryperf.py: removed redundant

Browse source 
TLDs and supported RRs with TTLs [RT #17972]
This commit is contained in:
Tatuya JINMEI 神明達哉 2008-06-13 18:17:08 +00:00
parent 4875b50dca
commit 250dcb4cf5
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
2379. [contrib] queryperf/gen-data-queryperf.py: removed redundant
TLDs and supported RRs with TTLs [RT #17972]
2378. [bug] gssapi_functions{} had a redundant member in BIND 9.5.
[RT #18169]

27
contrib/queryperf/utils/gen-data-queryperf.py
View file

@ -1,7 +1,7 @@
#!/usr/bin/python
#
# $Id: gen-data-queryperf.py,v 1.1 2003/04/10 02:33:40 marka Exp $
# $Id: gen-data-queryperf.py,v 1.2 2008/06/13 18:17:08 jinmei Exp $
#
# Contributed by Stephane Bortzmeyer <bortzmeyer@nic.fr>
#
@ -32,9 +32,15 @@ percent_random = 0.3
gen = None
zone_file = None
domains = {}
domain_ns = "^([a-z0-9-]+)(\.([a-z0-9-\.]+|)|)( +IN|) +NS"
domain_ns = r'^([a-z0-9-\.]+)((\s+\d+)?(\s+IN)?|(\s+IN)(\s+\d+)?)\s+NS'
domain_ns_re = re.compile(domain_ns, re.IGNORECASE)
def remove_tld(label, tld):
if label.endswith('.' + tld + '.'):
return label[0:-(1+ len(tld) + 1)]
else:
return label
def gen_random_label():
label = ""
for i in range(gen.randint(1, maxsize)):
@ -52,7 +58,7 @@ def usage():
try:
optlist, args = getopt.getopt(sys.argv[1:], "hp:f:n:t:m:",
["help", "percentrandom=", "zonefile=",
"num=", "tld=",
"number=", "tld=",
"maxsize="])
for option, value in optlist:
if option == "--help" or option == "-h":
@ -86,15 +92,22 @@ if zone_file:
while line:
domain_line = domain_ns_re.match(line)
if domain_line:
domain = domain_line.group(1)
print domain_line.group(1)
domain = remove_tld(domain_line.group(1), tld)
domains[domain] = 1
line = file.readline()
file.close()
if zone_file:
domains = domains.keys()
if len(domains) == 0:
sys.stderr.write("No domains found in '%s'\n" % zone_file)
sys.exit(1)
for i in range(num):
if zone_file:
if gen.random() < percent_random:
print make_domain(gen_random_label())
sys.stdout.write(make_domain(gen_random_label()))
else:
print make_domain(gen.choice(domains.keys()))
sys.stdout.write(make_domain(gen.choice(domains)))
else:
print make_domain(gen_random_label())
sys.stdout.write(make_domain(gen_random_label()))
sys.stdout.write("\n")