hackerncoder/trackingv2
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Lots of changes

Browse source 
Skip first 46 lines
Check running relays only
comment out downloading from collector
This commit is contained in:
HackerNCoder 2022-09-05 14:32:55 +00:00
parent f80eb9b0b8
commit c79eaed7c3
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
trackingv2.py
View file

@ -15,29 +15,30 @@ numberOfv2 = 0
consensus = "consensus" consensus = "consensus"
url = "https://collector.torproject.org/recent/relay-descriptors/consensuses/2022-{}-00-00-consensus".format(dt) #url = "https://collector.torproject.org/recent/relay-descriptors/consensuses/2022-{}-00-00-consensus".format(dt)
print(url) #print(url)
r = requests.get(url) #r = requests.get(url)
os.remove(consensus) #os.remove(consensus)
with open(consensus,"wb") as output: #with open(consensus,"wb") as output:
output.write(r.content) # output.write(r.content)
#file = open("/var/lib/tor/cached-microdesc-consensus", "r") consensus = open(consensus, "r")
file = open(consensus, "r")
for _ in range(46):
next(consensus)
while True: while True:
line1 = file.readline() line1 = consensus.readline()
if not line1: break if not line1: break
if re.search("^s", line1, re.IGNORECASE): if re.search("^s.*Running", line1, re.IGNORECASE):
isHSDir = False isHSDir = False
if re.search("^s.*HSDir", line1, re.IGNORECASE): if re.search("^s.*HSDir", line1, re.IGNORECASE):
numberOfHSDir += 1 numberOfHSDir += 1
isHSDir = True isHSDir = True
line2 = file.readline() line2 = consensus.readline()
if re.search("^v.*Tor (0.4.[6-9]|0.3.5.(17|18)|0.4.5.(11|12|13|14))", line2, re.IGNORECASE): if re.search("^v Tor 0\.(4\.[6-9]|3\.5\.(17|18)|4\.5\.(11|12|13|14))", line2, re.IGNORECASE):
if isHSDir: if isHSDir:
numberOfNonv2HSDir += 1 numberOfNonv2HSDir += 1
numberOfNonv2 += 1 numberOfNonv2 += 1
@ -45,13 +46,16 @@ while True:
if isHSDir: if isHSDir:
numberOfv2HSDir += 1 numberOfv2HSDir += 1
numberOfv2 += 1 numberOfv2 += 1
for _ in range(3):
next(consensus)
print(line1 + " " + line2 + " " + str(isHSDir))
dt = datetime.datetime.utcnow().strftime("%Y/%m/%d %H") dt = datetime.datetime.utcnow().strftime("%Y/%m/%d %H")
with open("trackingv2.csv", "a") as csvFile: with open("trackingv2.csv", "a") as csvFile:
csvFile.write("{},{},{},{}\n".format(numberOfv2HSDir, numberOfNonv2HSDir, numberOfHSDir, dt)) csvFile.write("{},{},{},{}\n".format(numberOfv2HSDir, numberOfNonv2HSDir, numberOfHSDir, dt))
with open("trackingv2relays.csv", "a") as relaysCsv: with open("trackingv2relays.csv", "a") as relaysCsv:
relaysCsv.write("{},{},{}\n".format(numberOfv2, numberOfNonv2, dt)) relaysCsv.write("{},{},{},{}\n".format(numberOfv2, numberOfNonv2, numberOfv2+numberOfNonv2, dt))
#print("Num HSDir: {}".format(numberOfHSDir)) #print("Num HSDir: {}".format(numberOfHSDir))
#print("< 0.4.6: {}".format(numberOfv2HSDir)) #print("< 0.4.6: {}".format(numberOfv2HSDir))