Browse Source

DirAuths bind themselves to the network now, just like Relays and Clients

Ian Goldberg 4 years ago
parent
commit
6bf079b351
3 changed files with 5 additions and 4 deletions
  1. 1 1
      client.py
  2. 3 2
      dirauth.py
  3. 1 1
      relay.py

+ 1 - 1
client.py

@@ -132,7 +132,7 @@ if __name__ == '__main__':
     for i in range(numdirauths):
         dira = dirauth.DirAuth(i, numdirauths)
         dirauths.append(dira)
-        dirauthaddrs.append(network.thenetwork.bind(dira))
+        dirauthaddrs.append(dira.netaddr)
 
     # Start some relays
     numrelays = 10

+ 3 - 2
dirauth.py

@@ -251,13 +251,14 @@ class DirAuth(network.Server):
         self.tot = tot
         self.name = "Dirauth %d of %d" % (me+1, tot)
         self.perfstats = PerfStats(EntType.DIRAUTH)
-        self.perfstats.name = self.name
         self.perfstats.is_bootstrapping = True
 
         # Create the dirauth signature keypair
         self.sigkey = nacl.signing.SigningKey.generate()
         self.perfstats.keygens += 1
 
+        self.netaddr = network.thenetwork.bind(self)
+        self.perfstats.name = "DirAuth at %s" % self.netaddr
         network.thenetwork.setdirauthkey(me, self.sigkey.verify_key)
         network.thenetwork.wantepochticks(self, True, True)
 
@@ -345,7 +346,7 @@ if __name__ == '__main__':
     dirauthaddrs = []
     for i in range(numdirauths):
         dirauth = DirAuth(i, numdirauths)
-        dirauthaddrs.append(network.thenetwork.bind(dirauth))
+        dirauthaddrs.append(dirauth.netaddr)
 
     for a in dirauthaddrs:
         print(a,end=' ')

+ 1 - 1
relay.py

@@ -388,7 +388,7 @@ if __name__ == '__main__':
     dirauthaddrs = []
     for i in range(numdirauths):
         dira = dirauth.DirAuth(i, numdirauths)
-        dirauthaddrs.append(network.thenetwork.bind(dira))
+        dirauthaddrs.append(dira.netaddr)
 
     # Start some relays
     numrelays = 10