Fresh import of RIPE lines; also added ilines.asn.conf which is a list

of AS numbers assigned to Switzerland and Liechtenstein according to the
RIPE NCC's database (ie delegated-ripencc-latest)

Added class 250 for the asn I lines, and inserted them in users.conf

This also obsoletes the update_ilines.sh shell script, replaced by the
ilines_update.cron which will be run manually for a little while and then
cronned every month/quarter or so.


git-svn-id: svn+ssh://svn.ipng.nl/usr/share/subversion/repositories/ircnet.ipng.ch@34 c5d60b8d-fdcb-4146-b734-af4215e9eb71
This commit is contained in:
ircnet
2009-09-08 09:13:47 +00:00
parent fba72645fb
commit 6d1ecac1d2
8 changed files with 2417 additions and 46 deletions

View File

@ -169,16 +169,18 @@ def main():
ofile.write("# File generated on %s by %s@%s\n" %
(time.asctime(time.localtime(time.time())),
getpass.getuser(), socket.gethostname()))
ofile.write("# Commandline: %s\n" % ' '.join(sys.argv))
ofile.write("# assets=%s asns=%s output=%s class=%s\n" %
(','.join(_assets), ','.join(_asns), _output, _class))
# TODO(pim): Make these lines wrap at ~80char because the ircd config
# parser cannot take long lines :(
# ofile.write("# Commandline: %s\n" % ' '.join(sys.argv))
# ofile.write("# assets=%s asns=%s output=%s class=%s\n" %
# (','.join(_assets), ','.join(_asns), _output, _class))
ofile.write("# Objects found: %d route/route6, %d ASn, %d as-set\n\n" %
(len(all_route_list), len(_data['asn']), len(_assets)))
for _asset in _data['as-set']:
ofile.write("# %s: %s\n" %
(_asset, ', '.join(_data['as-set'][_asset])))
# for _asset in _data['as-set']:
# ofile.write("# %s: %s\n" %
# (_asset, ', '.join(_data['as-set'][_asset])))
ofile.write("#\n\n")
output_linecount = 0

View File

@ -1,20 +0,0 @@
#!/bin/sh
INPUT="delegated-ripencc-latest"
do_country()
# $1=country $2=class $3=threshold
{
./delegated_ilines.py -i $INPUT -o ilines.$1.$$ -y $2 -c $1
[ ! -r ilines.$1.$$ ] && return -1
[ `wc -l ilines.$1.$$ | awk '{ print $1 }'` -lt $3 ] && {
echo "$1: File too short, less than $3 lines"
return -2
}
mv ilines.$1.$$ ../include/ilines.$1.conf
return 0
}
do_country ch 200 1000
do_country li 202 15