Switched vantage point to London.

diff --git a/Makefile b/Makefile
index 3051e34aaf1134dad1b9ddff3ea9aad0e04490bf..b701017cf32769bbe77720a24cd44c13db6d1ae6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,4 +7,4 @@ db.sqlite3:
        python makedb.py
 
 clean:
-       rm -i thyme_apnic_net* ip4net2asn.txt asn2name.txt db.sqlite3
+       rm -i thyme_apnic_net_* ip4net2asn.txt asn2name.txt db.sqlite3

diff --git a/get_asnmap.sh b/get_asnmap.sh
index 1e6a0bfe180e527315a7ba5aa128e28e7fd0a7d1..1623bb701abb11411d87ee57b9ea4f58d5aa079d 100644 (file)
--- a/get_asnmap.sh
+++ b/get_asnmap.sh
@@ -2,16 +2,24 @@
 
 # http://thyme.apnic.net/
 
+# Vantage point.
+#
+# Options:
+# - "current" (jp)
+# - "au"
+# - "london"
+# - "singapore"
+# - "hk"
+# - "guam"
+#
+vp="london"
+
 tstamp=$(date +%Y%m%d);
 
-# Also current (jp), au, hk, london
-curl -L "http://thyme.apnic.net/us/data-raw-table" \
-       -o "thyme_apnic_net_us_net2asn_${tstamp}.txt" && \
-rm -f ip4net2asn.txt && \
-ln -s "thyme_apnic_net_us_net2asn_${tstamp}.txt" ip4net2asn.txt
+curl -L "http://thyme.apnic.net/${vp}/data-raw-table" \
+       -o "thyme_apnic_net_${vp}_net2asn_${tstamp}.txt" && \
+ln -f -s "thyme_apnic_net_${vp}_net2asn_${tstamp}.txt" ip4net2asn.txt
 
-# Also current (jp), au, hk, london
-curl -L "http://thyme.apnic.net/hk/data-used-autnums" \
-       -o "thyme_apnic_net_us_asn2name_${tstamp}.txt" && \
-rm -f asn2name.txt && \
-ln -s "thyme_apnic_net_us_asn2name_${tstamp}.txt" asn2name.txt
+curl -L "http://thyme.apnic.net/${vp}/data-used-autnums" \
+       -o "thyme_apnic_net_${vp}_asn2name_${tstamp}.txt" && \
+ln -f -s "thyme_apnic_net_${vp}_asn2name_${tstamp}.txt" asn2name.txt