diff options
Diffstat (limited to 'lib/chutney/TorNet.py')
| -rw-r--r-- | lib/chutney/TorNet.py | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 559b635..eb8c310 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -65,8 +65,8 @@ class Node(object): nodelist.append(self) @staticmethod - def create(number, args): - return [Node(kwargs = args) for i in range(0, number)] + def create(number, kwargs): + return [Node(**kwargs) for i in range(0, number)] def specialize(self, **kwargs): return Node(parent=self, **kwargs) @@ -97,6 +97,7 @@ class Node(object): """ if self._stemcontroller is None: self._stemcontroller = stem.control.Controller.from_port(port = self._env['controlport']) + self._stemcontroller.authenticate() return self._stemcontroller def setNodenum(self, num): @@ -366,7 +367,7 @@ class LocalNodeBuilder(NodeBuilder): # 'basic' if hasbridgeauth: options = ("AlternateDirAuthority",) - else: + else: options = ("DirAuthority",) self._env['dirserver_flags'] += " hs v3ident=%s" % v3id @@ -571,7 +572,7 @@ class TorEnviron(chutney.Templating.Environ): def _get_dirport(self, my): return my['dirport_base']+my['nodenum'] - def _get_dir(self, my): + def _get_dir(self, my): return os.path.abspath(os.path.join(my['net_base_dir'], "nodes", "%03d%s"%(my['nodenum'], my['tag']))) @@ -725,10 +726,14 @@ def runConfigFile(verb, f): return getattr(network, verb)() +def signal_handler(signal, frame): + _THE_NETWORK.stop() + sys.exit(0) + def main(): global _BASE_ENVIRON global _THE_NETWORK - _BASE_ENVIRON = TorEnviron(chutney.Templating.Environ(**DEFAULTS)) + _BASE_ENVIRON = chutney.Templating.Environ(**DEFAULTS) _THE_NETWORK = Network(_BASE_ENVIRON) if len(sys.argv) < 3: @@ -739,8 +744,12 @@ def main(): f = open(sys.argv[2]) result = runConfigFile(sys.argv[1], f) if result is False: - return -1 + sys.exit(-1) + + signal.signal(signal.SIGINT, signal_handler) + signal.pause() + return 0 if __name__ == '__main__': - sys.exit(main()) + main() |